Merge remote-tracking branch 'origin/enhancement/project_submission_tabs' into test

Author: frjo

hypha/apply/activity/templates/messages/email/assign_paf_approvers.html

@@ -8,7 +8,6 @@
 
 {% trans "Title" %}: {{ source.title }}
 {% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:projects:approval' pk=source.pk %}
-{% trans "Original Submission" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:submissions:simplified' pk=source.submission.pk %}
 
 {% blocktrans with lead=source.lead email=source.lead.email %}Please contact {{ lead }} - {{ email }} if you have any questions.{% endblocktrans %}
 {% endblock %}{# fmt:on #}

hypha/apply/activity/templates/messages/email/paf_for_approval.html

@@ -8,7 +8,6 @@
 
 {% trans "Title" %}: {{ source.title }}
 {% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:projects:approval' pk=source.pk %}
-{% trans "Original Submission" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:submissions:simplified' pk=source.submission.pk %}
 
 {% blocktrans with lead=source.lead email=source.lead.email %}Please contact {{ lead }} - {{ email }} if you have any questions.{% endblocktrans %}
 {% endblock %}{# fmt:on #}

hypha/apply/activity/templates/messages/email/project_final_approval.html

@@ -8,7 +8,6 @@
 
 {% trans "Title" %}: {{ source.title }}
 {% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:projects:approval' pk=source.pk %}
-{% trans "Original Submission" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:submissions:simplified' pk=source.submission.pk %}
 
 {% blocktrans with lead=source.lead email=source.lead.email %}Please contact {{ lead }} - {{ email }} if you have any questions.{% endblocktrans %}
 {% endblock %}{# fmt:on #}

hypha/apply/activity/templates/messages/email/ready_for_contracting.html

@@ -9,7 +9,6 @@
 {% trans "Title" %}: {{ source.title }}
 {% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:projects:detail' pk=source.pk %}
 {% trans "Project Form" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:projects:approval' pk=source.pk %}
-{% trans "Original Submission" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:submissions:simplified' pk=source.submission.pk %}
 
 {% blocktrans with lead=source.lead email=source.lead.email %}Please contact {{ lead }} - {{ email }} if you have any questions.{% endblocktrans %}
 {% endblock %}{# fmt:on #}

hypha/apply/activity/templates/messages/email/sent_to_compliance.html

@@ -8,7 +8,6 @@
 
 {% trans "Title" %}: {{ source.title }}
 {% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:projects:approval' pk=source.pk %}
-{% trans "Original Submission" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:submissions:simplified' pk=source.submission.pk %}
 
 {% blocktrans with lead=source.lead email=source.lead.email %}Please contact {{ lead }} - {{ email }} if you have any questions.{% endblocktrans %}
 {% endblock %}{# fmt:on #}

hypha/apply/determinations/templates/determinations/determination_detail.html

@@ -6,7 +6,7 @@
 {% block content %}
     {% adminbar %}
         {% slot back_link %}
-            <a class="simplified__submissions-link" href="{{ determination.submission.get_absolute_url }}">
+            <a class="admin-bar__back-link" href="{{ determination.submission.get_absolute_url }}">
                 {% trans "View submission" %}
             </a>
         {% endslot %}

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

@@ -10,7 +10,7 @@
     <div class="admin-bar">
         <div class="admin-bar__inner">
             {% if request.GET.ref == 'all-alt' %}
-                <a class="simplified__submissions-link"
+                <a class="admin-bar__back-link"
                    hx-boost="true"
                    href="{% url "funds:submissions:list" %}"
                 >
@@ -48,7 +48,7 @@ <h1 class="mt-2 mb-0 font-medium">
             <div class="tabs js-tabs">
                 <div class="tabs__container">
                     <a class="tab__item" href="#submission-details" data-tab="tab-1">
-                        {% trans "Submission details" %}
+                        {% trans "Application" %}
                     </a>
 
                     <a class="tab__item"
@@ -60,12 +60,13 @@ <h1 class="mt-2 mb-0 font-medium">
                         {% trans "Conversations" %} ({{ comments_count }})
                     </a>
 
-                    <a class="tab__item"
-                       href="#activity-feed"
-                       data-tab="tab-3"
-                    >
-                        {% trans "Activity feed" %}
-                    </a>
+                    {% if object.project and PROJECTS_ENABLED %}
+                        <a class="tab__item js-tabs-off"
+                           href="{% url 'apply:projects:detail' pk=object.project.id %}"
+                        >
+                            {% trans "Project" %}
+                        </a>
+                    {% endif %}
                     {# is_staff is only used for Django Admin. #}
                     {% if request.user.is_staff %}
                         <a class="tab__item tab__item--right js-tabs-off" href="{% url 'admin:activity_event_changelist' %}?submission__id={{ object.id }}">
@@ -166,10 +167,6 @@ <h5>{% blocktrans with stage=object.previous.stage %}Your {{ stage }} applicatio
                         {% include "funds/includes/generic_primary_actions.html" %}
                     {% endblock %}
 
-                    {% if object.project and PROJECTS_ENABLED %}
-                        {% include 'funds/includes/project_block.html' %}
-                    {% endif %}
-
                     {% block screening_status %}
                     {% endblock %}
 

hypha/apply/funds/templates/funds/applicationsubmission_simplified_detail.html

@@ -103,6 +103,12 @@ <h5>{% trans "Actions to take" %}</h5>
             hx-target="#htmx-modal"
         >{% trans "Create Reminder" %}</button>
 
+        <a class="button button--white button--full-width button--bottom-space"
+           href="{% url "apply:submissions:download" pk=object.pk %}"
+        >
+            {% trans "Download PDF" %}
+        </a>
+
         {% if can_archive %}
             <button class="button button--white button--full-width button--bottom-space" hx-get="{% url 'funds:submissions:archive' pk=object.pk %}" hx-target="#htmx-modal">
                 {% heroicon_outline "lock-closed" aria_hidden="true" size=15 stroke_width=2 class="inline align-baseline me-1" %}