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 a7e1c53ae2..6b1c750d38 100644 --- a/hypha/apply/projects/templates/application_projects/project_approval_detail.html +++ b/hypha/apply/projects/templates/application_projects/project_approval_detail.html @@ -30,48 +30,53 @@
-
-

{% trans "Project Information" %}

+
+

{% trans "Project Information" %}

-
{% trans "Proposed start date" %}
+

{% trans "Proposed start date" %}

{{ object.proposed_start|date:"DATE_FORMAT"|default:"-" }}

-
{% trans "Project Proposed end date" %}
+

{% trans "Project Proposed end date" %}

{{ object.proposed_end|date:"DATE_FORMAT"|default:"-" }}

-
{% trans "Legal name" %}
+

{% trans "Legal name" %}

{{ object.contact_legal_name|default:"-" }}

-
{% trans "E-mail" %}
+

{% trans "E-mail" %}

{{ object.contact_email|default:"-" }}

-
{% trans "Address" %}
+

{% trans "Address" %}

{{ object.get_address_display|default:"-"}}

-
{% trans "Phone" %}
+

{% trans "Phone" %}

{{ object.phone|default:"-" }}

+<<<<<<< HEAD
{% trans "Value" %}

{{ object.value|default:"-"|format_number_as_currency }}

+======= +

{% trans "Value" %}

+

{{ CURRENCY_SYMBOL }}{{ object.value|default:"-" }}

+>>>>>>> origin/enhancement/update-paf-font-sizes
{% if object.sent_to_compliance_at %}
-
{% trans "Sent to Compliance" %}
+

{% trans "Sent to Compliance" %}

{{ object.sent_to_compliance_at|date:"DATE_FORMAT" }}

{% endif %} @@ -79,36 +84,34 @@
{% trans "Sent to Compliance" %}
{% if object.output_answers %} -
+
{{ object.output_answers }}
{% endif %} {% has_project_sow_form object as project_sow %} {% if project_sow and object.sow.output_answers %} -
+
{{ object.sow.output_answers }}
{% endif %}
-

{% trans "Approvals" %}

+

{% trans "Approvals" %}

{% for approval in project.paf_approvals.all %} {% if approval.approved %} -

{{ approval.paf_reviewer_role.label }}({{ approval.user.full_name }}) - {{ approval.created_at|date:"DATE_FORMAT" }}

-
+

{{ approval.paf_reviewer_role.label }}({{ approval.user }}) - {{ approval.approved_at|date:"DATE_FORMAT" }}

{% endif %} {% endfor %}
-

{% trans "Review" %}

+

{% trans "Review" %}

-

{% trans "Submission lead" %}

+

{% trans "Submission lead" %}

{{ project.submission.lead }}

-

{% trans "Reviews" %}

-
{% trans "Staff Reviewers" %}
+

{% trans "Staff reviewers" %}

{% for review in project.submission.reviews.by_staff %}
@@ -120,9 +123,9 @@
{% trans "Staff Reviewers" %}
{% empty %} - {% trans "No reviews" %} +

{% trans "No reviews" %}

{% endfor %} -
{% trans "External Reviewers" %}
+

{% trans "Advisory council" %}

{% for review in project.submission.reviews.by_reviewers %}
@@ -130,11 +133,11 @@
{% trans "External Reviewers" %}
{% empty %} - {% trans "No reviews" %} +

{% trans "No reviews" %}

{% endfor %}
-

{% trans "Supporting Documents" %}

+

{% trans "Supporting Documents" %}

{% trans "Submission" %}

{% for packet_file in object.packet_files.all %} diff --git a/hypha/apply/projects/templates/application_projects/project_sow_detail.html b/hypha/apply/projects/templates/application_projects/project_sow_detail.html index a9c8fe613a..fb64366de8 100644 --- a/hypha/apply/projects/templates/application_projects/project_sow_detail.html +++ b/hypha/apply/projects/templates/application_projects/project_sow_detail.html @@ -1,15 +1,8 @@ -{% extends "base-apply.html" %} +{% extends "application_projects/project_approval_detail.html" %} {% load i18n static approval_tools %} {% block title %}{{ object.title }}{% endblock %} -{% block extra_css %} - - {{ reviewer_form.media.css }} -{% endblock %} - -{% block body_class %}light-grey-bg{% endblock %} - {% block content %}
@@ -42,10 +35,10 @@
-

{% trans "Project scope of work(SOW)" %}

+

{% trans "Project scope of work(SOW)" %}

{% if object.sow.output_answers %} -
+
{{ object.sow.output_answers }}
{% endif %} @@ -55,10 +48,3 @@

{% trans "Project scope of work(SOW)" %}

{% endblock content %} - -{% block extra_js %} - {{ block.super }} - - - -{% endblock %} diff --git a/hypha/static_src/src/sass/apply/components/_simplified.scss b/hypha/static_src/src/sass/apply/components/_simplified.scss index 607d03940c..00e93544aa 100644 --- a/hypha/static_src/src/sass/apply/components/_simplified.scss +++ b/hypha/static_src/src/sass/apply/components/_simplified.scss @@ -152,4 +152,10 @@ margin: 0; } } + + &__paf_answers { + h4 { + font-size: 16px; + } + } }