Merge branch '1348-header-nesting-issue'

6 files changed, 12 insertions, 12 deletions

diff --git a/templates/web/base/report/_item.html b/templates/web/base/report/_item.html
index 6ae43f798..704dfd29c 100644
--- a/templates/web/base/report/_item.html
+++ b/templates/web/base/report/_item.html
@@ -3,7 +3,7 @@
     [% IF problem.photo %]
         <img class="img" height="60" width="90" src="[% problem.photos.first.url_fp %]" alt="">
     [% END %]
-        <h4>[% problem.title | html %]</h4>
+        <h3 class="item-list__heading">[% problem.title | html %]</h3>
         <small>
             [%- IF c.cobrand.moniker != 'fixamingata' %] [%# Default: %]
                 [%- prettify_dt( problem.confirmed, 1 ) %]
diff --git a/templates/web/fixmystreet-uk-councils/report/_item-with-pin.html b/templates/web/fixmystreet-uk-councils/report/_item-with-pin.html
deleted file mode 100644
index b36dac3b6..000000000
--- a/templates/web/fixmystreet-uk-councils/report/_item-with-pin.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<li class="item-list__item item-list__item--with-pin [% c.cobrand.pin_colour(problem) %]">
-    <a href="[% c.uri_for('/report', problem.id ) %]" class="[% problem.category %]">
-        <h3>[% problem.title | html %]</h3>
-        <p>Reported [%- prettify_dt( problem.confirmed, 1 ) %]</p>
-    </a>
-</li>
diff --git a/templates/web/greenwich/reports/_list-entry.html b/templates/web/greenwich/reports/_list-entry.html
index b24ef2260..43d3d6265 100644
--- a/templates/web/greenwich/reports/_list-entry.html
+++ b/templates/web/greenwich/reports/_list-entry.html
@@ -1 +1,4 @@
-[% INCLUDE 'report/_item-with-pin.html' %]
+[% INCLUDE 'report/_item.html'
+    no_fixed = 1
+    item_extra_class = 'item-list__item--with-pin ' _ c.cobrand.pin_colour(problem)
+%]
diff --git a/templates/web/oxfordshire/reports/_list-entry.html b/templates/web/oxfordshire/reports/_list-entry.html
index b24ef2260..43d3d6265 100644
--- a/templates/web/oxfordshire/reports/_list-entry.html
+++ b/templates/web/oxfordshire/reports/_list-entry.html
@@ -1 +1,4 @@
-[% INCLUDE 'report/_item-with-pin.html' %]
+[% INCLUDE 'report/_item.html'
+    no_fixed = 1
+    item_extra_class = 'item-list__item--with-pin ' _ c.cobrand.pin_colour(problem)
+%]
diff --git a/templates/web/zerotb/report/_item.html b/templates/web/zerotb/report/_item.html
index e12c9e1fa..8562fe607 100644
--- a/templates/web/zerotb/report/_item.html
+++ b/templates/web/zerotb/report/_item.html
@@ -1,5 +1,5 @@
 <li class="item-list__item item-list--reports__item">
 <a href="[% c.uri_for('/report', problem.id ) %]">
-        <h4>[% problem.title | html %]</h4>
+        <h3 class="item-list__heading">[% problem.title | html %]</h3>
 </a>
 </li>
diff --git a/templates/web/zurich/report/_item.html b/templates/web/zurich/report/_item.html
index a4d274a8e..560cbac51 100644
--- a/templates/web/zurich/report/_item.html
+++ b/templates/web/zurich/report/_item.html
@@ -4,9 +4,9 @@
         <img class="img" height="60" width="90" src="[% problem.photos.first.url_fp %]" alt="">
     [% END %]
       [% IF problem.state != 'unconfirmed' %]
-        <h4>[% problem.title | html %]</h4>
+        <h3 class="item-list__heading">[% problem.title | html %]</h3>
       [% ELSE %]
-        <h4><em>[% loc('Awaiting moderation') %]</em></h4>
+        <h3 class="item-list__heading"><em>[% loc('Awaiting moderation') %]</em></h3>
       [% END %]
         <small>[% prettify_dt( problem.created, 'zurich' ) %]
             [%- IF dist %], [% dist %]km[% END %]