From 155e626eb49862e0ee72027d12d21496ba6374ab Mon Sep 17 00:00:00 2001
From: Frank Duncan <frankduncan@opentechstrategies.com>
Date: Tue, 26 Sep 2023 08:15:04 -0500
Subject: [PATCH] User prettier on html files in advance of 4.6.0 merge
---
.../email/submission_confirmation.html | 14 ++--
.../templates/review/review_edit_form.html | 66 +++++++++----------
2 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/hypha/apply/activity/templates/messages/email/submission_confirmation.html b/hypha/apply/activity/templates/messages/email/submission_confirmation.html
index d33e67ee6..1a4a97222 100644
--- a/hypha/apply/activity/templates/messages/email/submission_confirmation.html
+++ b/hypha/apply/activity/templates/messages/email/submission_confirmation.html
@@ -3,14 +3,14 @@
{% load i18n %}
{% block content %}{% blocktrans with title=source.title %}We appreciate your {{ title }} application submission to the {{ ORG_LONG_NAME }}.{% endblocktrans %}
-{% if source.is_draft %}{% trans "Please note that it is not submitted for review because it's still in draft." %} {% trans "You can access the draft at" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}{% else %}{% trans "We will review and reply to your submission as quickly as possible." %}{% endif %}
+ {% if source.is_draft %}{% trans "Please note that it is not submitted for review because it's still in draft." %} {% trans "You can access the draft at" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}{% else %}{% trans "We will review and reply to your submission as quickly as possible." %}{% endif %}
-{% trans "If you have any questions, please submit them here" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}#communications
+ {% trans "If you have any questions, please submit them here" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}#communications
-{% blocktrans %}If you have issues accessing the submission system or general inquiries, please email us at {{ ORG_EMAIL }}.{% endblocktrans %}
+ {% blocktrans %}If you have issues accessing the submission system or general inquiries, please email us at {{ ORG_EMAIL }}.{% endblocktrans %}
-{% with email_context=source.page.specific %}{{ email_context.confirmation_text_extra }}{% endwith %}
+ {% with email_context=source.page.specific %}{{ email_context.confirmation_text_extra }}{% endwith %}
-{% trans "Project name" %}: {{ source.title }}
-{% trans "Contact name" %}: {{ source.user.get_full_name }}
-{% trans "Contact email" %}: {{ source.user.email }}{% endblock %}
+ {% trans "Project name" %}: {{ source.title }}
+ {% trans "Contact name" %}: {{ source.user.get_full_name }}
+ {% trans "Contact email" %}: {{ source.user.email }}{% endblock %}
diff --git a/hypha/apply/review/templates/review/review_edit_form.html b/hypha/apply/review/templates/review/review_edit_form.html
index 4760bc0e3..2be1c85cb 100644
--- a/hypha/apply/review/templates/review/review_edit_form.html
+++ b/hypha/apply/review/templates/review/review_edit_form.html
@@ -2,47 +2,47 @@
{% load i18n static %}
{% block title %}{{ title }}{% endblock %}
{% block content %}
-<div class="admin-bar">
- <div class="admin-bar__inner">
- <h1 class="beta heading heading--no-margin heading--bold">{{ title }}</h1>
- <h5>{% trans "For" %} <a href="{% url "funds:submissions:detail" submission.id %}">{{ submission.title }}</a></h5>
+ <div class="admin-bar">
+ <div class="admin-bar__inner">
+ <h1 class="beta heading heading--no-margin heading--bold">{{ title }}</h1>
+ <h5>{% trans "For" %} <a href="{% url "funds:submissions:detail" submission.id %}">{{ submission.title }}</a></h5>
+ </div>
</div>
-</div>
-{% include "forms/includes/form_errors.html" with form=form %}
+ {% include "forms/includes/form_errors.html" with form=form %}
-<div class="wrapper wrapper--medium wrapper--inner-space-medium wrapper--flex">
-<form class="form form--with-p-tags form--scoreable form--width" action="" method="post" novalidate>
- {{ form.media }}
- {% csrf_token %}
+ <div class="wrapper wrapper--medium wrapper--inner-space-medium wrapper--flex">
+ <form class="form form--with-p-tags form--scoreable form--width" action="" method="post" novalidate>
+ {{ form.media }}
+ {% csrf_token %}
- {% for hidden in form.hidden_fields %}
- {{ hidden }}
- {% endfor %}
+ {% for hidden in form.hidden_fields %}
+ {{ hidden }}
+ {% endfor %}
- {% for field in form.visible_fields %}
+ {% for field in form.visible_fields %}
{# to be replaced with better logic when we use stream form #}
- {% ifchanged field.field.group %}
- {% for key, value in form.titles.items %}
- {% if key == field.field.group %}
- <h2>{{ value }}</h2>
+ {% ifchanged field.field.group %}
+ {% for key, value in form.titles.items %}
+ {% if key == field.field.group %}
+ <h2>{{ value }}</h2>
+ {% endif %}
+ {% endfor %}
+ {% endifchanged %}
+
+ {% if field.field %}
+ {% include "forms/includes/field.html" %}
+ {% else %}
+ {{ field }}
{% endif %}
{% endfor %}
- {% endifchanged %}
-
- {% if field.field %}
- {% include "forms/includes/field.html" %}
- {% else %}
- {{ field }}
- {% endif %}
- {% endfor %}
- {% if not object.id or object.is_draft %}
- <button class="button button--submit button--top-space button--white" type="submit" name="{{ form.draft_button_name }}">{% trans "Save draft" %}</button>
- {% endif %}
- <button class="button button--submit button--top-space button--primary" type="submit" name="submit">{% trans "Submit" %}</button>
-</form>
-<div class="form--score-box">Score:0</div>
-</div>
+ {% if not object.id or object.is_draft %}
+ <button class="button button--submit button--top-space button--white" type="submit" name="{{ form.draft_button_name }}">{% trans "Save draft" %}</button>
+ {% endif %}
+ <button class="button button--submit button--top-space button--primary" type="submit" name="submit">{% trans "Submit" %}</button>
+ </form>
+ <div class="form--score-box">Score:0</div>
+ </div>
{% endblock %}
{% block extra_js %}
--
GitLab