More pages

src/pretix/control/context.py

@@ -12,7 +12,9 @@ from pretix.base.settings import GlobalSettingsObject
 from ..helpers.i18n import (
     get_javascript_format, get_javascript_output_format, get_moment_locale,
 )
-from .signals import html_head, nav_event, nav_global, nav_topbar
+from .signals import (
+    html_head, nav_event, nav_event_settings, nav_global, nav_topbar,
+)
 
 SessionStore = import_module(settings.SESSION_ENGINE).SessionStore
 
@@ -44,6 +46,12 @@ def contextprocessor(request):
     if getattr(request, 'event', None) and hasattr(request, 'organizer') and request.user.is_authenticated:
         for receiver, response in nav_event.send(request.event, request=request):
             _nav_event += response
+
+        ctx['nav_event_settings'] = []
+        for recv, retv in nav_event_settings.send(sender=request.event, request=request):
+            ctx['nav_event_settings'] += retv
+        ctx['nav_event_settings'].sort(key=lambda n: n['label'])
+
         if request.event.settings.get('payment_term_weekdays'):
             _js_payment_weekdays_disabled = '[0,6]'
 

src/pretix/control/templates/pretixcontrol/event/base.html

@@ -14,10 +14,79 @@
     {% if 'can_change_event_settings' in request.eventpermset %}
         <li>
             <a href="{% url 'control:event.settings' organizer=request.event.organizer.slug event=request.event.slug %}"
-                    {% if is_event_settings or "event.settings" == url_name or "event.settings." in url_name %}class="active"{% endif %}>
+               class="has-children">
                 <i class="fa fa-wrench fa-fw"></i>
                 {% trans "Settings" %}
             </a>
+            <a href="#" class="arrow">
+                <span class="fa arrow"></span>
+            </a>
+            <ul class="nav nav-second-level">
+                {% if 'can_change_event_settings' in request.eventpermset %}
+                    <li>
+                        <a href="{% url 'control:event.settings' organizer=request.event.organizer.slug event=request.event.slug %}"
+                           {% if "event.settings" == url_name %}class="active"{% endif %}>
+                            {% trans "General" %}
+                        </a>
+                    </li>
+                    <li>
+                        <a href="{% url 'control:event.settings.payment' organizer=request.event.organizer.slug event=request.event.slug %}"
+                           {% if "event.settings.payment" == url_name %}class="active"{% endif %}>
+                            {% trans "Payment" %}
+                        </a>
+                    </li>
+                    <li>
+                        <a href="{% url 'control:event.settings.plugins' organizer=request.event.organizer.slug event=request.event.slug %}"
+                           {% if "event.settings.plugins" == url_name %}class="active"{% endif %}>
+                            {% trans "Plugins" %}
+                        </a>
+                    </li>
+                    <li {% if "event.settings.display" == url_name %}class="active"{% endif %}>
+                        <a href="{% url 'control:event.settings.display' organizer=request.event.organizer.slug event=request.event.slug %}"
+                           {% if "event.settings.display" == url_name %}class="active"{% endif %}>
+                            {% trans "Display" %}
+                        </a>
+                    </li>
+                    <li>
+                        <a href="{% url 'control:event.settings.tickets' organizer=request.event.organizer.slug event=request.event.slug %}"
+                           {% if "event.settings.tickets" == url_name %}class="active"{% endif %}>
+                            {% trans "Tickets" %}
+                        </a>
+                    </li>
+                    <li>
+                        <a href="{% url 'control:event.settings.mail' organizer=request.event.organizer.slug event=request.event.slug %}" {% if "event.settings.mail" == url_name %}class="active"{% endif %}>
+                            {% trans "E-mail" %}
+                        </a>
+                    </li>
+                    <li>
+                        <a href="{% url 'control:event.settings.tax' organizer=request.event.organizer.slug event=request.event.slug %}" {% if "event.settings.tax" in url_name %}class="active"{% endif %}>
+                            {% trans "Tax rules" %}
+                        </a>
+                    </li>
+                    <li>
+                        <a href="{% url 'control:event.settings.invoice' organizer=request.event.organizer.slug event=request.event.slug %}" {% if "event.settings.invoice" == url_name %}class="active"{% endif %}>
+                            {% trans "Invoicing" %}
+                        </a>
+                    </li>
+                    <li>
+                        <a href="{% url 'control:event.settings.permissions' organizer=request.event.organizer.slug event=request.event.slug %}" {% if "event.settings.permissions" == url_name %}class="active"{% endif %}>
+                            {% trans "Permissions" %}
+                        </a>
+                    </li>
+                    <li>
+                        <a href="{% url 'control:event.settings.widget' organizer=request.event.organizer.slug event=request.event.slug %}" {% if "event.settings.widget" == url_name %}class="active"{% endif %}>
+                            {% trans "Widget" %}
+                        </a>
+                    </li>
+                {% endif %}
+                {% for nav in nav_event_settings %}
+                    <li>
+                        <a href="{{ nav.url }}" {% if nav.active %}class="active"{% endif %}>
+                            {{ nav.label }}
+                        </a>
+                    </li>
+                {% endfor %}
+            </ul>
         </li>
         {% if request.event.has_subevents %}
             <li>

