diff options
| author | Hakim Cassimally <hakim@mysociety.org> | 2015-02-09 18:01:32 +0000 |
|---|---|---|
| committer | Dave Arter <davea@mysociety.org> | 2015-10-06 09:09:24 +0100 |
| commit | 34f3f5a36b6773ad51060256d4e95efd7c45b3c8 (patch) | |
| tree | 5e656a15cc0bda3f930dc019d4dff664b8e035ac /templates | |
| parent | 2ff36453ebaa86e7f58f17ec63d2f95a88b8be99 (diff) | |
[Zurich] new status flags
Have moved the generation of banner text from the template into
problem_as_hashref
See mysociety/FixMyStreet-Commercial#672
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/web/zurich/admin/report_edit.html | 5 | ||||
| -rw-r--r-- | templates/web/zurich/report/banner.html | 19 |
2 files changed, 8 insertions, 16 deletions
diff --git a/templates/web/zurich/admin/report_edit.html b/templates/web/zurich/admin/report_edit.html index 50627eb48..1bf7c2a5c 100644 --- a/templates/web/zurich/admin/report_edit.html +++ b/templates/web/zurich/admin/report_edit.html @@ -101,11 +101,14 @@ ['confirmed', loc('Open')], ['planned', loc('Planned')], ['hidden', loc('Hidden')], + ['investigating', loc('Wish')], + ['partial', loc('Not contactable')], + ['unable to fix', loc('Jurisdiction unknown')], ] %] <option [% 'selected ' IF s.0 == problem.state %] value="[% s.0 %]">[% s.1 %]</option> [% END %] [% IF problem.state == 'closed' %] - <option selected value="closed">[% loc('Closed') %]</option> + <option selected value="closed">[% loc('Extern') %]</option> [% ELSIF problem.state == 'fixed - council' %] <option selected value="fixed - council">[% loc('Closed') %]</option> [% ELSIF problem.state == 'in progress' %] diff --git a/templates/web/zurich/report/banner.html b/templates/web/zurich/report/banner.html index eda70a0de..c10a99ef6 100644 --- a/templates/web/zurich/report/banner.html +++ b/templates/web/zurich/report/banner.html @@ -1,17 +1,6 @@ [% USE date %] -[% BLOCK banner %] - <div class="banner"> - <p id="[% id %]">[% text %]</p> - </div> -[% END %] - -[% IF problem.state == 'unconfirmed' %] - [% INCLUDE banner, id = 'closed', text = loc('Submitted') %] -[% 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 %] +[% problem_hashref = c.cobrand.problem_as_hashref(problem, c) %] +<div class="banner"> + <p id="[% problem_hashref.banner_id %]">[% problem_hashref.state_t %]</p> +</div> |