diff --git a/src/pretix/control/templates/pretixcontrol/event/new_index.html b/src/pretix/control/templates/pretixcontrol/event/new_index.html index 8c77c1488a..5a8f2ab1d1 100644 --- a/src/pretix/control/templates/pretixcontrol/event/new_index.html +++ b/src/pretix/control/templates/pretixcontrol/event/new_index.html @@ -7,41 +7,63 @@ {% load eventsignal %} {% block title %}{{ request.event.name }}{% endblock %} {% block content %} -

- {{ request.event.name }} - - {% if request.event.has_subevents %} - {% trans "Event series" %} - {% else %} - {{ request.event.get_date_range_display }} - {% endif %} - -

-
- {% trans "Shop URL:" %} - {% abseventurl request.event "presale:event.index" %} - -
- - {% include "pretixcontrol/event/fragment_qr_dropdown.html" with url=0 %} -
-
- - {{ shop_state.content|safe }} - - - - -
+ {% include "pretixcontrol/event/fragment_qr_dropdown.html" with url=0 %} +
+
+ + {{ shop_state.content|safe }} + + + + +
+ + +
+ {% trans "Internal comment" %} +
+ {% csrf_token %} +
+ {% bootstrap_field comment_form.comment layout="horizontal" show_help=True show_label=False horizontal_field_class="col-md-12" %} +
+ {% if not comment_form.readonly %} +

+ +

+ {% endif %} +
+
+ {% if has_overpaid_orders %} @@ -93,26 +115,6 @@ {% endif %} - -
- {% trans "Internal comment" %} -
- {% csrf_token %} -
- {% bootstrap_field comment_form.comment layout="horizontal" show_help=True show_label=False horizontal_field_class="col-md-12" %} -
- {% if not comment_form.readonly %} -

-
- -

- {% endif %} -
-
- {% eventsignal request.event "pretix.control.signals.event_dashboard_top" request=request %} diff --git a/src/pretix/control/views/new_dashboard.py b/src/pretix/control/views/new_dashboard.py index 2526f33e5a..d66d951489 100644 --- a/src/pretix/control/views/new_dashboard.py +++ b/src/pretix/control/views/new_dashboard.py @@ -42,14 +42,14 @@ class IndexView(EventPermissionRequiredMixin, ChartContainingView, TemplateView) can_view_orders = self.request.user.has_event_permission(self.request.organizer, self.request.event, 'can_view_orders', request=self.request) - can_change_event_settings = self.request.user.has_event_permission(self.request.organizer, self.request.event, - 'can_change_event_settings', - request=self.request) + # can_change_event_settings = self.request.user.has_event_permission(self.request.organizer, self.request.event, + # 'can_change_event_settings', + # request=self.request) ctx = { 'subevent': subevent, 'comment_form': CommentForm(initial={'comment': self.request.event.comment}, - readonly=not can_change_event_settings), + readonly=True), # not can_change_event_settings), } if subevent: diff --git a/src/pretix/static/pretixcontrol/scss/_dashboard.scss b/src/pretix/static/pretixcontrol/scss/_dashboard.scss index 22f8ff0b58..9b1b0315ba 100644 --- a/src/pretix/static/pretixcontrol/scss/_dashboard.scss +++ b/src/pretix/static/pretixcontrol/scss/_dashboard.scss @@ -20,7 +20,7 @@ align-self: stretch; padding: 15px 5px; border: 5px solid white; - min-height: 160px; + min-height: 140px; background: #F8F8F8; } @@ -34,6 +34,8 @@ .dashboard .widget-container.widget-small { width: 25%; + margin: 0; + padding: 0; } .dashboard .widget-container.widget-lazy-loading { @@ -73,12 +75,19 @@ .text-add { display: block; - padding: 10px 0; + //padding: 10px 0; text-align: center; font-size: 20px; } } +.event-comment { + textarea.form-control { + height: 0; + min-height: 95px; + } +} + .shop_state { span.live, span.off { font-size: 16px;