darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-07-24 01:49:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3952 from alphagov/emergency-alerts-content-review

Browse Source 
Emergency alerts content review
This commit is contained in:
Chris Hill-Scott
2021-07-08 09:33:54 +01:00
committed by GitHub
parent fab58b4e4e 9ac51481d7
commit ceca92c84e
15 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/main/views/broadcast.py
View File

@@ -64,7 +64,7 @@ def broadcast_dashboard(service_id):
)
@main.route('/services/<uuid:service_id>/previous-alerts')
@main.route('/services/<uuid:service_id>/past-alerts')
@user_has_permissions()
@service_has_permission('broadcast')
def broadcast_dashboard_previous(service_id):
@@ -74,8 +74,8 @@ def broadcast_dashboard_previous(service_id):
'cancelled',
'completed',
),
page_title='Previous alerts',
empty_message='You do not have any previous alerts',
page_title='Past alerts',
empty_message='You do not have any past alerts',
view_broadcast_endpoint='.view_previous_broadcast',
)

2
app/templates/main_nav.html
View File

@@ -6,7 +6,7 @@
{% if current_user.has_permissions() %}
{% if current_service.has_permission('broadcast') %}
<li><a class="govuk-link govuk-link--no-visited-state{{ main_navigation.is_selected('current-broadcasts') }}" href="{{ url_for('.broadcast_dashboard', service_id=current_service.id) }}">Current alerts</a></li>
<li><a class="govuk-link govuk-link--no-visited-state{{ main_navigation.is_selected('previous-broadcasts') }}" href="{{ url_for('.broadcast_dashboard_previous', service_id=current_service.id) }}">Previous alerts</a></li>
<li><a class="govuk-link govuk-link--no-visited-state{{ main_navigation.is_selected('previous-broadcasts') }}" href="{{ url_for('.broadcast_dashboard_previous', service_id=current_service.id) }}">Past alerts</a></li>
<li><a class="govuk-link govuk-link--no-visited-state{{ main_navigation.is_selected('rejected-broadcasts') }}" href="{{ url_for('.broadcast_dashboard_rejected', service_id=current_service.id) }}">Rejected alerts</a></li>
{% elif current_user.has_permissions('view_activity') %}
<li><a class="govuk-link govuk-link--no-visited-state{{ main_navigation.is_selected('dashboard') }}" href="{{ url_for('.service_dashboard', service_id=current_service.id) }}">Dashboard</a></li>

2
app/templates/views/broadcast/areas.html
View File

@@ -26,7 +26,7 @@
{% call form_wrapper() %}
{{ form.areas }}
{{ sticky_page_footer('Add to broadcast') }}
{{ sticky_page_footer('Continue') }}
{% endcall %}
{% endblock %}

2
app/templates/views/broadcast/counties.html
View File

@@ -35,7 +35,7 @@
</div>
{% endfor %}
{{ sticky_page_footer('Add to broadcast') }}
{{ sticky_page_footer('Continue') }}
{% endcall %}

4
app/templates/views/broadcast/libraries.html
View File

@@ -3,13 +3,13 @@
{% extends "withnav_template.html" %}
{% block service_page_title %}
Choose where to broadcast to
Choose where to send this alert
{% endblock %}
{% block maincolumn_content %}
{{ page_header(
"Choose where to broadcast to",
"Choose where to send this alert",
back_link=url_for(".preview_broadcast_areas", service_id=current_service.id, broadcast_message_id=broadcast_message.id)
) }}

6
app/templates/views/broadcast/preview-areas.html
View File

@@ -6,7 +6,7 @@
{% extends "withnav_template.html" %}
{% block service_page_title %}
Choose where to broadcast to
Choose where to send this alert
{% endblock %}
{% block extra_stylesheets %}
@@ -20,7 +20,7 @@
{% block maincolumn_content %}
{{ page_header(
"Choose where to broadcast to",
"Choose where to send this alert",
back_link=back_link
) }}
@@ -54,7 +54,7 @@
{% if broadcast_message.areas %}
{{ map(broadcast_message) }}
<form action="{{ url_for('.preview_broadcast_message', service_id=current_service.id, broadcast_message_id=broadcast_message.id) }}" method="get" class="govuk-!-margin-top-1">
{{ page_footer('Continue to preview') }}
{{ page_footer('Preview this alert') }}
</form>
{% endif %}

2
app/templates/views/broadcast/sub-areas.html
View File

@@ -28,7 +28,7 @@
{{ form.areas }}
</div>
{{ sticky_page_footer('Add to broadcast') }}
{{ sticky_page_footer('Continue') }}
{% endcall %}

4
app/templates/views/broadcast/tour/2.html
View File

