diff options
| -rw-r--r-- | templates/web/fixmystreet/report/display.html | 4 | ||||
| -rw-r--r-- | templates/web/zurich/report/banner.html | 13 |
2 files changed, 8 insertions, 9 deletions
diff --git a/templates/web/fixmystreet/report/display.html b/templates/web/fixmystreet/report/display.html index 8ae528876..6ab6e9222 100644 --- a/templates/web/fixmystreet/report/display.html +++ b/templates/web/fixmystreet/report/display.html @@ -25,10 +25,12 @@ <li><form method="post" action="/report/delete/[% problem.id %]"> <input type="submit" id="key-tool-report-abuse" class="abuse" value="Remove from site"> </form></li> - [% ELSE %] + [% ELSIF c.cobrand.moniker != 'zurich' %] <li><a rel="nofollow" id="key-tool-report-abuse" class="abuse" href="[% c.uri_for( '/contact', { id => problem.id } ) %]">[% loc('Report abuse' ) %]</a></li> [% END %] + [% IF c.cobrand.moniker != 'zurich' %] <li><a rel="nofollow" id="key-tool-report-updates" class="feed" href="[% c.uri_for( '/alert/subscribe', { id => problem.id } ) %]">[% loc('Get updates' ) %]</a></li> + [% END %] [% IF c.cobrand.moniker == 'fixmystreet' %] <li><a rel="nofollow" id="key-tool-report-share" class="share" href="#report-share">[% loc('Share') %]</a></li> [% END %] diff --git a/templates/web/zurich/report/banner.html b/templates/web/zurich/report/banner.html index 33fbda7c0..eda70a0de 100644 --- a/templates/web/zurich/report/banner.html +++ b/templates/web/zurich/report/banner.html @@ -5,16 +5,13 @@ </div> [% END %] -[% IF problem.is_fixed %] - [% INCLUDE banner, id = 'fixed', text = loc('Fixed') %] -[% END %] -[% IF problem.is_closed %] - [% INCLUDE banner, id = 'closed', text = loc('Third party') %] -[% END %] [% IF problem.state == 'unconfirmed' %] [% INCLUDE banner, id = 'closed', text = loc('Submitted') %] -[% END %] -[% IF problem.state == 'in progress' %] +[% ELSIF problem.state == 'confirmed' %] + [% INCLUDE banner, id = 'closed', text = loc('Open') %] +[% ELSIF problem.is_fixed OR problem.is_closed %] + [% INCLUDE banner, id = 'fixed', text = loc('Closed') %] +[% ELSIF problem.state == 'in progress' OR problem.state == 'planned' %] [% INCLUDE banner, id = 'progress', text = loc('In progress') %] [% END %] |