From c9fc2c1671c05717837f90e65fe29d94262bb261 Mon Sep 17 00:00:00 2001
From: Fredrik Jonsson <frjo@xdeb.org>
Date: Thu, 11 Apr 2024 08:32:15 +0200
Subject: [PATCH] Rename the beta and old submission all views to list and
grid. (#3866)
Fixes #3863
---
.../funds/applicationsubmission_detail.html | 4 +--
.../funds/includes/submission-list-item.html | 2 +-
.../includes/table_filter_and_search.html | 15 +---------
.../funds/templates/funds/submissions.html | 12 ++++----
.../templates/funds/submissions_overview.html | 2 +-
.../funds/templates/submissions/all.html | 28 ++++++++++---------
.../submissions/submenu/category.html | 12 ++++----
.../templates/submissions/submenu/funds.html | 12 ++++----
.../templates/submissions/submenu/leads.html | 8 +++---
.../submissions/submenu/meta-terms.html | 12 ++++----
.../submissions/submenu/reviewers.html | 12 ++++----
.../templates/submissions/submenu/rounds.html | 12 ++++----
hypha/apply/funds/urls.py | 28 +++++++++----------
.../core/templates/components/admin_bar.html | 2 +-
.../static_src/sass/abstracts/_variables.scss | 2 +-
15 files changed, 77 insertions(+), 86 deletions(-)
diff --git a/hypha/apply/funds/templates/funds/applicationsubmission_detail.html b/hypha/apply/funds/templates/funds/applicationsubmission_detail.html
index 59d3c9314..7021a81bb 100644
--- a/hypha/apply/funds/templates/funds/applicationsubmission_detail.html
+++ b/hypha/apply/funds/templates/funds/applicationsubmission_detail.html
@@ -13,10 +13,10 @@
{% endif %}
<div class="admin-bar">
<div class="admin-bar__inner">
- {% if request.GET.ref == 'all-beta' %}
+ {% if request.GET.ref == 'all-alt' %}
<a class="simplified__submissions-link"
hx-boost="true"
- href="{% url "funds:submissions:list-beta" %}"
+ href="{% url "funds:submissions:list-alt" %}"
>
{% trans "Back to submissions" %}
</a>
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 65e947509..d435f9e91 100644
--- a/hypha/apply/funds/templates/funds/includes/submission-list-item.html
+++ b/hypha/apply/funds/templates/funds/includes/submission-list-item.html
@@ -40,7 +40,7 @@
<span>
<a
title="{{ s.form_data.title }}"
- href="{% url "funds:submissions:detail" s.id %}?ref=all-beta"
+ href="{% url "funds:submissions:detail" s.id %}?ref=all-alt"
class="font-semibold text-base text-[#404041] hover:text-blue-600 transition-colors break-words"
>{{ s.form_data.title }}</a>
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 6633c8728..91e5f9f58 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
@@ -6,20 +6,7 @@
{# Left #}
<div class="actions-bar__inner actions-bar__inner--left">
{% if heading %}
- <h2 class="text-xl mb-2">
-
- {{ heading }}
-
- {% if show_try_new_submissions_link %}
- <a class="text-sm text-[#1d79a8] border-b border-transparent hover:opacity-70 hover:underline transition-all"
- hx-boost="true"
- href="{% url 'apply:submissions:list-beta' %}"
- >
- ({% heroicon_outline "rocket-launch" aria_hidden="true" size=15 stroke_width="2" class="inline align-text-bottom" %}
- {% trans "Try newer version" %})
- </a>
- {% endif %}
- </h2>
+ <h2 class="text-xl mb-2">{{ heading }}</h2>
{% endif %}
diff --git a/hypha/apply/funds/templates/funds/submissions.html b/hypha/apply/funds/templates/funds/submissions.html
index 347896fbe..ba0d3ec28 100644
--- a/hypha/apply/funds/templates/funds/submissions.html
+++ b/hypha/apply/funds/templates/funds/submissions.html
@@ -9,15 +9,17 @@
{% adminbar %}
{% slot header %}
{% trans "All Submissions" %}<span class="submissions-count"> ({{ table.rows|length }})</span>
- <a class="text-sm text-lime-300 border-b border-transparent hover:opacity-70 transition-all"
+ {% endslot %}
+ {% slot sub_heading %}{% trans "Search and filter all submissions" %}{% endslot %}
+
+ {% slot buttons %}
+ <a class="tab__item tab__item--right"
hx-boost="true"
- href="{% url 'apply:submissions:list-beta' %}"
+ href="{% url 'apply:submissions:list-alt' %}"
>
- {% heroicon_outline "rocket-launch" aria_hidden="true" size=15 stroke_width="2" class="inline align-text-bottom" %}
- {% trans "Try newer version" %}
+ {% trans "Switch to list view" %}
</a>
{% endslot %}
- {% slot sub_heading %}{% trans "Search and filter all submissions" %}{% endslot %}
{% endadminbar %}
<div class="wrapper wrapper--large wrapper--inner-space-medium">
diff --git a/hypha/apply/funds/templates/funds/submissions_overview.html b/hypha/apply/funds/templates/funds/submissions_overview.html
index 410be73ac..a7928172d 100644
--- a/hypha/apply/funds/templates/funds/submissions_overview.html
+++ b/hypha/apply/funds/templates/funds/submissions_overview.html
@@ -22,7 +22,7 @@
{% block table %}
<div class="wrapper wrapper--bottom-space">
{% trans "All Submissions" as all_submissions %}
- {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term use_search=True filter_action=filter_action search_action=search_action use_batch_actions=False heading=all_submissions show_try_new_submissions_link=True%}
+ {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term use_search=True filter_action=filter_action search_action=search_action use_batch_actions=False heading=all_submissions %}
{% render_table table %}
<div class="all-submissions-table__more">
diff --git a/hypha/apply/funds/templates/submissions/all.html b/hypha/apply/funds/templates/submissions/all.html
index e3241d6f8..5e7c71aca 100644
--- a/hypha/apply/funds/templates/submissions/all.html
+++ b/hypha/apply/funds/templates/submissions/all.html
@@ -9,15 +9,17 @@
{% block content %}{% spaceless %}
{% adminbar %}
{% slot header %}
- {% trans "All Submissions" %}
- <span class="submissions-count"> ({{ page.paginator.count }})</span>
- <a class="text-sm text-lime-300 border-b border-transparent hover:opacity-70 transition-all"
+ {% trans "All Submissions" %}<span class="submissions-count"> ({{ page.paginator.count }})</span>
+ {% endslot %}
+ {% slot sub_heading %}{% trans "Search and filter all submissions" %}{% endslot %}
+
+ {% slot buttons %}
+ <a class="tab__item tab__item--right"
href="{% url 'apply:submissions:list' %}"
>
- {% trans "View older version" %}
+ {% trans "Switch to grid view" %}
</a>
{% endslot %}
-
{% endadminbar %}
@@ -28,8 +30,8 @@
{% dropdown_menu title="Filters" heading="Filter submissions" %}
<a
- href="{% url "apply:submissions:list-beta" %}?query=lead:@me"
- hx-get="{% url "apply:submissions:list-beta" %}?query=lead:@me"
+ href="{% url "apply:submissions:list-alt" %}?query=lead:@me"
+ hx-get="{% url "apply:submissions:list-alt" %}?query=lead:@me"
hx-push-url="true"
hx-target="#main"
hx-swap="outerHTML"
@@ -40,8 +42,8 @@
{% trans "Your assigned submissions" %} {{ request.GET.lead }}
</a>
<a
- href="{% url "apply:submissions:list-beta" %}?query=flagged:@me"
- hx-get="{% url "apply:submissions:list-beta" %}?query=flagged:@me"
+ href="{% url "apply:submissions:list-alt" %}?query=flagged:@me"
+ hx-get="{% url "apply:submissions:list-alt" %}?query=flagged:@me"
hx-push-url="true"
hx-target="#main"
hx-swap="outerHTML"
@@ -52,8 +54,8 @@
{% trans "Your flagged submissions" %}
</a>
<a
- href="{% url "apply:submissions:list-beta" %}?query=flagged:@staff"
- hx-get="{% url "apply:submissions:list-beta" %}?query=flagged:@staff"
+ href="{% url "apply:submissions:list-alt" %}?query=flagged:@staff"
+ hx-get="{% url "apply:submissions:list-alt" %}?query=flagged:@staff"
hx-push-url="true"
hx-target="#main"
hx-swap="outerHTML"
@@ -64,8 +66,8 @@
{% trans "Staff flagged submissions" %}
</a>
<a
- href="{% url "apply:submissions:list-beta" %}?query=reviewer:@me"
- href="{% url "apply:submissions:list-beta" %}?query=reviewer:@me"
+ href="{% url "apply:submissions:list-alt" %}?query=reviewer:@me"
+ href="{% url "apply:submissions:list-alt" %}?query=reviewer:@me"
hx-push-url="true"
hx-target="#main"
hx-swap="outerHTML"
diff --git a/hypha/apply/funds/templates/submissions/submenu/category.html b/hypha/apply/funds/templates/submissions/submenu/category.html
index 14ee40512..ece63a3a8 100644
--- a/hypha/apply/funds/templates/submissions/submenu/category.html
+++ b/hypha/apply/funds/templates/submissions/submenu/category.html
@@ -4,8 +4,8 @@
data-filter-list>
{% if selected_category_options %}
<li data-filter-item-text>
- <a href="{% url "apply:submissions:list-beta" %}{% remove_from_query "only_query_string" "page" "category_options" %}"
- hx-get="{% url "apply:submissions:list-beta" %}{% remove_from_query "only_query_string" "page" "category_options" %}"
+ <a href="{% url "apply:submissions:list-alt" %}{% remove_from_query "only_query_string" "page" "category_options" %}"
+ hx-get="{% url "apply:submissions:list-alt" %}{% remove_from_query "only_query_string" "page" "category_options" %}"
hx-push-url="true"
class="flex px-3 py-2 text-gray-600 border-b items-center hover:bg-gray-100 focus:bg-gray-100{% if s.selected %}bg-gray-100{% endif %}">
{% trans "All Categories" %}
@@ -16,12 +16,12 @@
<li data-filter-item-text>
<a
{% if item.selected %}
- href="{% url "apply:submissions:list-beta" %}{% remove_from_query "only_query_string" "page" category_options=item.id %}"
- hx-get="{% url "apply:submissions:list-beta" %}{% remove_from_query "only_query_string" "page" category_options=item.id %}"
+ href="{% url "apply:submissions:list-alt" %}{% remove_from_query "only_query_string" "page" category_options=item.id %}"
+ hx-get="{% url "apply:submissions:list-alt" %}{% remove_from_query "only_query_string" "page" category_options=item.id %}"
title="Remove {{ item.title }} from current filters"
{% else %}
- href="{% url "apply:submissions:list-beta" %}{% add_to_query "only_query_string" "page" category_options=item.id %}"
- hx-get="{% url "apply:submissions:list-beta" %}{% add_to_query "only_query_string" "page" category_options=item.id %}"
+ href="{% url "apply:submissions:list-alt" %}{% add_to_query "only_query_string" "page" category_options=item.id %}"
+ hx-get="{% url "apply:submissions:list-alt" %}{% add_to_query "only_query_string" "page" category_options=item.id %}"
title="Add {{ item.title }} to current filters"
{% endif %}
hx-push-url="true"
diff --git a/hypha/apply/funds/templates/submissions/submenu/funds.html b/hypha/apply/funds/templates/submissions/submenu/funds.html
index 51159f10e..d45cf21ea 100644
--- a/hypha/apply/funds/templates/submissions/submenu/funds.html
+++ b/hypha/apply/funds/templates/submissions/submenu/funds.html
@@ -4,8 +4,8 @@
<ul class="text-gray-700 divide-y" aria-labelledby="dropdownBgHoverButton" data-filter-list>
{% if selected_funds %}
<li data-filter-item-text>
- <a href="{% url "apply:submissions:list-beta" %}{% remove_from_query "only_query_string" "page" "fund" %}"
- hx-get="{% url "apply:submissions:list-beta" %}{% remove_from_query "only_query_string" "page" "fund" %}"
+ <a href="{% url "apply:submissions:list-alt" %}{% remove_from_query "only_query_string" "page" "fund" %}"
+ hx-get="{% url "apply:submissions:list-alt" %}{% remove_from_query "only_query_string" "page" "fund" %}"
hx-push-url="true"
class="flex px-3 py-2 text-gray-600 items-center hover:bg-gray-100 focus:bg-gray-100{% if s.selected %}bg-gray-100{% endif %}">
{% trans "All Funds & Labs" %}
@@ -16,11 +16,11 @@
<li data-filter-item-text>
<a
{% if f.selected %}
- href="{% url "apply:submissions:list-beta" %}{% remove_from_query "only_query_string" "page" fund=f.id %}"
- hx-get="{% url "apply:submissions:list-beta" %}{% remove_from_query "only_query_string" "page" fund=f.id %}"
+ href="{% url "apply:submissions:list-alt" %}{% remove_from_query "only_query_string" "page" fund=f.id %}"
+ hx-get="{% url "apply:submissions:list-alt" %}{% remove_from_query "only_query_string" "page" fund=f.id %}"
{% else %}
- href="{% url "apply:submissions:list-beta" %}{% modify_query "only_query_string" "page" fund=f.id %}"
- hx-get="{% url "apply:submissions:list-beta" %}{% modify_query "only_query_string" "page" fund=f.id %}"
+ href="{% url "apply:submissions:list-alt" %}{% modify_query "only_query_string" "page" fund=f.id %}"
+ hx-get="{% url "apply:submissions:list-alt" %}{% modify_query "only_query_string" "page" fund=f.id %}"
{% endif %}
hx-push-url="true"
class="flex {% if f.selected %}ps-2 font-medium{% else %}ps-8{% endif %} pe-3 py-2 text-gray-600 items-center hover:bg-gray-100 focus:bg-gray-100{% if f.selected %}bg-gray-100{% endif %}">
diff --git a/hypha/apply/funds/templates/submissions/submenu/leads.html b/hypha/apply/funds/templates/submissions/submenu/leads.html
index ca3254e1c..0280d951d 100644
--- a/hypha/apply/funds/templates/submissions/submenu/leads.html
+++ b/hypha/apply/funds/templates/submissions/submenu/leads.html
@@ -3,8 +3,8 @@
<ul class="text-gray-700 divide-y" aria-labelledby="dropdownBgHoverButton" data-filter-list>
{% if selected_leads %}
<li data-filter-item-text>
- <a href="{% url "apply:submissions:list-beta" %}{% remove_from_query "only_query_string" "page" "lead" %}"
- hx-get="{% url "apply:submissions:list-beta" %}{% remove_from_query "only_query_string" "page" "lead" %}"
+ <a href="{% url "apply:submissions:list-alt" %}{% remove_from_query "only_query_string" "page" "lead" %}"
+ hx-get="{% url "apply:submissions:list-alt" %}{% remove_from_query "only_query_string" "page" "lead" %}"
hx-push-url="true"
class="flex px-3 py-2 text-gray-600 items-center hover:bg-gray-100 focus:bg-gray-100{% if s.selected %}bg-gray-100{% endif %}">
{% trans "All Leads" %}
@@ -14,8 +14,8 @@
{% for user in leads %}
<li data-filter-item-text>
<a
- href="{% url "apply:submissions:list-beta" %}{% modify_query "only_query_string" "page" lead=user.id %}"
- hx-get="{% url "apply:submissions:list-beta" %}{% modify_query "only_query_string" "page" lead=user.id %}"
+ href="{% url "apply:submissions:list-alt" %}{% modify_query "only_query_string" "page" lead=user.id %}"
+ hx-get="{% url "apply:submissions:list-alt" %}{% modify_query "only_query_string" "page" lead=user.id %}"
hx-push-url="true"
class="flex {% if user.selected %}ps-2 font-medium bg-gray-100{% else %}ps-8{% endif %} pe-3 py-2 text-gray-600 items-center hover:bg-gray-100 focus:bg-gray-100"
aria-selected="{% if user.selected %}true{% else %}false{% endif %}"
diff --git a/hypha/apply/funds/templates/submissions/submenu/meta-terms.html b/hypha/apply/funds/templates/submissions/submenu/meta-terms.html
index 3382fe2b4..5d1294d82 100644
--- a/hypha/apply/funds/templates/submissions/submenu/meta-terms.html
+++ b/hypha/apply/funds/templates/submissions/submenu/meta-terms.html
@@ -3,8 +3,8 @@
<ul class="text-gray-700 divide-y" aria-labelledby="dropdown-meta-terms" data-filter-list>
{% if selected_meta_terms %}
<li data-filter-item-text>
- <a href="{% url "apply:submissions:list-beta" %}{% remove_from_query "only_query_string" "page" "meta_terms" %}"
- hx-get="{% url "apply:submissions:list-beta" %}{% remove_from_query "only_query_string" "page" "meta_terms" %}"
+ <a href="{% url "apply:submissions:list-alt" %}{% remove_from_query "only_query_string" "page" "meta_terms" %}"
+ hx-get="{% url "apply:submissions:list-alt" %}{% remove_from_query "only_query_string" "page" "meta_terms" %}"
hx-push-url="true"
class="flex px-3 py-2 text-gray-600 items-center hover:bg-gray-100 focus:bg-gray-100{% if s.selected %}bg-gray-100{% endif %}">
{% trans "All Meta Terms" %}
@@ -15,12 +15,12 @@
<li data-filter-item-text>
<a
{% if meta_term.selected %}
- href="{% url "apply:submissions:list-beta" %}{% remove_from_query "only_query_string" "page" meta_terms=meta_term.id %}"
- hx-get="{% url "apply:submissions:list-beta" %}{% remove_from_query "only_query_string" "page" meta_terms=meta_term.id %}"
+ href="{% url "apply:submissions:list-alt" %}{% remove_from_query "only_query_string" "page" meta_terms=meta_term.id %}"
+ hx-get="{% url "apply:submissions:list-alt" %}{% remove_from_query "only_query_string" "page" meta_terms=meta_term.id %}"
title="Remove {{ meta_term.title }} from current filters"
{% else %}
- href="{% url "apply:submissions:list-beta" %}{% add_to_query "only_query_string" "page" meta_terms=meta_term.id %}"
- hx-get="{% url "apply:submissions:list-beta" %}{% add_to_query "only_query_string" "page" meta_terms=meta_term.id %}"
+ href="{% url "apply:submissions:list-alt" %}{% add_to_query "only_query_string" "page" meta_terms=meta_term.id %}"
+ hx-get="{% url "apply:submissions:list-alt" %}{% add_to_query "only_query_string" "page" meta_terms=meta_term.id %}"
title="Add {{ meta_term.title }} to current filters"
{% endif %}
hx-push-url="true"
diff --git a/hypha/apply/funds/templates/submissions/submenu/reviewers.html b/hypha/apply/funds/templates/submissions/submenu/reviewers.html
index 0be16e498..a64d1b980 100644
--- a/hypha/apply/funds/templates/submissions/submenu/reviewers.html
+++ b/hypha/apply/funds/templates/submissions/submenu/reviewers.html
@@ -3,8 +3,8 @@
<ul class="text-gray-700 divide-y dark:text-gray-200" aria-labelledby="dropdown-reviewers" data-filter-list>
{% if selected_reviewers %}
<li data-filter-item-text>
- <a href="{% url "apply:submissions:list-beta" %}{% remove_from_query "only_query_string" "page" "reviewers" %}"
- hx-get="{% url "apply:submissions:list-beta" %}{% remove_from_query "only_query_string" "page" "reviewers" %}"
+ <a href="{% url "apply:submissions:list-alt" %}{% remove_from_query "only_query_string" "page" "reviewers" %}"
+ hx-get="{% url "apply:submissions:list-alt" %}{% remove_from_query "only_query_string" "page" "reviewers" %}"
hx-push-url="true"
class="flex px-3 py-2 text-gray-600 items-center hover:bg-gray-100 focus:bg-gray-100{% if s.selected %}bg-gray-100{% endif %}">
{% trans "All Reviewers" %}
@@ -15,12 +15,12 @@
<li data-filter-item-text>
<a
{% if user.selected %}
- href="{% url "apply:submissions:list-beta" %}{% remove_from_query "only_query_string" "page" reviewers=user.id %}"
- hx-get="{% url "apply:submissions:list-beta" %}{% remove_from_query "only_query_string" "page" reviewers=user.id %}"
+ href="{% url "apply:submissions:list-alt" %}{% remove_from_query "only_query_string" "page" reviewers=user.id %}"
+ hx-get="{% url "apply:submissions:list-alt" %}{% remove_from_query "only_query_string" "page" reviewers=user.id %}"
title="Remove {{ user.title }} from current filters"
{% else %}
- href="{% url "apply:submissions:list-beta" %}{% add_to_query "only_query_string" "page" reviewers=user.id %}"
- hx-get="{% url "apply:submissions:list-beta" %}{% add_to_query "only_query_string" "page" reviewers=user.id %}"
+ href="{% url "apply:submissions:list-alt" %}{% add_to_query "only_query_string" "page" reviewers=user.id %}"
+ hx-get="{% url "apply:submissions:list-alt" %}{% add_to_query "only_query_string" "page" reviewers=user.id %}"
title="Add {{ user.title }} to current filters"
{% endif %}
hx-push-url="true"
diff --git a/hypha/apply/funds/templates/submissions/submenu/rounds.html b/hypha/apply/funds/templates/submissions/submenu/rounds.html
index acf20af3c..0f63fdcb6 100644
--- a/hypha/apply/funds/templates/submissions/submenu/rounds.html
+++ b/hypha/apply/funds/templates/submissions/submenu/rounds.html
@@ -7,8 +7,8 @@
{% if selected_rounds %}
<a
- href="{% url "apply:submissions:list-beta" %}{% remove_from_query "only_query_string" "page" "round" %}"
- hx-get="{% url "apply:submissions:list-beta" %}{% remove_from_query "only_query_string" "page" "round" %}"
+ href="{% url "apply:submissions:list-alt" %}{% remove_from_query "only_query_string" "page" "round" %}"
+ hx-get="{% url "apply:submissions:list-alt" %}{% remove_from_query "only_query_string" "page" "round" %}"
hx-push-url="true"
class="flex px-3 py-2 text-gray-600 border-b items-center hover:bg-gray-100 focus:bg-gray-100{% if s.selected %}bg-gray-100{% endif %}">
{% trans "All Rounds" %}
@@ -45,8 +45,8 @@
>
{% for f in closed_rounds %}
<a data-filter-item-text
- href="{% url "apply:submissions:list-beta" %}{% modify_query "only_query_string" "page" round=f.id %}"
- hx-get="{% url "apply:submissions:list-beta" %}{% modify_query "only_query_string" "page" round=f.id %}"
+ href="{% url "apply:submissions:list-alt" %}{% modify_query "only_query_string" "page" round=f.id %}"
+ hx-get="{% url "apply:submissions:list-alt" %}{% modify_query "only_query_string" "page" round=f.id %}"
hx-push-url="true"
class="flex {% if f.selected %}ps-2 font-medium{% else %}ps-8{% endif %} pe-3 py-2 text-gray-600 items-center hover:bg-gray-100 focus:bg-gray-100{% if f.selected %}bg-gray-100{% endif %}">
{% if f.selected %}
@@ -67,8 +67,8 @@
{% for f in open_rounds %}
<a
data-filter-item-text
- href="{% url "apply:submissions:list-beta" %}{% modify_query "only_query_string" "page" round=f.id %}"
- hx-get="{% url "apply:submissions:list-beta" %}{% modify_query "only_query_string" "page" round=f.id %}"
+ href="{% url "apply:submissions:list-alt" %}{% modify_query "only_query_string" "page" round=f.id %}"
+ hx-get="{% url "apply:submissions:list-alt" %}{% modify_query "only_query_string" "page" round=f.id %}"
hx-push-url="true"
class="flex {% if f.selected %}ps-2 font-medium{% else %}ps-8{% endif %} pe-3 py-2 text-gray-600 items-center hover:bg-gray-100 focus:bg-gray-100{% if f.selected %}bg-gray-100{% endif %}">
{% if f.selected %}
diff --git a/hypha/apply/funds/urls.py b/hypha/apply/funds/urls.py
index 98892d60b..060cd4045 100644
--- a/hypha/apply/funds/urls.py
+++ b/hypha/apply/funds/urls.py
@@ -87,47 +87,47 @@ submission_urls = (
get_applications_status_counts,
name="applications_status_counts",
),
- path("all-beta/", submission_all_beta, name="list-beta"),
- path("all-beta/bulk_archive/", bulk_archive_submissions, name="bulk-archive"),
- path("all-beta/bulk_delete/", bulk_delete_submissions, name="bulk-delete"),
+ path("all-alt/", submission_all_beta, name="list-alt"),
+ path("all-alt/bulk_archive/", bulk_archive_submissions, name="bulk-archive"),
+ path("all-alt/bulk_delete/", bulk_delete_submissions, name="bulk-delete"),
path(
- "all-beta/bulk_update_status/",
+ "all-alt/bulk_update_status/",
bulk_update_submissions_status,
name="bulk-update-status",
),
- path("all-beta/submenu/funds/", sub_menu_funds, name="submenu-funds"),
- path("all-beta/submenu/leads/", sub_menu_leads, name="submenu-leads"),
- path("all-beta/submenu/rounds/", sub_menu_rounds, name="submenu-rounds"),
+ path("all-alt/submenu/funds/", sub_menu_funds, name="submenu-funds"),
+ path("all-alt/submenu/leads/", sub_menu_leads, name="submenu-leads"),
+ path("all-alt/submenu/rounds/", sub_menu_rounds, name="submenu-rounds"),
path(
- "all-beta/submenu/reviewers/", sub_menu_reviewers, name="submenu-reviewers"
+ "all-alt/submenu/reviewers/", sub_menu_reviewers, name="submenu-reviewers"
),
path(
- "all-beta/submenu/meta-terms/",
+ "all-alt/submenu/meta-terms/",
sub_menu_meta_terms,
name="submenu-meta-terms",
),
path(
- "all-beta/submenu/bulk-update-status/",
+ "all-alt/submenu/bulk-update-status/",
sub_menu_update_status,
name="submenu-update-status",
),
path(
- "all-beta/submenu/bulk-update-lead/",
+ "all-alt/submenu/bulk-update-lead/",
sub_menu_bulk_update_lead,
name="submenu-bulk-update-lead",
),
path(
- "all-beta/submenu/bulk-update-reviewers/",
+ "all-alt/submenu/bulk-update-reviewers/",
sub_menu_bulk_update_reviewers,
name="submenu-bulk-update-reviewers",
),
path(
- "all-beta/submenu/category-options/",
+ "all-alt/submenu/category-options/",
sub_menu_category_options,
name="submenu-category-options",
),
path(
- "all-beta/partials/review_decisions/",
+ "all-alt/partials/review_decisions/",
partial_reviews_decisions,
name="partial-reviews-decisions",
),
diff --git a/hypha/core/templates/components/admin_bar.html b/hypha/core/templates/components/admin_bar.html
index 4c8d138fa..6d6b392aa 100644
--- a/hypha/core/templates/components/admin_bar.html
+++ b/hypha/core/templates/components/admin_bar.html
@@ -7,7 +7,7 @@
<h1 class="text-2xl mb-2 font-medium md:text-3xl md:m-0">{% render_slot slots.header %}</h1>
{% if slots.sub_heading %}<p class="text-sm hidden md:block m-0">{% render_slot slots.sub_heading %}</p>{% endif %}
</div>
-
+ {% if slots.buttons %}<div class="-mb-5 self-end">{% render_slot slots.buttons %}</div>{% endif %}
{% render_slot slots.inner_block %}
</div>
</div>
diff --git a/hypha/static_src/sass/abstracts/_variables.scss b/hypha/static_src/sass/abstracts/_variables.scss
index a91b39be6..ff40c1066 100644
--- a/hypha/static_src/sass/abstracts/_variables.scss
+++ b/hypha/static_src/sass/abstracts/_variables.scss
@@ -121,7 +121,7 @@ $medium-transition: 0.5s ease;
$base-delay: 30ms;
// Spacing
-$mobile-gutter: 20px;
+$mobile-gutter: 1.25rem;
// Filters
$filter-dropdown: ".select2 .select2-selection.select2-selection--single";
--
GitLab