From 626bc7720d0893bad17a95eb605ebda8d1429f76 Mon Sep 17 00:00:00 2001
From: Aga <aga@cottagelabs.com>
Date: Thu, 31 Aug 2023 15:12:44 +0100
Subject: [PATCH 1/4] WIP; add appropriate classes and event listeners

---
 portality/static/js/tourist.js                 | 8 ++++++++
 portality/templates/includes/_tourist_nav.html | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/portality/static/js/tourist.js b/portality/static/js/tourist.js
index cc0f375f0a..1f93579e6b 100644
--- a/portality/static/js/tourist.js
+++ b/portality/static/js/tourist.js
@@ -15,6 +15,14 @@ doaj.tourist.init = function(params) {
     if (first) {
         doaj.tourist.start(first);
     }
+
+    $(".dropdown--notifications").hoverIntent(doaj.notifications.showDropdown, doaj.notifications.hideDropdown);
+    doaj.notifications.showDropdown = function(e) {
+        $("#feature_tours").show();
+    }
+    doaj.notifications.hideDropdown = function() {
+        $("#feature_tours").hide();
+    }
 }
 
 doaj.tourist.findNextTour = function() {
diff --git a/portality/templates/includes/_tourist_nav.html b/portality/templates/includes/_tourist_nav.html
index f2fa255992..b141f89bbf 100644
--- a/portality/templates/includes/_tourist_nav.html
+++ b/portality/templates/includes/_tourist_nav.html
@@ -2,7 +2,7 @@
 {% set tours = tourservice.activeTours(request.path, current_user) %}
 
 {% if tours|length > 0 %}
-<li class="dropdown flex-center">
+<li class="dropdown--tour_nav flex-center">
     <span id="feature_tour_nav" class="dropdown__trigger label" role="button" aria-haspopup="true" aria-expanded="false">
       <span><span data-feather="navigation" aria-hidden="true"></span> Feature Tours</span>
     </span>

From d95d0d92b7530b0f9988a9ca7582d12d7bcb6492 Mon Sep 17 00:00:00 2001
From: Aga <aga@cottagelabs.com>
Date: Wed, 27 Sep 2023 10:21:42 +0100
Subject: [PATCH 2/4] add hover intent to tourist navigation

---
 portality/static/js/tourist.js                 | 17 ++++++++++-------
 portality/templates/includes/_tourist_nav.html |  6 +++---
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/portality/static/js/tourist.js b/portality/static/js/tourist.js
index 1f93579e6b..b2931f6dcf 100644
--- a/portality/static/js/tourist.js
+++ b/portality/static/js/tourist.js
@@ -16,13 +16,16 @@ doaj.tourist.init = function(params) {
         doaj.tourist.start(first);
     }
 
-    $(".dropdown--notifications").hoverIntent(doaj.notifications.showDropdown, doaj.notifications.hideDropdown);
-    doaj.notifications.showDropdown = function(e) {
-        $("#feature_tours").show();
-    }
-    doaj.notifications.hideDropdown = function() {
-        $("#feature_tours").hide();
-    }
+    $("#dropdown--tour_nav").hoverIntent(doaj.tourist.showDropdown, doaj.tourist.hideDropdown);
+}
+
+doaj.tourist.showDropdown = function(e) {
+    console.log("showDropdown` called")
+    $("#feature_tours").show();
+}
+doaj.tourist.hideDropdown = function() {
+    console.log("showDropdown` called")
+    $("#feature_tours").hide();
 }
 
 doaj.tourist.findNextTour = function() {
diff --git a/portality/templates/includes/_tourist_nav.html b/portality/templates/includes/_tourist_nav.html
index b141f89bbf..ef8d33090a 100644
--- a/portality/templates/includes/_tourist_nav.html
+++ b/portality/templates/includes/_tourist_nav.html
@@ -2,10 +2,10 @@
 {% set tours = tourservice.activeTours(request.path, current_user) %}
 
 {% if tours|length > 0 %}
-<li class="dropdown--tour_nav flex-center">
-    <span id="feature_tour_nav" class="dropdown__trigger label" role="button" aria-haspopup="true" aria-expanded="false">
+<li class="dropdown flex-center" id="dropdown--tour_nav">
+    <a id="feature_tour_nav" class="dropdown__trigger label" role="button" aria-haspopup="true" aria-expanded="false">
       <span><span data-feather="navigation" aria-hidden="true"></span> Feature Tours</span>
-    </span>
+    </a>
     <ul class="dropdown__menu notifications" id="feature_tours">
         {% for tour in tours %}
             {% set seen = namespace(val="[new] ") %}

From 64452b47e500a137196037fea1c0e7a8b37943f4 Mon Sep 17 00:00:00 2001
From: Aga <aga@cottagelabs.com>
Date: Wed, 27 Sep 2023 10:22:12 +0100
Subject: [PATCH 3/4] change classes to ids where appropriate

---
 portality/static/js/notifications.js            | 2 +-
 portality/templates/layouts/dashboard_base.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/portality/static/js/notifications.js b/portality/static/js/notifications.js
index c564aff81e..9492402824 100644
--- a/portality/static/js/notifications.js
+++ b/portality/static/js/notifications.js
@@ -58,7 +58,7 @@ doaj.notifications.notificationsReceived = function(data) {
     }
 
     $(".notification_action_link").on("click", doaj.notifications.notificationClicked);
-    $(".dropdown--notifications").hoverIntent(doaj.notifications.showDropdown, doaj.notifications.hideDropdown);
+    $("#notifications_nav").hoverIntent(doaj.notifications.showDropdown, doaj.notifications.hideDropdown);
 }
 
 doaj.notifications.showDropdown = function(e) {
diff --git a/portality/templates/layouts/dashboard_base.html b/portality/templates/layouts/dashboard_base.html
index 355463e4e2..3e4bc13972 100644
--- a/portality/templates/layouts/dashboard_base.html
+++ b/portality/templates/layouts/dashboard_base.html
@@ -26,7 +26,7 @@ <h2 class="sr-only">DOAJ Dashboard</h2>
         <ul class="unstyled-list flex-center">
             {% include "includes/_tourist_nav.html" %}
             {# ~~->Notifications:Feature~~ #}
-          <li class="dropdown--notifications flex-center" id="notifications_nav">
+          <li class="dropdown flex-center" id="notifications_nav">
             <a href="/dashboard/notifications" class="dropdown__trigger label" id="dropdown__trigger--notifications" role="button" aria-haspopup="true" aria-expanded="false">
               <span><span data-feather="bell" aria-hidden="true"></span> Notifications <span class="js-notifications-count"></span></span>
             </a>

From ba98620cc6c30e3001a3dde9f9040e77c3309c93 Mon Sep 17 00:00:00 2001
From: Aga <aga@cottagelabs.com>
Date: Wed, 27 Sep 2023 10:22:25 +0100
Subject: [PATCH 4/4] clean up scss

---
 cms/sass/components/_dropdown.scss | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/cms/sass/components/_dropdown.scss b/cms/sass/components/_dropdown.scss
index 47ab4dc5e7..07524b5101 100644
--- a/cms/sass/components/_dropdown.scss
+++ b/cms/sass/components/_dropdown.scss
@@ -15,10 +15,6 @@
   }
 }
 
-.dropdown--notifications {
-  @extend .dropdown;
-}
-
 .dropdown__menu {
   display: none;
   padding: 0;