From cb513cd4bd871122c17fd171bc83f15f19711187 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Thu, 14 Dec 2023 14:14:43 +0000
Subject: [PATCH] Tidy up front page sub-templates.

---
 templates/web/base/front/pre-steps.html       |  1 -
 templates/web/base/front/recent.html          |  4 ++-
 templates/web/base/index-steps.html           |  6 -----
 templates/web/base/index.html                 | 11 +++++++-
 .../web/bathnes/front/emergency-message.html  |  0
 .../{pre-steps.html => pre-columns.html}      |  2 --
 templates/web/camden/index-steps.html         |  6 -----
 templates/web/hart/index-steps.html           |  6 -----
 .../web/highwaysengland/index-steps.html      |  5 ----
 .../web/northamptonshire/index-steps.html     |  6 -----
 .../web/oxfordshire/front/post-steps.html     |  1 +
 .../web/oxfordshire/front/pre-recent.html     |  3 +++
 .../web/oxfordshire/front/pre-steps.html      |  5 ++++
 templates/web/oxfordshire/front/recent.html   | 25 -------------------
 templates/web/oxfordshire/index-steps.html    | 19 --------------
 templates/web/peterborough/index-steps.html   |  5 ----
 templates/web/shropshire/index-steps.html     |  5 ----
 templates/web/tfl/index-steps.html            |  6 -----
 templates/web/thamesmead/index-steps.html     |  5 ----
 19 files changed, 22 insertions(+), 99 deletions(-)
 delete mode 100644 templates/web/base/front/pre-steps.html
 delete mode 100644 templates/web/bathnes/front/emergency-message.html
 rename templates/web/bromley/front/{pre-steps.html => pre-columns.html} (86%)
 create mode 100644 templates/web/oxfordshire/front/post-steps.html
 create mode 100644 templates/web/oxfordshire/front/pre-recent.html
 create mode 100644 templates/web/oxfordshire/front/pre-steps.html
 delete mode 100644 templates/web/oxfordshire/front/recent.html
 delete mode 100644 templates/web/oxfordshire/index-steps.html

