Delete old letter branding request page

app/main/views/service_settings.py

@@ -1001,15 +1001,6 @@ def service_preview_letter_branding(service_id):
     )
 
 
-@main.route("/services/<uuid:service_id>/service-settings/request-letter-branding", methods=['GET', 'POST'])
-@user_has_permissions('manage_service', 'manage_templates')
-def request_letter_branding(service_id):
-    return render_template(
-        'views/service-settings/request-letter-branding.html',
-        from_template=request.args.get('from_template'),
-    )
-
-
 @main.route("/services/<uuid:service_id>/service-settings/link-service-to-organisation", methods=['GET', 'POST'])
 @user_is_platform_admin
 def link_service_to_organisation(service_id):
@@ -1085,7 +1076,8 @@ def branding_request(service_id, branding_type):
         'views/service-settings/branding/branding-options.html',
         form=form,
         branding_type=branding_type,
-        branding_name=branding_name
+        branding_name=branding_name,
+        from_template=request.args.get('from_template')
     )
 
 

app/navigation.py

@@ -237,7 +237,6 @@ class HeaderNavigation(Navigation):
         'registration_continue',
         'remove_user_from_organisation',
         'remove_user_from_service',
-        'request_letter_branding',
         'request_to_go_live',
         'resend_email_link',
         'resend_email_verification',
@@ -404,7 +403,6 @@ class MainNavigation(Navigation):
             'branding_request',
             'estimate_usage',
             'link_service_to_organisation',
-            'request_letter_branding',
             'request_to_go_live',
             'service_add_email_reply_to',
             'service_add_letter_contact',
@@ -802,7 +800,6 @@ class CaseworkNavigation(Navigation):
         'registration_continue',
         'remove_user_from_organisation',
         'remove_user_from_service',
-        'request_letter_branding',
         'request_to_go_live',
         'resend_email_link',
         'resend_email_verification',
@@ -1081,7 +1078,6 @@ class OrgNavigation(Navigation):
         'register_from_org_invite',
         'registration_continue',
         'remove_user_from_service',
-        'request_letter_branding',
         'request_to_go_live',
         'resend_email_link',
         'resend_email_verification',

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

@@ -14,7 +14,7 @@
 
   {{ page_header(
     'Change {} branding'.format(branding_type),
-    back_link=url_for('main.service_settings', service_id=current_service.id)
+    back_link=url_for('.view_template', service_id=current_service.id, template_id=from_template) if from_template else url_for('.service_settings', service_id=current_service.id)
   ) }}
 
   <p>

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

@@ -1,39 +0,0 @@
-{% extends "withnav_template.html" %}
-{% from "components/radios.html" import radios %}
-{% from "components/page-header.html" import page_header %}
-{% from "components/page-footer.html" import page_footer %}
-
-{% block service_page_title %}
-  Letter branding
-{% endblock %}
-
-{% block maincolumn_content %}
-
-  {{ page_header(
-    'Letter branding',
-    back_link=url_for('.view_template', service_id=current_service.id, template_id=from_template) if from_template else url_for('.service_settings', service_id=current_service.id)
-  ) }}
-
-  <div class="grid-row">
-    <div class="column-three-quarters">
-      {% if current_service.letter_branding_id %}
-        <p>
-          Your letters have the {{ current_service.letter_branding.name }} logo.
-        </p>
-        <p>
-          <a href="{{ url_for('main.feedback', ticket_type='ask-question-give-feedback', body='letter-branding') }}">Contact us</a>
-          if you want to use a different logo.
-        </p>
-      {% else %}
-        <p>
-          Your letters do not have a logo.
-        </p>
-        <p>
-          <a href="{{ url_for('main.feedback', ticket_type='ask-question-give-feedback', body='letter-branding') }}">Contact us</a>
-          if you want to add your organisation’s logo.
-        </p>
-      {% endif %}
-    </div>
-  </div>
-
-{% endblock %}

app/templates/views/templates/_template.html

@@ -51,7 +51,7 @@
 <div class="column-whole template-container">
   {% if current_user.has_permissions('manage_templates') and template.template_type == 'letter' %}
     {% if not current_service.letter_branding_id %}
-      <a href="{{ url_for(".request_letter_branding", service_id=current_service.id, from_template=template.id) }}" class="edit-template-link-letter-branding">Add logo</a>
+      <a href="{{ url_for(".branding_request", service_id=current_service.id, branding_type="letter", from_template=template.id) }}" class="edit-template-link-letter-branding">Add logo</a>
     {% endif %}
     <a href="{{ url_for(".edit_template_postage", service_id=current_service.id, template_id=template.id) }}" class="edit-template-link-letter-postage">Change</a>
     <a href="{{ url_for(".edit_service_template", service_id=current_service.id, template_id=template.id) }}" class="edit-template-link-letter-body">Edit</a>