diff --git a/hypha/apply/funds/templates/funds/admin/widgets/read_only.html b/hypha/apply/funds/templates/funds/admin/widgets/read_only.html index f0198a013c..5372e75642 100644 --- a/hypha/apply/funds/templates/funds/admin/widgets/read_only.html +++ b/hypha/apply/funds/templates/funds/admin/widgets/read_only.html @@ -1,2 +1,13 @@ {% load i18n %} -
{{ widget.value }}
{% if widget.edit_link %}
{% trans "Edit" %}
{% endif %} + +
+ {{ widget.value }} +
+ +{% if widget.edit_link %} +
+ + {% trans "Edit" %} + +
+{% endif %} diff --git a/hypha/apply/funds/templates/funds/applicationrevision_list.html b/hypha/apply/funds/templates/funds/applicationrevision_list.html index 215c5b776b..d595af9a9c 100644 --- a/hypha/apply/funds/templates/funds/applicationrevision_list.html +++ b/hypha/apply/funds/templates/funds/applicationrevision_list.html @@ -5,7 +5,15 @@ {% block content %} {% adminbar %} {% slot header %}{% trans "Revisions" %}{% endslot %} - {% slot sub_heading %}{% trans "For" %} {{ submission.title_text_display }}{% endslot %} + {% slot sub_heading %} + {% trans "For" %} + + {{ submission.title_text_display }} + + {% endslot %} {% endadminbar %}
@@ -19,11 +27,19 @@ ({% trans "current" %}) {% endif %} {% if revision.is_draft %} - ({% trans "draft" %}) + ({% trans "draft" %}) + {% endif %}

