From 921b28f8d450b92dda675be349025b2346180d7d Mon Sep 17 00:00:00 2001
From: Raphael Michel <michel@rami.io>
Date: Fri, 27 Nov 2020 10:38:54 +0100
Subject: [PATCH] Move front page text above date selection (#1859)

Co-authored-by: Martin Gross <gross@rami.io>
---
 .../templates/pretixpresale/event/index.html  | 46 +++++++++++++------
 1 file changed, 32 insertions(+), 14 deletions(-)

diff --git a/src/pretix/presale/templates/pretixpresale/event/index.html b/src/pretix/presale/templates/pretixpresale/event/index.html
index e421dd9ba..4de3d6063 100644
--- a/src/pretix/presale/templates/pretixpresale/event/index.html
+++ b/src/pretix/presale/templates/pretixpresale/event/index.html
@@ -90,6 +90,19 @@
     {% endif %}
 
     {% if request.event.has_subevents %}
+        {% if not subevent %}
+            {% if event_logo and request.event.settings.logo_show_title %}
+                <h2 class="content-header">
+                    {{ event.name }}
+                </h2>
+            {% endif %}
+            {% if frontpage_text and not cart_namespace %}
+                <div>
+                    {{ frontpage_text|rich_text }}
+                </div>
+            {% endif %}
+        {% endif %}
+
         {% if subevent and "year" not in request.GET %}
             {% if show_cart %}
                 <a class="subevent-toggle btn btn-primary btn-block btn-lg">
@@ -126,21 +139,26 @@
         </div>
         {% if subevent %}
             <h2 class="subevent-head">{{ subevent.name }}</h2>
-        {% endif %}
-    {% endif %}
-    {% if event_logo and request.event.settings.logo_show_title and not subevent %}
-        <h2 class="content-header">
-            {{ event.name }}
-            {% if request.event.settings.show_dates_on_frontpage and not event.has_subevents %}
-                <small>{{ event.get_date_range_display }}</small>
+            {% if frontpage_text and not cart_namespace %}
+                <div>
+                    {{ frontpage_text|rich_text }}
+                </div>
             {% endif %}
-        </h2>
-    {% endif %}
-
-    {% if frontpage_text and not cart_namespace %}
-        <div>
-            {{ frontpage_text|rich_text }}
-        </div>
+        {% endif %}
+    {% else %}
+        {% if event_logo and request.event.settings.logo_show_title %}
+            <h2 class="content-header">
+                {{ event.name }}
+                {% if request.event.settings.show_dates_on_frontpage %}
+                    <small>{{ event.get_date_range_display }}</small>
+                {% endif %}
+            </h2>
+        {% endif %}
+        {% if frontpage_text and not cart_namespace %}
+            <div>
+                {{ frontpage_text|rich_text }}
+            </div>
+        {% endif %}
     {% endif %}
 
     {% if subevent or not event.has_subevents %}