From b8d7966eb105c02bc4528a8a7e0b28ea061279d8 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Tue, 1 Mar 2022 12:25:23 +0000
Subject: [PATCH] Add macro for letter branding previews
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This extends the same thing we’ve done for email branding previews in
the previous commit to cover letter branding as well.
---
 app/templates/components/branding-preview.html       | 12 ++++++++++--
 .../settings/preview-email-branding.html             |  4 ++--
 .../settings/preview-letter-branding.html            |  4 +++-
 .../branding/email-branding-govuk.html               |  4 ++--
 .../branding/email-branding-nhs.html                 |  4 ++--
 .../branding/email-branding-options.html             |  4 ++--
 .../service-settings/preview-email-branding.html     |  4 ++--
 .../service-settings/preview-letter-branding.html    |  3 ++-
 8 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/app/templates/components/branding-preview.html b/app/templates/components/branding-preview.html
index f29a1361e..d6a55782d 100644
--- a/app/templates/components/branding-preview.html
+++ b/app/templates/components/branding-preview.html
@@ -1,3 +1,11 @@
-{% macro branding_preview(branding_style) %}
-  <iframe src="{{ url_for('main.email_template', branding_style=branding_style) }}" class="branding-preview"></iframe>
+{% macro branding_preview(branding_style, endpoint) %}
+  <iframe src="{{ url_for(endpoint, branding_style=branding_style) }}" class="branding-preview"></iframe>
+{% endmacro %}
+
+{% macro email_branding_preview(branding_style) %}
+  {{ branding_preview(branding_style, 'main.email_template') }}
+{% endmacro %}
+
+{% macro letter_branding_preview(branding_style) %}
+  {{ branding_preview(branding_style, 'main.letter_template') }}
 {% endmacro %}
diff --git a/app/templates/views/organisations/organisation/settings/preview-email-branding.html b/app/templates/views/organisations/organisation/settings/preview-email-branding.html
index 92f9185ff..6b401f711 100644
--- a/app/templates/views/organisations/organisation/settings/preview-email-branding.html
+++ b/app/templates/views/organisations/organisation/settings/preview-email-branding.html
@@ -1,7 +1,7 @@
 {% extends "org_template.html" %}
 {% from "components/form.html" import form_wrapper %}
 {% from "components/button/macro.njk" import govukButton %}
-{% from "components/branding-preview.html" import branding_preview %}
+{% from "components/branding-preview.html" import email_branding_preview %}
 
 {% block org_page_title %}
   Preview email branding
@@ -12,7 +12,7 @@
   <h1 class="heading-large">Preview email branding</h1>
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-full">
-      {{ branding_preview(form.branding_style.data) }}
+      {{ email_branding_preview(form.branding_style.data) }}
       {% call form_wrapper(action=action) %}
         <div class="form-group">
           {{ form.hidden_tag() }}
diff --git a/app/templates/views/organisations/organisation/settings/preview-letter-branding.html b/app/templates/views/organisations/organisation/settings/preview-letter-branding.html
index 3b0504596..0b4075e0f 100644
--- a/app/templates/views/organisations/organisation/settings/preview-letter-branding.html
+++ b/app/templates/views/organisations/organisation/settings/preview-letter-branding.html
@@ -1,6 +1,8 @@
 {% extends "org_template.html" %}
 {% from "components/form.html" import form_wrapper %}
 {% from "components/page-footer.html" import page_footer %}
+{% from "components/branding-preview.html" import letter_branding_preview %}
+
 {% block per_page_title %}
   Preview letter branding
 {% endblock %}
@@ -10,7 +12,7 @@
   <h1 class="heading-large">Preview letter branding</h1>
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-full">
-      <iframe src="{{ url_for('main.letter_template', branding_style=form.branding_style.data) }}" class="branding-preview"></iframe>
+      {{ letter_branding_preview(form.branding_style.data) }}
       {% call form_wrapper(action=action) %}
         <div class="form-group">
           {{ form.hidden_tag() }}