+ {% if not forloop.first %} - {% trans "Compare" %} + + {% trans "Compare" %} + {% endif %} {% endfor %} diff --git a/hypha/apply/funds/templates/funds/applicationsubmission_admin_detail.html b/hypha/apply/funds/templates/funds/applicationsubmission_admin_detail.html index 048e2718ab..41dcae8c92 100644 --- a/hypha/apply/funds/templates/funds/applicationsubmission_admin_detail.html +++ b/hypha/apply/funds/templates/funds/applicationsubmission_admin_detail.html @@ -2,7 +2,10 @@ {% load i18n static workflow_tags review_tags determination_tags translate_tags heroicons %} {% block sidebar_top %} -
+
{% include "funds/includes/admin_primary_actions.html" %}
{% endblock %} @@ -19,7 +22,11 @@
{% trans "Flags" %}
{% trans "Reviews & assignees" %}
-
+
@@ -31,7 +38,12 @@
{% trans "Reviews & assignees" %}
{% include 'review/includes/review_button.html' with submission=object class="button--half-width" %} {% if request.user.is_apply_staff and object.reviews.exists %} - {% trans "View all" %} + + {% trans "View all" %} + {% endif %}
@@ -76,7 +88,11 @@
{% trans "Reminders" %}
-
+
diff --git a/hypha/apply/funds/templates/funds/applicationsubmission_detail.html b/hypha/apply/funds/templates/funds/applicationsubmission_detail.html index 04b7aa8072..4103a075d0 100644 --- a/hypha/apply/funds/templates/funds/applicationsubmission_detail.html +++ b/hypha/apply/funds/templates/funds/applicationsubmission_detail.html @@ -43,7 +43,10 @@ {# is_staff is only used for Django Admin. #} {% if request.user.is_staff %} - + {% endif %} @@ -58,7 +61,9 @@

{% trans "Congratulations!" %}

{% blocktrans with stage=object.previous.stage %}Your {{ stage }} application has been accepted.{% endblocktrans %}
- {% blocktrans with stage=object.stage %}Start your {{ stage }} application.{% endblocktrans %} + + {% blocktrans with stage=object.stage %}Start your {{ stage }} application.{% endblocktrans %} +
{% else %}
@@ -83,14 +88,20 @@
{% blocktrans with stage=object.previous.stage %}Your {{ stage }} applicatio {% else %} {% trans "Submitted " %} {% endif %} - {{ object.submit_time|date:"SHORT_DATETIME_FORMAT" }} - {% trans "by" %} - {% display_submission_author %} + + {{ object.submit_time|date:"SHORT_DATETIME_FORMAT" }} + + {% trans "by" %} + {% display_submission_author %} - {% trans "Updated" %} - {{ object.live_revision.timestamp|date:"SHORT_DATETIME_FORMAT" }} + {% trans "Updated" %} + + + {{ object.live_revision.timestamp|date:"SHORT_DATETIME_FORMAT" }} + + {% trans "by" %} {% display_submission_author True %} @@ -122,7 +133,13 @@
{% blocktrans with stage=object.previous.stage %}Your {{ stage }} applicatio
{% if request.user|can_translate_submission %} -
+
{% include "funds/includes/rendered_answers.html" %}
{% else %} @@ -166,11 +183,25 @@
{% blocktrans with stage=object.previous.stage %}Your {{ stage }} applicatio
{% trans "Related submissions" %}
{% if object.previous %} -

{% trans "View linked" %} {{ object.previous.stage }}

+

+ + {% trans "View linked" %} {{ object.previous.stage }} + +

{% endif %} {% if object.next %} -

{% trans "View linked" %} {{ object.next.stage }}

+

+ + {% trans "View linked" %} {{ object.next.stage }} + +

{% endif %}
@@ -181,12 +212,17 @@
{% endif %}
- + {{ submission.title }}
#{{ submission.application_id }} - {{ submission.submit_time|date:"SHORT_DATETIME_FORMAT" }} + + {{ submission.submit_time|date:"SHORT_DATETIME_FORMAT" }} + in {{ submission.round|default_if_none:submission.page }} · {{ submission.phase }} diff --git a/hypha/apply/funds/templates/funds/applicationsubmission_form.html b/hypha/apply/funds/templates/funds/applicationsubmission_form.html index ee000f03c0..aa5d3d2ab0 100644 --- a/hypha/apply/funds/templates/funds/applicationsubmission_form.html +++ b/hypha/apply/funds/templates/funds/applicationsubmission_form.html @@ -5,7 +5,9 @@ {% block content %} {% adminbar %} - {% slot header %}{% trans "Editing" %}: {{ object.title }} #{{ object.application_id }}{% endslot %} + {% slot header %} + {% trans "Editing" %}: {{ object.title }} #{{ object.application_id }} + {% endslot %} {% endadminbar %} {% include "forms/includes/form_errors.html" with form=form %} @@ -34,14 +36,22 @@
{% trans "Save draft" as save_draft %} {% for button_name, button_type, button_value in buttons %} - + {% endfor %}
-

{% trans "You must have Javascript enabled to use this form." %}

+

+ {% trans "You must have Javascript enabled to use this form." %} +

- {% endblock %} {% block extra_js %} diff --git a/hypha/apply/funds/templates/funds/applicationsubmission_reviewer_detail.html b/hypha/apply/funds/templates/funds/applicationsubmission_reviewer_detail.html index 63bb4de4ff..ee350d44f6 100644 --- a/hypha/apply/funds/templates/funds/applicationsubmission_reviewer_detail.html +++ b/hypha/apply/funds/templates/funds/applicationsubmission_reviewer_detail.html @@ -12,7 +12,11 @@
{% trans "Flags" %}
{% trans "Reviews & assignees" %}
-
+
diff --git a/hypha/apply/funds/templates/funds/comments.html b/hypha/apply/funds/templates/funds/comments.html index 9f27c6f48c..55c5348598 100644 --- a/hypha/apply/funds/templates/funds/comments.html +++ b/hypha/apply/funds/templates/funds/comments.html @@ -39,7 +39,7 @@ {# is_staff is only used for Django Admin. #} {% if request.user.is_staff %} {% trans "View message log" %} diff --git a/hypha/apply/funds/templates/funds/grouped_application_list.html b/hypha/apply/funds/templates/funds/grouped_application_list.html deleted file mode 100644 index c4bd0ac01b..0000000000 --- a/hypha/apply/funds/templates/funds/grouped_application_list.html +++ /dev/null @@ -1,22 +0,0 @@ -{% extends "base-apply.html" %} -{% load i18n static %} - -{% block content %} - - {% adminbar %} - {% slot header %}{% trans "List of Submissions summary" %}{% endslot %} - {% endadminbar %} - -
-{% endblock %} - -{% block extra_css %} - {{ filter.form.media.css }} -{% endblock %} - -{% block extra_js %} - {{ filter.form.media.js }} - - - -{% endblock %} diff --git a/hypha/apply/funds/templates/funds/includes/admin_primary_actions.html b/hypha/apply/funds/templates/funds/includes/admin_primary_actions.html index d5efa6efed..5273e9b289 100644 --- a/hypha/apply/funds/templates/funds/includes/admin_primary_actions.html +++ b/hypha/apply/funds/templates/funds/includes/admin_primary_actions.html @@ -44,7 +44,10 @@
{% trans "Actions to take" %}
{% if object.is_finished %} {% with determination=object.determinations.last %} {% if determination %} - {% trans "View determination" %} + {% trans "View determination" %} {% endif %} {% endwith %} {% endif %} @@ -80,12 +83,22 @@
{% trans "Actions to take" %}
>{% trans "Lead" %}
-
- {% trans "More actions" %} - {% trans "Revisions" %} +
+ + {% trans "More actions" %} + + + {% trans "Revisions" %} {% if request.user|can_translate_submission %} - @@ -103,14 +116,19 @@
{% trans "Actions to take" %}
hx-target="#htmx-modal" >{% trans "Create Reminder" %} - {% trans "Download PDF" %} {% if can_archive %} - diff --git a/hypha/apply/funds/templates/funds/reminder_confirm_delete.html b/hypha/apply/funds/templates/funds/reminder_confirm_delete.html index 0903123b90..15c3d5989b 100644 --- a/hypha/apply/funds/templates/funds/reminder_confirm_delete.html +++ b/hypha/apply/funds/templates/funds/reminder_confirm_delete.html @@ -13,10 +13,18 @@
{% csrf_token %} -

Are you sure you want to delete "{{ object }}"?{% endblocktrans %}

- -
-
-
+

+ {% blocktrans %}Are you sure you want to delete "{{ object }}"?{% endblocktrans %} +

+ + +
+
{% endblock %} diff --git a/hypha/apply/funds/templates/funds/revisions_compare.html b/hypha/apply/funds/templates/funds/revisions_compare.html index 93b222bebb..ab88556aff 100644 --- a/hypha/apply/funds/templates/funds/revisions_compare.html +++ b/hypha/apply/funds/templates/funds/revisions_compare.html @@ -1,6 +1,7 @@ {% extends "base-apply.html" %} {% load i18n %} {% block title %}{% trans "Compare" %}: {{ object.title }}{% endblock %} + {% block content %} {% adminbar %} @@ -12,7 +13,10 @@ {% slot header %}{% trans "Comparing revisions" %}{% endslot %} {% slot sub_heading %} - {% trans "For" %} {{ object.title_text_display }} + {% trans "For" %} + + {{ object.title_text_display }} + {% endslot %} {% endadminbar %} @@ -31,24 +35,47 @@

{% trans "Proposal Information (New)" %}

{% for from_field, to_field in required_fields %} {% if forloop.first %} -

{% trans "Title" %}

{{ from_field }}

{% trans "Title" %}

{{ to_field }} + +

{% trans "Title" %}

{{ from_field }} +

{% trans "Title" %}

{{ to_field }} + {% elif forloop.counter == 2 %} -

{% trans "Legal Name" %}

{{ from_field }}

{% trans "Legal Name" %}

{{ to_field }} + +

{% trans "Legal Name" %}

{{ from_field }} +

{% trans "Legal Name" %}

{{ to_field }} + {% elif forloop.counter == 3 %} -

{% trans "E-mail" %}

{{ from_field }}

{% trans "E-mail" %}

{{ to_field }} + +

{% trans "E-mail" %}

{{ from_field }} +

{% trans "E-mail" %}

{{ to_field }} + {% elif forloop.counter == 4 %} -

{% trans "Address" %}

{{ from_field }}

{% trans "Address" %}

{{ to_field }} + +

{% trans "Address" %}

{{ from_field }} +

{% trans "Address" %}

{{ to_field }} + {% elif forloop.counter == 5 %} -

{% trans "Project Duration" %}

{{ from_field }}

{% trans "Project Duration" %}

{{ to_field }} + +

{% trans "Project Duration" %}

{{ from_field }} +

{% trans "Project Duration" %}

{{ to_field }} + {% elif forloop.counter == 6 %} -

{% trans "Requested Funding" %}

{{ from_field }}

{% trans "Requested Funding" %}

{{ to_field }} - + +

{% trans "Requested Funding" %}

{{ from_field }} +

{% trans "Requested Funding" %}

{{ to_field }} + {% else %} - {{ from_field }}{{ to_field }} + + {{ from_field }} + {{ to_field }} + {% endif %} {% endfor %} {% for from_field, to_field in stream_fields %} - {{ from_field }}{{ to_field }} + + {{ from_field }} + {{ to_field }} + {% endfor %} diff --git a/hypha/apply/funds/templates/funds/staff_assignments.html b/hypha/apply/funds/templates/funds/staff_assignments.html index 6c5eedc994..a3ad680044 100644 --- a/hypha/apply/funds/templates/funds/staff_assignments.html +++ b/hypha/apply/funds/templates/funds/staff_assignments.html @@ -8,7 +8,9 @@ {% adminbar %} {% slot header %}{% trans "Staff assignments" %}{% endslot %} - {% slot sub_heading %}{% trans "Track and explore the staff assignments" %}{% endslot %} + {% slot sub_heading %} + {% trans "Track and explore the staff assignments" %} + {% endslot %} {% endadminbar %}
diff --git a/hypha/apply/funds/templates/funds/submission-success.html b/hypha/apply/funds/templates/funds/submission-success.html index 76f5d5474b..9107782883 100644 --- a/hypha/apply/funds/templates/funds/submission-success.html +++ b/hypha/apply/funds/templates/funds/submission-success.html @@ -30,7 +30,9 @@

{% blocktrans %}Thank you for your submission to the {{ ORG_LONG_NAME }}.{% {% with email_context=page.specific %} {% if email_context.confirmation_text_extra %} -

{{ email_context.confirmation_text_extra|urlize }}

+

+ {{ email_context.confirmation_text_extra|urlize }} +

{% endif %} {% endwith %} diff --git a/hypha/apply/funds/templates/funds/submission_sealed.html b/hypha/apply/funds/templates/funds/submission_sealed.html index 06fa55fdec..0267ce8f14 100644 --- a/hypha/apply/funds/templates/funds/submission_sealed.html +++ b/hypha/apply/funds/templates/funds/submission_sealed.html @@ -17,14 +17,24 @@

+

{% trans "This application is sealed until the round is closed" %}

+

{% trans "The round ends on" %}: {{ object.round.specific.end_date }}

- {% trans "Go back" %} + + + {% trans "Go back" %} + + {% if can_view_sealed %} -

{% trans "As an admin you are allowed to access the application. However, this action will be recorded." %}

+

+ {% trans "As an admin you are allowed to access the application. However, this action will be recorded." %} +

{% csrf_token %} - +
{% endif %}
diff --git a/hypha/apply/funds/templates/funds/submissions_result.html b/hypha/apply/funds/templates/funds/submissions_result.html index 8e8775b76b..1336ab8c96 100644 --- a/hypha/apply/funds/templates/funds/submissions_result.html +++ b/hypha/apply/funds/templates/funds/submissions_result.html @@ -19,12 +19,20 @@
{% trans "Amounts" %}
-
{% trans "Applied" %} ({% get_currency_symbol %})
-
{{ submission_sum|default:"0"|format_number_as_currency }}
+
+ {% trans "Applied" %} ({% get_currency_symbol %}) +
+
+ {{ submission_sum|default:"0"|format_number_as_currency }} +
-
{% trans "Accepted" %} ({% get_currency_symbol %})
-
{{ submission_accepted_sum|default:"0"|format_number_as_currency }}
+
+ {% trans "Accepted" %} ({% get_currency_symbol %}) +
+
+ {{ submission_accepted_sum|default:"0"|format_number_as_currency }} +
@@ -56,12 +64,20 @@
{% trans "Reviews" %}
{{ review_count|default:"0" }}
-
{% trans "You" %}
-
{{ review_my_count|default:"0" }}
+
+ {% trans "You" %} +
+
+ {{ review_my_count|default:"0" }} +
-
{% trans "Your avg. score" %}
-
{{ review_my_score|floatformat:"0"|default:"0" }}
+
+ {% trans "Your avg. score" %} +
+
+ {{ review_my_score|floatformat:"0"|default:"0" }} +
diff --git a/hypha/apply/funds/templates/funds/tables/table.html b/hypha/apply/funds/templates/funds/tables/table.html index 4971400454..2c839dc995 100644 --- a/hypha/apply/funds/templates/funds/tables/table.html +++ b/hypha/apply/funds/templates/funds/tables/table.html @@ -46,7 +46,9 @@ {{ reviewer }} {% if reviewer.role %}{% image reviewer.role.icon max-12x12 %}{% endif %} - {{ reviewer.review.get_recommendation_display }} + + {{ reviewer.review.get_recommendation_display }} + {% for opinion in reviewer.review.opinions.all %} {% if forloop.first %} @@ -56,9 +58,13 @@
  • {{ opinion.author }} - {% if opinion.author.role %}{% image opinion.author.role.icon max-12x12 %}{% endif %} + {% if opinion.author.role %} + {% image opinion.author.role.icon max-12x12 %} + {% endif %} + + + {{ opinion.get_opinion_display }} - {{ opinion.get_opinion_display }}
    • {% if forloop.last %} @@ -104,7 +110,9 @@ {% for column, cell in row.items %} {% if column.name != "selected" %} - {% if column.localize == None %}{{ cell }}{% else %}{% if column.localize %}{{ cell|localize }}{% else %}{{ cell|unlocalize }}{% endif %}{% endif %} + + {% if column.localize == None %}{{ cell }}{% else %}{% if column.localize %}{{ cell|localize }}{% else %}{{ cell|unlocalize }}{% endif %}{% endif %} + {% endif %} {% endfor %} @@ -117,7 +125,9 @@ {% endblock %} {% block table.tbody.empty_text %} - {{ table.empty_text }} + + {{ table.empty_text }} + {% endblock table.tbody.empty_text %} {% block pagination %} diff --git a/hypha/apply/funds/urls.py b/hypha/apply/funds/urls.py index 460fa4788a..ef0401594f 100644 --- a/hypha/apply/funds/urls.py +++ b/hypha/apply/funds/urls.py @@ -6,7 +6,6 @@ from hypha.apply.projects.views import ProjectDetailView from .views import ( - GroupingApplicationsListView, RoundListView, SubmissionPrivateMediaView, submission_success, @@ -136,7 +135,6 @@ partial_reviews_decisions, name="partial-reviews-decisions", ), - path("summary/", GroupingApplicationsListView.as_view(), name="summary"), path("result/", SubmissionResultView.as_view(), name="result"), path( "reviews/", diff --git a/hypha/apply/funds/views/__init__.py b/hypha/apply/funds/views/__init__.py index 696f3ac74f..16b86225cf 100644 --- a/hypha/apply/funds/views/__init__.py +++ b/hypha/apply/funds/views/__init__.py @@ -2,7 +2,6 @@ from django.contrib.auth.mixins import UserPassesTestMixin from django.shortcuts import get_object_or_404, render from django.utils.decorators import method_decorator -from django.views.generic.base import TemplateView from django_filters.views import FilterView from django_tables2.views import SingleTableMixin @@ -32,15 +31,6 @@ def submission_success(request, pk): ) -@method_decorator(staff_required, name="dispatch") -class GroupingApplicationsListView(TemplateView): - """ - Template view for grouped submissions - """ - - template_name = "funds/grouped_application_list.html" - - @method_decorator(staff_required, name="dispatch") class RoundListView(SingleTableMixin, FilterView): template_name = "funds/rounds.html" diff --git a/hypha/static_src/javascript/tabs.js b/hypha/static_src/javascript/tabs.js deleted file mode 100644 index 88fbc2e409..0000000000 --- a/hypha/static_src/javascript/tabs.js +++ /dev/null @@ -1,131 +0,0 @@ -(function ($) { - let Tabs = class { - static selector() { - return ".js-tabs"; - } - - constructor(node) { - this.node = node[0]; - // The tabs - this.tabItems = Array.prototype.slice.call( - this.node.querySelectorAll(".tab__item:not(.js-tabs-off)") - ); - - // The tabs content - this.tabsContents = Array.prototype.slice.call( - document.querySelectorAll(".tabs__content") - ); - - // The tabs content container - this.tabsContentsContainer = Array.prototype.slice.call( - document.querySelectorAll(".js-tabs-content") - ); - - // Active classes - this.tabActiveClass = "tab__item--active"; - this.tabContentActiveClass = "tabs__content--current"; - this.defaultSelectedTab = "tab-1"; - this.addDataAttributes(); - this.bindEvents(); - } - - addDataAttributes() { - // Add data-attrs for multiple tabs - this.tabsContentsContainer.forEach((tabsContent, i) => { - tabsContent.dataset.tabs = i + 1; - }); - - $(".js-tabs").each(function (i) { - $(this).attr("data-tabs", i + 1); - }); - } - - bindEvents() { - this.updateTabOnLoad(); - - this.tabItems.forEach((el) => { - el.addEventListener("click", (e) => { - // prevent the page jumping - e.preventDefault(); - this.tabs(e); - }); - }); - } - - findTab(href) { - return document.querySelector(`a[href="#${href}"]`); - } - - updateTabOnLoad() { - // Find tab with matching hash and activate - const url = document.location.toString(); - let tabName = url.split("#")[1]; - // check if tabName contains "--" - if (tabName && tabName.includes("--")) { - tabName = tabName.split("--")[0]; - } - const match = this.findTab(tabName); - - return tabName ? this.addTabClasses(match) : this.addTabClasses(null); - } - - tabs(e) { - // Find current tab - const tab = e.currentTarget; - - const tabContentId = $(tab).closest(".js-tabs").data("tabs"); - - // For older browsers that do not support ViewTransition. - if (!document.startViewTransition) { - this.stripTabClasses(tabContentId); - this.addTabClasses(tab); - this.updateUrl(tab); - } - - // For modern browsers activate ViewTransition. - document.startViewTransition(() => { - this.stripTabClasses(tabContentId); - this.addTabClasses(tab); - this.updateUrl(tab); - }); - } - - stripTabClasses(tabContentId) { - // remove active classes from all tabs and tab contents - const parents = Array.prototype.slice.call( - $(`.js-tabs-content[data-tabs=${tabContentId}]`).find(".tabs__content") - ); - const childTabs = Array.prototype.slice.call( - $(`.js-tabs[data-tabs=${tabContentId}]`).find(".tab__item") - ); - childTabs.forEach((tabItem) => - tabItem.classList.remove(this.tabActiveClass) - ); - parents.forEach((tabsContent) => - tabsContent.classList.remove(this.tabContentActiveClass) - ); - } - - addTabClasses(tab) { - if (tab === null) { - tab = document.querySelector(`[data-tab=${this.defaultSelectedTab}]`); - } - - const tabId = tab.getAttribute("data-tab"); - const tabContentId = $(tab).closest(".js-tabs").data("tabs"); - const parents = $(`.js-tabs-content[data-tabs=${tabContentId}]`); - - // add active classes to tabs and their respecitve content - tab.classList.add(this.tabActiveClass); - $(parents).find(`#${tabId}`).addClass(this.tabContentActiveClass); - } - - updateUrl(tab) { - window.location.hash = tab.getAttribute("href"); - } - }; - - $(Tabs.selector()).each((index, el) => { - new Tabs($(el)); - }); -})(jQuery); diff --git a/hypha/static_src/sass/components/_tabs.scss b/hypha/static_src/sass/components/_tabs.scss index cfcc1195ff..bdce8739e7 100644 --- a/hypha/static_src/sass/components/_tabs.scss +++ b/hypha/static_src/sass/components/_tabs.scss @@ -47,10 +47,7 @@ &:hover { color: variables.$color--light-blue; - background-color: rgba( - #fff, - 0.8 - ); + background-color: rgba(#fff, 0.8); } &--alt { @@ -87,14 +84,5 @@ background-color: var(--color-bg-default); } } - - &--right { - display: none; - - @include mixins.media-query(sm) { - display: block; - margin-inline-start: auto; - } - } } }