Include last update in around/my pages.

Keep sent information still only on all reports pages. Also fix possible
space before comma in _item.html.

6 files changed, 11 insertions, 9 deletions

diff --git a/templates/web/bromley/report/_item.html b/templates/web/bromley/report/_item.html
index 75f542b77..9e9c05bcb 100644
--- a/templates/web/bromley/report/_item.html
+++ b/templates/web/bromley/report/_item.html
@@ -8,10 +8,10 @@
         <span>[% problem.title | html %]</span><br />
         <small>[% prettify_dt( problem.confirmed, 1 ) %]
             [%- IF dist %], [% dist %]km[% END %]
-            [%- IF include_lastupdate AND problem.confirmed != problem.lastupdate AND problem.whensent != problem.lastupdate %],
+            [%- IF NOT exclude_lastupdate AND problem.confirmed != problem.lastupdate AND problem.whensent != problem.lastupdate %],
                 [% tprintf(loc('last updated %s'), prettify_dt( problem.lastupdate, 1 ) ) %]
             [%- END %]
-        [% IF include_lastupdate %]
+        [% IF include_sentinfo %]
             [% IF problem.bodies_str_ids.size > 1 %] [% loc('(sent to both)') %]
             [% ELSIF problem.bodies_str_ids.size == 0 %] [% loc('(not sent to council)') %]
             [% END %]
diff --git a/templates/web/bromley/reports/_list-entry.html b/templates/web/bromley/reports/_list-entry.html
new file mode 100755
index 000000000..070048af6
--- /dev/null
+++ b/templates/web/bromley/reports/_list-entry.html
@@ -0,0 +1 @@
+[% INCLUDE 'report/_item.html' include_sentinfo = 1 exclude_lastupdate = 1 %]
diff --git a/templates/web/fixmystreet/report/_item.html b/templates/web/fixmystreet/report/_item.html
index 8e2e73a8d..6ac18b534 100644
--- a/templates/web/fixmystreet/report/_item.html
+++ b/templates/web/fixmystreet/report/_item.html
@@ -7,16 +7,16 @@
     [% END %]
         <h4>[% problem.title | html %]</h4>
         <small>
-            [% IF c.cobrand.moniker != 'fixamingata' %] [%# Default: %]
+            [%- IF c.cobrand.moniker != 'fixamingata' %] [%# Default: %]
                 [%- prettify_dt( problem.confirmed, 1 ) %]
-            [% ELSE %] [%# Swedish cobrand fixamingata: %]
+            [%- ELSE %] [%# Swedish cobrand fixamingata: %]
                 [%- prettify_dt( problem.confirmed) %]
-            [% END %]
+            [%- END %]
             [%- IF dist %], [% dist %]km[% END %]
-            [%- IF include_lastupdate AND problem.confirmed != problem.lastupdate AND problem.whensent != problem.lastupdate %],
+            [%- IF NOT exclude_lastupdate AND problem.confirmed != problem.lastupdate AND problem.whensent != problem.lastupdate %],
                 [% tprintf(loc('last updated %s'), prettify_dt( problem.lastupdate, 1 ) ) %]
             [%- END %]
-        [% IF include_lastupdate %]
+        [% IF include_sentinfo %]
             [% IF problem.bodies_str_ids.size > 1 %] [% loc('(sent to both)') %]
             [% ELSIF problem.bodies_str_ids.size == 0 %] [% loc('(not sent to council)') %]
             [% END %]
diff --git a/templates/web/fixmystreet/reports/_list-entry.html b/templates/web/fixmystreet/reports/_list-entry.html
index 8509df376..4c0abd337 100755
--- a/templates/web/fixmystreet/reports/_list-entry.html
+++ b/templates/web/fixmystreet/reports/_list-entry.html
@@ -1 +1 @@
-[% INCLUDE 'report/_item.html', include_lastupdate = 1 %]
+[% INCLUDE 'report/_item.html' include_sentinfo = 1 %]
diff --git a/templates/web/zurich/report/_item.html b/templates/web/zurich/report/_item.html
index 22b39a2c8..816afd0ff 100644
--- a/templates/web/zurich/report/_item.html
+++ b/templates/web/zurich/report/_item.html
@@ -12,7 +12,7 @@
       [% END %]
         <small>[% prettify_dt( problem.created, 'zurich' ) %]
             [%- IF dist %], [% dist %]km[% END %]
-            [%- IF include_lastupdate AND problem.created != problem.lastupdate AND problem.whensent != problem.lastupdate %],
+            [%- IF NOT exclude_lastupdate AND problem.created != problem.lastupdate AND problem.whensent != problem.lastupdate %],
                 [% tprintf(loc('last updated %s'), prettify_dt( problem.lastupdate, 'zurich' ) ) %]
             [%- END %]
         [% IF NOT no_fixed AND problem.is_fixed %]
diff --git a/templates/web/zurich/reports/_list-entry.html b/templates/web/zurich/reports/_list-entry.html
new file mode 100755
index 000000000..070048af6
--- /dev/null
+++ b/templates/web/zurich/reports/_list-entry.html
@@ -0,0 +1 @@
+[% INCLUDE 'report/_item.html' include_sentinfo = 1 exclude_lastupdate = 1 %]