Merge remote-tracking branch 'origin/maintenance/clean-up-js-files' into test

Author: frjo

hypha/apply/activity/templates/activity/include/comment_form.html

@@ -10,7 +10,6 @@
     >
         {% csrf_token %}
 
-        {{ comment_form.media }}
         {% for hidden in comment_form.hidden_fields %}
             {{ hidden }}
         {% endfor %}

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 %}

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 %}

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>

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 %}

hypha/apply/determinations/templates/determinations/base_determination_form.html

@@ -30,7 +30,6 @@
                   action="" method="post"
                   x-data="{ isFormSubmitting: false }"
                   x-on:submit="isFormSubmitting = true">
-                {{ form.media }}
                 {% csrf_token %}
                 {% for hidden in form.hidden_fields %}
                     {{ hidden }}

hypha/apply/funds/templates/funds/application_base.html

@@ -39,7 +39,6 @@ <h3>{% blocktrans %}Sorry this {{ page|verbose_name }} is not accepting applicat
                     </a>
                 {% endif %}
                 <form class="form application-form" action="/test500/" method="POST" enctype="multipart/form-data">
-                    {{ form.media }}
                     {% csrf_token %}
 
                     {% for field in form %}
@@ -90,7 +89,6 @@ <h3>{% blocktrans %}Sorry this {{ page|verbose_name }} is not accepting applicat
     <script src="{% static 'js/application-form.js' %}"></script>
     <script src="{% static 'js/tinymce-word-count.js' %}"></script>
     <script src="{% static 'js/submission-form-copy.js' %}"></script>
-    <script src="{% static 'js/application-form-links-new-window.js' %}"></script>
     {% if not show_all_group_fields %}
         <script src="{% static 'js/form-group-toggle.js' %}"></script>
     {% endif %}

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 %}

hypha/apply/funds/templates/funds/applicationsubmission_detail.html

@@ -261,7 +261,12 @@ <h4 class="m-0 sr-only">{% trans "Add communication" %}</h4>
     </div>
 {% endblock %}
 
+{% block extra_css %}
+    {{ comment_form.media.css }}
+{% endblock %}
+
 {% block extra_js %}
+    {{ comment_form.media.js }}
     <script src="{% static 'js/tabs.js' %}"></script>
     <script src="{% static 'js/submission-text-cleanup.js' %}"></script>
     <script>

hypha/apply/funds/templates/funds/applicationsubmission_form.html

@@ -14,7 +14,6 @@
         <div class="wrapper--sidebar--inner">
             <form class="form application-form" action="" method="post" enctype="multipart/form-data">
                 {% csrf_token %}
-                {{ form.media }}
 
                 {% for field in form %}
                     {% if field.field %}
@@ -46,10 +45,10 @@
 {% endblock %}
 
 {% block extra_js %}
+    <script src="{% static 'js/application-form.js' %}"></script>
     <script src="{% static 'js/tinymce-word-count.js' %}"></script>
     <script src="{% static 'js/multi-input-fields.js' %}"></script>
     <script src="{% static 'js/submission-form-copy.js' %}"></script>
-    <script src="{% static 'js/application-form-links-new-window.js' %}"></script>
     {% if not show_all_group_fields %}
         <script src="{% static 'js/form-group-toggle.js' %}"></script>
     {% endif %}