src/pretix/control/templates/pretixcontrol/event/display.html

@@ -6,22 +6,30 @@
     <form action="" method="post" class="form-horizontal" enctype="multipart/form-data">
         {% csrf_token %}
         {% bootstrap_form_errors form %}
-        <fieldset>
+        <fieldset class="panel panel-default">
+            <div class="panel-heading">
                 <legend>{% trans "Event page" %}</legend>
+            </div>
+            <div class="panel-body">
                 {% bootstrap_field form.logo_image layout="control" %}
                 {% bootstrap_field form.frontpage_text layout="control" %}
                 {% bootstrap_field form.show_variations_expanded layout="control" %}
                 {% if form.frontpage_subevent_ordering %}
                     {% bootstrap_field form.frontpage_subevent_ordering layout="control" %}
                 {% endif %}
+            </div>
         </fieldset>
-        <fieldset>
+        <fieldset class="panel panel-default">
+            <div class="panel-heading">
                 <legend>{% trans "Shop design" %}</legend>
+            </div>
+            <div class="panel-body">
                 {% url "control:organizer.display" organizer=request.organizer.slug as org_url %}
                 {% propagated request.event org_url "primary_color" "primary_font" %}
                     {% bootstrap_field form.primary_color layout="control" %}
                     {% bootstrap_field form.primary_font layout="control" %}
                 {% endpropagated %}
+            </div>
         </fieldset>
         <div class="form-group submit-group">
             <button type="submit" class="btn btn-primary btn-save">

src/pretix/control/templates/pretixcontrol/event/mail.html

@@ -6,15 +6,17 @@
           mail-preview-url="{% url "control:event.settings.mail.preview" event=request.event.slug organizer=request.event.organizer.slug %}">
         {% csrf_token %}
         {% bootstrap_form_errors form %}
-        <fieldset>
+        <fieldset class="panel panel-default">
+            <div class="panel-heading">
                 <legend>{% trans "E-mail settings" %}</legend>
+            </div>
+            <div class="panel-body">
                 {% bootstrap_field form.mail_prefix layout="control" %}
                 {% bootstrap_field form.mail_from layout="control" %}
                 {% bootstrap_field form.mail_text_signature layout="control" %}
                 {% bootstrap_field form.mail_bcc layout="control" %}
+            </div>
         </fieldset>
