diff options
| author | Matthew Somerville <matthew-github@dracos.co.uk> | 2017-08-29 15:15:10 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew-github@dracos.co.uk> | 2017-08-29 15:15:10 +0100 |
| commit | 759b5ef970546c0a70fb4f8d051b1f6dd54e4d2d (patch) | |
| tree | 2f76a073e1c07df40e8cec71cafef02f5d54c184 /templates | |
| parent | 05c6a4b980b07a7c15b6b9727f6315d326e233a0 (diff) | |
| parent | b43dbace0f747897640920e4cf9adb55b84bc2c8 (diff) | |
Merge branch 'move-report-states-to-database-part-1'
Diffstat (limited to 'templates')
7 files changed, 8 insertions, 8 deletions
diff --git a/templates/web/base/admin/_translations.html b/templates/web/base/admin/_translations.html index d2e0ba322..d8f7d52fb 100644 --- a/templates/web/base/admin/_translations.html +++ b/templates/web/base/admin/_translations.html @@ -6,7 +6,7 @@ <th>[% loc('Language') %]</th> <th>[% loc('Translation') %]</th> </tr> - [% FOREACH language IN languages.keys %] + [% FOREACH language IN languages.keys.sort %] <tr> <td> <label for="translation_[% language %]">[% languages.$language.name %] ([% language %])</label> diff --git a/templates/web/base/admin/problem_row.html b/templates/web/base/admin/problem_row.html index def6ce60f..79461367e 100644 --- a/templates/web/base/admin/problem_row.html +++ b/templates/web/base/admin/problem_row.html @@ -30,7 +30,7 @@ [%- END -%] <br>[% problem.cobrand %]<br>[% problem.cobrand_data | html %] </td> - <td>[% prettify_state(problem.state) %]<br><small> + <td>[% prettify_state(problem.state, 1) %]<br><small> [% loc('Created') %]: [% PROCESS format_time time=problem.created %] <br>[% loc('When sent') %]: [% PROCESS format_time time=problem.whensent %] [%- IF problem.is_visible %]<br>[% loc('Confirmed:' ) %] [% PROCESS format_time time=problem.confirmed %][% END -%] diff --git a/templates/web/base/admin/state_groups_select.html b/templates/web/base/admin/state_groups_select.html index 9a70cd2c9..87674c47d 100644 --- a/templates/web/base/admin/state_groups_select.html +++ b/templates/web/base/admin/state_groups_select.html @@ -1,3 +1,3 @@ [% PROCESS 'admin/report_blocks.html'; # For state_groups %] [% DEFAULT current_state = problem.state %] -[% INCLUDE 'report/_state_select_field.html' %] +[% INCLUDE 'report/_state_select_field.html' single_fixed=0 %] diff --git a/templates/web/base/report/_item.html b/templates/web/base/report/_item.html index 153fbf58e..3f5c5464b 100644 --- a/templates/web/base/report/_item.html +++ b/templates/web/base/report/_item.html @@ -94,7 +94,7 @@ </div> <div> <h4>[% loc('State') %]</h4> - <p>[% prettify_state(problem.state) %]</p> + <p>[% prettify_state(problem.state, 1) %]</p> </div> <div> <h4>[% loc('Priority') %]</h4> diff --git a/templates/web/base/report/_state_select_field.html b/templates/web/base/report/_state_select_field.html index c580c897d..0f6d8faf6 100644 --- a/templates/web/base/report/_state_select_field.html +++ b/templates/web/base/report/_state_select_field.html @@ -9,12 +9,12 @@ [% END ~%] [% END ~%] [% IF NOT found ~%] - <option selected value="[% current_state %]">[% prettify_state(current_state) %]</option> + <option selected value="[% current_state %]">[% prettify_state(current_state, single_fixed) %]</option> [% END ~%] [% FOREACH group IN state_groups %] <optgroup label="[% group.0 %]"> [% FOREACH state IN group.1 %] - <option [% 'selected ' IF state == current_state %]value="[% state %]">[% prettify_state(state) %]</option> + <option [% 'selected ' IF state == current_state %]value="[% state %]">[% prettify_state(state, single_fixed) %]</option> [% END %] </optgroup> [% END %] diff --git a/templates/web/base/report/inspect/state_groups_select.html b/templates/web/base/report/inspect/state_groups_select.html index af41c6770..2cf1a4de5 100644 --- a/templates/web/base/report/inspect/state_groups_select.html +++ b/templates/web/base/report/inspect/state_groups_select.html @@ -9,4 +9,4 @@ SET state_groups = [ %] [% DEFAULT current_state = problem.state %] -[% INCLUDE 'report/_state_select_field.html' %] +[% INCLUDE 'report/_state_select_field.html' single_fixed=1 %] diff --git a/templates/web/oxfordshire/report/inspect/state_groups_select.html b/templates/web/oxfordshire/report/inspect/state_groups_select.html index a5fce525c..d36fb0191 100644 --- a/templates/web/oxfordshire/report/inspect/state_groups_select.html +++ b/templates/web/oxfordshire/report/inspect/state_groups_select.html @@ -9,4 +9,4 @@ SET state_groups = [ %] [% DEFAULT current_state = problem.state %] -[% INCLUDE 'report/_state_select_field.html' %] +[% INCLUDE 'report/_state_select_field.html' single_fixed=1 %] |