Merge branch '1141-list-css-part-4'

23 files changed, 40 insertions, 35 deletions

diff --git a/templates/web/base/around/on_map_list_items.html b/templates/web/base/around/on_map_list_items.html
index 90f836fc8..b7257030d 100644
--- a/templates/web/base/around/on_map_list_items.html
+++ b/templates/web/base/around/on_map_list_items.html
@@ -8,7 +8,7 @@
         [% INCLUDE 'reports/_list-entry.html' %]
     [% END %]
 [% ELSE %]
-    <li class="empty">
+    <li class="item-list__item item-list__item--empty">
         <p>[% loc('There are no reports to show.') %]</p>
     </li>
 [% END %]
diff --git a/templates/web/base/around/tabbed_lists.html b/templates/web/base/around/tabbed_lists.html
index 2828027e2..b0d46444d 100755
--- a/templates/web/base/around/tabbed_lists.html
+++ b/templates/web/base/around/tabbed_lists.html
@@ -1,5 +1,5 @@
 [% INCLUDE "reports/_list-filters.html" %]
 
-<ul id="current" class="issue-list-a">
+<ul id="current" class="item-list item-list--reports">
     [% INCLUDE "around/on_map_list_items.html" %]
 </ul>
diff --git a/templates/web/base/front/recent.html b/templates/web/base/front/recent.html
index de74f3326..cb83c51b8 100644
--- a/templates/web/base/front/recent.html
+++ b/templates/web/base/front/recent.html
@@ -13,7 +13,7 @@
     </h2>
 
     <section class="full-width">
-        <ul class="issue-list-a">
+        <ul class="item-list item-list--reports item-list--front-page">
           [% FOREACH problem IN recent_photos %]
             [% INCLUDE 'front/_list-entry.html' %]
           [% END %]
diff --git a/templates/web/base/my/_problem-list.html b/templates/web/base/my/_problem-list.html
index 4b5fc73d6..e74dd25ec 100644
--- a/templates/web/base/my/_problem-list.html
+++ b/templates/web/base/my/_problem-list.html
@@ -1,10 +1,10 @@
-<ul class='issue-list-a full-width'>
+<ul class='item-list item-list--reports full-width'>
     [% IF problems.size %]
         [% FOREACH problem = problems %]
             [% INCLUDE 'reports/_list-entry.html' no_fixed = 1 %]
         [% END %]
     [% ELSE %]
-        <li class="empty">
+        <li class="item-list__item item-list__item--empty">
             <p>[% loc('There are no reports to show.') %]</p>
         </li>
     [% END %]
diff --git a/templates/web/base/my/my.html b/templates/web/base/my/my.html
index 91cf40b68..9be4edfca 100644
--- a/templates/web/base/my/my.html
+++ b/templates/web/base/my/my.html
@@ -43,7 +43,7 @@
             pager = updates_pager,
             param = 'u'
         %]
-        <ul class="issue-list full-width">
+        <ul class="item-list item-list--updates full-width">
     [% END %]
 
     <li>&ldquo;[% u.text | html %]&rdquo;
diff --git a/templates/web/base/report/_item.html b/templates/web/base/report/_item.html
index 2fcfa9fb8..d79a4e9f3 100644
--- a/templates/web/base/report/_item.html
+++ b/templates/web/base/report/_item.html
@@ -1,5 +1,5 @@
-<li>
-<a class="text" href="[% c.uri_for('/report', problem.id ) %]">
+<li class="item-list__item item-list--reports__item [% item_extra_class %]">
+<a href="[% c.uri_for('/report', problem.id ) %]">
     [% IF problem.photo;
         photo = problem.get_photo_params
     %]
diff --git a/templates/web/base/reports/_problem-list.html b/templates/web/base/reports/_problem-list.html
index a4c78877a..4da9e1bb6 100644
--- a/templates/web/base/reports/_problem-list.html
+++ b/templates/web/base/reports/_problem-list.html
@@ -5,13 +5,13 @@
 </section>
 
 [% BLOCK column %]
-    <ul class="issue-list-a">
+    <ul class="item-list item-list--reports">
         [% IF problems %]
             [% FOREACH problem IN problems %]
                 [% INCLUDE 'reports/_list-entry.html' include_sentinfo = 1 include_lastupdate = 1 %]
             [% END %]
         [% ELSE %]
-            <li class="empty">
+            <li class="item-list__item item-list__item--empty">
                 <p>[% loc('There are no reports to show.') %]</p>
             </li>
         [% END %]
diff --git a/templates/web/bromley/front/_list-entry.html b/templates/web/bromley/front/_list-entry.html
new file mode 100755
index 000000000..046c3b97f
--- /dev/null
+++ b/templates/web/bromley/front/_list-entry.html
@@ -0,0 +1 @@
+[% INCLUDE 'report/_item.html' no_fixed = 1 item_extra_class = 'item-list__item--with-pin' %]
diff --git a/templates/web/bromley/report/_item.html b/templates/web/bromley/report/_item.html
index 6398f698e..3bd8a8686 100644
--- a/templates/web/bromley/report/_item.html
+++ b/templates/web/bromley/report/_item.html
@@ -1,5 +1,5 @@
-<li class="[% c.cobrand.pin_colour(problem) %]">
-<a class="[% problem.category %] text" href="[% c.uri_for('/report', problem.id ) %]">
+<li class="item-list__item item-list--reports__item item-list__item--with-pin [% c.cobrand.pin_colour(problem) %]">
+<a class="[% problem.category %]" href="[% c.uri_for('/report', problem.id ) %]">
     [% IF problem.photo;
         photo = problem.get_photo_params
     %]
