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

Refactor service name code to reduce duplication

Browse Source 
This makes the code shareable between:
- the broadcast tour pages
- the broadcast settings platform admin page
- the regular service navigation

On the training mode tour pages we don’t want to confuse people with the
organisation name or _Switch service_ links, so those are omitted and
the code is therefore slightly different.
This commit is contained in:
Chris Hill-Scott
2021-05-19 09:39:38 +01:00
parent 766df5d1ca
commit 016f38db9b
5 changed files with 53 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,5 @@
{% from "components/banner.html" import banner_wrapper %}
{% from "service_navigation.html" import navigation_service_name %}
{% extends "admin_template.html" %}
@@ -11,9 +12,7 @@
{% block content %}
<div class="navigation-service">
<div class="navigation-service-name govuk-!-font-weight-bold">
{{ current_service.name }} <span class="navigation-service-type navigation-service-type--training">Training</span>
</div>
{{ navigation_service_name(current_service) }}
</div>
<div class="banner-tour banner-tour-no-fixed-height banner-tour-with-service-name">

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

@@ -10,11 +10,7 @@
{% block content %}
<div class="navigation-service">
<div class="navigation-service-name govuk-!-font-weight-bold">
{{ current_service.name }} <span class="navigation-service-type navigation-service-type--training">Training</span>
</div>
</div>
{% include "service_navigation.html" %}
<div class="banner-tour banner-tour-no-fixed-height banner-tour-with-service-name">
<div class="govuk-grid-row">

28
app/templates/views/service-settings/service-confirm-broadcast-account-type.html
View File

@@ -1,4 +1,5 @@
{% extends "withnav_template.html" %}
{% from "service_navigation.html" import broadcast_service_name_tag %}
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
@@ -15,30 +16,19 @@
'Confirm emergency alert settings',
back_link=url_for('.service_set_broadcast_channel', service_id=current_service.id)
) }}
<p class="govuk-body">
{{ broadcast_service_name_tag(
form.account_type.service_mode == 'training',
form.account_type.broadcast_channel,
form.account_type.provider_restriction,
left_margin=False,
) }}
</p>
{% if form.account_type.service_mode == 'training' %}
<p class="govuk-body">
<span class="navigation-service-type navigation-service-type--training govuk-!-margin-left-0">Training</span>
</p>
<p class="govuk-body">
No phones will receive alerts sent from this service.
</p>
{% else %}
<p class="govuk-body">
{% if form.account_type.broadcast_channel == 'severe' %}
<span class="navigation-service-type navigation-service-type--live govuk-!-margin-left-0">Live
{% elif form.account_type.broadcast_channel == 'government' %}
<span class="navigation-service-type navigation-service-type--government govuk-!-margin-left-0">Government
{% else %}
<span class="navigation-service-type navigation-service-type--live govuk-!-margin-left-0">{{ form.account_type.broadcast_channel|title }}
{% endif %}
{% if form.account_type.provider_restriction != 'all' %}
({{ form.account_type.provider_restriction|format_mobile_network }})
{% endif %}
{% if form.account_type.broadcast_channel == 'test' and form.account_type.provider_restriction == 'all'%}
(all networks)
{% endif %}
</span>
</p>
<p class="govuk-body">
Members of the public
{% if form.account_type.broadcast_channel == 'test' %}