diff options
| author | Zarino Zappia <mail@zarino.co.uk> | 2016-11-28 12:50:45 +0000 |
|---|---|---|
| committer | Matthew Somerville <matthew-github@dracos.co.uk> | 2017-01-12 15:17:32 +0000 |
| commit | d967ee5ef454c8e3b91812bc2280a3969d0d6baa (patch) | |
| tree | 7306646b8f655fdd5571c61a7bf670e93ff9d45a | |
| parent | b80c49adc9e769cdd6a41a6fef23dd5c9b1a578c (diff) | |
Show response priorities in report list items
| -rw-r--r-- | templates/web/base/report/_item.html | 12 | ||||
| -rw-r--r-- | web/cobrands/sass/_base.scss | 12 |
2 files changed, 19 insertions, 5 deletions
diff --git a/templates/web/base/report/_item.html b/templates/web/base/report/_item.html index 02457e5a0..dc4ccbf4e 100644 --- a/templates/web/base/report/_item.html +++ b/templates/web/base/report/_item.html @@ -13,6 +13,13 @@ <div class="item-list__description">[% problem.detail | html %]</div> [% END %] <small> + [% IF NOT no_fixed AND problem.is_fixed %] + <span class="item-list__item__state">[% loc('Fixed') %]</span> + [% ELSIF NOT no_fixed AND problem.is_closed %] + <span class="item-list__item__state">[% loc('Closed') %]</span> + [% ELSIF problem.response_priority AND (c.user.has_permission_to('report_edit_priority', problem.bodies_str_ids) OR c.user.has_permission_to('report_inspect', problem.bodies_str_ids)) %] + <span class="item-list__item__state">[% problem.response_priority.name %]</span> + [% END %] [%- IF c.cobrand.moniker != 'fixamingata' %] [%# Default: %] [%- prettify_dt( problem.confirmed, 1 ) %] [%- ELSE %] [%# Swedish cobrand fixamingata: %] @@ -29,11 +36,6 @@ [% ELSIF problem.bodies_str_ids.size == 0 %] [% loc('(not sent to council)') %] [% 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 c.user.has_permission_to('report_inspect', problem.bodies_str_ids) %] diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss index a90eb8005..3bb8715a1 100644 --- a/web/cobrands/sass/_base.scss +++ b/web/cobrands/sass/_base.scss @@ -1033,6 +1033,18 @@ input.final-submit { } } +.item-list__item__state { + font-size: 0.9em; + font-style: normal; + font-weight: bold; + padding: 0.2em 0.5em; + vertical-align: -0.1em; + background: #888; + color: #fff; + border-radius: 0.3em; + margin-right: 0.1em; +} + .item-list__item--empty p { margin: 0; } |