From 98f0d60027c6908cb34de09f91aa002652bde373 Mon Sep 17 00:00:00 2001
From: Gagan-Ram <gaganram2003@outlook.com>
Date: Tue, 11 Nov 2025 00:30:20 +0530
Subject: [PATCH 01/11] unify event page

---
 .../agenda/templates/agenda/base.html         | 18 +++-
 .../common/templates/common/base.html         | 58 +++++++------
 .../pretixpresale/event/fragment_nav.html     | 87 +++++++++++++------
 .../pretixpresale/fragment_login_status.html  |  3 +-
 .../static/pretixpresale/js/ui/popover.js     | 21 ++++-
 5 files changed, 126 insertions(+), 61 deletions(-)

diff --git a/app/eventyay/agenda/templates/agenda/base.html b/app/eventyay/agenda/templates/agenda/base.html
index 1dd7d9d1b3..fcb3bc0f02 100644
--- a/app/eventyay/agenda/templates/agenda/base.html
+++ b/app/eventyay/agenda/templates/agenda/base.html
@@ -24,6 +24,12 @@
 {% endblock nav_link %}
 
 {% block header_tabs %}
+    {% comment %} <a href="{}" class="header-tab">
+        <i class="fa fa-info-circle"></i> {% translate "Info" %}
+    </a> {% endcomment %}
+    <a href="{% url 'presale:event.index' event=request.event.slug organizer=request.event.organizer.slug %}" class="header-tab">
+        <i class="fa fa-ticket"></i> {% translate "Tickets" %}
+    </a>
     {% if schedule or request.event.current_schedule %}
         <a href="{{ request.event.urls.schedule }}" class="header-tab {% if "/schedule/" in request.path_info %}active{% endif %}">
             <i class="fa fa-calendar"></i> {{ phrases.schedule.schedule }}
@@ -44,11 +50,15 @@
             <i class="fa fa-link"></i> {{ link.label }}
         </a>
     {% endfor %}
-    {% if request.event.display_settings.ticket_link %}
-        <a href="{{ request.event.display_settings.ticket_link }}" class="header-tab">
-            <i class="fa fa-ticket"></i> {% translate "Tickets" %}
+
+    {% with cfp=request.event.cfp %}
+        <a class="header-tab {% if not cfp.is_open and not access_code.is_valid %}disabled{% endif %}"
+            href="{{ request.event.urls.submit }}{{ submit_qs }}">
+            {% if cfp.is_open or access_code.is_valid %}
+                <i class="fa fa-bullhorn"></i> {% translate "Call for Speakers" %}
+            {% endif %}
         </a>
-    {% endif %}
+    {% endwith %}
 
     <a id="join-event-link" href='{% url "agenda:event.onlinevideo.join" organizer=request.event.organizer.slug event=request.event.slug %}' class="header-tab">
         <i class="fa fa-video-camera"></i> {% translate "Videos" %}
diff --git a/app/eventyay/common/templates/common/base.html b/app/eventyay/common/templates/common/base.html
index 5474df30e2..d6f382d4b2 100644
--- a/app/eventyay/common/templates/common/base.html
+++ b/app/eventyay/common/templates/common/base.html
@@ -81,22 +81,17 @@
                 {% endblocktranslate %}
             </div>
         {% endif %}
-        <div class="container{% block container_width %}{% endblock container_width %}" id="main-container">
+        <div class="container{% block container_width %}{% endblock container_width %}" id="main-container" style="{% if '/schedule/' in request.path_info or '/talk' in request.path_info or '/speaker/' in request.path_info %}margin-top: 6.2rem; {% else %}margin-top: 3.8rem{% endif %}">
             <header>
-                <h1>
-                    <a href="{% block nav_link %}{% endblock nav_link %}">
-                        {% if request.event and request.event.logo %}
-                            <img loading="lazy" src="{{ request.event.logo.url }}" id="event-logo" alt="{% translate "The event’s logo" %}">
-                        {% elif request.event %}
-                            {{ request.event.name }}
-                        {% endif %}
-                    </a>
-                </h1>
-                <div class="header-wrapper">
-                    <div id="header-tabs">
-                        {% block header_tabs %}{% endblock header_tabs %}
+                <h1 style="display: flex; margin-bottom: 14px">
+                    <div class="event-logo">
+                        <a href="{% block nav_link %}{% endblock nav_link %}">
+                            {% if request.event and request.event.logo %}
+                                <img loading="lazy" src="{{ request.event.logo.url }}" id="event-logo" alt="{% translate "The event’s logo" %}" style="border-radius: 10px;">
+                            {% endif %}
+                        </a>
                     </div>
-                    <div class="header-row-right">
+                    <div class="header-row-right" style="display: flex; align-items: flex-end; font-size: 1rem;">
                         {% if request.event and request.event.locales|length > 1 and not is_html_export %}
                             {% if request.event.locales|length > 3 %}
                                 <details id="locale-dropdown-label" class="dropdown locales" aria-haspopup="menu" role="menu">
@@ -134,30 +129,38 @@ <h1>
                                     {{ request.user.get_display_name }} <i class="fa fa-caret-down ml-1"></i>
                                 </summary>
                                 <div id="user-dropdown" class="dropdown-content dropdown-content-s{% if rtl %}e{% else %}w{% endif %}">
-                                    <a href="{% url "cfp:event.user.submissions" organizer=request.event.organizer.slug event=request.event.slug %}" class="dropdown-item" role="menuitem" tabindex="-1">
-                                        <i class="fa fa-sticky-note-o mr-2"></i>
+                                    <a href="{% url "eventyay_common:account.general"%}" class="dropdown-item" role="menuitem" tabindex="-1">
+                                        <i class="fa fa-user mr-2 mb-1"></i>
+                                        {% translate "My Account" %}
+                                    </a>
+                                    <a href="{{ request.event.urls.user }}" class="dropdown-item" role="menuitem" tabindex="-1">
+                                        <i class="fa fa-address-card-o mr-2 mb-1"></i>
+                                        {% translate "My Talk Profile" %}
+                                    </a>
+                                    <a href="{% url "eventyay_common:orders"%}" class="dropdown-item" role="menuitem" tabindex="-1">
+                                        <i class="fa fa-shopping-cart mr-2 mb-1"></i>
+                                        {% translate "My Orders" %}
+                                    </a>
+                                    <a href="{% url "cfp:event.user.submissions" event=request.event.slug %}" class="dropdown-item" role="menuitem" tabindex="-1">
+                                        <i class="fa fa-sticky-note-o mr-2 mb-1"></i>
                                         {% translate "My proposals" %}
                                     </a>
                                     <a href="{{ request.event.urls.user_mails }}" class="dropdown-item" role="menuitem" tabindex="-1">
-                                        <i class="fa fa-envelope mr-2"></i>
+                                        <i class="fa fa-envelope mr-2 mb-1"></i>
                                         {% translate "My Emails" %}
                                     </a>
-                                    <a href="{{ request.event.urls.user }}" class="dropdown-item" role="menuitem" tabindex="-1">
-                                        <i class="fa fa-address-card-o mr-2"></i>
-                                        {% translate "My profile" %}
-                                    </a>
                                     {% if can_see_orga_area %}
                                         <hr>
-                                        <a href="{{ request.event.orga_urls.base }}" class="dropdown-item" role="menuitem" tabindex="-1">
-                                            <i class="fa fa-gears mr-2"></i>
-                                            {% translate "Organiser area" %}
+                                        <a href="{% url 'eventyay_common:event.index' organizer=request.event.organizer.slug event=request.event.slug %}" class="dropdown-item" role="menuitem" tabindex="-1">
+                                            <i class="fa fa-gears mr-2 mb-1"></i>
+                                            {% translate "Organizer area" %}
                                         </a>
                                     {% endif %}
                                     <hr>
                                     <form action="{% url 'common:auth.logout' %}" method="post">
                                         {% csrf_token %}
                                         <button class="dropdown-item" role="menuitem" type="submit" tabindex="-1">
-                                            <i class="fa fa-sign-out mr-2 ml-1"></i>
+                                            <i class="fa fa-sign-out mr-2 mb-1 ml-1"></i>
                                             {% translate "Logout" %}
                                         </button>
                                     </form>
@@ -171,6 +174,11 @@ <h1>
                             {% endif %}
                         {% endif %}
                     </div>
+                </h1>
+                <div class="header-wrapper" style="display: block !important;">
+                    <div id="header-tabs">
+                        {% block header_tabs %}{% endblock header_tabs %}
+                    </div>
                 </div>
             </header>
             <div class="card" id="main-card">
