diff --git a/Makefile b/Makefile index 54c28a5e85..b1cbc7e2f1 100644 --- a/Makefile +++ b/Makefile @@ -74,6 +74,7 @@ download-esm-modules: ## Download ECMAScript modules for the project download-esm @github/relative-time-element $(JS_ESM_DIR) download-esm @github/filter-input-element $(JS_ESM_DIR) download-esm choices.js $(JS_ESM_DIR) + download-esm cally $(JS_ESM_DIR) .cache/tandem: ## Install tandem, a tool for running multiple commands in parallel @@ -100,6 +101,4 @@ download-esm-modules: ## Download ECMAScript modules for the project cp node_modules/htmx.org/dist/ext/multi-swap.js $(JS_VENDOR_DIR)/htmx-ext-multi-swap.min.js cp node_modules/alpinejs/dist/cdn.min.js $(JS_VENDOR_DIR)/alpine.min.js cp node_modules/@alpinejs/focus/dist/cdn.min.js $(JS_VENDOR_DIR)/alpine-focus.min.js - cp node_modules/daterangepicker/moment.min.js $(JS_VENDOR_DIR)/moment.min.js - cp node_modules/daterangepicker/daterangepicker.js $(JS_VENDOR_DIR)/daterangepicker.min.js @touch $@ diff --git a/hypha/apply/funds/templates/funds/includes/table_filter_and_search.html b/hypha/apply/funds/templates/funds/includes/table_filter_and_search.html index ed12359bb2..66ad2fda96 100644 --- a/hypha/apply/funds/templates/funds/includes/table_filter_and_search.html +++ b/hypha/apply/funds/templates/funds/includes/table_filter_and_search.html @@ -103,59 +103,49 @@

{{ heading }}

{% enddropdown_menu %} {% else %} -
- {{ field.label }} - {% heroicon_micro attributes.icon|default:"chevron-down" aria_hidden="true" size="16" class="hidden md:inline-block size-4 ms-0.5" %} -
+ {% dropdown_menu title=field.label heading=field|get_dropdown_heading position="right" %} + + {% heroicon_micro "chevron-left" aria_label="Previous" slot="previous" aria_hidden=true size=18 %} + {% heroicon_micro "chevron-right" aria_label="Next" slot="next" aria_hidden=true size=18 %} + + + {% enddropdown_menu %} - - {% endif %} diff --git a/hypha/apply/funds/templates/submissions/all.html b/hypha/apply/funds/templates/submissions/all.html index 1557d609a7..99384764fe 100644 --- a/hypha/apply/funds/templates/submissions/all.html +++ b/hypha/apply/funds/templates/submissions/all.html @@ -46,6 +46,7 @@ hx-target="#main" hx-push-url="true" hx-swap="outerHTML transition:true" + name="querySubmissions" > {% dropdown_menu title="Filters" heading="Filter submissions" %} @@ -322,19 +323,21 @@ x-show="!showSelectedSubmissions" class="flex flex-wrap gap-2 items-center menu-filters" > -
- -
+ {% dropdown_menu title="Submitted" heading="Filter by submitted date(s)" %} + + {% heroicon_micro "chevron-left" aria_label="Previous" slot="previous" aria_hidden=true size=18 %} + {% heroicon_micro "chevron-right" aria_label="Next" slot="next" aria_hidden=true size=18 %} + + + {% enddropdown_menu %} -
- -
+ {% dropdown_menu title="Updated" heading="Filter by updated date(s)" %} + + {% heroicon_micro "chevron-left" aria_label="Previous" slot="previous" aria_hidden=true size=18 %} + {% heroicon_micro "chevron-right" aria_label="Next" slot="next" aria_hidden=true size=18 %} + + + {% enddropdown_menu %} {% dropdown_menu title="Status" heading="Filter by current status" enable_search=True %}