Split branding-options.html into two

This splits the template into separate templates for emails and letters
since the journey for email branding is about to change.

app/main/views/service_settings.py

@@ -1160,9 +1160,8 @@ def email_branding_request(service_id):
         return redirect(url_for('.service_settings', service_id=current_service.id))
 
     return render_template(
-        'views/service-settings/branding/branding-options.html',
+        'views/service-settings/branding/email-branding-options.html',
         form=form,
-        branding_type='email',
         branding_name=branding_name,
     )
 
@@ -1200,9 +1199,8 @@ def letter_branding_request(service_id):
         ) if from_template else url_for('.service_settings', service_id=current_service.id))
 
     return render_template(
-        'views/service-settings/branding/branding-options.html',
+        'views/service-settings/branding/letter-branding-options.html',
         form=form,
-        branding_type='letter',
         branding_name=branding_name,
         from_template=from_template
     )

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

@@ -0,0 +1,63 @@
+{% extends "withnav_template.html" %}
+{% from "components/radios.html" import radio, conditional_radio_panel %}
+{% from "components/select-input.html" import select_wrapper %}
+{% from "components/textbox.html" import textbox %}
+{% from "components/page-header.html" import page_header %}
+{% from "components/page-footer.html" import page_footer %}
+{% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
+
+{% block service_page_title %}
+  Change email branding
+{% endblock %}
+
+{% block backLink %}
+  {{ govukBackLink({
+    "href": url_for('.service_settings', service_id=current_service.id)
+  }) }}
+{% endblock %}
+
+{% block maincolumn_content %}
+
+  {{ page_header('Change email branding') }}
+
+  <p class="govuk-body">
+    Your emails currently have {{ branding_name }} branding.
+  </p>
+
+  {% if current_service.needs_to_change_email_branding %}
+    <p class="govuk-body">
+      You should be using your own branding instead. We can help you to set this up.
+    </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') %}
+        {{ 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 %}
+
+{% endblock %}

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

@@ -8,7 +8,7 @@
 {% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
-  Change {{ branding_type }} branding
+  Change letter branding
 {% endblock %}
 
 {% block backLink %}
@@ -19,18 +19,12 @@
 
 {% block maincolumn_content %}
 
-  {{ page_header('Change {} branding'.format(branding_type)) }}
+  {{ page_header('Change letter branding') }}
 
   <p class="govuk-body">
-    Your {{ branding_type }}s currently have {{ branding_name }} branding.
+    Your letters currently have {{ branding_name }} branding.
   </p>
 
-  {% if current_service.needs_to_change_email_branding and branding_type == "email" %}
-    <p class="govuk-body">
-      You should be using your own branding instead. We can help you to set this up.
-    </p>
-  {% endif %}
-
   {% call form_wrapper() %}
     {% if form.something_else_is_only_option %}
       {{ textbox(