-
-
Notifications
You must be signed in to change notification settings - Fork 230
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Emergency message OOH and on reporting pages #4015
Conversation
d8137df
to
07a2475
Compare
Codecov Report
@@ Coverage Diff @@
## master #4015 +/- ##
==========================================
- Coverage 82.84% 82.78% -0.06%
==========================================
Files 362 362
Lines 25290 25267 -23
Branches 3818 3815 -3
==========================================
- Hits 20951 20918 -33
- Misses 3154 3160 +6
- Partials 1185 1189 +4
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good and works well! I've sprinkled a few suggestions in which I think will make the admin editing page a bit nicer to use.
Biggest thing missing now is user documentation :)
07a2475
to
b6f17b6
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
⏰ 🚨 🆗
@@ -47,6 +47,7 @@ | |||
|
|||
[% IF hardcoded_reporting_message %] | |||
<p>Your reporting page message is currently hard-coded.</p> | |||
<pre>[% hardcoded_reporting_message %]</pre> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I was originally thinking of a rendered preview, but actually showing the HTML makes a lot more sense!
93a92b5
to
cb578e8
Compare
cb578e8
to
93a92b5
Compare
This PR firstly consolidates a couple of ways of showing a message top left on the reporting pages into using
form_after_heading.html
. It then adds the ability to customise that message in the admin, leaving the hard-coded ones alone (though they could be moved to the database way of storing it easily enough). And then it adds OOH handling to all the 'emergency' messages, with an interface for specifying out of hours (defaulting to weekends, BH, midnight-8am/6pm-midnight on weekdays).Don't really like the allowing of
<p class>
in the scrubber, but couldn't see an easy way to accommodate both simple text messages like Bucks have with a<strong>
and that's about it, or something in a<p class="box-warning">
like say National Highways.Would need some documentation on e.g. using that class if that's what we wanted to do. Or set it up for them first time.
Fixes https://github.com/mysociety/societyworks/issues/2570
Note this doesn't apply OOH to extra question stopper messages, I think we'd wait to see if that was wanted then, because that would be another level of complexity, I think, hopefully this could cover most.