From eae708a1bc33fe31fb32341f6ae9549e5280836f Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Wed, 13 Feb 2019 15:43:08 +0000 Subject: [PATCH] Finesse wording on letter branding request page MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Telling people to ask if they want a different logo doesn’t make sense if they don’t have one at all. --- .../request-letter-branding.html | 26 ++++++++++++------- tests/app/main/views/test_service_settings.py | 2 +- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/app/templates/views/service-settings/request-letter-branding.html b/app/templates/views/service-settings/request-letter-branding.html index 5095c298c..33f2ca8d3 100644 --- a/app/templates/views/service-settings/request-letter-branding.html +++ b/app/templates/views/service-settings/request-letter-branding.html @@ -11,17 +11,23 @@

Letter branding

-

- {% if current_service.letter_branding_id %} + {% if current_service.letter_branding_id %} +

Your letters have the {{ current_service.letter_branding.name }} logo. - {% else %} - Your letters have no logo. - {% endif %} -

-

- Contact support - if you want to use a different logo. -

+

+

+ Contact support + if you want to use a different logo. +

+ {% else %} +

+ Your letters do not have a logo. +

+

+ Contact support + if you want to add your organisation’s logo. +

+ {% endif %} {% if from_template %} {{ page_footer( back_link=url_for('.view_template', service_id=current_service.id, template_id=from_template), diff --git a/tests/app/main/views/test_service_settings.py b/tests/app/main/views/test_service_settings.py index 59477c3cd..976ddacc8 100644 --- a/tests/app/main/views/test_service_settings.py +++ b/tests/app/main/views/test_service_settings.py @@ -2089,7 +2089,7 @@ def test_request_letter_branding( service_id=SERVICE_ONE_ID, **extra_args ) - assert request_page.select_one('main p').text.strip() == 'Your letters have no logo.' + assert request_page.select_one('main p').text.strip() == 'Your letters do not have a logo.' link_href = request_page.select_one('main a')['href'] feedback_page = client_request.get_url(link_href) assert feedback_page.select_one('textarea').text.strip() == (