diff options
Diffstat (limited to 'templates/web')
| -rw-r--r-- | templates/web/base/maps/noscript_map.html | 2 | ||||
| -rw-r--r-- | templates/web/base/report/_item.html | 23 | ||||
| -rw-r--r-- | templates/web/oxfordshire/reports/_list-entry.html | 1 |
3 files changed, 15 insertions, 11 deletions
diff --git a/templates/web/base/maps/noscript_map.html b/templates/web/base/maps/noscript_map.html index bce562a59..f35f152e8 100644 --- a/templates/web/base/maps/noscript_map.html +++ b/templates/web/base/maps/noscript_map.html @@ -54,7 +54,7 @@ [% BLOCK pin %] [% IF pin.id %] -<a title="[% pin.title | html %]" href="[% c.uri_for('/report/' _ pin.id) %]"> +<a title="[% pin.title | html %]" href="[% c.cobrand.base_url_for_report( pin.problem ) %][% pin.problem.url %]"> [%- END -%] <img border="0" class="pin" src="[% start %][% c.cobrand.path_to_pin_icons _ 'pin-' _ pin.colour _ '.png' %]" alt="[% loc('Problem') %]" style="top:[% pin.py - 64 %]px; left:[% pin.px - 24 %]px; position: absolute;"> diff --git a/templates/web/base/report/_item.html b/templates/web/base/report/_item.html index 704dfd29c..5894c5d81 100644 --- a/templates/web/base/report/_item.html +++ b/templates/web/base/report/_item.html @@ -1,5 +1,5 @@ <li class="item-list__item item-list--reports__item [% item_extra_class %]"> -<a href="[% c.uri_for('/report', problem.id ) %]"> +<a href="[% c.cobrand.base_url_for_report( problem ) %][% problem.url %]"> [% IF problem.photo %] <img class="img" height="60" width="90" src="[% problem.photos.first.url_fp %]" alt=""> [% END %] @@ -14,15 +14,18 @@ [%- IF problem.confirmed != problem.lastupdate AND problem.whensent != problem.lastupdate %], [% tprintf(loc('last updated %s'), prettify_dt( problem.lastupdate, 1 ) ) %] [%- END %] - [% 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)') %] + [% IF include_sentinfo %] + [% IF c.cobrand.is_council && !c.cobrand.owns_problem( problem ) %] + (sent to [% problem.body %]) + [% ELSIF problem.bodies_str_ids.size > 1 %] [% loc('(sent to both)') %] + [% ELSIF problem.bodies_str_ids.size == 0 %] [% loc('(not sent to council)') %] + [% END %] [% END %] - [% END %] - [% IF NOT no_fixed AND problem.is_fixed %] - [% loc('(fixed)') %] - [% ELSIF NOT no_fixed AND problem.is_closed %] - [% loc('(closed)') %] - [% END %]</small> + [% IF NOT no_fixed AND problem.is_fixed %] + [% loc('(fixed)') %] + [% ELSIF NOT no_fixed AND problem.is_closed %] + [% loc('(closed)') %] + [% END %] + </small> </a> </li> diff --git a/templates/web/oxfordshire/reports/_list-entry.html b/templates/web/oxfordshire/reports/_list-entry.html index 43d3d6265..76b135665 100644 --- a/templates/web/oxfordshire/reports/_list-entry.html +++ b/templates/web/oxfordshire/reports/_list-entry.html @@ -1,4 +1,5 @@ [% INCLUDE 'report/_item.html' no_fixed = 1 + include_sentinfo = 1 item_extra_class = 'item-list__item--with-pin ' _ c.cobrand.pin_colour(problem) %] |