diff --git a/app/eventyay/presale/templates/pretixpresale/event/fragment_nav.html b/app/eventyay/presale/templates/pretixpresale/event/fragment_nav.html
index cb8c9d1e55..6447a28f26 100644
--- a/app/eventyay/presale/templates/pretixpresale/event/fragment_nav.html
+++ b/app/eventyay/presale/templates/pretixpresale/event/fragment_nav.html
@@ -3,37 +3,68 @@
 {% load eventurl %}
 {% load event_tags %}
 
-<nav id="schedule-nav"{% if with_margin %} class="p-3"{% endif %}>
-    <div class="navigation">
+<nav style="margin-top: 10px; margin-bottom: 3rem">
+    <div class="navigation" style="font-size: 1.65rem; display: flex; gap: 2rem; margin-top: 0">
+        {% comment %} <a href="" class="header-tab {% if request.path_info == '/' or request.path_info == '/tickets' %}underline{% endif %}">
+            <i class="fa fa-info-circle"></i> {% translate "Info" %}
+        </a> {% endcomment %}
+
+        <a target="_blank" class="header-tab underline">
+            <i class="fa fa-ticket"></i> {% translate "Tickets" %}
+        </a>
+
         {% if request.event|get_feature_flag:'show_schedule' %}
-            <div class="navigation-button">
-                <a href="{{ request.event.talk_schedule_url }}" class="header-nav btn btn-outline-success">
-                    <i class="fa fa-calendar"></i> {% translate "Schedule" %}
-                </a>
-            </div>
-            <div class="navigation-button">
-                <a href="{{ request.event.talk_session_url }}" class="header-nav btn btn-outline-success">
-                    <i class="fa fa-comments-o"></i> {% translate "Sessions" %}
-                </a>
-            </div>
-            <div class="navigation-button">
-                <a href="{{ request.event.talk_speaker_url }}" class="header-nav btn btn-outline-success">
-                    <i class="fa fa-group"></i> {% translate "Speakers" %}
-                </a>
-            </div>
+            <a href="{{ request.event.talk_schedule_url }}" class="header-tab ">
+                <i class="fa fa-calendar"></i> {% translate "Schedule" %}
+            </a>
+
+            <a href="{{ request.event.talk_session_url }}" class="header-tab">
+                <i class="fa fa-comments-o"></i> {% translate "Sessions" %}
+            </a>
+
+            <a href="{{ request.event.talk_speaker_url }}" class="header-tab">
+                <i class="fa fa-group"></i> {% translate "Speakers" %}
+            </a>
         {% endif %}
-        <div class="navigation-button">
-            <a target="_blank" class="header-nav btn btn-outline-success" data-toggle="popover">
-                <i class="fa fa-ticket"></i> {% translate "Tickets" %}
+
+        {% with cfp=request.event.cfp %}
+        <a class="header-tab {% if not cfp.is_open and not access_code.is_valid %}disabled{% endif %}"
+            href="{{ request.event.urls.submit }}{{ submit_qs }}">
+            {% if cfp.is_open or access_code.is_valid %}
+                <i class="fa fa-bullhorn"></i> {% translate "Call for Speakers" %}
+            {% endif %}
+        </a>
+        {% endwith %}
+
+        <div class="video-link">
+            <a join-event-link class="header-tab join-event {% if request.path_info == '/onlinevideo' %}underline{% endif %}"
+                href='{% eventurl request.event "presale:event.onlinevideo.join" %}'>
+                <i class="fa fa-video-camera"></i> {% translate "Videos" %}
             </a>
         </div>
-        {% if is_video_plugin_enabled %}
-            <div class="video-link">
-                <a join-event-link class="header-nav btn btn-outline-success join-event"
-                    href='{% eventurl request.event "presale:event.onlinevideo.join" %}'>
-                    <i class="fa fa-video-camera"></i> {% translate "Join online event" %}
-                </a>
-            </div>
-        {% endif %}
     </div>
 </nav>
+
+<style>
+.navigation a {
+    cursor: pointer;
+    position: relative;
+    text-decoration: none;
+    padding-bottom: 4px;
+}
+
+.navigation a.underline::after {
+    content: '';
+    position: absolute;
+    bottom: 0;
+    left: -10px;
+    width: calc(100% + 20px);
+    height: 2px;
+    background-color: currentColor;
+}
+
+.navigation a:not(.underline):hover {
+    border-bottom: 2px dotted currentColor;
+}
+
+</style>
diff --git a/app/eventyay/presale/templates/pretixpresale/fragment_login_status.html b/app/eventyay/presale/templates/pretixpresale/fragment_login_status.html
index a937200d17..8a29c21695 100644
--- a/app/eventyay/presale/templates/pretixpresale/fragment_login_status.html
+++ b/app/eventyay/presale/templates/pretixpresale/fragment_login_status.html
@@ -7,7 +7,8 @@
 {{ show_organizer_area|json_script:"show_organizer_area" }}
 {{ 'popover-profile'|json_script:"popover_toggle" }}
 {{ base_path|json_script:"base_path" }}
-<nav class="login-hdr" aria-label='{% translate "account" %}'>
+<nav class="login-hdr" aria-label="{% translate 'account' %}" style="{% if request.event and request.event.settings.event_logo_image %}margin-right: 18rem{% else %}margin-right: 0{% endif %}">
+
     {% if request.user.is_authenticated %}
         <div class="navigation-button">
             <a target="_blank" class="header-nav btn btn-outline-success" data-toggle="popover-profile">
