Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/enhancement/update-paf-font-size…
Browse files Browse the repository at this point in the history 
…s' into test
  • Loading branch information
@frjo
frjo committed Jul 13, 2023
2 parents 911c629 + c2489f4 commit a19824a
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 39 deletions.
47 changes: 25 additions & 22 deletions hypha/apply/projects/templates/application_projects/project_approval_detail.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,85 +30,88 @@ <h5 class="simplified__subheading">
</div>
<div class="wrapper wrapper--large wrapper--tabs">
<div class="wrapper wrapper--sidebar">
<article class="wrapper--sidebar--inner simplified__wrapper">
<h3>{% trans "Project Information" %}</h3>
<article class="wrapper--sidebar--inner">
<h4>{% trans "Project Information" %}</h4>
<div class="card card--solid">
<div class="grid grid--proposal-info">
<div>
<h5>{% trans "Proposed start date" %}</h5>
<p class="font-bold">{% trans "Proposed start date" %}</p>
<p>{{ object.proposed_start|date:"DATE_FORMAT"|default:"-" }}</p>
</div>

<div>
<h5>{% trans "Project Proposed end date" %}</h5>
<p class="font-bold">{% trans "Project Proposed end date" %}</p>
<p>{{ object.proposed_end|date:"DATE_FORMAT"|default:"-" }}</p>
</div>

<div>
<h5>{% trans "Legal name" %}</h5>
<p class="font-bold">{% trans "Legal name" %}</p>
<p>{{ object.contact_legal_name|default:"-" }}</p>
</div>

<div>
<h5>{% trans "E-mail" %}</h5>
<p class="font-bold">{% trans "E-mail" %}</p>
<p>{{ object.contact_email|default:"-" }}</p>
</div>

<div>
<h5>{% trans "Address" %}</h5>
<p class="font-bold">{% trans "Address" %}</p>
<p>{{ object.get_address_display|default:"-"}}</p>
</div>

<div>
<h5>{% trans "Phone" %}</h5>
<p class="font-bold">{% trans "Phone" %}</p>
<p>{{ object.phone|default:"-" }}</p>
</div>

<div>
<<<<<<< HEAD
<h5>{% trans "Value" %}</h5>
<p>{{ object.value|default:"-"|format_number_as_currency }}</p>
=======
<p class="font-bold">{% trans "Value" %}</p>
<p>{{ CURRENCY_SYMBOL }}{{ object.value|default:"-" }}</p>
>>>>>>> origin/enhancement/update-paf-font-sizes
</div>

{% if object.sent_to_compliance_at %}
<div>
<h5>{% trans "Sent to Compliance" %}</h5>
<p class="font-bold">{% trans "Sent to Compliance" %}</p>
<p>{{ object.sent_to_compliance_at|date:"DATE_FORMAT" }}</p>
</div>
{% endif %}

</div>

{% if object.output_answers %}
<div class="simplified__rich-text">
<div class="simplified__paf_answers">
{{ object.output_answers }}
</div>
{% endif %}

{% has_project_sow_form object as project_sow %}
{% if project_sow and object.sow.output_answers %}
<div class="simplified__rich-text">
<div class="simplified__paf_answers">
{{ object.sow.output_answers }}
</div>
{% endif %}
</div>

<h3>{% trans "Approvals" %}</h3>
<h4>{% trans "Approvals" %}</h4>
<div class="card card--solid">
{% for approval in project.paf_approvals.all %}
{% if approval.approved %}
<p><b>{{ approval.paf_reviewer_role.label }}</b>({{ approval.user.full_name }}) - {{ approval.created_at|date:"DATE_FORMAT" }}</p>
<br>
<p><b>{{ approval.paf_reviewer_role.label }}</b>({{ approval.user }}) - {{ approval.approved_at|date:"DATE_FORMAT" }}</p>
{% endif %}
{% endfor %}
</div>

<h3>{% trans "Review" %}</h3>
<h4>{% trans "Review" %}</h4>
<div class="card card--solid">
<h4>{% trans "Submission lead" %}</h4>
<p class="font-bold">{% trans "Submission lead" %}</p>
<p>{{ project.submission.lead }}</p>

<h4>{% trans "Reviews" %}</h4>
<h5>{% trans "Staff Reviewers" %}</h5>
<p class="font-bold">{% trans "Staff reviewers" %}</p>
{% for review in project.submission.reviews.by_staff %}
<div class="card__reviewer-outcome">
<span class="card__reviewer">
Expand All @@ -120,21 +123,21 @@ <h5>{% trans "Staff Reviewers" %}</h5>
</span>
</div>
{% empty %}
{% trans "No reviews" %}
<p>{% trans "No reviews" %}</p>
{% endfor %}
<h5>{% trans "External Reviewers" %}</h5>
<p class="font-bold">{% trans "Advisory council" %}</p>
{% for review in project.submission.reviews.by_reviewers %}
<div class="card__reviewer-outcome">
<span class="card__reviewer">
{{ review.author }} - {{ review.created_at|date:"DATE_FORMAT" }}
</span>
</div>
{% empty %}
{% trans "No reviews" %}
<p>{% trans "No reviews" %}</p>
{% endfor %}
</div>

<h3>{% trans "Supporting Documents" %}</h3>
<h4>{% trans "Supporting Documents" %}</h4>
<div class="card card--solid">
<p><a href="{% url 'apply:submissions:simplified' pk=object.submission_id %}">{% trans "Submission" %}</a></p>
{% for packet_file in object.packet_files.all %}
Expand Down
20 changes: 3 additions & 17 deletions hypha/apply/projects/templates/application_projects/project_sow_detail.html
View file
Original file line number Diff line number Diff line change
@@ -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 %}
<link rel="stylesheet" href="{% static 'css/apply/fancybox.css' %}">
{{ reviewer_form.media.css }}
{% endblock %}

{% block body_class %}light-grey-bg{% endblock %}

{% block content %}
<div class="simplified">
<div class="simplified__admin-bar">
Expand Down Expand Up @@ -42,10 +35,10 @@ <h5 class="simplified__subheading">
<div class="wrapper wrapper--large wrapper--tabs">
<div class="wrapper wrapper--sidebar">
<article class="wrapper--sidebar--inner simplified__wrapper">
<h3>{% trans "Project scope of work(SOW)" %}</h3>
<h4>{% trans "Project scope of work(SOW)" %}</h4>
<div class="card card--solid">
{% if object.sow.output_answers %}
<div class="simplified__rich-text">
<div class="simplified__paf_answers">
{{ object.sow.output_answers }}
</div>
{% endif %}
Expand All @@ -55,10 +48,3 @@ <h3>{% trans "Project scope of work(SOW)" %}</h3>
</div>
</div>
{% endblock content %}

{% block extra_js %}
{{ block.super }}
<script src="{% static 'js/apply/jquery.fancybox.min.js' %}"></script>
<script src="{% static 'js/apply/fancybox-global.js' %}"></script>
<script src="{% static 'js/apply/dropdown.js' %}"></script>
{% endblock %}
6 changes: 6 additions & 0 deletions hypha/static_src/src/sass/apply/components/_simplified.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,4 +152,10 @@
margin: 0;
}
}

&__paf_answers {
h4 {
font-size: 16px;
}
}
}

0 comments on commit a19824a

Please sign in to comment.