@@ -3,7 +3,7 @@
{% extends "admin_template.html" %}
{% block per_page_title %}
In an emergency, you can broadcast an alert to every mobile phone in
In an emergency, you can send an alert to every mobile phone in
the affected area at exactly the same time.
{% endblock %}
@@ -15,7 +15,7 @@
<div class="govuk-grid-row">
<div class="govuk-grid-column-one-half">
<h1 class="heading-medium">
In an emergency, you can broadcast an alert to every mobile phone in
In an emergency, you can send an alert to every mobile phone in
the affected area at exactly the same time.
</h1>
<p class="govuk-body heading-medium govuk-!-margin-bottom-6">

4
app/templates/views/broadcast/tour/5.html
View File

@@ -22,13 +22,13 @@
You’re in training mode.
</h1>
<p class="govuk-body heading-medium">
There’s no risk of broadcasting a real alert.
There’s no risk of sending a real alert.
</p>
<p class="govuk-body heading-medium">
Get used to the system now, so you know what to do in an&nbsp;emergency.
</p>
<p class="govuk-body heading-medium">
When you’re ready, you can turn off training mode.
When you’re ready, you can ask for access to the live system.
</p>
<p class="govuk-body heading-medium">
<a class="govuk-link govuk-link--no-visited-state" href='{{ url_for(".service_dashboard", service_id=current_service.id) }}'>

4
app/templates/views/broadcast/tour/6.html
View File

@@ -3,7 +3,7 @@
{% extends "admin_template.html" %}
{% block per_page_title %}
Notify has not broadcast your alert because you’re in training mode.
Notify has not sent your alert because you’re in training mode.
{% endblock %}
{% set mainClasses = "govuk-!-padding-top-0 govuk-!-padding-bottom-0" %}
@@ -16,7 +16,7 @@
<div class="govuk-grid-row">
<div class="govuk-grid-column-one-half">
<h1 class="heading-medium">
Notify has not broadcast your alert because you’re in training mode.
Notify has not sent your alert because you’re in training mode.
</h1>
<p class="govuk-body heading-medium">
In a real emergency, every mobile phone in the area

10
app/templates/views/broadcast/view-message.html
View File

@@ -53,7 +53,7 @@
</p>
{{ page_footer(
delete_link=url_for('main.reject_broadcast_message', service_id=current_service.id, broadcast_message_id=broadcast_message.id),
delete_link_text='Withdraw this alert'
delete_link_text='Discard this alert'
) }}
{% else %}
<p class="govuk-body govuk-!-margin-bottom-3">
@@ -75,7 +75,7 @@
{{ page_footer(
"Start broadcasting now",
delete_link=url_for('main.reject_broadcast_message', service_id=current_service.id, broadcast_message_id=broadcast_message.id),
delete_link_text='Cancel this alert'
delete_link_text='Reject this alert'
) }}
{% endcall %}
</details>
@@ -124,7 +124,7 @@
<p class="govuk-body govuk-!-margin-bottom-2 live-broadcast live-broadcast--left">
Live since {{ broadcast_message.starts_at|format_datetime_relative }}&ensp;
{%- if not hide_stop_link %}
<a href="{{ url_for('.cancel_broadcast_message', service_id=current_service.id, broadcast_message_id=broadcast_message.id) }}" class="destructive-link destructive-link--no-visited-state">Stop broadcasting</a>
<a href="{{ url_for('.cancel_broadcast_message', service_id=current_service.id, broadcast_message_id=broadcast_message.id) }}" class="destructive-link destructive-link--no-visited-state">Stop sending</a>
{% endif %}
</p>
{% elif broadcast_message.status == 'rejected' %}
@@ -134,7 +134,7 @@
</p>
{% else %}
<p class="govuk-body govuk-!-margin-bottom-4">
Broadcast
Sent
{{ broadcast_message.starts_at|format_datetime_human }}.
</p>
{% endif %}
@@ -165,7 +165,7 @@
{% if broadcast_message.status != 'pending-approval' %}
<p class="govuk-body govuk-!-margin-bottom-3">
{% if broadcast_message.created_by %}
Prepared by {{ broadcast_message.created_by.name }}
Sent by {{ broadcast_message.created_by.name }}
{%- else %}
Created from an API call
{%- endif %}

2
app/templates/views/templates/_template.html
View File

@@ -31,7 +31,7 @@
{% if current_user.has_permissions('send_messages') %}
<div class="govuk-grid-column-one-half">
<a href="{{ url_for(".broadcast", service_id=current_service.id, template_id=template.id) }}" class="govuk-link govuk-link--no-visited-state pill-separate-item">
Prepare broadcast
Get ready to send
</a>
</div>
{% endif %}