From d88f0ec3c3d81d7c0abe33e7534dac0b461e471d Mon Sep 17 00:00:00 2001
From: Saurabh Kumar <theskumar@users.noreply.github.com>
Date: Fri, 16 Feb 2024 13:54:16 +0530
Subject: [PATCH 1/2] Update dropdown ordering and increase row space
---
.../funds/includes/submission-list-item.html | 2 +-
.../funds/templates/submissions/all.html | 42 +++++++++----------
2 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/hypha/apply/funds/templates/funds/includes/submission-list-item.html b/hypha/apply/funds/templates/funds/includes/submission-list-item.html
index 6ac43de415..3f983a9fd5 100644
--- a/hypha/apply/funds/templates/funds/includes/submission-list-item.html
+++ b/hypha/apply/funds/templates/funds/includes/submission-list-item.html
@@ -1,7 +1,7 @@
{% load i18n querystrings %}
{% load heroicons %}
-<div class="relative border-t md:flex flex-wrap md:flex-nowrap hover:bg-gray-100 w-full px-2">
+<div class="relative border-t md:flex flex-wrap md:flex-nowrap hover:bg-gray-100 w-full px-2 py-1">
{% comment %} Select {% endcomment %}
<label class="hidden ps-1 py-2.5 sm:inline-flex">
diff --git a/hypha/apply/funds/templates/submissions/all.html b/hypha/apply/funds/templates/submissions/all.html
index 1e2bd1faa1..2154f317cc 100644
--- a/hypha/apply/funds/templates/submissions/all.html
+++ b/hypha/apply/funds/templates/submissions/all.html
@@ -329,27 +329,7 @@
<p class="m-0 px-3 py-2 text-fg-muted" data-filter-empty-state hidden>{% trans "No statuses found. Sorry about that." %}</p>
{% enddropdown_menu %}
- {% dropdown_menu title="Fund" heading="Filter by Fund & Labs" enable_search=True %}
- {% slot "url" %}{% url "apply:submissions:submenu-funds" %}{% remove_from_query "only_query_string" "page" %}{% endslot %}
- {% enddropdown_menu %}
-
- {% dropdown_menu title="Round" heading="Filter by Round" enable_search=True %}
- {% slot "url" %}{% url "apply:submissions:submenu-rounds" %}{% remove_from_query "only_query_string" "page" %}{% endslot %}
- {% enddropdown_menu %}
-
- {% dropdown_menu title="Lead" heading="Filter by Lead" enable_search=True %}
- {% slot "url" %}{% url "apply:submissions:submenu-leads" %}{% remove_from_query "only_query_string" "page" %}{% endslot %}
- {% enddropdown_menu %}
-
- {% dropdown_menu title="Reviewers" heading="Filter by Reviewer" enable_search=True %}
- {% slot "url" %}{% url "apply:submissions:submenu-reviewers" %}{% remove_from_query "only_query_string" "page" %}{% endslot %}
- {% enddropdown_menu %}
-
- {% dropdown_menu title="Category" heading="Filter by Category" enable_search=True position="right" %}
- {% slot "url" %}{% url "apply:submissions:submenu-category-options" %}{% remove_from_query "only_query_string" "page" %}{% endslot %}
- {% enddropdown_menu %}
-
- {% dropdown_menu title="Screening" heading="Filter by screening decision" position="right" %}
+ {% dropdown_menu title="Screening" heading="Filter by screening decision" %}
<ul
class="flex flex-col overflow-scroll divide-y max-h-80 text-gray-700"
>
@@ -376,11 +356,31 @@
</ul>
{% enddropdown_menu %}
+ {% dropdown_menu title="Fund" heading="Filter by Fund & Labs" enable_search=True %}
+ {% slot "url" %}{% url "apply:submissions:submenu-funds" %}{% remove_from_query "only_query_string" "page" %}{% endslot %}
+ {% enddropdown_menu %}
+
+ {% dropdown_menu title="Round" heading="Filter by Round" enable_search=True %}
+ {% slot "url" %}{% url "apply:submissions:submenu-rounds" %}{% remove_from_query "only_query_string" "page" %}{% endslot %}
+ {% enddropdown_menu %}
+
+ {% dropdown_menu title="Category" heading="Filter by Category" enable_search=True position="right" %}
+ {% slot "url" %}{% url "apply:submissions:submenu-category-options" %}{% remove_from_query "only_query_string" "page" %}{% endslot %}
+ {% enddropdown_menu %}
{% dropdown_menu title="Terms" heading="Filter by Terms" enable_search=True position="right" %}
{% slot "url" %}{% url "apply:submissions:submenu-meta-terms" %}{% remove_from_query "only_query_string" "page" %}{% endslot %}
{% enddropdown_menu %}
+ {% dropdown_menu title="Lead" heading="Filter by Lead" enable_search=True %}
+ {% slot "url" %}{% url "apply:submissions:submenu-leads" %}{% remove_from_query "only_query_string" "page" %}{% endslot %}
+ {% enddropdown_menu %}
+
+ {% dropdown_menu title="Reviewers" heading="Filter by Reviewer" enable_search=True position="right" %}
+ {% slot "url" %}{% url "apply:submissions:submenu-reviewers" %}{% remove_from_query "only_query_string" "page" %}{% endslot %}
+ {% enddropdown_menu %}
+
+
{% dropdown_menu title="Sort" heading="Sort by" position="right" %}
{% for sort_option in sort_options %}
<a
From f25318d32a49a7a54ce38a45389ae6826b08abb8 Mon Sep 17 00:00:00 2001
From: Saurabh Kumar <theskumar@users.noreply.github.com>
Date: Sat, 24 Feb 2024 09:44:48 +0530
Subject: [PATCH 2/2] update drowndown open position
---
hypha/apply/funds/templates/submissions/all.html | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hypha/apply/funds/templates/submissions/all.html b/hypha/apply/funds/templates/submissions/all.html
index 2154f317cc..412f93e1ce 100644
--- a/hypha/apply/funds/templates/submissions/all.html
+++ b/hypha/apply/funds/templates/submissions/all.html
@@ -364,7 +364,7 @@
{% slot "url" %}{% url "apply:submissions:submenu-rounds" %}{% remove_from_query "only_query_string" "page" %}{% endslot %}
{% enddropdown_menu %}
- {% dropdown_menu title="Category" heading="Filter by Category" enable_search=True position="right" %}
+ {% dropdown_menu title="Category" heading="Filter by Category" enable_search=True %}
{% slot "url" %}{% url "apply:submissions:submenu-category-options" %}{% remove_from_query "only_query_string" "page" %}{% endslot %}
{% enddropdown_menu %}
@@ -372,7 +372,7 @@
{% slot "url" %}{% url "apply:submissions:submenu-meta-terms" %}{% remove_from_query "only_query_string" "page" %}{% endslot %}
{% enddropdown_menu %}
- {% dropdown_menu title="Lead" heading="Filter by Lead" enable_search=True %}
+ {% dropdown_menu title="Lead" heading="Filter by Lead" enable_search=True position="right" %}
{% slot "url" %}{% url "apply:submissions:submenu-leads" %}{% remove_from_query "only_query_string" "page" %}{% endslot %}
{% enddropdown_menu %}