From 8863a2e64e9c5564a5261e7e59b92f030895964b Mon Sep 17 00:00:00 2001
From: Fredrik Jonsson <frjo@xdeb.org>
Date: Tue, 17 Dec 2024 08:41:51 +0100
Subject: [PATCH] Remove outdated block extras and move block extra css just
 above block extra js in templates.

---
 .../templates/dashboard/contracting_dashboard.html       | 5 -----
 .../dashboard/templates/dashboard/finance_dashboard.html | 5 -----
 .../templates/dashboard/reviewer_dashboard.html          | 8 ++++----
 .../dashboard/templates/dashboard/staff_dashboard.html   | 9 ++++-----
 .../funds/applicationsubmission_community_detail.html    | 5 -----
 .../funds/applicationsubmission_reviewer_detail.html     | 5 -----
 .../funds/templates/funds/base_submissions_table.html    | 8 ++++----
 .../funds/templates/funds/grouped_application_list.html  | 8 ++++----
 hypha/apply/funds/templates/funds/rounds.html            | 9 +++------
 .../templates/application_projects/invoice_list.html     | 2 --
 .../application_projects/project_approval_detail.html    | 8 --------
 11 files changed, 19 insertions(+), 53 deletions(-)

diff --git a/hypha/apply/dashboard/templates/dashboard/contracting_dashboard.html b/hypha/apply/dashboard/templates/dashboard/contracting_dashboard.html
index acc94225e9..f425b3fd8b 100644
--- a/hypha/apply/dashboard/templates/dashboard/contracting_dashboard.html
+++ b/hypha/apply/dashboard/templates/dashboard/contracting_dashboard.html
@@ -34,8 +34,3 @@ <h4 class="heading heading--normal">{% trans "PAFs for review" %}</h4>
         {% endif %}
     </div>
 {% endblock %}
-
-{% block extra_js %}
-    <script src="{% static 'js/submission-filters.js' %}"></script>
-    <script src="{% static 'js/tabs.js' %}"></script>
-{% endblock %}
diff --git a/hypha/apply/dashboard/templates/dashboard/finance_dashboard.html b/hypha/apply/dashboard/templates/dashboard/finance_dashboard.html
index 411a14c179..ffd2854e5c 100644
--- a/hypha/apply/dashboard/templates/dashboard/finance_dashboard.html
+++ b/hypha/apply/dashboard/templates/dashboard/finance_dashboard.html
@@ -100,8 +100,3 @@ <h4 class="heading heading--normal">{% trans "PAFs for review" %}</h4>
 
     </div>
 {% endblock %}
-
-{% block extra_js %}
-    {{ my_reviewed.filterset.form.media.js }}
-    <script src="{% static 'js/submission-filters.js' %}"></script>
-{% endblock %}
diff --git a/hypha/apply/dashboard/templates/dashboard/reviewer_dashboard.html b/hypha/apply/dashboard/templates/dashboard/reviewer_dashboard.html
index 6de151c199..dd7b7ebcff 100644
--- a/hypha/apply/dashboard/templates/dashboard/reviewer_dashboard.html
+++ b/hypha/apply/dashboard/templates/dashboard/reviewer_dashboard.html
@@ -2,10 +2,6 @@
 {% load render_table from django_tables2 %}
 {% load i18n static statusbar_tags workflow_tags %}
 
-{% block extra_css %}
-    {{ filter.form.media.css }}
-{% endblock %}
-
 {% block title %}{% trans "Dashboard" %}{% endblock %}
 
 {% block content %}
@@ -90,6 +86,10 @@ <h2 class="text-xl mb-2">
 
 {% endblock %}
 
+{% block extra_css %}
+    {{ filter.form.media.css }}
+{% endblock %}
+
 {% block extra_js %}
     {{ filter.form.media.js }}
     <script src="{% static 'js/submission-filters.js' %}"></script>
diff --git a/hypha/apply/dashboard/templates/dashboard/staff_dashboard.html b/hypha/apply/dashboard/templates/dashboard/staff_dashboard.html
index c46645e7bc..a488465e23 100644
--- a/hypha/apply/dashboard/templates/dashboard/staff_dashboard.html
+++ b/hypha/apply/dashboard/templates/dashboard/staff_dashboard.html
@@ -2,10 +2,6 @@
 {% load render_table from django_tables2 %}
 {% load i18n static nh3_tags markdown_tags heroicons %}
 
-{% block extra_css %}
-    {{ my_reviewed.filterset.form.media.css }}
-{% endblock %}
-
 {% block title %}{% trans "Dashboard" %}{% endblock %}
 
 {% block content %}
@@ -136,9 +132,12 @@ <h2 class="heading heading--normal">{{ review_heading }}</h2>
     </div>
 {% endblock %}
 
+{% block extra_css %}
+    {{ my_reviewed.filterset.form.media.css }}
+{% endblock %}
+
 {% block extra_js %}
     {{ my_reviewed.filterset.form.media.js }}
     <script src="{% static 'js/all-submissions-table.js' %}"></script>
     <script src="{% static 'js/submission-filters.js' %}"></script>
-    <script src="{% static 'js/tabs.js' %}"></script>
 {% endblock %}
diff --git a/hypha/apply/funds/templates/funds/applicationsubmission_community_detail.html b/hypha/apply/funds/templates/funds/applicationsubmission_community_detail.html
index 6a2b67cbd2..413add3a1a 100644
--- a/hypha/apply/funds/templates/funds/applicationsubmission_community_detail.html
+++ b/hypha/apply/funds/templates/funds/applicationsubmission_community_detail.html
@@ -22,8 +22,3 @@ <h5>{% trans "Reviews & assignees" %}</h5>
 
 {% block related %}
 {% endblock %}
