mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-09-11 10:28:41 -04:00
Update change links and headings (#3064)
* Update Settings titles * Update Change links on settings * Update Team members Change link * Update Settings pages headings
This commit is contained in:
@@ -77,7 +77,7 @@
|
||||
{% if user.status == 'pending' %}
|
||||
<a href="{{ url_for('.cancel_invited_user', service_id=current_service.id, invited_user_id=user.id)}}">Cancel invitation</a>
|
||||
{% elif user.state == 'active' and current_user.id != user.id %}
|
||||
<a href="{{ url_for('.edit_user_permissions', service_id=current_service.id, user_id=user.id)}}">Edit team member</a>
|
||||
<a href="{{ url_for('.edit_user_permissions', service_id=current_service.id, user_id=user.id)}}">Change details</a>
|
||||
{% endif %}
|
||||
</li>
|
||||
{% endif %}
|
||||
|
||||
@@ -92,7 +92,7 @@
|
||||
{% endif %}
|
||||
{% endcall %}
|
||||
{{ edit_field(
|
||||
'Manage' if current_service.count_email_reply_to_addresses else 'Change',
|
||||
'Manage',
|
||||
url_for('.service_email_reply_to',
|
||||
service_id=current_service.id),
|
||||
permissions=['manage_service','manage_api_keys']
|
||||
@@ -134,7 +134,7 @@
|
||||
{% endcall %}
|
||||
|
||||
{% call settings_row(if_has_permission='sms') %}
|
||||
{{ text_field('Text message sender') }}
|
||||
{{ text_field('Text message senders') }}
|
||||
{% call field(status='default' if current_service.default_sms_sender == "None" else '') %}
|
||||
{{ current_service.default_sms_sender | string | nl2br | safe if current_service.default_sms_sender else 'None'}}
|
||||
{% if current_service.count_sms_senders > 1 %}
|
||||
@@ -144,7 +144,7 @@
|
||||
{% endif %}
|
||||
{% endcall %}
|
||||
{{ edit_field(
|
||||
'Manage' if current_service.count_sms_senders > 1 else 'Change',
|
||||
'Manage',
|
||||
url_for('.service_sms_senders',
|
||||
service_id=current_service.id),
|
||||
permissions=['manage_service','manage_api_keys']
|
||||
@@ -165,7 +165,7 @@
|
||||
{% endcall %}
|
||||
|
||||
{% call settings_row(if_has_permission='sms') %}
|
||||
{{ text_field('International text messages') }}
|
||||
{{ text_field('Send international text messages') }}
|
||||
{{ boolean_field('international_sms' in current_service.permissions) }}
|
||||
{{ edit_field(
|
||||
'Change',
|
||||
@@ -228,7 +228,7 @@
|
||||
{% endif %}
|
||||
{% endcall %}
|
||||
{{ edit_field(
|
||||
'Manage' if current_service.count_letter_contact_details else 'Change',
|
||||
'Manage',
|
||||
url_for('.service_letter_contact_details',
|
||||
service_id=current_service.id),
|
||||
permissions=['manage_service','manage_api_keys']
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
{% from "components/form.html" import form_wrapper %}
|
||||
|
||||
{% block service_page_title %}
|
||||
Email branding
|
||||
Change email branding
|
||||
{% endblock %}
|
||||
|
||||
{% block maincolumn_content %}
|
||||
|
||||
{{ page_header(
|
||||
'Email branding',
|
||||
'Change email branding',
|
||||
back_link=url_for('main.service_settings', service_id=current_service.id)
|
||||
) }}
|
||||
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
{% from "components/form.html" import form_wrapper %}
|
||||
|
||||
{% block service_page_title %}
|
||||
Edit an address
|
||||
Change sender address
|
||||
{% endblock %}
|
||||
|
||||
{% block maincolumn_content %}
|
||||
|
||||
{{ page_header(
|
||||
'Edit an address',
|
||||
'Change sender address',
|
||||
back_link=None if request.args.get('from_template') else url_for('.service_letter_contact_details', service_id=current_service.id)
|
||||
) }}
|
||||
{% call form_wrapper() %}
|
||||
|
||||
@@ -36,8 +36,7 @@
|
||||
We’ll create a special phone number for them to contact. You'll be able to see
|
||||
the messages on your dashboard, or get them using the API.
|
||||
</p>
|
||||
It does not cost you anything to receive text messages. Users will pay their normal rate for
|
||||
messaging a mobile number.
|
||||
It does not cost you anything to receive text messages. Users will pay their standard text message rate.
|
||||
</p>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
{% from "components/form.html" import form_wrapper %}
|
||||
|
||||
{% block service_page_title %}
|
||||
International text messages
|
||||
Send international text messages
|
||||
{% endblock %}
|
||||
|
||||
{% block maincolumn_content %}
|
||||
@@ -13,7 +13,7 @@
|
||||
<div class="grid-row">
|
||||
<div class="column-five-sixths">
|
||||
{{ page_header(
|
||||
'International text messages',
|
||||
'Send international text messages',
|
||||
back_link=url_for('main.service_settings', service_id=current_service.id)
|
||||
) }}
|
||||
<p>
|
||||
|
||||
@@ -39,7 +39,7 @@ from tests.conftest import (
|
||||
'Can’t Add and edit templates '
|
||||
'Can’t Manage settings, team and usage '
|
||||
'Can’t Manage API integration '
|
||||
'Edit team member'
|
||||
'Change details'
|
||||
)
|
||||
),
|
||||
(
|
||||
|
||||
@@ -65,14 +65,14 @@ def mock_get_service_settings_page_common(
|
||||
|
||||
'Label Value Action',
|
||||
'Send emails On Change',
|
||||
'Reply-to email addresses Not set Change',
|
||||
'Reply-to email addresses Not set Manage',
|
||||
'Email branding GOV.UK Change',
|
||||
|
||||
'Label Value Action',
|
||||
'Send text messages On Change',
|
||||
'Text message sender GOVUK Change',
|
||||
'Text message senders GOVUK Manage',
|
||||
'Start text messages with service name On Change',
|
||||
'International text messages Off Change',
|
||||
'Send international text messages Off Change',
|
||||
'Receive text messages Off Change',
|
||||
|
||||
'Label Value Action',
|
||||
@@ -87,14 +87,14 @@ def mock_get_service_settings_page_common(
|
||||
|
||||
'Label Value Action',
|
||||
'Send emails On Change',
|
||||
'Reply-to email addresses Not set Change',
|
||||
'Reply-to email addresses Not set Manage',
|
||||
'Email branding GOV.UK Change',
|
||||
|
||||
'Label Value Action',
|
||||
'Send text messages On Change',
|
||||
'Text message sender GOVUK Change',
|
||||
'Text message senders GOVUK Manage',
|
||||
'Start text messages with service name On Change',
|
||||
'International text messages Off Change',
|
||||
'Send international text messages Off Change',
|
||||
'Receive text messages Off Change',
|
||||
|
||||
'Label Value Action',
|
||||
@@ -206,9 +206,9 @@ def test_organisation_name_links_to_org_dashboard(
|
||||
|
||||
'Label Value Action',
|
||||
'Send text messages On Change',
|
||||
'Text message sender GOVUK Change',
|
||||
'Text message senders GOVUK Manage',
|
||||
'Start text messages with service name On Change',
|
||||
'International text messages On Change',
|
||||
'Send international text messages On Change',
|
||||
'Receive text messages On Change',
|
||||
|
||||
'Label Value Action',
|
||||
@@ -227,9 +227,9 @@ def test_organisation_name_links_to_org_dashboard(
|
||||
|
||||
'Label Value Action',
|
||||
'Send text messages On Change',
|
||||
'Text message sender GOVUK Change',
|
||||
'Text message senders GOVUK Manage',
|
||||
'Start text messages with service name On Change',
|
||||
'International text messages Off Change',
|
||||
'Send international text messages Off Change',
|
||||
'Receive text messages Off Change',
|
||||
|
||||
'Label Value Action',
|
||||
@@ -1848,7 +1848,7 @@ def test_and_more_hint_appears_on_settings_with_more_than_just_a_single_sender(
|
||||
)
|
||||
|
||||
assert get_row(page, 3) == "Reply-to email addresses test@example.com …and 2 more Manage"
|
||||
assert get_row(page, 6) == "Text message sender Example …and 2 more Manage"
|
||||
assert get_row(page, 6) == "Text message senders Example …and 2 more Manage"
|
||||
assert get_row(page, 11) == "Sender addresses 1 Example Street …and 2 more Manage"
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user