Tidy up front page sub-templates.

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 %]

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>
-

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' %]

templates/web/bromley/front/pre-steps.html → 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

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>
-

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>
-

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>

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>
-

templates/web/oxfordshire/front/post-steps.html

@@ -0,0 +1 @@
+[%# Is in other column %]

templates/web/oxfordshire/front/pre-recent.html

@@ -0,0 +1,3 @@
+<section class="full-width">
+    [% INCLUDE "front/stats.html" %]
+</section>

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>

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>

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>

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>
-

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>