diff --git a/templates/web/base/front/pre-steps.html b/templates/web/base/front/pre-steps.html
deleted file mode 100644
index 89f4be599b5..00000000000
--- a/templates/web/base/front/pre-steps.html
+++ /dev/null
@@ -1 +0,0 @@
-[% PROCESS 'front/site-message.html' %]
diff --git a/templates/web/base/front/recent.html b/templates/web/base/front/recent.html
index 1fe6ad2bee5..00f1e5f0d37 100644
--- a/templates/web/base/front/recent.html
+++ b/templates/web/base/front/recent.html
@@ -1,4 +1,4 @@
-[% 
+[%
     recent_photos = c.cobrand.recent_photos('front', 5);
 %]
 
@@ -12,6 +12,8 @@ <h2>
         [% END -%]
     </h2>
 
+    [% TRY %][% INCLUDE "front/pre-recent.html" %][% CATCH file %][% END %]
+
     <section class="full-width">
         <ul id="js-reports-list" class="item-list item-list--reports item-list--front-page">
           [% FOREACH problem IN recent_photos %]
diff --git a/templates/web/base/index-steps.html b/templates/web/base/index-steps.html
index 0ee57bfcacc..9d6a99c0b86 100644
--- a/templates/web/base/index-steps.html
+++ b/templates/web/base/index-steps.html
@@ -11,9 +11,3 @@ <h2>[% loc('How to report a problem') %]</h2>
         <li>[% loc('We send it to the council on your behalf') %]</li>
     [% END %]
 </ol>
-
-<section class="full-width">
-[% INCLUDE "front/stats.html" %]
-[% TRY %][% INCLUDE "front/tips.html" %][% CATCH file %][% END %]
-</section>
-
diff --git a/templates/web/base/index.html b/templates/web/base/index.html
index 3a3885d906d..2e7b62071fb 100644
--- a/templates/web/base/index.html
+++ b/templates/web/base/index.html
@@ -6,11 +6,20 @@
     <p class="form-error">[% error %]</p>
 [% END %]
 
-[% PROCESS 'front/pre-steps.html' %]
+[% PROCESS 'front/site-message.html' %]
+
+[% TRY %][% INCLUDE "front/pre-columns.html" %][% CATCH file %][% END %]
 
 <div class="tablewrapper">
     <div id="front-howto">
+      [% TRY %][% INCLUDE "front/pre-steps.html" %][% CATCH file %][% END %]
         [% INCLUDE 'index-steps.html' %]
+      [% TRY %][% INCLUDE "front/post-steps.html" %][% CATCH file %]
+        <section class="full-width">
+            [% INCLUDE "front/stats.html" %]
+            [% TRY %][% INCLUDE "front/tips.html" %][% CATCH file %][% END %]
+        </section>
+      [% END %]
     </div>
 
     [% INCLUDE 'front/recent.html' %]
diff --git a/templates/web/bathnes/front/emergency-message.html b/templates/web/bathnes/front/emergency-message.html
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/templates/web/bromley/front/pre-steps.html b/templates/web/bromley/front/pre-columns.html
similarity index 86%
rename from templates/web/bromley/front/pre-steps.html
rename to templates/web/bromley/front/pre-columns.html
index 1800e3f2c81..6396ee4dcd6 100644
--- a/templates/web/bromley/front/pre-steps.html
+++ b/templates/web/bromley/front/pre-columns.html
@@ -1,5 +1,3 @@
-[% PROCESS 'front/site-message.html' %]
-
 <p>This is primarily for reporting physical problems that can be fixed
 like graffiti, cleansing issues or road defects. To report other
 kinds of problems like missed bins use our
diff --git a/templates/web/camden/index-steps.html b/templates/web/camden/index-steps.html
index 6a3e97ceff6..001074d9479 100644
--- a/templates/web/camden/index-steps.html
+++ b/templates/web/camden/index-steps.html
@@ -6,9 +6,3 @@ <h2>[% loc('How to report a problem') %]</h2>
     <li>Tell us what the problem is, and what we need to do</li>
     <li>Confirm the report and we will investigate it</li>
 </ol>
-
-<section class="full-width">
-[% INCLUDE "front/stats.html" %]
-[% TRY %][% INCLUDE "front/tips.html" %][% CATCH file %][% END %]
-</section>
-
diff --git a/templates/web/hart/index-steps.html b/templates/web/hart/index-steps.html
index 2d9ff08812e..8c6b86756c6 100644
--- a/templates/web/hart/index-steps.html
+++ b/templates/web/hart/index-steps.html
@@ -10,9 +10,3 @@ <h2> How to report </h2>
 <div id="hart_hants_note">
     This site can also be used to report problems to Hampshire County Council via FixMyStreet.
 </div>
-
-<section class="full-width">
-[% INCLUDE "front/stats.html" %]
-[% TRY %][% INCLUDE "front/tips.html" %][% CATCH file %][% END %]
-</section>
-
diff --git a/templates/web/highwaysengland/index-steps.html b/templates/web/highwaysengland/index-steps.html
index 10cb208f13a..f0485873c70 100644
--- a/templates/web/highwaysengland/index-steps.html
+++ b/templates/web/highwaysengland/index-steps.html
@@ -6,8 +6,3 @@ <h2>How to report a problem</h2>
     <li>Enter details of the problem</li>
     <li>We will investigate</li>
 </ol>
-
-<section class="full-width">
-[% INCLUDE "front/stats.html" %]
-[% TRY %][% INCLUDE "front/tips.html" %][% CATCH file %][% END %]
-</section>
diff --git a/templates/web/northamptonshire/index-steps.html b/templates/web/northamptonshire/index-steps.html
index 6ee7b96b3ae..e033dce90a1 100644
--- a/templates/web/northamptonshire/index-steps.html
+++ b/templates/web/northamptonshire/index-steps.html
@@ -10,9 +10,3 @@ <h2>[% loc('How to report a problem') %]</h2>
     </li>
     <li>Confirm the report and [% c.cobrand.council_name %] will investigate</li>
 </ol>
-
-<section class="full-width">
-[% INCLUDE "front/stats.html" %]
-[% TRY %][% INCLUDE "front/tips.html" %][% CATCH file %][% END %]
-</section>
-
diff --git a/templates/web/oxfordshire/front/post-steps.html b/templates/web/oxfordshire/front/post-steps.html
new file mode 100644
index 00000000000..f4869bdf9b8
--- /dev/null
+++ b/templates/web/oxfordshire/front/post-steps.html
@@ -0,0 +1 @@
+[%# Is in other column %]
diff --git a/templates/web/oxfordshire/front/pre-recent.html b/templates/web/oxfordshire/front/pre-recent.html
new file mode 100644
index 00000000000..dadde72b54e
--- /dev/null
+++ b/templates/web/oxfordshire/front/pre-recent.html
@@ -0,0 +1,3 @@
+<section class="full-width">
+    [% INCLUDE "front/stats.html" %]
+</section>
diff --git a/templates/web/oxfordshire/front/pre-steps.html b/templates/web/oxfordshire/front/pre-steps.html
new file mode 100644
index 00000000000..4c681a5e83b
--- /dev/null
+++ b/templates/web/oxfordshire/front/pre-steps.html
@@ -0,0 +1,5 @@
+<h2>[% loc('What we can and can’t fix') %]</h2>
+
+<div class="embed-responsive embed-responsive-16by9">
+    <iframe class="embed-responsive-item" src="https://www.youtube-nocookie.com/embed/D5mJHaQHkjY" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+</div>
diff --git a/templates/web/oxfordshire/front/recent.html b/templates/web/oxfordshire/front/recent.html
deleted file mode 100644
index fbd9b8eb734..00000000000
--- a/templates/web/oxfordshire/front/recent.html
+++ /dev/null
@@ -1,25 +0,0 @@
-[% recent_photos = c.cobrand.recent_photos('front', 5); %]
-
-[% IF recent_photos.size %]
-<div id="front-recently">
-    <h2>
-        [%- IF c.cobrand.moniker == 'hart' %]
-            Recently reported
-        [% ELSE %]
-            [% loc('Recently reported problems') %]
-        [% END -%]
-    </h2>
-
-    <section class="full-width">
-        [% INCLUDE "front/stats.html" %]
-    </section>
-
-    <section class="full-width">
-        <ul id="js-reports-list" class="item-list item-list--reports item-list--front-page">
-          [% FOREACH problem IN recent_photos %]
-            [% INCLUDE 'front/_list-entry.html' %]
-          [% END %]
-        </ul>
-    </section>
-</div>
-[% END %]
diff --git a/templates/web/oxfordshire/index-steps.html b/templates/web/oxfordshire/index-steps.html
deleted file mode 100644
index 308e0803df2..00000000000
--- a/templates/web/oxfordshire/index-steps.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<h2>[% loc('What we can and can’t fix') %]</h2>
-
-<div class="embed-responsive embed-responsive-16by9">
-    <iframe class="embed-responsive-item" src="https://www.youtube-nocookie.com/embed/D5mJHaQHkjY" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
-</div>
-
-<h2>[% loc('How to report a problem') %]</h2>
-
-<ol class="big-numbers">
-    <li>[% question %]</li>
-    <li>[% loc('Locate the problem on a map of the area') %]</li>
-    <li>[% loc('Enter details of the problem') %]</li>
-    [% IF c.cobrand.is_council %]
-        <li>Confirm the report and [% c.cobrand.council_name %] will investigate</li>
-    [% ELSIF c.cobrand.moniker == 'zurich' %]
-    [% ELSE %]
-        <li>[% loc('We send it to the council on your behalf') %]</li>
-    [% END %]
-</ol>
diff --git a/templates/web/peterborough/index-steps.html b/templates/web/peterborough/index-steps.html
index 13d8c8961ec..817712d4a7b 100644
--- a/templates/web/peterborough/index-steps.html
+++ b/templates/web/peterborough/index-steps.html
@@ -6,8 +6,3 @@ <h2>[% loc('How to report a problem') %]</h2>
     <li>[% loc('Enter more details of the problem') %]</li>
     <li>Confirm your report and [% c.cobrand.council_name %] will investigate</li>
 </ol>
-
-<section class="full-width">
-[% INCLUDE "front/stats.html" %]
-[% TRY %][% INCLUDE "front/tips.html" %][% CATCH file %][% END %]
-</section>
diff --git a/templates/web/shropshire/index-steps.html b/templates/web/shropshire/index-steps.html
index 540ba4edb61..b5a927cba30 100644
--- a/templates/web/shropshire/index-steps.html
+++ b/templates/web/shropshire/index-steps.html
@@ -6,8 +6,3 @@ <h2>[% loc('How to report a problem') %]</h2>
     <li>[% loc('Enter details of the problem') %]</li>
     <li>Confirm the report and [% c.cobrand.council_name %] will investigate</li>
 </ol>
-
-<section class="full-width">
-[% INCLUDE "front/stats.html" %]
-[% TRY %][% INCLUDE "front/tips.html" %][% CATCH file %][% END %]
-</section>
diff --git a/templates/web/tfl/index-steps.html b/templates/web/tfl/index-steps.html
index a66ac86543e..9cfd9124737 100644
--- a/templates/web/tfl/index-steps.html
+++ b/templates/web/tfl/index-steps.html
@@ -6,9 +6,3 @@ <h2>[% loc('How to report a problem') %]</h2>
     <li>[% loc('Enter details of the problem') %]</li>
     <li>Confirm the report and we will investigate</li>
 </ol>
-
-<section class="full-width">
-[% INCLUDE "front/stats.html" %]
-[% TRY %][% INCLUDE "front/tips.html" %][% CATCH file %][% END %]
-</section>
-
diff --git a/templates/web/thamesmead/index-steps.html b/templates/web/thamesmead/index-steps.html
index 3b5330204ea..6509ee95894 100644
--- a/templates/web/thamesmead/index-steps.html
+++ b/templates/web/thamesmead/index-steps.html
@@ -6,8 +6,3 @@ <h2>[% loc('How to report a problem') %]</h2>
     <li>[% loc('Enter details of the problem') %]</li>
     <li>Confirm the report. Peabody’s environmental services team at Thamesmead will investigate. We aim to respond within five working days.</li>
 </ol>
-
-<section class="full-width">
-[% INCLUDE "front/stats.html" %]
-[% TRY %][% INCLUDE "front/tips.html" %][% CATCH file %][% END %]
-</section>