-
-{% block extra_js %}
-    {{ reviewer_form.media.js }}
-    {{ block.super }}
-{% endblock %}
diff --git a/hypha/apply/funds/templates/funds/applicationsubmission_reviewer_detail.html b/hypha/apply/funds/templates/funds/applicationsubmission_reviewer_detail.html
index e4a7d60b7d..3bc8795e13 100644
--- a/hypha/apply/funds/templates/funds/applicationsubmission_reviewer_detail.html
+++ b/hypha/apply/funds/templates/funds/applicationsubmission_reviewer_detail.html
@@ -29,8 +29,3 @@ <h5>{% trans "Reviews & assignees" %}</h5>
 
 {% block related %}
 {% endblock %}
-
-{% block extra_js %}
-    {{ reviewer_form.media.js }}
-    {{ block.super }}
-{% endblock %}
diff --git a/hypha/apply/funds/templates/funds/base_submissions_table.html b/hypha/apply/funds/templates/funds/base_submissions_table.html
index b8f4148611..a14d32980e 100644
--- a/hypha/apply/funds/templates/funds/base_submissions_table.html
+++ b/hypha/apply/funds/templates/funds/base_submissions_table.html
@@ -2,10 +2,6 @@
 {% load static %}
 {% load render_table from django_tables2 %}
 
-{% block extra_css %}
-    {{ filter.form.media.css }}
-{% endblock %}
-
 {% block content %}
     {% block table %}
         {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term use_search=True filter_action=filter_action filter_classes="filters-open" can_export=can_export %}
@@ -14,6 +10,10 @@
     {% endblock %}
 {% endblock %}
 
+{% block extra_css %}
+    {{ filter.form.media.css }}
+{% endblock %}
+
 {% block extra_js %}
     {{ filter.form.media.js }}
     <script src="{% static 'js/all-submissions-table.js' %}"></script>
diff --git a/hypha/apply/funds/templates/funds/grouped_application_list.html b/hypha/apply/funds/templates/funds/grouped_application_list.html
index 0a6a68af5f..3ae34da1ef 100644
--- a/hypha/apply/funds/templates/funds/grouped_application_list.html
+++ b/hypha/apply/funds/templates/funds/grouped_application_list.html
@@ -1,10 +1,6 @@
 {% extends "base-apply.html" %}
 {% load i18n static %}
 
-{% block extra_css %}
-    {{ filter.form.media.css }}
-{% endblock %}
-
 {% block content %}
 
     {% adminbar %}
@@ -14,6 +10,10 @@
     <div id="grouped-applications-list"></div>
 {% endblock %}
 
+{% block extra_css %}
+    {{ filter.form.media.css }}
+{% endblock %}
+
 {% block extra_js %}
     {{ filter.form.media.js }}
     <script src="{% static 'js/all-submissions-table.js' %}"></script>
diff --git a/hypha/apply/funds/templates/funds/rounds.html b/hypha/apply/funds/templates/funds/rounds.html
index df26379bb6..12eab4d8bb 100644
--- a/hypha/apply/funds/templates/funds/rounds.html
+++ b/hypha/apply/funds/templates/funds/rounds.html
@@ -4,13 +4,7 @@
 
 {% block title %}{% trans "Rounds" %}{% endblock %}
 
-{% block extra_css %}
-    {{ filter.form.media.css }}
-{% endblock %}
-
-
 {% block content %}
-
     {% adminbar %}
         {% slot header %}{% trans "Rounds" %}{% endslot %}
         {% slot sub_heading %}{% trans "Explore current and past rounds" %}{% endslot %}
@@ -20,7 +14,10 @@
         {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term can_export=can_export %}
         {% render_table table %}
     </div>
+{% endblock %}
 
+{% block extra_css %}
+    {{ filter.form.media.css }}
 {% endblock %}
 
 {% block extra_js %}
diff --git a/hypha/apply/projects/templates/application_projects/invoice_list.html b/hypha/apply/projects/templates/application_projects/invoice_list.html
index db86b8796f..12e6985c6c 100644
--- a/hypha/apply/projects/templates/application_projects/invoice_list.html
+++ b/hypha/apply/projects/templates/application_projects/invoice_list.html
@@ -6,7 +6,6 @@
 {% block title %}{% trans "Invoices" %}{% endblock %}
 
 {% block content %}
-
     {% adminbar %}
         {% slot header %}{% trans "All Invoices" %} ({{ table.rows|length }}){% endslot %}
         {% slot sub_heading %}{% trans "View, search and filter all project invoices" %}{% endslot %}
@@ -28,7 +27,6 @@
             <p>{% trans "No Invoices available" %}</p>
         {% endif %}
     </div>
-
 {% endblock content %}
 
 {% block extra_css %}
diff --git a/hypha/apply/projects/templates/application_projects/project_approval_detail.html b/hypha/apply/projects/templates/application_projects/project_approval_detail.html
index 08d6cc5ffd..a1cb82f3ed 100644
--- a/hypha/apply/projects/templates/application_projects/project_approval_detail.html
+++ b/hypha/apply/projects/templates/application_projects/project_approval_detail.html
@@ -3,10 +3,6 @@
 
 {% block title %}{{ object.title }}{% endblock %}
 
-{% block extra_css %}
-    {{ reviewer_form.media.css }}
-{% endblock %}
-
 {% block content %}
     {% adminbar %}
         {% slot back_link %}
@@ -150,7 +146,3 @@ <h5>{% trans "Actions to take" %}</h5>
         </div>
     </div>
 {% endblock content %}
-
-{% block extra_js %}
-    {{ block.super }}
-{% endblock %}