diff options
| -rw-r--r-- | notes/states.txt | 2 | ||||
| -rw-r--r-- | templates/web/bromley/report/display.html | 2 | ||||
| -rw-r--r-- | templates/web/default/admin/report_edit.html | 2 | ||||
| -rw-r--r-- | templates/web/default/dashboard/index.html | 2 | ||||
| -rw-r--r-- | templates/web/default/report/update-form.html | 2 | ||||
| -rw-r--r-- | templates/web/fixmystreet/report/update-form.html | 2 | ||||
| -rw-r--r-- | templates/web/zurich/admin/report_edit.html | 2 | ||||
| -rw-r--r-- | templates/web/zurich/report/banner.html | 20 |
8 files changed, 27 insertions, 7 deletions
diff --git a/notes/states.txt b/notes/states.txt index 70515c41b..32f9beb1a 100644 --- a/notes/states.txt +++ b/notes/states.txt @@ -22,7 +22,7 @@ the problem has been reported to: Open ( a synonym for confirmed ) Investigating Planned - In Progress + In progress Fixed Closed diff --git a/templates/web/bromley/report/display.html b/templates/web/bromley/report/display.html index 82d2e1a4b..be5fd1ed4 100644 --- a/templates/web/bromley/report/display.html +++ b/templates/web/bromley/report/display.html @@ -79,7 +79,7 @@ <select name="state" id="form_state"> [% FOREACH state IN [ ['confirmed', loc('Open')], ['investigating', loc('Investigating')], ['planned', loc('Planned')], ['in progress', - loc('In Progress')], ['closed', loc('Closed')], ['fixed', loc('Fixed')] ] %] + loc('In progress')], ['closed', loc('Closed')], ['fixed', loc('Fixed')] ] %] <option [% 'selected ' IF state.0 == problem.state %] value="[% state.0 %]">[% state.1 %]</option> [% END %] </select> diff --git a/templates/web/default/admin/report_edit.html b/templates/web/default/admin/report_edit.html index 5913e05a3..d0b2e0e67 100644 --- a/templates/web/default/admin/report_edit.html +++ b/templates/web/default/admin/report_edit.html @@ -18,7 +18,7 @@ <li><label class="inline" for="state">[% loc('State:') %]</label> <select name="state" id="state"> [% FOREACH state IN [ ['confirmed', loc('Open')], ['investigating', loc('Investigating')], ['planned', loc('Planned')], ['in progress', - loc('In Progress')], ['closed', loc('Closed')], ['fixed', loc('Fixed')], ['fixed - user', + loc('In progress')], ['closed', loc('Closed')], ['fixed', loc('Fixed')], ['fixed - user', loc('Fixed - User')], ['fixed - council', loc('Fixed - Council')], ['hidden', loc('Hidden')], ['partial', loc('Partial')],['unconfirmed',loc('Unconfirmed')] ] %] <option [% 'selected ' IF state.0 == problem.state %] value="[% state.0 %]">[% state.1 %]</option> [% END %] diff --git a/templates/web/default/dashboard/index.html b/templates/web/default/dashboard/index.html index 169d7d3fe..b26bd48cd 100644 --- a/templates/web/default/dashboard/index.html +++ b/templates/web/default/dashboard/index.html @@ -137,7 +137,7 @@ <option value=''>All</option> [% FOREACH state IN [ ['confirmed', loc('Open')], ['investigating', loc('Investigating')], ['planned', loc('Planned')], ['in progress', - loc('In Progress')], ['closed', loc('Closed')], ['fixed', loc('Fixed')] ] %] + loc('In progress')], ['closed', loc('Closed')], ['fixed', loc('Fixed')] ] %] <option [% 'selected ' IF state.0 == q_state %] value="[% state.0 %]">[% state.1 %]</option> [% END %] </select> diff --git a/templates/web/default/report/update-form.html b/templates/web/default/report/update-form.html index 957fc9947..eeaec7915 100644 --- a/templates/web/default/report/update-form.html +++ b/templates/web/default/report/update-form.html @@ -29,7 +29,7 @@ <select name="state" id="form_state"> [% FOREACH state IN [ ['confirmed', loc('Open')], ['investigating', loc('Investigating')], ['planned', loc('Planned')], ['in progress', - loc('In Progress')], ['closed', loc('Closed')], ['fixed', loc('Fixed')] ] %] + loc('In progress')], ['closed', loc('Closed')], ['fixed', loc('Fixed')] ] %] <option [% 'selected ' IF state.0 == problem.state %] value="[% state.0 %]">[% state.1 %]</option> [% END %] </select> diff --git a/templates/web/fixmystreet/report/update-form.html b/templates/web/fixmystreet/report/update-form.html index ec5d57b2d..e8115ee00 100644 --- a/templates/web/fixmystreet/report/update-form.html +++ b/templates/web/fixmystreet/report/update-form.html @@ -27,7 +27,7 @@ <select name="state" id="form_state"> [% FOREACH state IN [ ['confirmed', loc('Open')], ['investigating', loc('Investigating')], ['planned', loc('Planned')], ['in progress', - loc('In Progress')], ['closed', loc('Closed')], ['fixed', loc('Fixed')] ] %] + loc('In progress')], ['closed', loc('Closed')], ['fixed', loc('Fixed')] ] %] <option [% 'selected ' IF state.0 == problem.state %] value="[% state.0 %]">[% state.1 %]</option> [% END %] </select> diff --git a/templates/web/zurich/admin/report_edit.html b/templates/web/zurich/admin/report_edit.html index 9f5825414..d66652541 100644 --- a/templates/web/zurich/admin/report_edit.html +++ b/templates/web/zurich/admin/report_edit.html @@ -26,7 +26,7 @@ [% FOREACH state IN [ ['unconfirmed',loc('Submitted')] ['confirmed', loc('Open')], - ['in progress', loc('In Progress')], + ['in progress', loc('In progress')], ['fixed - council', loc('Fixed')], ['hidden', loc('Hidden')], ['closed', loc('Third party')], diff --git a/templates/web/zurich/report/banner.html b/templates/web/zurich/report/banner.html new file mode 100644 index 000000000..33fbda7c0 --- /dev/null +++ b/templates/web/zurich/report/banner.html @@ -0,0 +1,20 @@ +[% USE date %] +[% BLOCK banner %] + <div class="banner"> + <p id="[% id %]">[% text %]</p> + </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' %] + [% INCLUDE banner, id = 'progress', text = loc('In progress') %] +[% END %] + |