darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-20 14:29:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3527 from alphagov/broadcast-end-time

Browse Source 
Let users choose when to end a broadcast
This commit is contained in:
Chris Hill-Scott
2020-07-17 10:43:10 +01:00
committed by GitHub
parent 2d7d800c64 741ab9288f
commit 4f859a69a6
9 changed files with 241 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/templates/components/radios.html
View File

@@ -23,7 +23,8 @@
{% macro radio_select(
field,
hint=None,
wrapping_class='form-group'
wrapping_class='form-group',
show_now_as_default=True
) %}
<div class="{{ wrapping_class }} {% if field.errors %} form-group-error{% endif %}">
<fieldset>
@@ -35,7 +36,7 @@
</span>
{% endif %}
</legend>
<div class="radio-select" data-module="radio-select" data-categories="{{ field.categories|join(',') }}">
<div class="radio-select" data-module="radio-select" data-categories="{{ field.categories|join(',') }}" data-show-now-as-default="{{ show_now_as_default|string|lower }}">
<div class="radio-select-column">
{% for option in field %}
<div class="multiple-choice">

9
app/templates/views/broadcast/preview-message.html
View File

@@ -1,7 +1,8 @@
{% from "components/button/macro.njk" import govukButton %}
{% from "components/form.html" import form_wrapper %}
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import sticky_page_footer %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/radios.html" import radio_select %}
{% extends "withnav_template.html" %}
@@ -28,7 +29,11 @@
{{ broadcast_message.template|string }}
{% call form_wrapper() %}
{{ sticky_page_footer('Submit for approval') }}
{{ radio_select(
form.finishes_at,
show_now_as_default=False
) }}
{{ page_footer('Submit for approval') }}
{% endcall %}
{% endblock %}