diff --git a/opentech/apply/determinations/templates/determinations/determination_form.html b/opentech/apply/determinations/templates/determinations/determination_form.html
index d6d0663b319e8934d4602d268c0fa1bd93f93949..b0b09b54edb46c3a3610de65f1d2ab93e108a2ae 100644
--- a/opentech/apply/determinations/templates/determinations/determination_form.html
+++ b/opentech/apply/determinations/templates/determinations/determination_form.html
@@ -9,6 +9,8 @@
</div>
</div>
+{% include "forms/includes/form_errors.html" with form=form %}
+
<div class="wrapper wrapper--medium wrapper--inner-space-medium">
<form class="form form--with-p-tags" action="" method="post" novalidate>
{{ form.media }}
@@ -29,7 +31,7 @@
{% endifchanged %}
{% if field.field %}
- {% include "funds/includes/field.html" %}
+ {% include "forms/includes/field.html" %}
{% else %}
{{ field }}
{% endif %}
diff --git a/opentech/apply/funds/templates/funds/applicationsubmission_form.html b/opentech/apply/funds/templates/funds/applicationsubmission_form.html
index 522fc46498b8dbdd479a25548913356d73424a84..290009da08ea5be3fffef3c998666a4d894d413e 100644
--- a/opentech/apply/funds/templates/funds/applicationsubmission_form.html
+++ b/opentech/apply/funds/templates/funds/applicationsubmission_form.html
@@ -7,19 +7,7 @@
</div>
</div>
-{% if form.errors or form.non_field_errors %}
-<div class="wrapper wrapper--medium wrapper--error">
- <svg class="icon icon--error"><use xlink:href="#error"></use></svg>
- <h5 class="heading heading--no-margin heading--regular">There were some errors with your form. Please amend the fields highlighted below</h5>
- {% if form.non_field_errors %}
- <ul>
- {% for error in form.non_field_errors %}
- <li class="error">{{ error }}</li>
- {% endfor %}
- </ul>
- {% endif %}
-</div>
-{% endif %}
+{% include "forms/includes/form_errors.html" with form=form %}
<div class="wrapper wrapper--light-grey-bg wrapper--form wrapper--sidebar">
<div>
@@ -29,7 +17,7 @@
{% for field in form %}
{% if field.field %}
- {% include "funds/includes/field.html" %}
+ {% include "forms/includes/field.html" %}
{% else %}
{{ field }}
{% endif %}
diff --git a/opentech/apply/funds/templates/funds/fund_type.html b/opentech/apply/funds/templates/funds/fund_type.html
index 1415fd1ebce20830e880cabed094c9168bc0e4e0..126f364f7fe9fcd316b76a18cacfd0d54e78ad25 100644
--- a/opentech/apply/funds/templates/funds/fund_type.html
+++ b/opentech/apply/funds/templates/funds/fund_type.html
@@ -32,7 +32,7 @@
{% for field in form %}
{% if field.field %}
- {% include "funds/includes/field.html" %}
+ {% include "forms/includes/field.html" %}
{% else %}
{{ field }}
{% endif %}
diff --git a/opentech/apply/review/templates/review/review_form.html b/opentech/apply/review/templates/review/review_form.html
index 16a0db10988a358da01b92bec18e53749fd230c8..d87628e529054e85f16838a6800b6eb3c2d450f9 100644
--- a/opentech/apply/review/templates/review/review_form.html
+++ b/opentech/apply/review/templates/review/review_form.html
@@ -8,23 +8,14 @@
</div>
</div>
+{% include "forms/includes/form_errors.html" with form=form %}
+
<div class="wrapper wrapper--medium wrapper--inner-space-medium">
{% if not has_submitted_review %}
<form class="form form--with-p-tags form--scoreable" action="" method="post" novalidate>
{{ form.media }}
{% csrf_token %}
- {% if form.non_field_errors %}
- <div class="messages">
- <ul>
- {% for error in form.non_field_errors %}
- <li class="error">{{ error }}</li>
- {% endfor %}
- </ul>
- </div>
- {% endif %}
-
-
{% for hidden in form.hidden_fields %}
{{ hidden }}
{% endfor %}
@@ -40,7 +31,7 @@
{% endifchanged %}
{% if field.field %}
- {% include "funds/includes/field.html" %}
+ {% include "forms/includes/field.html" %}
{% else %}
{{ field }}
{% endif %}
diff --git a/opentech/apply/funds/templates/funds/includes/field.html b/opentech/apply/templates/forms/includes/field.html
similarity index 100%
rename from opentech/apply/funds/templates/funds/includes/field.html
rename to opentech/apply/templates/forms/includes/field.html
diff --git a/opentech/apply/templates/forms/includes/form_errors.html b/opentech/apply/templates/forms/includes/form_errors.html
new file mode 100644
index 0000000000000000000000000000000000000000..59bfb2ce404d4c26ff4e141e140ce4c57edd8d51
--- /dev/null
+++ b/opentech/apply/templates/forms/includes/form_errors.html
@@ -0,0 +1,13 @@
+{% if form.errors or form.non_field_errors %}
+<div class="wrapper wrapper--medium wrapper--error">
+ <svg class="icon icon--error"><use xlink:href="#error"></use></svg>
+ <h5 class="heading heading--no-margin heading--regular">There were some errors with your form. Please amend the fields highlighted below</h5>
+ {% if form.non_field_errors %}
+ <ul>
+ {% for error in form.non_field_errors %}
+ <li class="error">{{ error }}</li>
+ {% endfor %}
+ </ul>
+ {% endif %}
+</div>
+{% endif %}
diff --git a/opentech/apply/users/templates/users/account.html b/opentech/apply/users/templates/users/account.html
index 0f9c73f4b778798048c45c3cb8cda31afef49257..fafb3656fffbb2c9d7f7de923285fb21baf56923 100644
--- a/opentech/apply/users/templates/users/account.html
+++ b/opentech/apply/users/templates/users/account.html
@@ -16,7 +16,7 @@
<form action="" method="post" class="form">
{% csrf_token %}
{% for field in form %}
- {% include "funds/includes/field.html" %}
+ {% include "forms/includes/field.html" %}
{% endfor %}
<button class="button button--primary" type="submit">{% trans "Update Profile" %}</button>
</form>
diff --git a/opentech/apply/users/templates/users/change_password.html b/opentech/apply/users/templates/users/change_password.html
index ba6419db4311229e6748f2e098ded299657fe6cc..3045f65110003372be0e11b99291562b187b84c9 100644
--- a/opentech/apply/users/templates/users/change_password.html
+++ b/opentech/apply/users/templates/users/change_password.html
@@ -28,7 +28,7 @@
{% csrf_token %}
{% for field in form %}
- {% include "funds/includes/field.html" %}
+ {% include "forms/includes/field.html" %}
{% endfor %}
<button class="button button--primary" type="submit">{% trans 'Reset password' %}</button>
diff --git a/opentech/settings/base.py b/opentech/settings/base.py
index 0fec18577e34cd63f58f11d2cd9c3d39b02c2f36..f197ea6c20a07dd4141066d4cb465ea4a6d855df 100644
--- a/opentech/settings/base.py
+++ b/opentech/settings/base.py
@@ -105,6 +105,7 @@ TEMPLATES = [
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': [
os.path.join(PROJECT_DIR, 'templates'),
+ os.path.join(PROJECT_DIR, 'apply', 'templates'),
],
'APP_DIRS': True,
'OPTIONS': {