-        <fieldset>
-            <legend>{% trans "E-mail content" %}</legend>
         <div class="panel-group" id="questions_group">
             {% blocktrans asvar title_placed_order %}Placed order{% endblocktrans %}
             {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_placed" title=title_placed_order items="mail_text_order_placed" %}
@@ -46,9 +48,11 @@
             {% blocktrans asvar title_download_tickets_reminder %}Reminder to download tickets{% endblocktrans %}
             {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="ticket_reminder" title=title_download_tickets_reminder items="mail_days_download_reminder,mail_text_download_reminder" exclude="mail_days_download_reminder" %}
         </div>
-        </fieldset>
+        <fieldset class="panel panel-default">
-        <fieldset>
+            <div class="panel-heading">
                 <legend>{% trans "SMTP settings" %}</legend>
+            </div>
+            <div class="panel-body">
                 {% bootstrap_field form.smtp_use_custom layout="control" %}
                 {% bootstrap_field form.smtp_host layout="control" %}
                 {% bootstrap_field form.smtp_port layout="control" %}
@@ -56,6 +60,7 @@
                 {% bootstrap_field form.smtp_password layout="control" %}
                 {% bootstrap_field form.smtp_use_tls layout="control" %}
                 {% bootstrap_field form.smtp_use_ssl layout="control" %}
+            </div>
         </fieldset>
         <div class="form-group submit-group">
             <button type="submit" class="btn btn-primary btn-save">

src/pretix/control/templates/pretixcontrol/event/mail_settings_fragment.html

@@ -4,7 +4,10 @@
 <details class="panel panel-default">
     <summary class="panel-heading">
         <h4 class="panel-title">
+            <span>
+                {% trans "E-mail content:" %}
                 <strong>{% trans title %}</strong>
+            </span>
             <i class="fa fa-angle-down collapse-indicator"></i>
         </h4>
     </summary>

src/pretix/control/templates/pretixcontrol/event/payment.html

@@ -4,8 +4,10 @@
 {% block inside %}
     <form action="" method="post" class="form-horizontal form-plugins">
         {% csrf_token %}
-        <fieldset>
+        <fieldset class="panel panel-default">
+            <div class="panel-heading">
                 <legend>{% trans "Payment providers" %}</legend>
+            </div>
             <table class="table table-payment-providers">
                 <tbody>
                 {% for provider in providers %}
@@ -44,8 +46,11 @@
                 </tbody>
             </table>
         </fieldset>
-        <fieldset>
+        <fieldset class="panel panel-default">
+            <div class="panel-heading">
                 <legend>{% trans "General payment settings" %}</legend>
+            </div>
+            <div class="panel-body">
                 {% bootstrap_form_errors form layout="control" %}
                 {% bootstrap_field form.payment_term_days layout="control" %}
                 {% bootstrap_field form.payment_term_last layout="control" %}
@@ -53,6 +58,7 @@
                 {% bootstrap_field form.payment_term_expire_automatically layout="control" %}
                 {% bootstrap_field form.payment_term_accept_late layout="control" %}
                 {% bootstrap_field form.tax_rate_default layout="control" %}
+            </div>
         </fieldset>
         <div class="form-group submit-group">
             <button type="submit" class="btn btn-primary btn-save">

src/pretix/control/templates/pretixcontrol/event/plugins.html

@@ -4,8 +4,6 @@
 {% block inside %}
     <form action="" method="post" class="form-horizontal form-plugins">
         {% csrf_token %}
-		<fieldset>
-			<legend>{% trans "Installed plugins" %}</legend>
         {% if "success" in request.GET %}
             <div class="alert alert-success">
                 {% trans "Your changes have been saved." %}
@@ -22,13 +20,17 @@
                                 </div>
                                 <div class="col-sm-4">
                                     {% if plugin.app.compatibility_errors %}
-                                            <button class="btn disabled btn-block btn-default" disabled="disabled">{% trans "Incompatible" %}</button>
+                                        <button class="btn disabled btn-block btn-default"
+                                                disabled="disabled">{% trans "Incompatible" %}</button>
                                         {% elif plugin.restricted and not staff_session %}
-                                            <button class="btn disabled btn-block btn-default" disabled="disabled">{% trans "Not available" %}</button>
+                                        <button class="btn disabled btn-block btn-default"
+                                                disabled="disabled">{% trans "Not available" %}</button>
                                         {% elif plugin.module in plugins_active %}
-                                            <button class="btn btn-default btn-block" name="plugin:{{ plugin.module }}" value="disable">{% trans "Disable" %}</button>
+                                        <button class="btn btn-default btn-block" name="plugin:{{ plugin.module }}"
+                                                value="disable">{% trans "Disable" %}</button>
                                     {% else %}
-                                            <button class="btn btn-default btn-block" name="plugin:{{ plugin.module }}" value="enable">{% trans "Enable" %}</button>
+                                        <button class="btn btn-default btn-block" name="plugin:{{ plugin.module }}"
+                                                value="enable">{% trans "Enable" %}</button>
                                     {% endif %}
                                 </div>
                             </div>
@@ -74,6 +76,5 @@
                 </div>
             {% endfor %}
         </div>
-		</fieldset>
     </form>
 {% endblock %}

src/pretix/control/templates/pretixcontrol/event/settings.html

@@ -5,8 +5,11 @@
     <form action="" method="post" class="form-horizontal">
         {% csrf_token %}
         {% bootstrap_form_errors form %}
-        <fieldset>
+        <fieldset class="panel panel-default">
+            <div class="panel-heading">
                 <legend>{% trans "General information" %}</legend>
+            </div>
+            <div class="panel-body">
                 {% bootstrap_field form.name layout="control" %}
                 {% bootstrap_field form.slug layout="control" %}
                 {% bootstrap_field form.date_from layout="control" %}
@@ -35,9 +38,13 @@
                         </div>
                     </div>
                 {% endif %}
+            </div>
         </fieldset>
-        <fieldset>
+        <fieldset class="panel panel-default">
+            <div class="panel-heading">
                 <legend>{% trans "Display settings" %}</legend>
+            </div>
+            <div class="panel-body">
                 {% bootstrap_field sform.locales layout="control" %}
                 {% bootstrap_field sform.locale layout="control" %}
                 {% bootstrap_field sform.timezone layout="control" %}
@@ -48,17 +55,25 @@
                 {% bootstrap_field sform.confirm_text layout="control" %}
                 {% bootstrap_field sform.show_quota_left layout="control" %}
                 {% bootstrap_field sform.display_net_prices layout="control" %}
+            </div>
         </fieldset>
-        <fieldset>
+        <fieldset class="panel panel-default">
+            <div class="panel-heading">
                 <legend>{% trans "Timeline" %}</legend>
+            </div>
+            <div class="panel-body">
                 {% bootstrap_field form.presale_start layout="control" %}
                 {% bootstrap_field sform.presale_start_show_date layout="control" %}
                 {% bootstrap_field form.presale_end layout="control" %}
                 {% bootstrap_field sform.show_items_outside_presale_period layout="control" %}
                 {% bootstrap_field sform.last_order_modification_date layout="control" %}
+            </div>
         </fieldset>
-        <fieldset>
+        <fieldset class="panel panel-default">
+            <div class="panel-heading">
                 <legend>{% trans "Orders" %}</legend>
+            </div>
+            <div class="panel-body">
                 {% bootstrap_field sform.reservation_time layout="control" %}
                 {% bootstrap_field sform.max_items_per_order layout="control" %}
                 {% bootstrap_field sform.attendee_names_asked layout="control" %}
@@ -67,12 +82,17 @@
                 {% bootstrap_field sform.attendee_emails_asked layout="control" %}
                 {% bootstrap_field sform.attendee_emails_required layout="control" %}
                 {% bootstrap_field sform.cancel_allow_user layout="control" %}
+            </div>
         </fieldset>
-        <fieldset>
+        <fieldset class="panel panel-default">
+            <div class="panel-heading">
                 <legend>{% trans "Waiting list" %}</legend>
+            </div>
+            <div class="panel-body">
                 {% bootstrap_field sform.waiting_list_enabled layout="control" %}
                 {% bootstrap_field sform.waiting_list_auto layout="control" %}
                 {% bootstrap_field sform.waiting_list_hours layout="control" %}
+            </div>
         </fieldset>
         <div class="form-group submit-group">
             <button type="submit" class="btn btn-primary btn-save">

src/pretix/control/templates/pretixcontrol/event/settings_base.html

@@ -4,6 +4,8 @@
 {% block title %}{{ request.event.name }}{% endblock %}
 {% block content %}
     {% if "congratulations" in request.GET %}
+        <div class="panel panel-default">
+            <div class="panel-body">
                 <div class="thank-you">
                     <span class="fa fa-check-circle"></span>
 
@@ -13,7 +15,8 @@
                     </p>
                     <p>
                         {% blocktrans trimmed %}
-                    You can now scroll down and modify the settings in more detail, if you want, or you can create your
+                            You can now scroll down and modify the settings in more detail, if you want, or you can
+                            create your
                             first product to start selling tickets right away!
                         {% endblocktrans %}
                     </p>
@@ -25,70 +28,10 @@
                     </p>
                     <div class="clearfix"></div>
                 </div>
+            </div>
+        </div>
     {% endif %}
 
-    <h1>{% trans "Settings" %}</h1>
-    <ul class="nav nav-pills">
-        {% if 'can_change_event_settings' in request.eventpermset %}
-            <li {% if "event.settings" == url_name %}class="active"{% endif %}>
-                <a href="{% url 'control:event.settings' organizer=request.event.organizer.slug event=request.event.slug %}">
-                    {% trans "General" %}
-                </a>
-            </li>
-            <li {% if "event.settings.payment" == url_name %}class="active"{% endif %}>
-                <a href="{% url 'control:event.settings.payment' organizer=request.event.organizer.slug event=request.event.slug %}">
-                    {% trans "Payment" %}
-                </a>
-            </li>
-            <li {% if "event.settings.plugins" == url_name %}class="active"{% endif %}>
-                <a href="{% url 'control:event.settings.plugins' organizer=request.event.organizer.slug event=request.event.slug %}">
-                    {% trans "Plugins" %}
-                </a>
-            </li>
-            <li {% if "event.settings.display" == url_name %}class="active"{% endif %}>
-                <a href="{% url 'control:event.settings.display' organizer=request.event.organizer.slug event=request.event.slug %}">
-                    {% trans "Display" %}
-                </a>
-            </li>
-            <li {% if "event.settings.tickets" == url_name %}class="active"{% endif %}>
-                <a href="{% url 'control:event.settings.tickets' organizer=request.event.organizer.slug event=request.event.slug %}">
-                    {% trans "Tickets" %}
-                </a>
-            </li>
-            <li {% if "event.settings.mail" == url_name %}class="active"{% endif %}>
-                <a href="{% url 'control:event.settings.mail' organizer=request.event.organizer.slug event=request.event.slug %}">
-                    {% trans "E-mail" %}
-                </a>
-            </li>
-            <li {% if "event.settings.tax" in url_name %}class="active"{% endif %}>
-                <a href="{% url 'control:event.settings.tax' organizer=request.event.organizer.slug event=request.event.slug %}">
-                    {% trans "Tax rules" %}
-                </a>
-            </li>
-            <li {% if "event.settings.invoice" == url_name %}class="active"{% endif %}>
-                <a href="{% url 'control:event.settings.invoice' organizer=request.event.organizer.slug event=request.event.slug %}">
-                    {% trans "Invoicing" %}
-                </a>
-            </li>
-            <li {% if "event.settings.permissions" == url_name %}class="active"{% endif %}>
-                <a href="{% url 'control:event.settings.permissions' organizer=request.event.organizer.slug event=request.event.slug %}">
-                    {% trans "Permissions" %}
-                </a>
-            </li>
-            <li {% if "event.settings.widget" == url_name %}class="active"{% endif %}>
-                <a href="{% url 'control:event.settings.widget' organizer=request.event.organizer.slug event=request.event.slug %}">
-                    {% trans "Widget" %}
-                </a>
-            </li>
-        {% endif %}
-        {% for nav in nav_event_settings %}
-            <li {% if nav.active %}class="active"{% endif %}>
-                <a href="{{ nav.url }}">
-                    {{ nav.label }}
-                </a>
-            </li>
-        {% endfor %}
-    </ul>
     {% block inside %}
     {% endblock %}
 {% endblock %}

src/pretix/control/templates/pretixcontrol/event/tickets.html

@@ -4,12 +4,16 @@
 {% block inside %}
     <form action="" method="post" class="form-horizontal" enctype="multipart/form-data">
         {% csrf_token %}
-        <fieldset>
+        <fieldset class="panel panel-default">
+            <div class="panel-heading">
                 <legend>{% trans "Ticket download" %}</legend>
+            </div>
+            <div class="panel-body">
                 {% if request.event.settings.ticket_download and not any_enabled %}
                     <div class="alert alert-warning">
                         {% blocktrans trimmed %}
-                        You activated ticket downloads but no output provider is enabled. Be sure to enable a plugin and
+                            You activated ticket downloads but no output provider is enabled. Be sure to enable a plugin
+                            and
                             activate an output provider.
                         {% endblocktrans %}
                     </div>
@@ -19,6 +23,8 @@
                 {% bootstrap_field form.ticket_download_date layout="control" %}
                 {% bootstrap_field form.ticket_download_addons layout="control" %}
                 {% bootstrap_field form.ticket_download_nonadm layout="control" %}
+            </div>
+        </fieldset>
         {% for provider in providers %}
             <div class="panel panel-default ticketoutput-panel">
                 <div class="panel-heading">
@@ -42,7 +48,6 @@
                 {% trans "There are no ticket outputs available. Please go to the plugin settings and activate one or more ticket output plugins." %}</em>
             </div>
         {% endfor %}
-        </fieldset>
         <div class="form-group submit-group">
             <button type="submit" class="btn btn-primary btn-save">
                 {% trans "Save" %}

src/pretix/control/views/event.py

@@ -46,7 +46,6 @@ from pretix.control.forms.event import (
     TicketSettingsForm, WidgetCodeForm,
 )
 from pretix.control.permissions import EventPermissionRequiredMixin
-from pretix.control.signals import nav_event_settings
 from pretix.helpers.urls import build_absolute_uri
 from pretix.multidomain.urlreverse import get_domain
 from pretix.plugins.stripe.payment import StripeSettingsHolder
@@ -59,12 +58,7 @@ from ..logdisplay import OVERVIEW_BLACKLIST
 class EventSettingsViewMixin:
     def get_context_data(self, **kwargs):
         ctx = super().get_context_data(**kwargs)
-        ctx['nav_event_settings'] = []
         ctx['is_event_settings'] = True
-
-        for recv, retv in nav_event_settings.send(sender=self.request.event, request=self.request):
-            ctx['nav_event_settings'] += retv
-        ctx['nav_event_settings'].sort(key=lambda n: n['label'])
         return ctx
 
 

src/pretix/static/pretixbase/scss/_theme.scss

@@ -22,6 +22,14 @@
   margin-top: 0;
 }
 