diff --git a/app/templates/views/service-settings/branding/email-branding-govuk.html b/app/templates/views/service-settings/branding/email-branding-govuk.html
index ea41da440..e4b16841f 100644
--- a/app/templates/views/service-settings/branding/email-branding-govuk.html
+++ b/app/templates/views/service-settings/branding/email-branding-govuk.html
@@ -3,7 +3,7 @@
 {% 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/branding-preview.html" import branding_preview %}
+{% from "components/branding-preview.html" import email_branding_preview %}
 
 {% block service_page_title %}
   Check your new branding
@@ -23,7 +23,7 @@
     Emails from {{ current_service.name }} will look like this.
   </p>
 
-  {{ branding_preview('__NONE__') }}
+  {{ email_branding_preview('__NONE__') }}
 
   <h2 class="heading-medium">Before you continue</h2>
 
diff --git a/app/templates/views/service-settings/branding/email-branding-nhs.html b/app/templates/views/service-settings/branding/email-branding-nhs.html
index 91bc3d14c..ddaf96a3e 100644
--- a/app/templates/views/service-settings/branding/email-branding-nhs.html
+++ b/app/templates/views/service-settings/branding/email-branding-nhs.html
@@ -3,7 +3,7 @@
 {% 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/branding-preview.html" import branding_preview %}
+{% from "components/branding-preview.html" import email_branding_preview %}
 
 {% block service_page_title %}
   Check your new branding
@@ -22,7 +22,7 @@
   <p class="govuk-body">
     Emails from {{ current_service.name }} will look like this.
   </p>
-  {{ branding_preview(nhs_branding_id) }}
+  {{ email_branding_preview(nhs_branding_id) }}
 
   <h2 class="heading-medium">Before you continue</h2>
 
diff --git a/app/templates/views/service-settings/branding/email-branding-options.html b/app/templates/views/service-settings/branding/email-branding-options.html
index a7a256c17..27b891d45 100644
--- a/app/templates/views/service-settings/branding/email-branding-options.html
+++ b/app/templates/views/service-settings/branding/email-branding-options.html
@@ -6,7 +6,7 @@
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
 {% from "components/back-link/macro.njk" import govukBackLink %}
-{% from "components/branding-preview.html" import branding_preview %}
+{% from "components/branding-preview.html" import email_branding_preview %}
 
 {% block service_page_title %}
   Change email branding
@@ -26,7 +26,7 @@
     Your emails currently have {{ branding_name }} branding.
   </p>
 
-  {{ branding_preview(
+  {{ email_branding_preview(
     current_service.email_branding_id if current_service.email_branding else '__NONE__'
   ) }}
 
diff --git a/app/templates/views/service-settings/preview-email-branding.html b/app/templates/views/service-settings/preview-email-branding.html
index 8633a11e4..6ce35fa1d 100644
--- a/app/templates/views/service-settings/preview-email-branding.html
+++ b/app/templates/views/service-settings/preview-email-branding.html
@@ -1,7 +1,7 @@
 {% extends "withnav_template.html" %}
 {% from "components/form.html" import form_wrapper %}
 {% from "components/button/macro.njk" import govukButton %}
-{% from "components/branding-preview.html" import branding_preview %}
+{% from "components/branding-preview.html" import email_branding_preview %}
 
 {% block service_page_title %}
   Preview email branding
@@ -12,7 +12,7 @@
   <h1 class="heading-large">Preview email branding</h1>
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-full">
-      {{ branding_preview(form.branding_style.data) }}
+      {{ email_branding_preview(form.branding_style.data) }}
       {% call form_wrapper(action=action) %}
         <div class="form-group">
           {{ form.hidden_tag() }}
diff --git a/app/templates/views/service-settings/preview-letter-branding.html b/app/templates/views/service-settings/preview-letter-branding.html
index a65d6c432..2c9e1a30a 100644
--- a/app/templates/views/service-settings/preview-letter-branding.html
+++ b/app/templates/views/service-settings/preview-letter-branding.html
@@ -1,6 +1,7 @@
 {% extends "views/platform-admin/_base_template.html" %}
 {% from "components/form.html" import form_wrapper %}
 {% from "components/button/macro.njk" import govukButton %}
+{% from "components/branding-preview.html" import letter_branding_preview %}
 
 {% block per_page_title %}
   Preview letter branding
@@ -11,7 +12,7 @@
   <h1 class="heading-large">Preview letter branding</h1>
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-full">
-      <iframe src="{{ url_for('main.letter_template', branding_style=form.branding_style.data) }}" class="branding-preview"></iframe>
+      {{ letter_branding_preview(form.branding_style.data) }}
       {% call form_wrapper(action=action) %}
         <div class="form-group">
           {{ form.hidden_tag() }}