From dd5d614da2882cbe5df004378a4113b803614158 Mon Sep 17 00:00:00 2001 From: Phin Wolkwitz Date: Thu, 28 Sep 2023 12:34:54 +0200 Subject: [PATCH] Improve number display --- .../templates/pretixcontrol/event/new_index.html | 8 ++++---- src/pretix/control/views/new_dashboard.py | 8 ++++---- src/pretix/static/pretixcontrol/scss/_dashboard.scss | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/pretix/control/templates/pretixcontrol/event/new_index.html b/src/pretix/control/templates/pretixcontrol/event/new_index.html index 5a8f2ab1d1..330e660351 100644 --- a/src/pretix/control/templates/pretixcontrol/event/new_index.html +++ b/src/pretix/control/templates/pretixcontrol/event/new_index.html @@ -129,22 +129,22 @@
- -
+ -
+
{{ total_revenue.content|safe }} diff --git a/src/pretix/control/views/new_dashboard.py b/src/pretix/control/views/new_dashboard.py index d66d951489..dbcb1f9fbe 100644 --- a/src/pretix/control/views/new_dashboard.py +++ b/src/pretix/control/views/new_dashboard.py @@ -97,7 +97,7 @@ class IndexView(EventPermissionRequiredMixin, ChartContainingView, TemplateView) order__status__in=(Order.STATUS_PAID, Order.STATUS_PENDING), ).count() ctx['attendees_ordered'] = { - 'content': NUM_WIDGET.format(num=f'{tickc} ', + 'content': NUM_WIDGET.format(num=f'{tickc} ', text=_('Attendees (ordered)'), text_add=''), 'priority': 100, @@ -121,9 +121,9 @@ class IndexView(EventPermissionRequiredMixin, ChartContainingView, TemplateView) } ctx['attendees_paid_ordered'] = { 'content': NUM_WIDGET.format( - num=f' {tickc}', - text=_('Attendees'), - text_add=_(f'{paidc} paid, {tickc - paidc} pending')), + num='', + text=_(f'{paidc} paid, {tickc - paidc} pending'), + text_add=''), 'priority': 100, 'url': reverse('control:event.orders.overview', kwargs={ 'event': self.request.event.slug, diff --git a/src/pretix/static/pretixcontrol/scss/_dashboard.scss b/src/pretix/static/pretixcontrol/scss/_dashboard.scss index 9b1b0315ba..f546dd903d 100644 --- a/src/pretix/static/pretixcontrol/scss/_dashboard.scss +++ b/src/pretix/static/pretixcontrol/scss/_dashboard.scss @@ -11,10 +11,6 @@ margin-right: -15px; } -.no-background { - background: none !important; -} - .dashboard .widget-container { flex: 1 0 auto; align-self: stretch; @@ -24,6 +20,12 @@ background: #F8F8F8; } +.dashboard .widget-container.event-dashboard { + background: none !important; + padding: 0 5px 15px; + min-height: 0; +} + .dashboard .widget-container.widget-full { width: 100%; } @@ -34,8 +36,6 @@ .dashboard .widget-container.widget-small { width: 25%; - margin: 0; - padding: 0; } .dashboard .widget-container.widget-lazy-loading {