diff --git a/opentech/apply/funds/models/applications.py b/opentech/apply/funds/models/applications.py index 0d7e1b53136b0b1bbb00fd55ab0abadc09d4a443..92e2c33ae414087a9875aaf89f587b783e27d54e 100644 --- a/opentech/apply/funds/models/applications.py +++ b/opentech/apply/funds/models/applications.py @@ -37,6 +37,7 @@ class ApplicationBaseManager(PageQuerySet): class ApplicationBase(EmailForm, WorkflowStreamForm): # type: ignore is_createable = False + template = 'funds/application_base.html' # Adds validation around forms & workflows. Isn't on Workflow class due to not displaying workflow field on Round base_form_class = WorkflowFormAdminForm diff --git a/opentech/apply/funds/templates/funds/fund_type.html b/opentech/apply/funds/templates/funds/application_base.html similarity index 86% rename from opentech/apply/funds/templates/funds/fund_type.html rename to opentech/apply/funds/templates/funds/application_base.html index 126f364f7fe9fcd316b76a18cacfd0d54e78ad25..f3c0e80f6e04a9d4272d80f2e35f86361913803f 100644 --- a/opentech/apply/funds/templates/funds/fund_type.html +++ b/opentech/apply/funds/templates/funds/application_base.html @@ -1,6 +1,6 @@ {% extends "base.html" %} -{% load wagtailcore_tags static i18n %} +{% load wagtailcore_tags static i18n util_tags %} {# Dont include fixed apply button on this page #} {% block apply_button %}{% endblock %} {% block header_modifier %}header--light-bg{% endblock %} @@ -23,8 +23,8 @@ <div class="wrapper wrapper--medium wrapper--light-grey-bg wrapper--form"> {% if not page.open_round and not page.start_date and not request.is_preview %} - {# the fund has no open rounds and we arent on a round page #} - <h3>{% trans "Sorry this fund is not accepting applications at the moment" %}</h3> + {# the page has no open rounds and we arent on a round page #} + <h3>{% blocktrans %}Sorry this {{ page|verbose_name }} is not accepting applications at the moment{% endblocktrans %}</h3> {% else%} <form class="form" action="" method="POST" enctype="multipart/form-data"> {{ form.media }} diff --git a/opentech/apply/funds/templates/funds/fund_type_landing.html b/opentech/apply/funds/templates/funds/application_base_landing.html similarity index 100% rename from opentech/apply/funds/templates/funds/fund_type_landing.html rename to opentech/apply/funds/templates/funds/application_base_landing.html diff --git a/opentech/apply/funds/templates/funds/lab_type.html b/opentech/apply/funds/templates/funds/lab_type.html index baf5e0176d6b7c3e71491c18de68bb7ce1c11d41..a72feba691ae4ad6e67af8038e3da2a26b5ce0ed 100644 --- a/opentech/apply/funds/templates/funds/lab_type.html +++ b/opentech/apply/funds/templates/funds/lab_type.html @@ -1 +1 @@ -{% extends "funds/fund_type.html" %} +{% extends "funds/application_base.html" %} diff --git a/opentech/apply/funds/templates/funds/lab_type_landing.html b/opentech/apply/funds/templates/funds/lab_type_landing.html index 1b73052e1d57d66278b59e9f92f090f0691682ee..b6fcf631f03cdecbc1a57f103c80147ad6b8a040 100644 --- a/opentech/apply/funds/templates/funds/lab_type_landing.html +++ b/opentech/apply/funds/templates/funds/lab_type_landing.html @@ -1 +1 @@ -{% extends "funds/fund_type_landing.html" %} +{% extends "funds/application_base_landing.html" %} diff --git a/opentech/apply/funds/templates/funds/round.html b/opentech/apply/funds/templates/funds/round.html index 953606218a6a04918cfdfcab714e227e73c736dc..3b266d76dddecc5932b7e0304e354cc2c2520a15 100644 --- a/opentech/apply/funds/templates/funds/round.html +++ b/opentech/apply/funds/templates/funds/round.html @@ -1,4 +1,4 @@ -{% extends "funds/fund_type.html" %} +{% extends "funds/application_base.html" %} {% block page_title %}{{ page.get_parent.title }}{% endblock %} diff --git a/opentech/apply/funds/templates/funds/round_landing.html b/opentech/apply/funds/templates/funds/round_landing.html index f4f58593182e3d30195aaece1dbceafd2ba7f6e0..0ed5e7f0e678b2c322fe7499bc599a42c822b686 100644 --- a/opentech/apply/funds/templates/funds/round_landing.html +++ b/opentech/apply/funds/templates/funds/round_landing.html @@ -1,3 +1,3 @@ -{% extends "funds/fund_type_landing.html" %} +{% extends "funds/application_base_landing.html" %} {% block page_title %}{{ page.get_parent.title }}{% endblock %}