+.panel-heading legend {
+  margin-top: 0;
+  margin-bottom: 0;
+  font-size: ceil(($font-size-base * 1.125));
+  border: 0;
+  color: inherit;
+}
+
 .btn {
   border-width: 0px;
 }
@@ -90,13 +98,36 @@
   color: #3b3b3b;
 }
 
-.panel {
+.box-shadow-small {
+  box-shadow:0 2px 5px 0 rgba(78,50,92,.1),0 1px 1px 0 rgba(0,0,0,.07);
+}
+.box-shadow-medium {
   box-shadow: 0 7px 14px 0 rgba(78, 50, 92, 0.1),0 3px 6px 0 rgba(0,0,0,.07);
 }
+.box-shadow-medium {
+  box-shadow: 0 15px 35px 0 rgba(78, 50, 92, 0.1),0 5px 15px 0 rgba(0,0,0,.07);
+}
+
+.panel {
+  box-shadow:0 2px 5px 0 rgba(78,50,92,.1),0 1px 1px 0 rgba(0,0,0,.07);
+}
 .panel-default > .panel-heading, .panel-default > .panel-footer {
   background: white;
 }
 
+.panel > table td:first-child,
+.panel > .table-responsive table td:first-child,
+.panel > table th:first-child,
+.panel > .table-responsive table th:first-child {
+  padding-left: $panel-body-padding;
+}
+.panel > table td:last-child,
+.panel > .table-responsive table td:last-child,
+.panel > table th:last-child,
+.panel > .table-responsive table th:last-child {
+  padding-right: $panel-body-padding;
+}
+
 .panel-danger > .panel-heading, .panel-success > .panel-heading, .panel-default > .panel-heading, .panel-info > .panel-heading, .panel-warning > .panel-heading {
   color: #000000;
 }

src/pretix/static/pretixcontrol/scss/_forms.scss

@@ -55,9 +55,11 @@ div[data-formset-body], div[data-formset-form], div[data-nested-formset-form], d
 }
 
 .submit-group {
+  background: white;
+  box-shadow:0 2px 5px 0 rgba(78,50,92,.1),0 1px 1px 0 rgba(0,0,0,.07);
+  border-radius: $panel-border-radius;
   margin: 15px 0 0 0 !important;
   padding: 15px;
-  background: #eeeeee;
   text-align: right;
   .btn-save {
     // btn-lg