Split up email branding form into separate pages

We were showing the form to request email branding with a button which
submits your choice immediately. Now, we only submit the form
immediately if "Something else" is the only branding option available to
you. If you select any other radio button (or select "Something else"
when it's not the only option) we take you to another page which either
contains more information or a textbox to fill in the details for the
branding you want.

There is currently some duplication between the new pages and their
tests, but these will be changed in future versions of the work so will
start to differ more.

app/templates/views/service-settings/branding/email-branding-govuk.html

@@ -0,0 +1,43 @@
+{% extends "withnav_template.html" %}
+{% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
+{% from "components/page-footer.html" import page_footer %}
+{% from "components/page-header.html" import page_header %}
+
+{% block service_page_title %}
+  Before you request new branding
+{% endblock %}
+
+{% block backLink %}
+  {{ govukBackLink({
+    "href": url_for('.email_branding_request', service_id=current_service.id)
+  }) }}
+{% endblock %}
+
+{% block maincolumn_content %}
+
+  {{ page_header('Before you request new branding') }}
+
+  <p class="govuk-body">Check that your new branding matches the rest of your service.</p>
+
+  <p class="govuk-body">You can use the GOV.UK logo on your emails if:</p>
+  <ul class="list list-bullet">
+    <li>your website looks like GOV.UK</li>
+    <li>your email links to a website that looks like GOV.UK</li>
+    <li>people get an email from your service after using GOV.UK</li>
+  </ul>
+
+  <p class="govuk-body">
+    You cannot use GOV.UK branding if your organisation is
+    <a class="govuk-link govuk-link--no-visited-state"
+      href="https://www.gov.uk/government/publications/govuk-proposition/govuk-proposition#organisations-independent-from-government">independent
+      from government</a>.
+  </p>
+
+  <p class="govuk-body">We’ll email you once your branding’s ready to use, or if we need any more information.</p>
+
+  {% call form_wrapper() %}
+    {{ page_footer('Request new branding', button_name='branding_choice', button_value=('govuk_and_org' if with_org == 'True' else 'govuk')) }}
+  {% endcall %}
+
+{% endblock %}

app/templates/views/service-settings/branding/email-branding-nhs.html

@@ -0,0 +1,33 @@
+{% extends "withnav_template.html" %}
+{% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
+{% from "components/page-footer.html" import page_footer %}
+{% from "components/page-header.html" import page_header %}
+
+{% block service_page_title %}
+  Before you request new branding
+{% endblock %}
+
+{% block backLink %}
+  {{ govukBackLink({
+    "href": url_for('.email_branding_request', service_id=current_service.id)
+  }) }}
+{% endblock %}
+
+{% block maincolumn_content %}
+
+  {{ page_header('Before you request new branding') }}
+
+  <p class="govuk-body">
+    <a class="govuk-link govuk-link--no-visited-state" href="https://www.england.nhs.uk/nhsidentity/identity-guidelines/who-can-use-the-nhs-identity/">Check that your service is allowed to use the NHS identity</a>.
+  </p>
+
+  <p class="govuk-body">Your new branding should match the rest of your service.</p>
+
+  <p class="govuk-body">We’ll email you once your branding’s ready to use, or if we need any more information.</p>
+
+  {% call form_wrapper() %}
+    {{ page_footer('Request new branding') }}
+  {% endcall %}
+
+{% endblock %}

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

@@ -1,5 +1,5 @@
 {% extends "withnav_template.html" %}
-{% from "components/radios.html" import radio, conditional_radio_panel %}
+{% from "components/radios.html" import radio %}
 {% from "components/select-input.html" import select_wrapper %}
 {% from "components/textbox.html" import textbox %}
 {% from "components/page-header.html" import page_header %}
@@ -31,33 +31,27 @@
     </p>
   {% endif %}
 
-  {% call form_wrapper() %}
-    {% if form.something_else_is_only_option %}
-      {{ textbox(
-        form.something_else,
-        hint='Include links to your brand guidelines or examples of how to use your branding',
-        width='1-1',
-      ) }}
-    {% else %}
-      {% call select_wrapper(form.options) %}
-        {% for option in form.options %}
-          {{ radio(option, data_target='panel-something-else' if option.data == form.FALLBACK_OPTION_VALUE else '') }}
-        {% endfor %}
-      {% endcall %}
-      {% call conditional_radio_panel('panel-something-else') %}
+  {% 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',
-          autosize=True,
         ) }}
-      {% endcall %}
-    {% endif %}
-    <p class="form-group">
-      We’ll email you once your branding’s ready to use, or if we need any
-      more information.
-    </p>
-    {{ page_footer('Request new branding') }}
-  {% endcall %}
+      <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 %}
 
 {% endblock %}

app/templates/views/service-settings/branding/email-branding-organisation.html

@@ -0,0 +1,31 @@
+{% extends "withnav_template.html" %}
+{% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
+{% from "components/page-footer.html" import page_footer %}
+{% from "components/page-header.html" import page_header %}
+
+{% block service_page_title %}
+  When you request new branding
+{% endblock %}
+
+{% block backLink %}
+  {{ govukBackLink({
+    "href": url_for('.email_branding_request', service_id=current_service.id)
+  }) }}
+{% endblock %}
+
+{% block maincolumn_content %}
+
+  {{ page_header('When you request new branding') }}
+
+  <p class="govuk-body">We’ll check if we already have the {{organisation}} logo.</p>
+
+  <p class="govuk-body">If we do, we’ll let you know when your new branding is ready to use.</p>
+
+  <p class="govuk-body">If we don’t, we’ll email you to ask for more information.</p>
+
+  {% call form_wrapper() %}
+    {{ page_footer('Request new branding') }}
+  {% endcall %}
+
+{% endblock %}

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

@@ -0,0 +1,32 @@
+{% extends "withnav_template.html" %}
+{% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
+{% from "components/page-footer.html" import page_footer %}
+{% from "components/page-header.html" import page_header %}
+{% from "components/textbox.html" import textbox %}
+
+{% block service_page_title %}
+  Describe the branding you want
+{% endblock %}
+
+{% block backLink %}
+  {{ govukBackLink({
+    "href": url_for('.email_branding_request', service_id=current_service.id)
+  }) }}
+{% endblock %}
+
+{% block maincolumn_content %}
+
+  {{ page_header('Describe the branding you want') }}
+
+  {% 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 %}
+
+{% endblock %}