diff --git a/templates/web/fixamingata/front/recent.html b/templates/web/fixamingata/front/recent.html
index bfe35832e..255882f41 100644
--- a/templates/web/fixamingata/front/recent.html
+++ b/templates/web/fixamingata/front/recent.html
@@ -20,7 +20,7 @@
         </h2>
 
         <section class="full-width">
-            <ul class="issue-list-a">
+            <ul class="item-list item-list--reports">
             [% FOREACH problem IN recent_photos %]
             [% INCLUDE 'report/_item.html', no_fixed = 1 %]
             [% END %]
diff --git a/templates/web/fixmybarangay/around/tabbed_lists.html b/templates/web/fixmybarangay/around/tabbed_lists.html
index 342b03f0e..f2f257b03 100644
--- a/templates/web/fixmybarangay/around/tabbed_lists.html
+++ b/templates/web/fixmybarangay/around/tabbed_lists.html
@@ -9,7 +9,7 @@ IF allow_creation %]
 </menu>
 [% END %]
         
-<ul id="current" class="issue-list-a tab">
+<ul id="current" class="item-list item-list--reports tab">
     [% INCLUDE "around/on_map_list_items.html" %]
 </ul>
 
diff --git a/templates/web/fixmybarangay/report/_message_manager.html b/templates/web/fixmybarangay/report/_message_manager.html
index 3845feeef..e937066ff 100644
--- a/templates/web/fixmybarangay/report/_message_manager.html
+++ b/templates/web/fixmybarangay/report/_message_manager.html
@@ -16,7 +16,7 @@
 	</div>
 [% END %]
 
-<ul id="message_manager" class="issue-list-a tab" style="display: none">
+<ul id="message_manager" class="item-list item-list--reports tab" style="display: none">
 	<li id="mm-admin-buttons">
 		[% IF problem.id %]
 			<a style="float:left" id="mm-link-to-toggle-archive" href="#" title="show the message(s) associated with this report">show message for <b>this</b> report</a>
diff --git a/templates/web/fixmystreet-uk-councils/report/_item-with-pin.html b/templates/web/fixmystreet-uk-councils/report/_item-with-pin.html
index cd70410d3..b36dac3b6 100644
--- a/templates/web/fixmystreet-uk-councils/report/_item-with-pin.html
+++ b/templates/web/fixmystreet-uk-councils/report/_item-with-pin.html
@@ -1,4 +1,4 @@
-<li class="[% c.cobrand.pin_colour(problem) %]">
+<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>
diff --git a/templates/web/fixmystreet/report/update.html b/templates/web/fixmystreet/report/update.html
index 847277dfd..66e698606 100644
--- a/templates/web/fixmystreet/report/update.html
+++ b/templates/web/fixmystreet/report/update.html
@@ -3,9 +3,9 @@
 [% IF loop.first %]
 <section class="full-width">
     <h4 class="static-with-rule">[% loc('Updates') %]</h4>
-    <ul class="issue-list">
+    <ul class="item-list item-list--updates">
 [% END %]
-        <li class="issue">
+        <li class="item-list__item item-list__item--updates">
           [% IF moderating; original_update = update.moderation_original_data %]
             <form method="post" action="/moderate/report/[% problem.id %]/update/[% update.id %]">
                 <input type="button" class="btn moderate moderate-display" value="moderate">
@@ -22,14 +22,14 @@
                     [% END %]
                 </div>
           [% END %]
-            <div class="update-wrap">
+            <div class="item-list__update-wrap">
             [% IF update.whenanswered %]
-                <div class="update-text">
+                <div class="item-list__update-text">
                     <p class="meta-2"> [% INCLUDE meta_line %] </p>
                 </div>
             [% ELSE %]
                 [% INCLUDE 'report/photo.html' object=update %]
-                <div class="update-text">
+                <div class="item-list__update-text">
                     <div class="moderate-display">
                         [% add_links( update.text ) | html_para %]
                     </div>
diff --git a/templates/web/fixmystreet/reports/_ward-list.html b/templates/web/fixmystreet/reports/_ward-list.html
index 5e82a93cc..b7e19ffc2 100755
--- a/templates/web/fixmystreet/reports/_ward-list.html
+++ b/templates/web/fixmystreet/reports/_ward-list.html
@@ -2,10 +2,12 @@
 <section id="council_wards" class="hidden-js">
 <h2>[% ward_text %]</h2>
     <p>[% loc('Follow a ward link to view only reports within that ward.') %]</p>
