From 95f0c40c8c94871f68fd3737521b84233f90577a Mon Sep 17 00:00:00 2001
From: Sarah-DfE <103052329+Sarah-DfE@users.noreply.github.com>
Date: Thu, 19 Sep 2024 10:14:33 +0000
Subject: [PATCH 1/9] Salary changes to paid langing pages ### Trello card
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://trello.com/c/1hEfOnoc/6542-update-paid-advertising-landing-pages-to-mention-starting-salary

### Context

The advertising team can’t promote the new £31k starting salary until after the consultation period - and their advertising schedules mean that they can’t start running ads with the new salary amount until the new year

We've added the new £31k to three pages, agreed with the advertising team.

### Changes proposed in this pull request

### Guidance to review
---
 app/views/content/landing/grow/_collage.html.erb               | 3 ++-
 .../content/landing/how-to-become-a-teacher/_promo.html.erb    | 2 +-
 .../train-to-teach-if-you-have-a-degree/_promo.html.erb        | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/views/content/landing/grow/_collage.html.erb b/app/views/content/landing/grow/_collage.html.erb
index dc60b97ea7..d21df52501 100644
--- a/app/views/content/landing/grow/_collage.html.erb
+++ b/app/views/content/landing/grow/_collage.html.erb
@@ -7,7 +7,8 @@
           checklist: [
             "career progression ",
             "personal development",
-            "opportunities to increase your pay"
+            "opportunities to increase your pay",
+            "a minimum starting salary of <%= v :salaries_starting_min %> (or higher in London)",
           ],
           image_paths: [
             "static/images/content/grow/Smiling_Student.jpg",
diff --git a/app/views/content/landing/how-to-become-a-teacher/_promo.html.erb b/app/views/content/landing/how-to-become-a-teacher/_promo.html.erb
index e6111da05f..29d2e3c285 100644
--- a/app/views/content/landing/how-to-become-a-teacher/_promo.html.erb
+++ b/app/views/content/landing/how-to-become-a-teacher/_promo.html.erb
@@ -2,7 +2,7 @@
   <div class="col col-full-content">
     <%= render Content::PurpleBoxComponent.new(
       heading: "Find out more about getting into teaching",
-      text: "Explore how you can get into teaching primary or secondary and find top tips on making a successful application.",
+      text: "Explore how you can get into teaching primary or secondary and find top tips on making a successful application. With a competitive starting salary of <%= v :salaries_starting_min %> (or higher in London), it pays to do what you love. 
       cta: {
         text: "Get tailored guidance in your inbox",
         path: "/mailinglist/signup/name",
diff --git a/app/views/content/landing/train-to-teach-if-you-have-a-degree/_promo.html.erb b/app/views/content/landing/train-to-teach-if-you-have-a-degree/_promo.html.erb
index 1fed1682bf..06cc24ebad 100644
--- a/app/views/content/landing/train-to-teach-if-you-have-a-degree/_promo.html.erb
+++ b/app/views/content/landing/train-to-teach-if-you-have-a-degree/_promo.html.erb
@@ -3,7 +3,7 @@
   <% promo.with_right_section(
     heading: "Find out more about getting into teaching"
   ) do %>
-      <p>Find out more about funding your training, as well as top tips on making a successful application.</p>
+      <p>Find out more about funding your training, as well as top tips on making a successful application. With a competitive starting salary of <%= v :salaries_starting_min %> (or higher in London), it pays to do what you love. </p>
 
       <%= link_to("Get tailored guidance in your inbox", "/mailinglist/signup/name", class: "button") %>
   <% end %>

From d031756e9c1322e3f5ea0010f213c2c9fc86b8af Mon Sep 17 00:00:00 2001
From: Sarah-DfE <103052329+Sarah-DfE@users.noreply.github.com>
Date: Thu, 19 Sep 2024 12:04:22 +0100
Subject: [PATCH 2/9] Updating variables

---
 .../content/landing/how-to-become-a-teacher/_promo.html.erb     | 2 +-
 .../landing/train-to-teach-if-you-have-a-degree/_promo.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/content/landing/how-to-become-a-teacher/_promo.html.erb b/app/views/content/landing/how-to-become-a-teacher/_promo.html.erb
index 29d2e3c285..406b57ba69 100644
--- a/app/views/content/landing/how-to-become-a-teacher/_promo.html.erb
+++ b/app/views/content/landing/how-to-become-a-teacher/_promo.html.erb
@@ -2,7 +2,7 @@
   <div class="col col-full-content">
     <%= render Content::PurpleBoxComponent.new(
       heading: "Find out more about getting into teaching",
-      text: "Explore how you can get into teaching primary or secondary and find top tips on making a successful application. With a competitive starting salary of <%= v :salaries_starting_min %> (or higher in London), it pays to do what you love. 
+      text: "Explore how you can get into teaching primary or secondary and find top tips on making a successful application. With a competitive starting salary of $salaries_starting_min$ (or higher in London), it pays to do what you love. 
       cta: {
         text: "Get tailored guidance in your inbox",
         path: "/mailinglist/signup/name",
diff --git a/app/views/content/landing/train-to-teach-if-you-have-a-degree/_promo.html.erb b/app/views/content/landing/train-to-teach-if-you-have-a-degree/_promo.html.erb
index 06cc24ebad..fcb9d349cd 100644
--- a/app/views/content/landing/train-to-teach-if-you-have-a-degree/_promo.html.erb
+++ b/app/views/content/landing/train-to-teach-if-you-have-a-degree/_promo.html.erb
@@ -3,7 +3,7 @@
   <% promo.with_right_section(
     heading: "Find out more about getting into teaching"
   ) do %>
-      <p>Find out more about funding your training, as well as top tips on making a successful application. With a competitive starting salary of <%= v :salaries_starting_min %> (or higher in London), it pays to do what you love. </p>
+      <p>Find out more about funding your training, as well as top tips on making a successful application. With a competitive starting salary of $salaries_starting_min$ (or higher in London), it pays to do what you love. </p>
 
       <%= link_to("Get tailored guidance in your inbox", "/mailinglist/signup/name", class: "button") %>
   <% end %>

From 3c47723dc6bcff662090134473fe3245c88a74e7 Mon Sep 17 00:00:00 2001
From: Sarah-DfE <103052329+Sarah-DfE@users.noreply.github.com>
Date: Thu, 19 Sep 2024 12:11:05 +0100
Subject: [PATCH 3/9] fixing linting

---
 .../content/landing/how-to-become-a-teacher/_promo.html.erb     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/content/landing/how-to-become-a-teacher/_promo.html.erb b/app/views/content/landing/how-to-become-a-teacher/_promo.html.erb
index 406b57ba69..71d86ff212 100644
--- a/app/views/content/landing/how-to-become-a-teacher/_promo.html.erb
+++ b/app/views/content/landing/how-to-become-a-teacher/_promo.html.erb
@@ -2,7 +2,7 @@
   <div class="col col-full-content">
     <%= render Content::PurpleBoxComponent.new(
       heading: "Find out more about getting into teaching",
-      text: "Explore how you can get into teaching primary or secondary and find top tips on making a successful application. With a competitive starting salary of $salaries_starting_min$ (or higher in London), it pays to do what you love. 
+      text: "Explore how you can get into teaching primary or secondary and find top tips on making a successful application. With a competitive starting salary of $salaries_starting_min$ (or higher in London), it pays to do what you love.
       cta: {
         text: "Get tailored guidance in your inbox",
         path: "/mailinglist/signup/name",

From a5ee4897eb79f3b7731150dcd1b6fa2b4f504f9c Mon Sep 17 00:00:00 2001
From: Sarah-DfE <103052329+Sarah-DfE@users.noreply.github.com>
Date: Thu, 19 Sep 2024 12:12:48 +0100
Subject: [PATCH 4/9] Updating a bit of code

---
 .../content/landing/how-to-become-a-teacher/_promo.html.erb     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/content/landing/how-to-become-a-teacher/_promo.html.erb b/app/views/content/landing/how-to-become-a-teacher/_promo.html.erb
index 71d86ff212..50edafa928 100644
--- a/app/views/content/landing/how-to-become-a-teacher/_promo.html.erb
+++ b/app/views/content/landing/how-to-become-a-teacher/_promo.html.erb
@@ -2,7 +2,7 @@
   <div class="col col-full-content">
     <%= render Content::PurpleBoxComponent.new(
       heading: "Find out more about getting into teaching",
-      text: "Explore how you can get into teaching primary or secondary and find top tips on making a successful application. With a competitive starting salary of $salaries_starting_min$ (or higher in London), it pays to do what you love.
+      text: "Explore how you can get into teaching primary or secondary and find top tips on making a successful application. With a competitive starting salary of $salaries_starting_min$ (or higher in London), it pays to do what you love.",
       cta: {
         text: "Get tailored guidance in your inbox",
         path: "/mailinglist/signup/name",

From b26558463cab4d87e08cc65350c6c4e3e67ff63b Mon Sep 17 00:00:00 2001
From: Sarah-DfE <103052329+Sarah-DfE@users.noreply.github.com>
Date: Thu, 19 Sep 2024 12:20:25 +0100
Subject: [PATCH 5/9] Update app/views/content/landing/grow/_collage.html.erb

---
 app/views/content/landing/grow/_collage.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/content/landing/grow/_collage.html.erb b/app/views/content/landing/grow/_collage.html.erb
index d21df52501..9dd49f3344 100644
--- a/app/views/content/landing/grow/_collage.html.erb
+++ b/app/views/content/landing/grow/_collage.html.erb
@@ -8,7 +8,7 @@
             "career progression ",
             "personal development",
             "opportunities to increase your pay",
-            "a minimum starting salary of <%= v :salaries_starting_min %> (or higher in London)",
+            "a minimum starting salary of $salaries_starting_min$ (or higher in London)",
           ],
           image_paths: [
             "static/images/content/grow/Smiling_Student.jpg",

From 6f55c43ee9741c4cee7318a7304665ecdc6f0fbb Mon Sep 17 00:00:00 2001
From: Sarah-DfE <103052329+Sarah-DfE@users.noreply.github.com>
Date: Thu, 19 Sep 2024 12:49:16 +0100
Subject: [PATCH 6/9] Update app/views/content/landing/grow/_collage.html.erb

---
 app/views/content/landing/grow/_collage.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/content/landing/grow/_collage.html.erb b/app/views/content/landing/grow/_collage.html.erb
index 9dd49f3344..dc2ef3090b 100644
--- a/app/views/content/landing/grow/_collage.html.erb
+++ b/app/views/content/landing/grow/_collage.html.erb
@@ -8,7 +8,7 @@
             "career progression ",
             "personal development",
             "opportunities to increase your pay",
-            "a minimum starting salary of $salaries_starting_min$ (or higher in London)",
+            "a starting salary of $salaries_starting_min$ (or higher in London)",
           ],
           image_paths: [
             "static/images/content/grow/Smiling_Student.jpg",

From b2aa45416ce4cd618ed89894fe2b612135201bb9 Mon Sep 17 00:00:00 2001
From: Martyn Whitwell <martyn.whitwell@gmail.com>
Date: Thu, 19 Sep 2024 14:53:53 +0100
Subject: [PATCH 7/9] Update _promo.html.erb

---
 .../landing/train-to-teach-if-you-have-a-degree/_promo.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/content/landing/train-to-teach-if-you-have-a-degree/_promo.html.erb b/app/views/content/landing/train-to-teach-if-you-have-a-degree/_promo.html.erb
index fcb9d349cd..06cc24ebad 100644
--- a/app/views/content/landing/train-to-teach-if-you-have-a-degree/_promo.html.erb
+++ b/app/views/content/landing/train-to-teach-if-you-have-a-degree/_promo.html.erb
@@ -3,7 +3,7 @@
   <% promo.with_right_section(
     heading: "Find out more about getting into teaching"
   ) do %>
-      <p>Find out more about funding your training, as well as top tips on making a successful application. With a competitive starting salary of $salaries_starting_min$ (or higher in London), it pays to do what you love. </p>
+      <p>Find out more about funding your training, as well as top tips on making a successful application. With a competitive starting salary of <%= v :salaries_starting_min %> (or higher in London), it pays to do what you love. </p>
 
       <%= link_to("Get tailored guidance in your inbox", "/mailinglist/signup/name", class: "button") %>
   <% end %>

From 5f6502a0ac0245c05bf961494b18a0a48f3d56b0 Mon Sep 17 00:00:00 2001
From: Martyn Whitwell <martyn.whitwell@gmail.com>
Date: Thu, 19 Sep 2024 17:04:46 +0100
Subject: [PATCH 8/9] allow variable use in checklists

---
 app/components/content/checklist_collage_component.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/components/content/checklist_collage_component.rb b/app/components/content/checklist_collage_component.rb
index 9afdff528d..c571231faf 100644
--- a/app/components/content/checklist_collage_component.rb
+++ b/app/components/content/checklist_collage_component.rb
@@ -2,10 +2,12 @@ module Content
   class ChecklistCollageComponent < ViewComponent::Base
     attr_reader :checklist, :image_paths, :cta
 
+    include ContentHelper
+
     def initialize(checklist:, image_paths:, cta: nil)
       super
 
-      @checklist = checklist
+      @checklist = checklist.map { |item| substitute_values(item) }
       @image_paths = image_paths
       @cta = cta
     end

From 51e858384bd9f98d229ea4c8bf769923ab5a80dd Mon Sep 17 00:00:00 2001
From: Sarah-DfE <103052329+Sarah-DfE@users.noreply.github.com>
Date: Tue, 24 Sep 2024 09:10:56 +0100
Subject: [PATCH 9/9] Updating bullet point order at top

---
 app/views/content/landing/grow/_collage.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/content/landing/grow/_collage.html.erb b/app/views/content/landing/grow/_collage.html.erb
index dc2ef3090b..7fb7ff13b5 100644
--- a/app/views/content/landing/grow/_collage.html.erb
+++ b/app/views/content/landing/grow/_collage.html.erb
@@ -5,10 +5,10 @@
         <p class="col-720">Teaching is a fulfilling career. Not only can you inspire the pupils you teach, you also get to learn new skills, build your confidence and become your best self. The benefits of being a teacher include:</p>
         <%= render Content::ChecklistCollageComponent.new(
           checklist: [
+            "a starting salary of $salaries_starting_min$ (or higher in London)",
             "career progression ",
             "personal development",
             "opportunities to increase your pay",
-            "a starting salary of $salaries_starting_min$ (or higher in London)",
           ],
           image_paths: [
             "static/images/content/grow/Smiling_Student.jpg",