diff --git a/src/pretix/presale/templates/pretixpresale/organizers/index.html b/src/pretix/presale/templates/pretixpresale/organizers/index.html index 6683920ee4..4a7bb82242 100644 --- a/src/pretix/presale/templates/pretixpresale/organizers/index.html +++ b/src/pretix/presale/templates/pretixpresale/organizers/index.html @@ -47,62 +47,66 @@ {% include "pretixpresale/fragment_event_list_filter.html" with request=request %} {% endif %} -
-
- {% for e in events %}{% eventurl e "presale:event.index" as url %} -
-
{{ e.name }}
-
- {% if e.settings.show_dates_on_frontpage %} - {% if e.has_subevents %} - {% icon "calendar" %} {% trans "Multiple dates" context "subevent" %} -
- - {{ e.daterange|default:e.get_date_range_display_as_html }} - - {% else %} - {{ e.daterange|default:e.get_date_range_display_as_html }} - {% if e.settings.show_times %} - {% timezone e.tzname %} -
- - {% icon "clock-o" %} - {{ e.date_from|date:"TIME_FORMAT" }} - {% if e.settings.show_date_to and e.date_to and e.date_to.date == e.date_from.date %} - – {{ e.date_to|date:"TIME_FORMAT" }} - {% endif %} - - {% endtimezone %} - {% endif %} - {% endif %} - {% else %} -   - {% endif %} -
-
- - {% include "pretixpresale/fragment_event_list_status.html" with event=e %} - -
-
- - {% if e.has_subevents %}{% icon "ticket" %} {% trans "Tickets" %} - {% elif e.presale_is_running and e.best_availability_state == 100 %} - {% icon "ticket" %} {% trans "Tickets" %} + {% if events %} +
+
+ {% for e in events %}{% eventurl e "presale:event.index" as url %} +
+
{{ e.name }}
+
+ {% if e.settings.show_dates_on_frontpage %} + {% if e.has_subevents %} + {% icon "calendar" %} {% trans "Multiple dates" context "subevent" %} +
+ + {{ e.daterange|default:e.get_date_range_display_as_html }} + {% else %} - {% icon "info" %} {% trans "More info" %} + {{ e.daterange|default:e.get_date_range_display_as_html }} + {% if e.settings.show_times %} + {% timezone e.tzname %} +
+ + {% icon "clock-o" %} + {{ e.date_from|date:"TIME_FORMAT" }} + {% if e.settings.show_date_to and e.date_to and e.date_to.date == e.date_from.date %} + – {{ e.date_to|date:"TIME_FORMAT" }} + {% endif %} + + {% endtimezone %} + {% endif %} {% endif %} - -
-
- {% empty %} - {% if "old" in request.GET %} -

{% if not events %}{% trans "No archived events found." %} {% endif %}{% trans "Show upcoming" %}

- {% else %} -

{% if not events %}{% trans "No public upcoming events found." %} {% endif %}{% trans "Show past events" %}

- {% endif %} - {% endfor %} -
+ {% else %} +   + {% endif %} +
+
+ + {% include "pretixpresale/fragment_event_list_status.html" with event=e %} + +
+
+ + {% if e.has_subevents %}{% icon "ticket" %} {% trans "Tickets" %} + {% elif e.presale_is_running and e.best_availability_state == 100 %} + {% icon "ticket" %} {% trans "Tickets" %} + {% else %} + {% icon "info" %} {% trans "More info" %} + {% endif %} + +
+
+ {% endfor %} +
+
+
+ {% endif %} +
+ {% if "old" in request.GET %} +

{% if not events %}{% trans "No archived events found." %} {% endif %}{% trans "Show upcoming" %}

+ {% else %} +

{% if not events %}{% trans "No public upcoming events found." %} {% endif %}{% trans "Show past events" %}

+ {% endif %}
{% include "pretixpresale/pagination.html" %} diff --git a/src/pretix/static/pretixpresale/scss/_event.scss b/src/pretix/static/pretixpresale/scss/_event.scss index 71d2cb779c..3b901caedb 100644 --- a/src/pretix/static/pretixpresale/scss/_event.scss +++ b/src/pretix/static/pretixpresale/scss/_event.scss @@ -145,6 +145,11 @@ article.item-with-variations .product-row:last-child:after { margin-bottom: 0; } +.panel > hr { + margin: 0; + border-top: 1px solid $table-border-color; +} + .product-row { padding: 1.25*$line-height-computed 0; diff --git a/src/pretix/static/pretixpresale/scss/main.scss b/src/pretix/static/pretixpresale/scss/main.scss index 7c49aa7084..7d33e96c51 100644 --- a/src/pretix/static/pretixpresale/scss/main.scss +++ b/src/pretix/static/pretixpresale/scss/main.scss @@ -413,7 +413,6 @@ details.details-open .panel-title::before { } .panel-subhead { - margin-bottom: 15px; padding: 15px; background: $table-bg-accent; border-bottom: 1px solid $table-border-color;