diff options
| author | Matthew Somerville <matthew-github@dracos.co.uk> | 2018-12-13 16:30:58 +0000 |
|---|---|---|
| committer | Matthew Somerville <matthew-github@dracos.co.uk> | 2018-12-13 16:31:00 +0000 |
| commit | 9c30377ff2c7930771b6c9be10f5a4f24456be0b (patch) | |
| tree | e9360d512c76656d803f8b368b1834a0fad7e60b /templates | |
| parent | 7aa0c362dfe81ac880e92e0d46ca30a43bb14179 (diff) | |
Stop both Unknown/In progress banners appearing.
Previously, CSS was absolutely positioning one on top of the other.
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/web/base/report/banner.html | 5 | ||||
| -rw-r--r-- | templates/web/fixmystreet.com/report/banner.html | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/templates/web/base/report/banner.html b/templates/web/base/report/banner.html index bca3f1395..cf700dd4a 100644 --- a/templates/web/base/report/banner.html +++ b/templates/web/base/report/banner.html @@ -11,6 +11,8 @@ [% IF problem.is_open AND date.now - problem.lastupdate.epoch > 8 * 7 * 24 * 60 * 60 %] [% INCLUDE banner, id = 'unknown', text = loc('Unknown') %] +[% ELSIF problem.is_in_progress %] + [% INCLUDE banner, id = 'progress', text = prettify_state(problem.state) %] [% END %] [% IF problem.is_fixed %] [% INCLUDE banner, id = 'fixed', text = prettify_state('fixed') %] @@ -18,6 +20,3 @@ [% IF problem.is_closed %] [% INCLUDE banner, id = 'closed', text = prettify_state('closed') %] [% END %] -[% IF problem.is_in_progress %] - [% INCLUDE banner, id = 'progress', text = prettify_state(problem.state) %] -[% END %] diff --git a/templates/web/fixmystreet.com/report/banner.html b/templates/web/fixmystreet.com/report/banner.html index dd7119fc4..8f6ea19c1 100644 --- a/templates/web/fixmystreet.com/report/banner.html +++ b/templates/web/fixmystreet.com/report/banner.html @@ -21,9 +21,7 @@ [% IF problem.is_open AND date.now - problem.lastupdate.epoch > 8 * 7 * 24 * 60 * 60 %] [% INCLUDE banner, id = 'unknown', text = loc('Unknown') %] - [% END %] - - [% IF problem.is_in_progress %] + [% ELSIF problem.is_in_progress %] [% INCLUDE banner, id = 'progress', text = loc('In progress') %] [% END %] |