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

Merge pull request #4180 from alphagov/dedup-something-else-181415991

Browse Source 
Link directly to email branding "something else"
This commit is contained in:
Ben Thorner
2022-03-07 11:33:11 +00:00
committed by GitHub
parent a7e6d5b442 c22d3412fa
commit f827a825a1
6 changed files with 116 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,12 +92,18 @@
}}
{% endcall %}
{% if email_branding_options.something_else_is_only_option %}
{% set email_request_url = url_for('.email_branding_something_else', service_id=current_service.id) %}
{% else %}
{% set email_request_url = url_for('.email_branding_request', service_id=current_service.id) %}
{% endif %}
{% call settings_row(if_has_permission='email') %}
{{ text_field('Email branding') }}
{{ text_field(current_service.email_branding_name) }}
{{ edit_field(
'Change',
url_for('.email_branding_request', service_id=current_service.id),
email_request_url,
permissions=['manage_service'],
suffix='email branding',
)}}

30
app/templates/views/service-settings/branding/email-branding-options.html
View File

@@ -34,27 +34,13 @@
</p>
{% endif %}
{% if form.something_else_is_only_option %}
{% call form_wrapper() %}
{{ textbox(
form.something_else,
hint='Include links to your brand guidelines or examples of how to use your branding.',
width='1-1',
) }}
<p class="form-group">
We’ll email you when your branding is ready, or if we need any more information.
</p>
{{ page_footer('Request new branding') }}
{% endcall %}
{% else %}
{% call form_wrapper() %}
{% call select_wrapper(form.options) %}
{% for option in form.options %}
{{ radio(option) }}
{% endfor %}
{% endcall %}
{{ page_footer('Continue') }}
{% endcall %}
{% endif %}
{% call form_wrapper() %}
{% call select_wrapper(form.options) %}
{% for option in form.options %}
{{ radio(option) }}
{% endfor %}
{% endcall %}
{{ page_footer('Continue') }}
{% endcall %}
{% endblock %}

10
app/templates/views/service-settings/branding/email-branding-something-else.html
View File

@@ -9,10 +9,14 @@
Describe the branding you want
{% endblock %}
{% if branding_options.something_else_is_only_option %}
{% set back_url = url_for('.service_settings', service_id=current_service.id) %}
{% else %}
{% set back_url = url_for('.email_branding_request', service_id=current_service.id) %}
{% endif %}
{% block backLink %}
{{ govukBackLink({
"href": url_for('.email_branding_request', service_id=current_service.id)
}) }}
{{ govukBackLink({"href": back_url}) }}
{% endblock %}
{% block maincolumn_content %}