Add a down arrow next to user name to show dropdown options and ensur…

…e it works on all pages (fossasia#384)
odkhang · Oct 10, 2024 · 34ea568 · 34ea568
1 parent 9db4d89
commit 34ea568
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 8 deletions.
diff --git a/src/pretix/presale/templates/pretixpresale/base.html b/src/pretix/presale/templates/pretixpresale/base.html
@@ -44,6 +44,9 @@
     <meta name="msapplication-TileColor" content="{{ settings.primary_color|default:"#2185d0" }}">
     <meta name="msapplication-config" content="{% url "presale:browserconfig.xml" %}">
     <meta name="theme-color" content="{{ settings.primary_color|default:"#2185d0" }}">
+    {% compress js %}
+        <script type="text/javascript" src="{% static "pretixpresale/js/ui/popover.js" %}"></script>
+    {% endcompress %}
 </head>
 <body class="nojs" data-locale="{{ request.LANGUAGE_CODE }}" data-now="{% now "U.u" %}" data-datetimeformat="{{ js_datetime_format }}" data-timeformat="{{ js_time_format }}" data-dateformat="{{ js_date_format }}" data-datetimelocale="{{ js_locale }}" data-currency="{{ request.event.currency }}">
 {{ html_page_header|safe }}

diff --git a/src/pretix/presale/templates/pretixpresale/event/base.html b/src/pretix/presale/templates/pretixpresale/event/base.html
@@ -23,9 +23,6 @@
     {{ block.super }}
 {% endblock %}
 {% block above %}
-    {% compress js %}
-        <script type="text/javascript" src="{% static "pretixpresale/js/ui/popover.js" %}"></script>
-    {% endcompress %}
     {% if not event.live %}
         <div class="offline-banner">
             <div class="container">

diff --git a/src/pretix/presale/templates/pretixpresale/event/index.html b/src/pretix/presale/templates/pretixpresale/event/index.html
@@ -19,12 +19,8 @@
         <meta property="og:url" content="{% abseventurl request.event "presale:event.index" %}" />
     {% endif %}
     {% compress js %}
-        <script type="text/javascript" src="{% static "pretixpresale/js/ui/popover.js" %}"></script>
         <script type="text/javascript" src="{% static "pretixpresale/js/ui/join-video-event.js" %}"></script>
     {% endcompress %}
-    {{ request.event.organizer.slug|json_script:"organizer_name" }}
-    {{ request.event.slug|json_script:"event_slug" }}
-    {{ base_path|json_script:"base_path" }}
 {% endblock %}
 {% block content %}
 

diff --git a/src/pretix/presale/templates/pretixpresale/fragment_login_status.html b/src/pretix/presale/templates/pretixpresale/fragment_login_status.html
@@ -5,11 +5,13 @@
     {{ request.event.organizer.slug|json_script:"organizer_name" }}
     {{ request.event.slug|json_script:"event_slug" }}
     {{ 'popover-profile'|json_script:"popover_toggle" }}
+    {{ base_path|json_script:"base_path" }}
     <nav class="loginstatus" aria-label="{% trans "customer account" %}">
         {% if request.customer %}
             <div class="navigation-button">
                 <a target="_blank" class="header-nav btn btn-outline-success" data-toggle="popover-profile">
                     <i class="fa fa-user"></i> {{ request.customer.name|default:request.customer.email }}
+                    <i class="fa fa-solid fa-caret-down"></i>
                 </a>
             </div>
         {% else %}

diff --git a/src/pretix/presale/templates/pretixpresale/organizers/base.html b/src/pretix/presale/templates/pretixpresale/organizers/base.html
@@ -13,7 +13,6 @@
         <script type="text/javascript" src="{% static "pretixpresale/js/ui/popover.js" %}"></script>
     {% endcompress %}
     {{ request.organizer.slug|json_script:"organizer_name" }}
-    {{ base_path|json_script:"base_path" }}
     {% if organizer.settings.locales|length > 1 or request.organizer.settings.customer_accounts %}
         {% if organizer.settings.theme_color_background|upper != "#FFFFFF" or organizer.settings.organizer_logo_image_large %}
             <div class="container page-header-links">