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

Merge pull request #3893 from alphagov/allow-provider-all-channels

Browse Source 
Allow setting provider for any channel
This commit is contained in:
David McDonald
2021-06-03 09:36:43 +01:00
committed by GitHub
parent 2d40208fec d04602c3aa
commit 0fcb7778ac
7 changed files with 162 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/templates/service_navigation.html
View File

@@ -17,17 +17,15 @@
{% set margin_class = "" if left_margin else "govuk-!-margin-left-0" %}
{% if trial_mode %}
<span class="navigation-service-type navigation-service-type--training {{margin_class}}">Training
{% elif broadcast_channel == 'severe' %}
{% else %}
{% if broadcast_channel == "severe" %}
<span class="navigation-service-type navigation-service-type--live {{margin_class}}">Live
{% elif broadcast_channel == 'test' %}
<span class="navigation-service-type navigation-service-type--live {{margin_class}}">{{ broadcast_channel|title }}
{% if allowed_broadcast_provider == "all" %}
(all networks)
{% else %}
<span class="navigation-service-type navigation-service-type--{{broadcast_channel}} {{margin_class}}">{{ broadcast_channel|title }}
{% endif %}
{% if allowed_broadcast_provider != "all" %}
({{ allowed_broadcast_provider|format_mobile_network }})
{% endif %}
{% elif broadcast_channel == 'government' %}
<span class="navigation-service-type navigation-service-type--government {{margin_class}}">Government
{% endif %}
</span>
{% endmacro %}

6
app/templates/views/service-settings.html
View File

@@ -1,6 +1,7 @@
{% extends "withnav_template.html" %}
{% from "components/banner.html" import banner_wrapper %}
{% from "components/table.html" import mapping_table, row, settings_row, text_field, optional_text_field, edit_field, field, boolean_field with context %}
{% from "service_navigation.html" import broadcast_service_name_tag %}
{% block service_page_title %}
Settings
@@ -434,10 +435,7 @@
{% if not current_service.broadcast_channel %}
Off
{% else %}
{% if current_service.live and current_service.broadcast_channel == "government" %}Government{% endif %}
{% if current_service.live and current_service.broadcast_channel == "severe" %}Live{% endif %}
{% if current_service.live and current_service.broadcast_channel == "test" %}Test {% if current_service.allowed_broadcast_provider != "all" %}({{ current_service.allowed_broadcast_provider|format_mobile_network }}){% else %}(all networks){% endif %}{%endif%}
{% if not current_service.live%}Training {% endif%}
{{ broadcast_service_name_tag(current_service.trial_mode, current_service.broadcast_channel, current_service.allowed_broadcast_provider, left_margin=False) }}
{% endif %}
{% endcall %}
{{ edit_field(