-    <ul class="issue-list-a full-width">
-        [% FOR child IN children.values.sort('name') %]
-        <li><a href="[% child.url %]"><span class="text">[% child.name %]</span></a></li>
-        [% END %]
+    <ul class="item-list item-list--wards full-width">
+      [% FOR child IN children.values.sort('name') %]
+        <li class="item-list__item item-list--wards__item">
+            <a href="[% child.url %]">[% child.name %]</a>
+        </li>
+      [% END %]
     </ul>
 </section>
 [% END %]
diff --git a/templates/web/greenwich/front/_list-entry.html b/templates/web/greenwich/front/_list-entry.html
new file mode 100755
index 000000000..046c3b97f
--- /dev/null
+++ b/templates/web/greenwich/front/_list-entry.html
@@ -0,0 +1 @@
+[% INCLUDE 'report/_item.html' no_fixed = 1 item_extra_class = 'item-list__item--with-pin' %]
diff --git a/templates/web/oxfordshire/front/_list-entry.html b/templates/web/oxfordshire/front/_list-entry.html
new file mode 100755
index 000000000..046c3b97f
--- /dev/null
+++ b/templates/web/oxfordshire/front/_list-entry.html
@@ -0,0 +1 @@
+[% INCLUDE 'report/_item.html' no_fixed = 1 item_extra_class = 'item-list__item--with-pin' %]
diff --git a/templates/web/zerotb/around/on_map_list_items.html b/templates/web/zerotb/around/on_map_list_items.html
index 2cc7251e4..5c7822b48 100644
--- a/templates/web/zerotb/around/on_map_list_items.html
+++ b/templates/web/zerotb/around/on_map_list_items.html
@@ -8,7 +8,7 @@
         [% INCLUDE 'report/_item.html' %]
     [% END %]
 [% ELSE %]
-    <li class="empty">
+    <li class="item-list__item item-list__item--empty">
         <p>[% loc('No clinics found.') %]</p>
     </li>
 [% END %]
diff --git a/templates/web/zerotb/around/tabbed_lists.html b/templates/web/zerotb/around/tabbed_lists.html
index 76c0f71f8..090f03be0 100644
--- a/templates/web/zerotb/around/tabbed_lists.html
+++ b/templates/web/zerotb/around/tabbed_lists.html
@@ -1,3 +1,3 @@
-<ul id="current" class="issue-list-a tab">
+<ul id="current" class="item-list item-list--reports tab">
     [% INCLUDE "around/on_map_list_items.html" %]
 </ul>
diff --git a/templates/web/zerotb/report/_item.html b/templates/web/zerotb/report/_item.html
index 92fb8e8d8..e12c9e1fa 100644
--- a/templates/web/zerotb/report/_item.html
+++ b/templates/web/zerotb/report/_item.html
@@ -1,5 +1,5 @@
-<li>
-<a class="text" href="[% c.uri_for('/report', problem.id ) %]">
+<li class="item-list__item item-list--reports__item">
+<a href="[% c.uri_for('/report', problem.id ) %]">
         <h4>[% problem.title | html %]</h4>
 </a>
 </li>
diff --git a/templates/web/zurich/report/_item.html b/templates/web/zurich/report/_item.html
index 22b39a2c8..9ba5e6fcb 100644
--- a/templates/web/zurich/report/_item.html
+++ b/templates/web/zurich/report/_item.html
@@ -1,5 +1,5 @@
-<li>
-<a class="text" href="[% c.uri_for('/report', problem.id ) %]">
+<li class="item-list__item item-list--reports__item">
+<a href="[% c.uri_for('/report', problem.id ) %]">
     [% IF problem.state != 'unconfirmed' AND problem.photo AND c.cobrand.allow_photo_display(problem);
         photo = problem.get_photo_params
     %]
diff --git a/templates/web/zurich/report/updates.html b/templates/web/zurich/report/updates.html
index cb7644694..1e835aab7 100644
--- a/templates/web/zurich/report/updates.html
+++ b/templates/web/zurich/report/updates.html
@@ -1,9 +1,9 @@
 [% IF problem.state == 'fixed - council' OR problem.state == 'closed' %]
     <h4 class="static-with-rule">[% loc('Updates') %]</h4>
-    <ul class="issue-list">
+    <ul class="item-list item-list--updates">
         <li>
-            <div class="update-wrap">
-                <div class="update-text">
+            <div class="item-list__update-wrap">
+                <div class="item-list__update-text">
                     <p class="meta-2">[% prettify_dt( problem.lastupdate, 'zurich' ) %]</p>
                     [%# XXX following should honour zurich_closed_states instead? %]
                     [% IF problem.state == 'fixed - council'
diff --git a/templates/web/zurich/reports/index.html b/templates/web/zurich/reports/index.html
index 0ece1ca2c..fd0efcf94 100755
--- a/templates/web/zurich/reports/index.html
+++ b/templates/web/zurich/reports/index.html
@@ -15,7 +15,7 @@
 
 <section class="full-width">
   [% IF problems.0 %]
-    <ul class="issue-list-a">
+    <ul class="item-list item-list--reports">
       [% FOREACH problem IN problems.0 %]
         [% INCLUDE 'reports/_list-entry.html' %]
       [% END %]