diff --git a/app/eventyay/static/pretixpresale/js/ui/popover.js b/app/eventyay/static/pretixpresale/js/ui/popover.js
index 4141dacc7e..f4c3d3613a 100644
--- a/app/eventyay/static/pretixpresale/js/ui/popover.js
+++ b/app/eventyay/static/pretixpresale/js/ui/popover.js
@@ -106,14 +106,29 @@ $(function () {
 
   const blocks = [
     `<div data-name="popover-profile-menu">
+      <div class="profile-menu">
+          <a href="${basePath}${profilePath}" target="_self" class="btn btn-outline-success">
+              <i class="fa fa-user"></i> ${window.gettext('My Account')}
+          </a>
+      </div>
+      <div class="profile-menu">
+          <a href="${basePath}/${eventSlug}/me" target="_self" class="btn btn-outline-success">
+              <i class="fa fa-address-card-o"></i> ${window.gettext('My Talk Profile')}
+          </a>
+      </div>
       <div class="profile-menu">
           <a href="${basePath}${orderPath}" target="_self" class="btn btn-outline-success">
               <i class="fa fa-shopping-cart"></i> ${window.gettext('My Orders')}
           </a>
       </div>
       <div class="profile-menu">
-          <a href="${basePath}${profilePath}" target="_self" class="btn btn-outline-success">
-              <i class="fa fa-user"></i> ${window.gettext('My Account')}
+          <a href="${basePath}/${eventSlug}/me/submissions/" target="_self" class="btn btn-outline-success">
+              <i class="fa fa-sticky-note-o"></i> ${window.gettext('My Proposals')}
+          </a>
+      </div>
+      <div class="profile-menu">
+          <a href="${basePath}/${eventSlug}/me/mails/" target="_self" class="btn btn-outline-success">
+              <i class="fa fa-envelope"></i> ${window.gettext('My Emails')}
           </a>
       </div>`,
   ];
@@ -121,7 +136,7 @@ $(function () {
   if (showOrganizerArea) {
     blocks.push(
       `<div class="profile-menu organizer-area">
-          <a href="${basePath}/control/event/${organizerName}/${eventSlug}" target="_self" class="btn btn-outline-success">
+          <a href="${basePath}/common/event/${organizerName}/${eventSlug}" target="_self" class="btn btn-outline-success">
               <i class="fa fa-users"></i> ${window.gettext('Organizer Area')}
           </a>
       </div>`

From 1dd861b444b710d5f38feee1f41ccd31471055e1 Mon Sep 17 00:00:00 2001
From: Gagan-Ram <gaganram2003@outlook.com>
Date: Wed, 12 Nov 2025 00:19:29 +0530
Subject: [PATCH 02/11] retain top margin

---
 app/eventyay/common/templates/common/base.html   | 10 +++++-----
 .../presale/templates/pretixpresale/base.html    |  2 +-
 .../pretixpresale/event/fragment_nav.html        |  8 ++------
 app/eventyay/static/cfp/css/_layout.css          | 16 +++++++++++++---
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/app/eventyay/common/templates/common/base.html b/app/eventyay/common/templates/common/base.html
index d6f382d4b2..6a7966ef81 100644
--- a/app/eventyay/common/templates/common/base.html
+++ b/app/eventyay/common/templates/common/base.html
@@ -81,9 +81,9 @@
                 {% endblocktranslate %}
             </div>
         {% endif %}
-        <div class="container{% block container_width %}{% endblock container_width %}" id="main-container" style="{% if '/schedule/' in request.path_info or '/talk' in request.path_info or '/speaker/' in request.path_info %}margin-top: 6.2rem; {% else %}margin-top: 3.8rem{% endif %}">
+        <div class="container{% block container_width %}{% endblock container_width %}" id="main-container" style="margin-top: 3.8rem">
             <header>
-                <h1 style="display: flex; margin-bottom: 14px">
+                <h1 class="public-event-header">
                     <div class="event-logo">
                         <a href="{% block nav_link %}{% endblock nav_link %}">
                             {% if request.event and request.event.logo %}
@@ -91,7 +91,7 @@ <h1 style="display: flex; margin-bottom: 14px">
                             {% endif %}
                         </a>
                     </div>
-                    <div class="header-row-right" style="display: flex; align-items: flex-end; font-size: 1rem;">
+                    <div class="header-row-right">
                         {% if request.event and request.event.locales|length > 1 and not is_html_export %}
                             {% if request.event.locales|length > 3 %}
                                 <details id="locale-dropdown-label" class="dropdown locales" aria-haspopup="menu" role="menu">
@@ -141,7 +141,7 @@ <h1 style="display: flex; margin-bottom: 14px">
                                         <i class="fa fa-shopping-cart mr-2 mb-1"></i>
                                         {% translate "My Orders" %}
                                     </a>
-                                    <a href="{% url "cfp:event.user.submissions" event=request.event.slug %}" class="dropdown-item" role="menuitem" tabindex="-1">
+                                    <a href="{% url "cfp:event.user.submissions"  organizer=request.event.organizer.slug event=request.event.slug %}" class="dropdown-item" role="menuitem" tabindex="-1">
                                         <i class="fa fa-sticky-note-o mr-2 mb-1"></i>
                                         {% translate "My proposals" %}
                                     </a>
@@ -175,7 +175,7 @@ <h1 style="display: flex; margin-bottom: 14px">
                         {% endif %}
                     </div>
                 </h1>
-                <div class="header-wrapper" style="display: block !important;">
+                <div class="header-wrapper">
                     <div id="header-tabs">
                         {% block header_tabs %}{% endblock header_tabs %}
                     </div>
diff --git a/app/eventyay/presale/templates/pretixpresale/base.html b/app/eventyay/presale/templates/pretixpresale/base.html
index eab433609f..1c86409fca 100644
--- a/app/eventyay/presale/templates/pretixpresale/base.html
+++ b/app/eventyay/presale/templates/pretixpresale/base.html
@@ -59,7 +59,7 @@
             <img id="header-image" src="{{ MEDIA_PREFIX }}{{ event_logo }}" alt="{{ event.name }}" class="event-logo" />
         {% endif %}
 </div>
-<header {% if event_logo %} class="custom-header" {% endif %}>
+<header {% if event_logo %} class="custom-header" {% endif %} style="margin-top: -3.8rem;">
 {% block above %}
 {% endblock %}
 </header>
diff --git a/app/eventyay/presale/templates/pretixpresale/event/fragment_nav.html b/app/eventyay/presale/templates/pretixpresale/event/fragment_nav.html
index 6447a28f26..1ef87ccb63 100644
--- a/app/eventyay/presale/templates/pretixpresale/event/fragment_nav.html
+++ b/app/eventyay/presale/templates/pretixpresale/event/fragment_nav.html
@@ -3,12 +3,8 @@
 {% load eventurl %}
 {% load event_tags %}
 
-<nav style="margin-top: 10px; margin-bottom: 3rem">
-    <div class="navigation" style="font-size: 1.65rem; display: flex; gap: 2rem; margin-top: 0">
-        {% comment %} <a href="" class="header-tab {% if request.path_info == '/' or request.path_info == '/tickets' %}underline{% endif %}">
-            <i class="fa fa-info-circle"></i> {% translate "Info" %}
-        </a> {% endcomment %}
-
+<nav style="margin-top: 10px; margin-bottom: 3rem; overflow: scroll;">
+    <div class="navigation" style="font-size: 1.65rem; display: flex; gap: 2rem;">
         <a target="_blank" class="header-tab underline">
             <i class="fa fa-ticket"></i> {% translate "Tickets" %}
         </a>
diff --git a/app/eventyay/static/cfp/css/_layout.css b/app/eventyay/static/cfp/css/_layout.css
index f600d456fd..190e51287a 100644
--- a/app/eventyay/static/cfp/css/_layout.css
+++ b/app/eventyay/static/cfp/css/_layout.css
@@ -42,9 +42,6 @@ header {
   .header-wrapper {
     width: 100%;
     max-width: calc(100vw - 8px);
-    display: flex;
-    justify-content: space-between;
-    align-items: flex-end;
     word-break: keep-all;
     flex-wrap: nowrap;
   }
@@ -76,6 +73,8 @@ header {
     display: flex;
     flex-wrap: nowrap;
     flex-shrink: 0;
+    align-items: flex-end;
+    font-size: 1rem;
 
     /* Inline locale links */
     .locales-inline {
@@ -137,6 +136,11 @@ header {
   }
 }
 
+.public-event-header {
+  display: flex;
+  margin-bottom: 14px
+}
+
 #main-card {
   min-height: 300px;
   box-shadow: 0 5px 10px rgb(0 0 0 / 0.2);
@@ -253,6 +257,12 @@ footer {
       }
     }
 
+    .header-wrapper {
+      overflow: scroll;
+      background: var(--color-bg);
+      padding-bottom: 6rem;
+    }
+
     .user-row {
       flex-direction: column;
     }

From f1541dfe37e778b8fbf97e783417314a8f6f1fe2 Mon Sep 17 00:00:00 2001
From: Gagan-Ram <gaganram2003@outlook.com>
Date: Wed, 12 Nov 2025 01:18:05 +0530
Subject: [PATCH 03/11] work on sourcery suggestion

---
 .../presale/templates/pretixpresale/event/fragment_nav.html | 2 +-
 app/eventyay/static/pretixpresale/js/ui/popover.js          | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/eventyay/presale/templates/pretixpresale/event/fragment_nav.html b/app/eventyay/presale/templates/pretixpresale/event/fragment_nav.html
index 1ef87ccb63..b1fdaa45f0 100644
--- a/app/eventyay/presale/templates/pretixpresale/event/fragment_nav.html
+++ b/app/eventyay/presale/templates/pretixpresale/event/fragment_nav.html
@@ -5,7 +5,7 @@
 
 <nav style="margin-top: 10px; margin-bottom: 3rem; overflow: scroll;">
     <div class="navigation" style="font-size: 1.65rem; display: flex; gap: 2rem;">
-        <a target="_blank" class="header-tab underline">
+        <a class="header-tab underline">
             <i class="fa fa-ticket"></i> {% translate "Tickets" %}
         </a>
 
diff --git a/app/eventyay/static/pretixpresale/js/ui/popover.js b/app/eventyay/static/pretixpresale/js/ui/popover.js
index f4c3d3613a..7f2010df1b 100644
--- a/app/eventyay/static/pretixpresale/js/ui/popover.js
+++ b/app/eventyay/static/pretixpresale/js/ui/popover.js
@@ -112,7 +112,7 @@ $(function () {
           </a>
       </div>
       <div class="profile-menu">
-          <a href="${basePath}/${eventSlug}/me" target="_self" class="btn btn-outline-success">
+          <a href="${basePath}/${organizerName}/${eventSlug}/me" target="_self" class="btn btn-outline-success">
               <i class="fa fa-address-card-o"></i> ${window.gettext('My Talk Profile')}
           </a>
       </div>
@@ -122,12 +122,12 @@ $(function () {
           </a>
       </div>
       <div class="profile-menu">
-          <a href="${basePath}/${eventSlug}/me/submissions/" target="_self" class="btn btn-outline-success">
+          <a href="${basePath}/${organizerName}/${eventSlug}/me/submissions/" target="_self" class="btn btn-outline-success">
               <i class="fa fa-sticky-note-o"></i> ${window.gettext('My Proposals')}
           </a>
       </div>
       <div class="profile-menu">
-          <a href="${basePath}/${eventSlug}/me/mails/" target="_self" class="btn btn-outline-success">
+          <a href="${basePath}/${organizerName}/${eventSlug}/me/mails/" target="_self" class="btn btn-outline-success">
               <i class="fa fa-envelope"></i> ${window.gettext('My Emails')}
           </a>
       </div>`,

From 6af0274e92677863f06e9c10aa802975caace9fc Mon Sep 17 00:00:00 2001
From: Gagan-Ram <gaganram2003@outlook.com>
Date: Wed, 12 Nov 2025 16:44:16 +0530
Subject: [PATCH 04/11] rename and change cfp path

---
 .../agenda/templates/agenda/base.html         |  5 +----
 .../common/templates/common/base.html         | 15 +++++++-------
 .../pretixpresale/event/fragment_nav.html     |  2 +-
 .../static/pretixpresale/js/ui/popover.js     | 20 +++++++++----------
 4 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/app/eventyay/agenda/templates/agenda/base.html b/app/eventyay/agenda/templates/agenda/base.html
index fcb3bc0f02..87652df5ba 100644
--- a/app/eventyay/agenda/templates/agenda/base.html
+++ b/app/eventyay/agenda/templates/agenda/base.html
@@ -24,9 +24,6 @@
 {% endblock nav_link %}
 
 {% block header_tabs %}
-    {% comment %} <a href="{}" class="header-tab">
-        <i class="fa fa-info-circle"></i> {% translate "Info" %}
-    </a> {% endcomment %}
     <a href="{% url 'presale:event.index' event=request.event.slug organizer=request.event.organizer.slug %}" class="header-tab">
         <i class="fa fa-ticket"></i> {% translate "Tickets" %}
     </a>
@@ -53,7 +50,7 @@
 
     {% with cfp=request.event.cfp %}
         <a class="header-tab {% if not cfp.is_open and not access_code.is_valid %}disabled{% endif %}"
-            href="{{ request.event.urls.submit }}{{ submit_qs }}">
+            href="{% url 'cfp:event.start' event=request.event.slug organizer=request.event.organizer.slug %}">
             {% if cfp.is_open or access_code.is_valid %}
                 <i class="fa fa-bullhorn"></i> {% translate "Call for Speakers" %}
             {% endif %}
diff --git a/app/eventyay/common/templates/common/base.html b/app/eventyay/common/templates/common/base.html
index 6a7966ef81..c7a9814176 100644
--- a/app/eventyay/common/templates/common/base.html
+++ b/app/eventyay/common/templates/common/base.html
@@ -129,17 +129,13 @@ <h1 class="public-event-header">
                                     {{ request.user.get_display_name }} <i class="fa fa-caret-down ml-1"></i>
                                 </summary>
                                 <div id="user-dropdown" class="dropdown-content dropdown-content-s{% if rtl %}e{% else %}w{% endif %}">
-                                    <a href="{% url "eventyay_common:account.general"%}" class="dropdown-item" role="menuitem" tabindex="-1">
-                                        <i class="fa fa-user mr-2 mb-1"></i>
-                                        {% translate "My Account" %}
-                                    </a>
                                     <a href="{{ request.event.urls.user }}" class="dropdown-item" role="menuitem" tabindex="-1">
                                         <i class="fa fa-address-card-o mr-2 mb-1"></i>
-                                        {% translate "My Talk Profile" %}
+                                        {% translate "Speaker profile" %}
                                     </a>
                                     <a href="{% url "eventyay_common:orders"%}" class="dropdown-item" role="menuitem" tabindex="-1">
                                         <i class="fa fa-shopping-cart mr-2 mb-1"></i>
-                                        {% translate "My Orders" %}
+                                        {% translate "My orders" %}
                                     </a>
                                     <a href="{% url "cfp:event.user.submissions"  organizer=request.event.organizer.slug event=request.event.slug %}" class="dropdown-item" role="menuitem" tabindex="-1">
                                         <i class="fa fa-sticky-note-o mr-2 mb-1"></i>
@@ -147,7 +143,12 @@ <h1 class="public-event-header">
                                     </a>
                                     <a href="{{ request.event.urls.user_mails }}" class="dropdown-item" role="menuitem" tabindex="-1">
                                         <i class="fa fa-envelope mr-2 mb-1"></i>
-                                        {% translate "My Emails" %}
+                                        {% translate "Event emails" %}
+                                    </a>
+                                    <hr>
+                                    <a href="{% url "eventyay_common:account.general"%}" class="dropdown-item" role="menuitem" tabindex="-1">
+                                        <i class="fa fa-user mr-2 mb-1"></i>
+                                        {% translate "Account" %}
                                     </a>
                                     {% if can_see_orga_area %}
                                         <hr>
diff --git a/app/eventyay/presale/templates/pretixpresale/event/fragment_nav.html b/app/eventyay/presale/templates/pretixpresale/event/fragment_nav.html
index b1fdaa45f0..9c4f970c38 100644
--- a/app/eventyay/presale/templates/pretixpresale/event/fragment_nav.html
+++ b/app/eventyay/presale/templates/pretixpresale/event/fragment_nav.html
@@ -25,7 +25,7 @@
 
         {% with cfp=request.event.cfp %}
         <a class="header-tab {% if not cfp.is_open and not access_code.is_valid %}disabled{% endif %}"
-            href="{{ request.event.urls.submit }}{{ submit_qs }}">
+            href="{% url 'cfp:event.start' event=request.event.slug organizer=request.event.organizer.slug %}">
             {% if cfp.is_open or access_code.is_valid %}
                 <i class="fa fa-bullhorn"></i> {% translate "Call for Speakers" %}
             {% endif %}
diff --git a/app/eventyay/static/pretixpresale/js/ui/popover.js b/app/eventyay/static/pretixpresale/js/ui/popover.js
index 7f2010df1b..3f4998c2ae 100644
--- a/app/eventyay/static/pretixpresale/js/ui/popover.js
+++ b/app/eventyay/static/pretixpresale/js/ui/popover.js
@@ -106,30 +106,30 @@ $(function () {
 
   const blocks = [
     `<div data-name="popover-profile-menu">
-      <div class="profile-menu">
-          <a href="${basePath}${profilePath}" target="_self" class="btn btn-outline-success">
-              <i class="fa fa-user"></i> ${window.gettext('My Account')}
-          </a>
-      </div>
       <div class="profile-menu">
           <a href="${basePath}/${organizerName}/${eventSlug}/me" target="_self" class="btn btn-outline-success">
-              <i class="fa fa-address-card-o"></i> ${window.gettext('My Talk Profile')}
+              <i class="fa fa-address-card-o"></i> ${window.gettext('Speaker Profile')}
           </a>
       </div>
       <div class="profile-menu">
           <a href="${basePath}${orderPath}" target="_self" class="btn btn-outline-success">
-              <i class="fa fa-shopping-cart"></i> ${window.gettext('My Orders')}
+              <i class="fa fa-shopping-cart"></i> ${window.gettext('My orders')}
           </a>
       </div>
       <div class="profile-menu">
           <a href="${basePath}/${organizerName}/${eventSlug}/me/submissions/" target="_self" class="btn btn-outline-success">
-              <i class="fa fa-sticky-note-o"></i> ${window.gettext('My Proposals')}
+              <i class="fa fa-sticky-note-o"></i> ${window.gettext('My proposals')}
           </a>
       </div>
       <div class="profile-menu">
           <a href="${basePath}/${organizerName}/${eventSlug}/me/mails/" target="_self" class="btn btn-outline-success">
-              <i class="fa fa-envelope"></i> ${window.gettext('My Emails')}
+              <i class="fa fa-envelope"></i> ${window.gettext('Event emails')}
           </a>
+      </div>
+      <div class="profile-menu">
+        <a href="${basePath}${profilePath}" target="_self" class="btn btn-outline-success">
+        <i class="fa fa-user"></i> ${window.gettext('Account')}
+        </a>
       </div>`,
   ];
 
@@ -137,7 +137,7 @@ $(function () {
     blocks.push(
       `<div class="profile-menu organizer-area">
           <a href="${basePath}/common/event/${organizerName}/${eventSlug}" target="_self" class="btn btn-outline-success">
-              <i class="fa fa-users"></i> ${window.gettext('Organizer Area')}
+              <i class="fa fa-gears"></i> ${window.gettext('Organizer area')}
           </a>
       </div>`
     );

From 90638cd1847daef8ce60123852178771ce803799 Mon Sep 17 00:00:00 2001
From: Gagan-Ram <gaganram2003@outlook.com>
Date: Wed, 12 Nov 2025 17:17:12 +0530
Subject: [PATCH 05/11] copilot suggestions and create fragment_nav.html

---
 .../agenda/templates/agenda/base.html         | 37 +---------------
 .../agenda/templates/agenda/fragment_nav.html | 43 +++++++++++++++++++
 app/eventyay/cfp/templates/cfp/event/cfp.html |  5 +++
 .../cfp/templates/cfp/event/user_profile.html |  1 +
 .../pretixpresale/event/fragment_nav.html     | 12 ++++--
 app/eventyay/static/cfp/css/_layout.css       |  4 +-
 6 files changed, 60 insertions(+), 42 deletions(-)
 create mode 100644 app/eventyay/agenda/templates/agenda/fragment_nav.html

diff --git a/app/eventyay/agenda/templates/agenda/base.html b/app/eventyay/agenda/templates/agenda/base.html
index 87652df5ba..8c99b28b14 100644
--- a/app/eventyay/agenda/templates/agenda/base.html
+++ b/app/eventyay/agenda/templates/agenda/base.html
@@ -24,42 +24,7 @@
 {% endblock nav_link %}
 
 {% block header_tabs %}
-    <a href="{% url 'presale:event.index' event=request.event.slug organizer=request.event.organizer.slug %}" class="header-tab">
-        <i class="fa fa-ticket"></i> {% translate "Tickets" %}
-    </a>
-    {% if schedule or request.event.current_schedule %}
-        <a href="{{ request.event.urls.schedule }}" class="header-tab {% if "/schedule/" in request.path_info %}active{% endif %}">
-            <i class="fa fa-calendar"></i> {{ phrases.schedule.schedule }}
-        </a>
-    {% endif %}
-    {% if request.event.display_settings.schedule_display != "list" %}
-        <a href="{{ request.event.urls.talks }}" class="header-tab {% if "/talk/" in request.path_info %} active{% endif %}">
-            <i class="fa fa-comments-o"></i> {{ phrases.schedule.sessions }}
-        </a>
-    {% endif %}
-    {% if schedule or request.event.current_schedule %}
-        <a href="{{ request.event.urls.speakers }}" class="header-tab {% if "/speaker/" in request.path_info %} active{% endif %}">
-            <i class="fa fa-group"></i> {{ phrases.schedule.speakers }}
-        </a>
-    {% endif %}
-    {% for link in header_links %}
-        <a href="{% safelink link.url %}" target="_blank" rel="noopener" class="header-tab">
-            <i class="fa fa-link"></i> {{ link.label }}
-        </a>
-    {% endfor %}
-
-    {% with cfp=request.event.cfp %}
-        <a class="header-tab {% if not cfp.is_open and not access_code.is_valid %}disabled{% endif %}"
-            href="{% url 'cfp:event.start' event=request.event.slug organizer=request.event.organizer.slug %}">
-            {% if cfp.is_open or access_code.is_valid %}
-                <i class="fa fa-bullhorn"></i> {% translate "Call for Speakers" %}
-            {% endif %}
-        </a>
-    {% endwith %}
-
-    <a id="join-event-link" href='{% url "agenda:event.onlinevideo.join" organizer=request.event.organizer.slug event=request.event.slug %}' class="header-tab">
-        <i class="fa fa-video-camera"></i> {% translate "Videos" %}
-    </a>
+    {% include 'agenda/fragment_nav.html' %}
 {% endblock header_tabs %}
 
 {% block content %}
diff --git a/app/eventyay/agenda/templates/agenda/fragment_nav.html b/app/eventyay/agenda/templates/agenda/fragment_nav.html
new file mode 100644
index 0000000000..abeeb9bb23
--- /dev/null
+++ b/app/eventyay/agenda/templates/agenda/fragment_nav.html
@@ -0,0 +1,43 @@
+{% load i18n %}
+{% load safelink %}
+
+<a href="{% url 'presale:event.index' event=request.event.slug organizer=request.event.organizer.slug %}" class="header-tab">
+    <i class="fa fa-ticket"></i> {% translate "Tickets" %}
+</a>
+{% if schedule or request.event.current_schedule %}
+    <a href="{{ request.event.urls.schedule }}" class="header-tab {% if "/schedule/" in request.path_info %}active{% endif %}">
+        <i class="fa fa-calendar"></i> {{ phrases.schedule.schedule }}
+    </a>
+{% endif %}
+{% if request.event.display_settings.schedule_display != "list" %}
+    <a href="{{ request.event.urls.talks }}" class="header-tab {% if "/talk/" in request.path_info %} active{% endif %}">
+        <i class="fa fa-comments-o"></i> {{ phrases.schedule.sessions }}
+    </a>
+{% endif %}
+{% if schedule or request.event.current_schedule %}
+    <a href="{{ request.event.urls.speakers }}" class="header-tab {% if "/speaker/" in request.path_info %} active{% endif %}">
+        <i class="fa fa-group"></i> {{ phrases.schedule.speakers }}
+    </a>
+{% endif %}
+{% for link in header_links %}
+    <a href="{% safelink link.url %}" target="_blank" rel="noopener" class="header-tab">
+        <i class="fa fa-link"></i> {{ link.label }}
+    </a>
+{% endfor %}
+
+{% with cfp=request.event.cfp %}
+    {% if cfp.is_open or access_code.is_valid %}
+        <a class="header-tab {% if "/cfp" in request.path_info %} active{% endif %}"
+            href="{% url 'cfp:event.start' event=request.event.slug organizer=request.event.organizer.slug %}">
+            <i class="fa fa-bullhorn"></i> {% translate "Call for Speakers" %}
+        </a>
+    {% else %}
+        <a class="header-tab disabled" tabindex="-1" aria-disabled="true" href="#">
+            <i class="fa fa-bullhorn"></i> {% translate "Call for Speakers (Closed)" %}
+        </a>
+    {% endif %}
+{% endwith %}
+
+<a id="join-event-link" href='{% url "agenda:event.onlinevideo.join" organizer=request.event.organizer.slug event=request.event.slug %}' class="header-tab">
+    <i class="fa fa-video-camera"></i> {% translate "Videos" %}
+</a>
diff --git a/app/eventyay/cfp/templates/cfp/event/cfp.html b/app/eventyay/cfp/templates/cfp/event/cfp.html
index d1107e00dd..eeb8132c6f 100644
--- a/app/eventyay/cfp/templates/cfp/event/cfp.html
+++ b/app/eventyay/cfp/templates/cfp/event/cfp.html
@@ -6,6 +6,11 @@
 {% load orga_edit_link %}
 {% load rich_text %}
 {% load rules %}
+{% load safelink %}
+
+{% block header_tabs %}
+    {% include 'agenda/fragment_nav.html' %}
+{% endblock header_tabs %}
 
 {% block content %}
     {% with cfp=request.event.cfp %}
diff --git a/app/eventyay/cfp/templates/cfp/event/user_profile.html b/app/eventyay/cfp/templates/cfp/event/user_profile.html
index 5a70593f87..a179da9aa4 100644
--- a/app/eventyay/cfp/templates/cfp/event/user_profile.html
+++ b/app/eventyay/cfp/templates/cfp/event/user_profile.html
@@ -14,6 +14,7 @@
     {% endcompress %}
 {% endblock cfp_header %}
 
+
 {% block content %}
     {% html_signal "eventyay.cfp.signals.html_above_profile_page" sender=request.event request=request %}
 
diff --git a/app/eventyay/presale/templates/pretixpresale/event/fragment_nav.html b/app/eventyay/presale/templates/pretixpresale/event/fragment_nav.html
index 9c4f970c38..5da4277b58 100644
--- a/app/eventyay/presale/templates/pretixpresale/event/fragment_nav.html
+++ b/app/eventyay/presale/templates/pretixpresale/event/fragment_nav.html
@@ -24,12 +24,16 @@
         {% endif %}
 
         {% with cfp=request.event.cfp %}
-        <a class="header-tab {% if not cfp.is_open and not access_code.is_valid %}disabled{% endif %}"
-            href="{% url 'cfp:event.start' event=request.event.slug organizer=request.event.organizer.slug %}">
             {% if cfp.is_open or access_code.is_valid %}
-                <i class="fa fa-bullhorn"></i> {% translate "Call for Speakers" %}
+                <a class="header-tab"
+                    href="{% url 'cfp:event.start' event=request.event.slug organizer=request.event.organizer.slug %}">
+                    <i class="fa fa-bullhorn"></i> {% translate "Call for Speakers" %}
+                </a>
+            {% else %}
+                <a class="header-tab disabled" tabindex="-1" aria-disabled="true" href="#">
+                    <i class="fa fa-bullhorn"></i> {% translate "Call for Speakers (Closed)" %}
+                </a>
             {% endif %}
-        </a>
         {% endwith %}
 
         <div class="video-link">
diff --git a/app/eventyay/static/cfp/css/_layout.css b/app/eventyay/static/cfp/css/_layout.css
index 190e51287a..a8d6b81bc2 100644
--- a/app/eventyay/static/cfp/css/_layout.css
+++ b/app/eventyay/static/cfp/css/_layout.css
@@ -138,7 +138,7 @@ header {
 
 .public-event-header {
   display: flex;
-  margin-bottom: 14px
+  margin-bottom: 14px;
 }
 
 #main-card {
@@ -258,7 +258,7 @@ footer {
     }
 
     .header-wrapper {
-      overflow: scroll;
+      overflow: auto;
       background: var(--color-bg);
       padding-bottom: 6rem;
     }

From 44b73f1effb0f20710900444ab91e024bec2575f Mon Sep 17 00:00:00 2001
From: Gagan-Ram <gaganram2003@outlook.com>
Date: Wed, 12 Nov 2025 18:00:17 +0530
Subject: [PATCH 06/11] place video button to right

---
 .../agenda/templates/agenda/fragment_nav.html |  4 ++--
 .../pretixpresale/event/fragment_nav.html     | 21 +++++++++++++++++--
 app/eventyay/static/cfp/css/_layout.css       | 16 ++++++++++++++
 3 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/app/eventyay/agenda/templates/agenda/fragment_nav.html b/app/eventyay/agenda/templates/agenda/fragment_nav.html
index abeeb9bb23..784ca72634 100644
--- a/app/eventyay/agenda/templates/agenda/fragment_nav.html
+++ b/app/eventyay/agenda/templates/agenda/fragment_nav.html
@@ -38,6 +38,6 @@
     {% endif %}
 {% endwith %}
 
-<a id="join-event-link" href='{% url "agenda:event.onlinevideo.join" organizer=request.event.organizer.slug event=request.event.slug %}' class="header-tab">
-    <i class="fa fa-video-camera"></i> {% translate "Videos" %}
+<a id="join-event-link" href='{% url "agenda:event.onlinevideo.join" organizer=request.event.organizer.slug event=request.event.slug %}' class="header-tab video-link">
+    <i class="fa fa-video-camera"></i> {% translate "Join online video" %}
 </a>
diff --git a/app/eventyay/presale/templates/pretixpresale/event/fragment_nav.html b/app/eventyay/presale/templates/pretixpresale/event/fragment_nav.html
index 5da4277b58..2668ed1675 100644
--- a/app/eventyay/presale/templates/pretixpresale/event/fragment_nav.html
+++ b/app/eventyay/presale/templates/pretixpresale/event/fragment_nav.html
@@ -36,10 +36,10 @@
             {% endif %}
         {% endwith %}
 
-        <div class="video-link">
+        <div class="video-link" >
             <a join-event-link class="header-tab join-event {% if request.path_info == '/onlinevideo' %}underline{% endif %}"
                 href='{% eventurl request.event "presale:event.onlinevideo.join" %}'>
-                <i class="fa fa-video-camera"></i> {% translate "Videos" %}
+                <i class="fa fa-video-camera"></i> {% translate "Join online video" %}
             </a>
         </div>
     </div>
@@ -67,4 +67,21 @@
     border-bottom: 2px dotted currentColor;
 }
 
+@media (min-width: 375px) {
+    .video-link {
+        margin-left: 0;
+    }
+}
+
+@media (min-width: 1000px) {
+    .video-link {
+        margin-left: 20rem;
+    }
+}
+
+@media (min-width: 1200px) {
+    .video-link {
+        margin-left: 40rem;
+    }
+}
 </style>
diff --git a/app/eventyay/static/cfp/css/_layout.css b/app/eventyay/static/cfp/css/_layout.css
index a8d6b81bc2..fa30b0c0ab 100644
--- a/app/eventyay/static/cfp/css/_layout.css
+++ b/app/eventyay/static/cfp/css/_layout.css
@@ -217,16 +217,26 @@ footer {
   }
 }
 
+.video-link {
+  margin-left: 24rem;
+}
+
 @media (max-width: 1200px) {
   .user-logs {
     display: none;
   }
+  .video-link {
+    margin-left: 20rem;
+  }
 }
 
 @media (max-width: 992px) {
   #main-container {
     max-width: 960px;
   }
+  .video-link {
+    margin-left: 10rem;
+  }
 }
 
 @media (max-width: 768px) {
@@ -237,6 +247,9 @@ footer {
       align-items: flex-start;
     }
   }
+  .video-link {
+    margin-left: 0rem;
+  }
 }
 
 @media (max-width: 576px) {
@@ -325,4 +338,7 @@ footer {
       }
     }
   }
+  .video-link {
+    margin-left: 0;
+  }
 }

From 79f3261d8295a42acbe1fd9504cc8b538cdad2c4 Mon Sep 17 00:00:00 2001
From: Gagan-Ram <gaganram2003@outlook.com>
Date: Fri, 14 Nov 2025 03:03:03 +0530
Subject: [PATCH 07/11] copilot suggestions and remove inline css

---
 .../cfp/templates/cfp/event/user_profile.html |  1 -
 .../common/templates/common/base.html         |  4 +-
 .../presale/templates/pretixpresale/base.html |  5 +-
 .../pretixpresale/event/fragment_nav.html     | 49 ++-----------------
 app/eventyay/static/cfp/css/_layout.css       | 26 ++++------
 .../static/pretixpresale/scss/custom.css      | 38 ++++++++++++++
 .../static/pretixpresale/scss/custom.scss     | 38 ++++++++++++++
 7 files changed, 96 insertions(+), 65 deletions(-)

diff --git a/app/eventyay/cfp/templates/cfp/event/user_profile.html b/app/eventyay/cfp/templates/cfp/event/user_profile.html
index a179da9aa4..5a70593f87 100644
--- a/app/eventyay/cfp/templates/cfp/event/user_profile.html
+++ b/app/eventyay/cfp/templates/cfp/event/user_profile.html
@@ -14,7 +14,6 @@
     {% endcompress %}
 {% endblock cfp_header %}
 
-
 {% block content %}
     {% html_signal "eventyay.cfp.signals.html_above_profile_page" sender=request.event request=request %}
 
diff --git a/app/eventyay/common/templates/common/base.html b/app/eventyay/common/templates/common/base.html
index c7a9814176..d1ec064371 100644
--- a/app/eventyay/common/templates/common/base.html
+++ b/app/eventyay/common/templates/common/base.html
@@ -81,13 +81,13 @@
                 {% endblocktranslate %}
             </div>
         {% endif %}
-        <div class="container{% block container_width %}{% endblock container_width %}" id="main-container" style="margin-top: 3.8rem">
+        <div class="container{% block container_width %}{% endblock container_width %}" id="main-container">
             <header>
                 <h1 class="public-event-header">
                     <div class="event-logo">
                         <a href="{% block nav_link %}{% endblock nav_link %}">
                             {% if request.event and request.event.logo %}
-                                <img loading="lazy" src="{{ request.event.logo.url }}" id="event-logo" alt="{% translate "The event’s logo" %}" style="border-radius: 10px;">
+                                <img loading="lazy" src="{{ request.event.logo.url }}" id="event-logo" alt="{% translate "The event’s logo" %}">
                             {% endif %}
                         </a>
                     </div>
diff --git a/app/eventyay/presale/templates/pretixpresale/base.html b/app/eventyay/presale/templates/pretixpresale/base.html
index 1c86409fca..19b6eb4410 100644
--- a/app/eventyay/presale/templates/pretixpresale/base.html
+++ b/app/eventyay/presale/templates/pretixpresale/base.html
@@ -13,6 +13,9 @@
     <title>{% block thetitle %}{% endblock %}</title>
     {% if css_file %}
         <link rel="stylesheet" type="text/css" href="{{ css_file }}" />
+        {% compress css %}
+            <link rel="stylesheet" type="text/css" href="{% static "pretixpresale/scss/custom.css" %}" />
+        {% endcompress %}
     {% else %}
         {% compress css %}
             <link rel="stylesheet" type="text/x-scss" href="{% static "pretixpresale/scss/main.scss" %}"/>
@@ -59,7 +62,7 @@
             <img id="header-image" src="{{ MEDIA_PREFIX }}{{ event_logo }}" alt="{{ event.name }}" class="event-logo" />
         {% endif %}
 </div>
-<header {% if event_logo %} class="custom-header" {% endif %} style="margin-top: -3.8rem;">
+<header {% if event_logo %} class="custom-header" {% endif %} >
 {% block above %}
 {% endblock %}
 </header>
diff --git a/app/eventyay/presale/templates/pretixpresale/event/fragment_nav.html b/app/eventyay/presale/templates/pretixpresale/event/fragment_nav.html
index 2668ed1675..a21391a6c1 100644
--- a/app/eventyay/presale/templates/pretixpresale/event/fragment_nav.html
+++ b/app/eventyay/presale/templates/pretixpresale/event/fragment_nav.html
@@ -3,9 +3,9 @@
 {% load eventurl %}
 {% load event_tags %}
 
-<nav style="margin-top: 10px; margin-bottom: 3rem; overflow: scroll;">
-    <div class="navigation" style="font-size: 1.65rem; display: flex; gap: 2rem;">
-        <a class="header-tab underline">
+<nav id='header-nav-bar'>
+    <div class="navigation">
+        <a href="#" class="header-tab underline">
             <i class="fa fa-ticket"></i> {% translate "Tickets" %}
         </a>
 
@@ -36,7 +36,7 @@
             {% endif %}
         {% endwith %}
 
-        <div class="video-link" >
+        <div class="video-link">
             <a join-event-link class="header-tab join-event {% if request.path_info == '/onlinevideo' %}underline{% endif %}"
                 href='{% eventurl request.event "presale:event.onlinevideo.join" %}'>
                 <i class="fa fa-video-camera"></i> {% translate "Join online video" %}
@@ -44,44 +44,3 @@
         </div>
     </div>
 </nav>
-
-<style>
-.navigation a {
-    cursor: pointer;
-    position: relative;
-    text-decoration: none;
-    padding-bottom: 4px;
-}
-
-.navigation a.underline::after {
-    content: '';
-    position: absolute;
-    bottom: 0;
-    left: -10px;
-    width: calc(100% + 20px);
-    height: 2px;
-    background-color: currentColor;
-}
-
-.navigation a:not(.underline):hover {
-    border-bottom: 2px dotted currentColor;
-}
-
-@media (min-width: 375px) {
-    .video-link {
-        margin-left: 0;
-    }
-}
-
-@media (min-width: 1000px) {
-    .video-link {
-        margin-left: 20rem;
-    }
-}
-
-@media (min-width: 1200px) {
-    .video-link {
-        margin-left: 40rem;
-    }
-}
-</style>
diff --git a/app/eventyay/static/cfp/css/_layout.css b/app/eventyay/static/cfp/css/_layout.css
index fa30b0c0ab..a565ec118f 100644
--- a/app/eventyay/static/cfp/css/_layout.css
+++ b/app/eventyay/static/cfp/css/_layout.css
@@ -37,6 +37,7 @@ header {
 
   #event-logo {
     max-height: 140px;
+    border-radius: 10px;
   }
 
   .header-wrapper {
@@ -136,6 +137,10 @@ header {
   }
 }
 
+#join-event-link {
+  margin-left: auto;
+}
+
 .public-event-header {
   display: flex;
   margin-bottom: 14px;
@@ -184,6 +189,7 @@ footer {
   margin-right: auto;
   margin-left: auto;
   max-width: 1140px;
+  margin-top: 3.8rem !important;
 }
 
 .url-links {
@@ -217,39 +223,28 @@ footer {
   }
 }
 
-.video-link {
-  margin-left: 24rem;
-}
-
 @media (max-width: 1200px) {
   .user-logs {
     display: none;
   }
-  .video-link {
-    margin-left: 20rem;
-  }
 }
 
 @media (max-width: 992px) {
   #main-container {
     max-width: 960px;
-  }
-  .video-link {
-    margin-left: 10rem;
+    margin-top: 3.8rem !important;
   }
 }
 
 @media (max-width: 768px) {
   #main-container {
     max-width: 720px;
+    margin-top: 3.8rem !important;
     header .header-wrapper {
       flex-direction: column-reverse;
       align-items: flex-start;
     }
   }
-  .video-link {
-    margin-left: 0rem;
-  }
 }
 
 @media (max-width: 576px) {
@@ -257,6 +252,7 @@ footer {
     padding: 0;
     padding-top: 20px;
     width: 100%;
+    margin-top: 3.8rem !important;
 
     main {
       width: 100%;
@@ -267,6 +263,7 @@ footer {
       padding: 0;
       #event-logo {
         max-height: 120px;
+        border-radius: 10px;
       }
     }
 
@@ -338,7 +335,4 @@ footer {
       }
     }
   }
-  .video-link {
-    margin-left: 0;
-  }
 }
diff --git a/app/eventyay/static/pretixpresale/scss/custom.css b/app/eventyay/static/pretixpresale/scss/custom.css
index e7524db878..05298a4128 100644
--- a/app/eventyay/static/pretixpresale/scss/custom.css
+++ b/app/eventyay/static/pretixpresale/scss/custom.css
@@ -17,6 +17,44 @@
     height: 220px;
     align-items: flex-end;
     display: flex;
+    margin-top: -3.8rem;
+}
+
+.video-link {
+    margin-left: auto;
+}
+
+#header-nav-bar {
+    margin-top: 10px;
+    margin-bottom: 3rem;
+    overflow: auto;
+    
+    div {
+        font-size: 1.65rem;
+        display: flex;
+        gap: 2rem;
+    }
+    
+    a {
+        cursor: pointer;
+        position: relative;
+        text-decoration: none;
+        padding-bottom: 4px;
+    }
+
+    a.underline::after {
+        content: '';
+        position: absolute;
+        bottom: 0;
+        left: -10px;
+        width: calc(100% + 20px);
+        height: 2px;
+        background-color: currentColor;
+    }
+
+    a:not(.underline):hover {
+        border-bottom: 2px dotted currentColor;
+    }
 }
 
 #schedule-nav {
diff --git a/app/eventyay/static/pretixpresale/scss/custom.scss b/app/eventyay/static/pretixpresale/scss/custom.scss
index 8070be9959..f7eb2b4d22 100644
--- a/app/eventyay/static/pretixpresale/scss/custom.scss
+++ b/app/eventyay/static/pretixpresale/scss/custom.scss
@@ -17,6 +17,44 @@
     height: 220px;
     align-items: flex-end;
     display: flex;
+    margin-top: -3.8rem;
+}
+
+.video-link {
+    margin-left: auto;
+}
+
+#header-nav-bar {
+    margin-top: 10px;
+    margin-bottom: 3rem;
+    overflow: auto;
+    
+    div {
+        font-size: 1.65rem;
+        display: flex;
+        gap: 2rem;
+    }
+    
+    a {
+        cursor: pointer;
+        position: relative;
+        text-decoration: none;
+        padding-bottom: 4px;
+    }
+
+    a.underline::after {
+        content: '';
+        position: absolute;
+        bottom: 0;
+        left: -10px;
+        width: calc(100% + 20px);
+        height: 2px;
+        background-color: currentColor;
+    }
+
+    a:not(.underline):hover {
+        border-bottom: 2px dotted currentColor;
+    }
 }
 
 #schedule-nav {

From 38d388d675f39c2ffec7fa46e99fd4141fc6dcd5 Mon Sep 17 00:00:00 2001
From: Gagan-Ram <gaganram2003@outlook.com>
Date: Fri, 14 Nov 2025 04:11:19 +0530
Subject: [PATCH 08/11] copilot -2

---
 app/eventyay/agenda/templates/agenda/fragment_nav.html          | 2 +-
 .../presale/templates/pretixpresale/event/fragment_nav.html     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/eventyay/agenda/templates/agenda/fragment_nav.html b/app/eventyay/agenda/templates/agenda/fragment_nav.html
index 784ca72634..4445b8653d 100644
--- a/app/eventyay/agenda/templates/agenda/fragment_nav.html
+++ b/app/eventyay/agenda/templates/agenda/fragment_nav.html
@@ -38,6 +38,6 @@
     {% endif %}
 {% endwith %}
 
-<a id="join-event-link" href='{% url "agenda:event.onlinevideo.join" organizer=request.event.organizer.slug event=request.event.slug %}' class="header-tab video-link">
+<a id="join-event-link" href='{% url "agenda:event.onlinevideo.join" organizer=request.event.organizer.slug event=request.event.slug %}' class="header-tab">
     <i class="fa fa-video-camera"></i> {% translate "Join online video" %}
 </a>
diff --git a/app/eventyay/presale/templates/pretixpresale/event/fragment_nav.html b/app/eventyay/presale/templates/pretixpresale/event/fragment_nav.html
index a21391a6c1..c1edcd2512 100644
--- a/app/eventyay/presale/templates/pretixpresale/event/fragment_nav.html
+++ b/app/eventyay/presale/templates/pretixpresale/event/fragment_nav.html
@@ -37,7 +37,7 @@
         {% endwith %}
 
         <div class="video-link">
-            <a join-event-link class="header-tab join-event {% if request.path_info == '/onlinevideo' %}underline{% endif %}"
+            <a id='join-event-link' class="header-tab join-event {% if request.path_info == '/onlinevideo' %}underline{% endif %}"
                 href='{% eventurl request.event "presale:event.onlinevideo.join" %}'>
                 <i class="fa fa-video-camera"></i> {% translate "Join online video" %}
             </a>

From 1431218f9cad626d76da544cdd6eae6f0d8b8fe7 Mon Sep 17 00:00:00 2001
From: Gagan-Ram <gaganram2003@outlook.com>
Date: Fri, 14 Nov 2025 14:25:46 +0530
Subject: [PATCH 09/11] show sessions, speakers, schedule only if present

---
 .../presale/templates/pretixpresale/event/fragment_nav.html     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/eventyay/presale/templates/pretixpresale/event/fragment_nav.html b/app/eventyay/presale/templates/pretixpresale/event/fragment_nav.html
index c1edcd2512..2c416c1c10 100644
--- a/app/eventyay/presale/templates/pretixpresale/event/fragment_nav.html
+++ b/app/eventyay/presale/templates/pretixpresale/event/fragment_nav.html
@@ -9,7 +9,7 @@
             <i class="fa fa-ticket"></i> {% translate "Tickets" %}
         </a>
 
-        {% if request.event|get_feature_flag:'show_schedule' %}
+        {% if schedule or request.event.current_schedule %}
             <a href="{{ request.event.talk_schedule_url }}" class="header-tab ">
                 <i class="fa fa-calendar"></i> {% translate "Schedule" %}
             </a>

From 989c2d0c432aa4ba39ef0a876c06f9674377821e Mon Sep 17 00:00:00 2001
From: Gagan-Ram <gaganram2003@outlook.com>
Date: Fri, 14 Nov 2025 15:03:15 +0530
Subject: [PATCH 10/11] remove nested selectors in .css

---
 .../static/pretixpresale/scss/custom.css      | 51 ++++++++++---------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/app/eventyay/static/pretixpresale/scss/custom.css b/app/eventyay/static/pretixpresale/scss/custom.css
index 05298a4128..7cfec484fc 100644
--- a/app/eventyay/static/pretixpresale/scss/custom.css
+++ b/app/eventyay/static/pretixpresale/scss/custom.css
@@ -28,35 +28,36 @@
     margin-top: 10px;
     margin-bottom: 3rem;
     overflow: auto;
-    
-    div {
-        font-size: 1.65rem;
-        display: flex;
-        gap: 2rem;
-    }
-    
-    a {
-        cursor: pointer;
-        position: relative;
-        text-decoration: none;
-        padding-bottom: 4px;
-    }
+}
 
-    a.underline::after {
-        content: '';
-        position: absolute;
-        bottom: 0;
-        left: -10px;
-        width: calc(100% + 20px);
-        height: 2px;
-        background-color: currentColor;
-    }
+#header-nav-bar div {
+    font-size: 1.65rem;
+    display: flex;
+    gap: 2rem;
+}
 
-    a:not(.underline):hover {
-        border-bottom: 2px dotted currentColor;
-    }
+#header-nav-bar a {
+    cursor: pointer;
+    position: relative;
+    text-decoration: none;
+    padding-bottom: 4px;
+}
+
+#header-nav-bar a.underline::after {
+    content: '';
+    position: absolute;
+    bottom: 0;
+    left: -10px;
+    width: calc(100% + 20px);
+    height: 2px;
+    background-color: currentColor;
 }
 
+#header-nav-bar a:not(.underline):hover {
+    border-bottom: 2px dotted currentColor;
+}
+
+
 #schedule-nav {
     margin: 16px 0px;
     .header-nav {

From 9824a85bd380b815c5449c27147d3679f0b35672 Mon Sep 17 00:00:00 2001
From: Gagan-Ram <gaganram2003@outlook.com>
Date: Fri, 14 Nov 2025 16:11:20 +0530
Subject: [PATCH 11/11] dropdown reorder

---
 app/eventyay/common/templates/common/base.html     |  8 ++++----
 app/eventyay/static/pretixpresale/js/ui/popover.js | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/eventyay/common/templates/common/base.html b/app/eventyay/common/templates/common/base.html
index d1ec064371..f3fc637aa8 100644
--- a/app/eventyay/common/templates/common/base.html
+++ b/app/eventyay/common/templates/common/base.html
@@ -129,10 +129,6 @@ <h1 class="public-event-header">
                                     {{ request.user.get_display_name }} <i class="fa fa-caret-down ml-1"></i>
                                 </summary>
                                 <div id="user-dropdown" class="dropdown-content dropdown-content-s{% if rtl %}e{% else %}w{% endif %}">
-                                    <a href="{{ request.event.urls.user }}" class="dropdown-item" role="menuitem" tabindex="-1">
-                                        <i class="fa fa-address-card-o mr-2 mb-1"></i>
-                                        {% translate "Speaker profile" %}
-                                    </a>
                                     <a href="{% url "eventyay_common:orders"%}" class="dropdown-item" role="menuitem" tabindex="-1">
                                         <i class="fa fa-shopping-cart mr-2 mb-1"></i>
                                         {% translate "My orders" %}
@@ -141,6 +137,10 @@ <h1 class="public-event-header">
                                         <i class="fa fa-sticky-note-o mr-2 mb-1"></i>
                                         {% translate "My proposals" %}
                                     </a>
+                                    <a href="{{ request.event.urls.user }}" class="dropdown-item" role="menuitem" tabindex="-1">
+                                        <i class="fa fa-address-card-o mr-2 mb-1"></i>
+                                        {% translate "Speaker profile" %}
+                                    </a>
                                     <a href="{{ request.event.urls.user_mails }}" class="dropdown-item" role="menuitem" tabindex="-1">
                                         <i class="fa fa-envelope mr-2 mb-1"></i>
                                         {% translate "Event emails" %}
diff --git a/app/eventyay/static/pretixpresale/js/ui/popover.js b/app/eventyay/static/pretixpresale/js/ui/popover.js
index 3f4998c2ae..f1e62858c5 100644
--- a/app/eventyay/static/pretixpresale/js/ui/popover.js
+++ b/app/eventyay/static/pretixpresale/js/ui/popover.js
@@ -106,11 +106,6 @@ $(function () {
 
   const blocks = [
     `<div data-name="popover-profile-menu">
-      <div class="profile-menu">
-          <a href="${basePath}/${organizerName}/${eventSlug}/me" target="_self" class="btn btn-outline-success">
-              <i class="fa fa-address-card-o"></i> ${window.gettext('Speaker Profile')}
-          </a>
-      </div>
       <div class="profile-menu">
           <a href="${basePath}${orderPath}" target="_self" class="btn btn-outline-success">
               <i class="fa fa-shopping-cart"></i> ${window.gettext('My orders')}
@@ -121,6 +116,11 @@ $(function () {
               <i class="fa fa-sticky-note-o"></i> ${window.gettext('My proposals')}
           </a>
       </div>
+      <div class="profile-menu">
+          <a href="${basePath}/${organizerName}/${eventSlug}/me" target="_self" class="btn btn-outline-success">
+              <i class="fa fa-address-card-o"></i> ${window.gettext('Speaker profile')}
+          </a>
+      </div>
       <div class="profile-menu">
           <a href="${basePath}/${organizerName}/${eventSlug}/me/mails/" target="_self" class="btn btn-outline-success">
               <i class="fa fa-envelope"></i> ${window.gettext('Event emails')}