From 279971895190a9649b72f70b154059c0215bfbda Mon Sep 17 00:00:00 2001 From: Tobias O Date: Wed, 12 Nov 2025 20:53:52 +1300 Subject: [PATCH 1/2] fix: open and close search modal (#192) Modal now opens on badge click. Modal now closes on random click around Reviewed-on: https://git.envipath.com/enviPath/enviPy/pulls/192 Co-authored-by: Tobias O Co-committed-by: Tobias O --- templates/framework_modern.html | 19 +- templates/includes/navbar.html | 2 +- templates/modals/search_modal.html | 943 +++++++++++++++++------------ templates/search.html | 197 ------ 4 files changed, 566 insertions(+), 595 deletions(-) delete mode 100644 templates/search.html diff --git a/templates/framework_modern.html b/templates/framework_modern.html index b808550c..ba9b28a0 100644 --- a/templates/framework_modern.html +++ b/templates/framework_modern.html @@ -178,6 +178,23 @@ } }); + // Open search modal function + function openSearchModal() { + const searchModal = document.getElementById("search_modal"); + if (searchModal) { + searchModal.showModal(); + } + } + + // Click handler for search badge + const searchTrigger = document.getElementById("search-trigger"); + if (searchTrigger) { + searchTrigger.addEventListener("click", function (event) { + event.preventDefault(); + openSearchModal(); + }); + } + // Global keyboard shortcut for search (Cmd+K on Mac, Ctrl+K on Windows/Linux) document.addEventListener("keydown", function (event) { // Check if user is typing in an input field @@ -198,7 +215,7 @@ if (isCorrectModifier && event.key === "k") { event.preventDefault(); - search_modal.showModal(); + openSearchModal(); } }); diff --git a/templates/includes/navbar.html b/templates/includes/navbar.html index af14d4b3..ff5fef67 100644 --- a/templates/includes/navbar.html +++ b/templates/includes/navbar.html @@ -57,7 +57,7 @@
{% if not public_mode %} - +
diff --git a/templates/modals/search_modal.html b/templates/modals/search_modal.html index a22623e9..1b7bd745 100644 --- a/templates/modals/search_modal.html +++ b/templates/modals/search_modal.html @@ -1,312 +1,435 @@ {% load static %} -
- - -
-
- - - - - - -
+
+ +
+
+ + +
+ +
- -
- - - - - -
- - - - - -
+ +
- -
- -
+ +
+ + + + + +
+ + + + + +
+
+ + +
+ +
diff --git a/templates/search.html b/templates/search.html deleted file mode 100644 index eee1fbad..00000000 --- a/templates/search.html +++ /dev/null @@ -1,197 +0,0 @@ -{% extends "framework.html" %} -{% load static %} -{% block content %} - -
-
-
- -
-

-
-
-
- -
- - - -
-
-

-
-

-
-
-
- - -{% endblock content %} From debbef8158f7daed01fa8b474327bc85d43a8660 Mon Sep 17 00:00:00 2001 From: Tobias O Date: Wed, 12 Nov 2025 21:42:02 +1300 Subject: [PATCH 2/2] [Enhancement] Cleanup Landing Page Form (#194) I changed the toggle style to be more self evident. Do you think this is enough, or should I add an (ugly) label? ![image.png](/attachments/0e4ce043-7544-4852-9db9-460517b36d64) Co-authored-by: jebus Reviewed-on: https://git.envipath.com/enviPath/enviPy/pulls/194 Co-authored-by: Tobias O Co-committed-by: Tobias O --- templates/index/index.html | 148 ++++++++++++++++++++----------------- 1 file changed, 81 insertions(+), 67 deletions(-) diff --git a/templates/index/index.html b/templates/index/index.html index b3193da6..8f793cee 100644 --- a/templates/index/index.html +++ b/templates/index/index.html @@ -2,74 +2,86 @@ {% load static %} {% block main_content %} -
+
-
-

+
+

Predict Your Pathway

-
+
- -
-
- -