Factor out reporting form h1 heading.

form_heading.html was a misleading name for a partial containing the
optional message that some cobrands display after the reporting form
title, so we’ve now renamed it to make it clearer. This also allowed
us to spin out the actual “Report your problem” heading into its own
partial template, called form_heading.html.

9 files changed, 6 insertions, 5 deletions

diff --git a/templates/web/base/report/new/fill_in_details_form.html b/templates/web/base/report/new/fill_in_details_form.html
index c9bb2bf87..448941647 100644
--- a/templates/web/base/report/new/fill_in_details_form.html
+++ b/templates/web/base/report/new/fill_in_details_form.html
@@ -1,4 +1,4 @@
-<h1>[% loc('Report your problem') %]</h1>
+[% PROCESS 'report/new/form_heading.html' %]
 
 <div class="js-new-report-user-hidden">
 
diff --git a/templates/web/base/report/new/form_after_heading.html b/templates/web/base/report/new/form_after_heading.html
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/templates/web/base/report/new/form_after_heading.html
diff --git a/templates/web/base/report/new/form_heading.html b/templates/web/base/report/new/form_heading.html
index e69de29bb..bd61baa95 100644
--- a/templates/web/base/report/new/form_heading.html
+++ b/templates/web/base/report/new/form_heading.html
@@ -0,0 +1 @@
+<h1>[% loc('Report your problem') %]</h1>
diff --git a/templates/web/base/report/new/form_report.html b/templates/web/base/report/new/form_report.html
index 52133ba68..9f99b86c3 100644
--- a/templates/web/base/report/new/form_report.html
+++ b/templates/web/base/report/new/form_report.html
@@ -1,7 +1,7 @@
 [% SET form_show_category_only = NOT category || field_errors.category || disable_form_message || have_disable_qn_to_answer %]
 
 <!-- report/new/form_report.html -->
-[% INCLUDE 'report/new/form_heading.html' %]
+[% INCLUDE 'report/new/form_after_heading.html' %]
 
 [% IF field_errors.bodies %]
     <p class='form-error'>[% field_errors.bodies %]</p>
diff --git a/templates/web/base/report/new/login_success_form.html b/templates/web/base/report/new/login_success_form.html
index b9abf2023..22da33265 100644
--- a/templates/web/base/report/new/login_success_form.html
+++ b/templates/web/base/report/new/login_success_form.html
@@ -1,4 +1,4 @@
-<h1>[% loc('Report your problem') %]</h1>
+[% PROCESS 'report/new/form_heading.html' %]
 
 <p class='form-success'>[% loc('You have successfully signed in; please check and confirm your details are accurate:') %]</p>
 
diff --git a/templates/web/base/report/new/oauth_email_form.html b/templates/web/base/report/new/oauth_email_form.html
index 8e5b9a7ae..a5ca1c290 100644
--- a/templates/web/base/report/new/oauth_email_form.html
+++ b/templates/web/base/report/new/oauth_email_form.html
@@ -1,4 +1,4 @@
-<h1>[% loc('Report your problem') %]</h1>
+[% PROCESS 'report/new/form_heading.html' %]
 
 <p class="form-error">
     [% loc('Please note your report has <strong>not yet been sent</strong>.') %]
diff --git a/templates/web/buckinghamshire/report/new/form_heading.html b/templates/web/buckinghamshire/report/new/form_after_heading.html
index 81bff156a..81bff156a 100644
--- a/templates/web/buckinghamshire/report/new/form_heading.html
+++ b/templates/web/buckinghamshire/report/new/form_after_heading.html
diff --git a/templates/web/oxfordshire/report/new/form_heading.html b/templates/web/oxfordshire/report/new/form_after_heading.html
index a561c7efb..a561c7efb 100644
--- a/templates/web/oxfordshire/report/new/form_heading.html
+++ b/templates/web/oxfordshire/report/new/form_after_heading.html
diff --git a/templates/web/zurich/report/new/fill_in_details_form.html b/templates/web/zurich/report/new/fill_in_details_form.html
index 17e308f07..4c266bbad 100644
--- a/templates/web/zurich/report/new/fill_in_details_form.html
+++ b/templates/web/zurich/report/new/fill_in_details_form.html
@@ -7,7 +7,7 @@
     <fieldset>
         <div id="problem_form">
 
-            [% INCLUDE 'report/new/form_heading.html' %]
+            [% INCLUDE 'report/new/form_after_heading.html' %]
 
 
             [% IF field_errors.bodies %]