From 861ac9915af4c2484e46bb205d9a9271508e234b Mon Sep 17 00:00:00 2001
From: emmaachesongray <168454683+emmaachesongray@users.noreply.github.com>
Date: Wed, 11 Dec 2024 13:18:13 +0000
Subject: [PATCH] update content and remove redundant files
---
.../explore-subjects/art-and-design.md | 1 -
.../art-and-design/_article.html.erb | 3 +++
.../explore-subjects/biology.md | 1 -
.../biology/_article.html.erb | 4 +++-
.../explore-subjects/chemistry.md | 1 -
.../chemistry/_article.html.erb | 4 +++-
.../explore-subjects/computing.md | 1 -
.../computing/_article.html.erb | 3 +++
.../explore-subjects/design-and-technology.md | 1 -
.../design-and-technology/_article.html.erb | 3 +++
.../explore-subjects/drama.md | 1 -
.../explore-subjects/drama/_article.html.erb | 4 +++-
.../explore-subjects/english.md | 1 -
.../english/_article.html.erb | 4 +++-
.../explore-subjects/geography.md | 1 -
.../geography/_article.html.erb | 3 +++
.../explore-subjects/history.md | 1 -
.../history/_article.html.erb | 4 +++-
.../explore-subjects/languages.md | 1 -
.../languages/_article.html.erb | 3 +++
.../explore-subjects/maths.md | 1 -
.../explore-subjects/maths/_article.html.erb | 3 +++
.../explore-subjects/music.md | 1 -
.../explore-subjects/music/_article.html.erb | 3 +++
.../explore-subjects/physics.md | 1 -
.../physics/_article.html.erb | 3 +++
.../explore-subjects/religious-education.md | 1 -
.../religious-education/_article.html.erb | 4 +++-
.../subject-pages/_adviser-promo.html.erb | 7 -------
docs/content.md | 6 +-----
.../shared/adviser_promo.html.erb_spec.rb | 21 -------------------
31 files changed, 43 insertions(+), 53 deletions(-)
delete mode 100644 app/views/content/shared/subject-pages/_adviser-promo.html.erb
delete mode 100644 spec/views/content/shared/adviser_promo.html.erb_spec.rb
diff --git a/app/views/content/life-as-a-teacher/explore-subjects/art-and-design.md b/app/views/content/life-as-a-teacher/explore-subjects/art-and-design.md
index a0d5481bfd..ee968e2d00 100644
--- a/app/views/content/life-as-a-teacher/explore-subjects/art-and-design.md
+++ b/app/views/content/life-as-a-teacher/explore-subjects/art-and-design.md
@@ -19,5 +19,4 @@ keywords:
content:
- "content/shared/subject-pages/header"
- "content/life-as-a-teacher/explore-subjects/art-and-design/article"
- - "content/shared/subject-pages/adviser-promo"
---
diff --git a/app/views/content/life-as-a-teacher/explore-subjects/art-and-design/_article.html.erb b/app/views/content/life-as-a-teacher/explore-subjects/art-and-design/_article.html.erb
index 75b23816eb..b631140384 100644
--- a/app/views/content/life-as-a-teacher/explore-subjects/art-and-design/_article.html.erb
+++ b/app/views/content/life-as-a-teacher/explore-subjects/art-and-design/_article.html.erb
@@ -65,4 +65,7 @@
<%= render 'content/shared/teaching/ect_support' %>
+ <%= render CallsToAction::AdviserComponent.new(
+ text: "An adviser with years of teaching experience can help you to become an art and design teacher. Chat by phone, text, or email as little or often as you need.",
+ ) %>
diff --git a/app/views/content/life-as-a-teacher/explore-subjects/biology.md b/app/views/content/life-as-a-teacher/explore-subjects/biology.md
index 15ecea2aff..cd3f138574 100644
--- a/app/views/content/life-as-a-teacher/explore-subjects/biology.md
+++ b/app/views/content/life-as-a-teacher/explore-subjects/biology.md
@@ -19,5 +19,4 @@ keywords:
content:
- "content/shared/subject-pages/header"
- "content/life-as-a-teacher/explore-subjects/biology/article"
- - "content/shared/subject-pages/adviser-promo"
---
diff --git a/app/views/content/life-as-a-teacher/explore-subjects/biology/_article.html.erb b/app/views/content/life-as-a-teacher/explore-subjects/biology/_article.html.erb
index ed30b9b60e..73d5218268 100644
--- a/app/views/content/life-as-a-teacher/explore-subjects/biology/_article.html.erb
+++ b/app/views/content/life-as-a-teacher/explore-subjects/biology/_article.html.erb
@@ -83,6 +83,8 @@
<%= render 'content/shared/teaching/ect_support' %>
-
+ <%= render CallsToAction::AdviserComponent.new(
+ text: "An adviser with years of teaching experience can help you to become a biology teacher. Chat by phone, text, or email as little or often as you need.",
+ ) %>
diff --git a/app/views/content/life-as-a-teacher/explore-subjects/chemistry.md b/app/views/content/life-as-a-teacher/explore-subjects/chemistry.md
index 815755c847..c3ba88fb6d 100644
--- a/app/views/content/life-as-a-teacher/explore-subjects/chemistry.md
+++ b/app/views/content/life-as-a-teacher/explore-subjects/chemistry.md
@@ -19,5 +19,4 @@ keywords:
content:
- "content/shared/subject-pages/header"
- "content/life-as-a-teacher/explore-subjects/chemistry/article"
- - "content/shared/subject-pages/adviser-promo"
---
diff --git a/app/views/content/life-as-a-teacher/explore-subjects/chemistry/_article.html.erb b/app/views/content/life-as-a-teacher/explore-subjects/chemistry/_article.html.erb
index 79b64f7919..0cb89ea599 100644
--- a/app/views/content/life-as-a-teacher/explore-subjects/chemistry/_article.html.erb
+++ b/app/views/content/life-as-a-teacher/explore-subjects/chemistry/_article.html.erb
@@ -104,5 +104,7 @@
<%= render 'content/shared/teaching/ect_support' %>
-
+ <%= render CallsToAction::AdviserComponent.new(
+ text: "An adviser with years of teaching experience can help you to become a chemistry teacher. Chat by phone, text, or email as little or often as you need.",
+ ) %>
diff --git a/app/views/content/life-as-a-teacher/explore-subjects/computing.md b/app/views/content/life-as-a-teacher/explore-subjects/computing.md
index 7531ffc1ac..674fbdfa32 100644
--- a/app/views/content/life-as-a-teacher/explore-subjects/computing.md
+++ b/app/views/content/life-as-a-teacher/explore-subjects/computing.md
@@ -22,5 +22,4 @@ keywords:
content:
- "content/shared/subject-pages/header"
- "content/life-as-a-teacher/explore-subjects/computing/article"
- - "content/shared/subject-pages/adviser-promo"
---
diff --git a/app/views/content/life-as-a-teacher/explore-subjects/computing/_article.html.erb b/app/views/content/life-as-a-teacher/explore-subjects/computing/_article.html.erb
index f120f93614..df4aa5ee4e 100644
--- a/app/views/content/life-as-a-teacher/explore-subjects/computing/_article.html.erb
+++ b/app/views/content/life-as-a-teacher/explore-subjects/computing/_article.html.erb
@@ -82,4 +82,7 @@
<%= render 'content/shared/qualifications-training/paid_internships' %>
<%= render 'content/shared/teaching/ect_support' %>
+ <%= render CallsToAction::AdviserComponent.new(
+ text: "An adviser with years of teaching experience can help you to become a computing teacher. Chat by phone, text, or email as little or often as you need.",
+ ) %>
diff --git a/app/views/content/life-as-a-teacher/explore-subjects/design-and-technology.md b/app/views/content/life-as-a-teacher/explore-subjects/design-and-technology.md
index d592fb3d3e..808d50f7f1 100644
--- a/app/views/content/life-as-a-teacher/explore-subjects/design-and-technology.md
+++ b/app/views/content/life-as-a-teacher/explore-subjects/design-and-technology.md
@@ -19,5 +19,4 @@ keywords:
content:
- "content/shared/subject-pages/header"
- "content/life-as-a-teacher/explore-subjects/design-and-technology/article"
- - "content/shared/subject-pages/adviser-promo"
---
diff --git a/app/views/content/life-as-a-teacher/explore-subjects/design-and-technology/_article.html.erb b/app/views/content/life-as-a-teacher/explore-subjects/design-and-technology/_article.html.erb
index 18a0c16b1d..eaf29b122e 100644
--- a/app/views/content/life-as-a-teacher/explore-subjects/design-and-technology/_article.html.erb
+++ b/app/views/content/life-as-a-teacher/explore-subjects/design-and-technology/_article.html.erb
@@ -76,4 +76,7 @@
<%= render 'content/shared/teaching/ect_support' %>
+ <%= render CallsToAction::AdviserComponent.new(
+ text: "An adviser with years of teaching experience can help you to become a design and technology teacher. Chat by phone, text, or email as little or often as you need.",
+ ) %>
diff --git a/app/views/content/life-as-a-teacher/explore-subjects/drama.md b/app/views/content/life-as-a-teacher/explore-subjects/drama.md
index 7f85655ef4..dd50e158fd 100644
--- a/app/views/content/life-as-a-teacher/explore-subjects/drama.md
+++ b/app/views/content/life-as-a-teacher/explore-subjects/drama.md
@@ -17,5 +17,4 @@ keywords:
content:
- "content/shared/subject-pages/header"
- "content/life-as-a-teacher/explore-subjects/drama/article"
- - "content/shared/subject-pages/adviser-promo"
---
diff --git a/app/views/content/life-as-a-teacher/explore-subjects/drama/_article.html.erb b/app/views/content/life-as-a-teacher/explore-subjects/drama/_article.html.erb
index d896704c4c..d248c969ae 100644
--- a/app/views/content/life-as-a-teacher/explore-subjects/drama/_article.html.erb
+++ b/app/views/content/life-as-a-teacher/explore-subjects/drama/_article.html.erb
@@ -63,5 +63,7 @@
<%= render 'content/shared/teaching/ect_support' %>
-
+ <%= render CallsToAction::AdviserComponent.new(
+ text: "An adviser with years of teaching experience can help you to become a drama teacher. Chat by phone, text, or email as little or often as you need.",
+ ) %>
diff --git a/app/views/content/life-as-a-teacher/explore-subjects/english.md b/app/views/content/life-as-a-teacher/explore-subjects/english.md
index 64abe74526..9686d570b5 100644
--- a/app/views/content/life-as-a-teacher/explore-subjects/english.md
+++ b/app/views/content/life-as-a-teacher/explore-subjects/english.md
@@ -19,6 +19,5 @@ keywords:
content:
- "content/shared/subject-pages/header"
- "content/life-as-a-teacher/explore-subjects/english/article"
- - "content/shared/subject-pages/adviser-promo"
---
diff --git a/app/views/content/life-as-a-teacher/explore-subjects/english/_article.html.erb b/app/views/content/life-as-a-teacher/explore-subjects/english/_article.html.erb
index 92ce358337..375d0e8bdb 100644
--- a/app/views/content/life-as-a-teacher/explore-subjects/english/_article.html.erb
+++ b/app/views/content/life-as-a-teacher/explore-subjects/english/_article.html.erb
@@ -85,5 +85,7 @@
<%= render 'content/shared/teaching/ect_support' %>
-
+ <%= render CallsToAction::AdviserComponent.new(
+ text: "An adviser with years of teaching experience can help you to become an English teacher. Chat by phone, text, or email as little or often as you need.",
+ ) %>
diff --git a/app/views/content/life-as-a-teacher/explore-subjects/geography.md b/app/views/content/life-as-a-teacher/explore-subjects/geography.md
index 4ad59175e9..2478aa8456 100644
--- a/app/views/content/life-as-a-teacher/explore-subjects/geography.md
+++ b/app/views/content/life-as-a-teacher/explore-subjects/geography.md
@@ -19,5 +19,4 @@ keywords:
content:
- "content/shared/subject-pages/header"
- "content/life-as-a-teacher/explore-subjects/geography/article"
- - "content/shared/subject-pages/adviser-promo"
---
diff --git a/app/views/content/life-as-a-teacher/explore-subjects/geography/_article.html.erb b/app/views/content/life-as-a-teacher/explore-subjects/geography/_article.html.erb
index 6215a3a1e4..3081a2fbba 100644
--- a/app/views/content/life-as-a-teacher/explore-subjects/geography/_article.html.erb
+++ b/app/views/content/life-as-a-teacher/explore-subjects/geography/_article.html.erb
@@ -69,4 +69,7 @@
<%= render 'content/shared/teaching/ect_support' %>
+ <%= render CallsToAction::AdviserComponent.new(
+ text: "An adviser with years of teaching experience can help you to become a geography teacher. Chat by phone, text, or email as little or often as you need.",
+ ) %>
diff --git a/app/views/content/life-as-a-teacher/explore-subjects/history.md b/app/views/content/life-as-a-teacher/explore-subjects/history.md
index feea7b4d83..b30416c461 100644
--- a/app/views/content/life-as-a-teacher/explore-subjects/history.md
+++ b/app/views/content/life-as-a-teacher/explore-subjects/history.md
@@ -16,5 +16,4 @@ keywords:
content:
- "content/shared/subject-pages/header"
- "content/life-as-a-teacher/explore-subjects/history/article"
- - "content/shared/subject-pages/adviser-promo"
---
diff --git a/app/views/content/life-as-a-teacher/explore-subjects/history/_article.html.erb b/app/views/content/life-as-a-teacher/explore-subjects/history/_article.html.erb
index 9cf047f61a..ec5ea18496 100644
--- a/app/views/content/life-as-a-teacher/explore-subjects/history/_article.html.erb
+++ b/app/views/content/life-as-a-teacher/explore-subjects/history/_article.html.erb
@@ -69,5 +69,7 @@
<%= render 'content/shared/teaching/ect_support' %>
-
+ <%= render CallsToAction::AdviserComponent.new(
+ text: "An adviser with years of teaching experience can help you to become a history teacher. Chat by phone, text, or email as little or often as you need.",
+ ) %>
diff --git a/app/views/content/life-as-a-teacher/explore-subjects/languages.md b/app/views/content/life-as-a-teacher/explore-subjects/languages.md
index 86d10490eb..66c7c685e2 100644
--- a/app/views/content/life-as-a-teacher/explore-subjects/languages.md
+++ b/app/views/content/life-as-a-teacher/explore-subjects/languages.md
@@ -25,5 +25,4 @@ keywords:
content:
- "content/shared/subject-pages/header"
- "content/life-as-a-teacher/explore-subjects/languages/article"
- - "content/shared/subject-pages/adviser-promo"
---
diff --git a/app/views/content/life-as-a-teacher/explore-subjects/languages/_article.html.erb b/app/views/content/life-as-a-teacher/explore-subjects/languages/_article.html.erb
index 3d7fbe7090..6061441945 100644
--- a/app/views/content/life-as-a-teacher/explore-subjects/languages/_article.html.erb
+++ b/app/views/content/life-as-a-teacher/explore-subjects/languages/_article.html.erb
@@ -96,4 +96,7 @@
<%= render 'content/shared/teaching/ect_support' %>
+ <%= render CallsToAction::AdviserComponent.new(
+ text: "An adviser with years of teaching experience can help you to become a languages teacher. Chat by phone, text, or email as little or often as you need.",
+ ) %>
diff --git a/app/views/content/life-as-a-teacher/explore-subjects/maths.md b/app/views/content/life-as-a-teacher/explore-subjects/maths.md
index fc3c4711cb..96c5b99d6a 100644
--- a/app/views/content/life-as-a-teacher/explore-subjects/maths.md
+++ b/app/views/content/life-as-a-teacher/explore-subjects/maths.md
@@ -21,5 +21,4 @@ keywords:
content:
- "content/shared/subject-pages/header"
- "content/life-as-a-teacher/explore-subjects/maths/article"
- - "content/shared/subject-pages/adviser-promo"
---
diff --git a/app/views/content/life-as-a-teacher/explore-subjects/maths/_article.html.erb b/app/views/content/life-as-a-teacher/explore-subjects/maths/_article.html.erb
index a62a8ac8e4..ca0495379e 100644
--- a/app/views/content/life-as-a-teacher/explore-subjects/maths/_article.html.erb
+++ b/app/views/content/life-as-a-teacher/explore-subjects/maths/_article.html.erb
@@ -75,4 +75,7 @@
<%= render 'content/shared/teaching/ect_support' %>
+ <%= render CallsToAction::AdviserComponent.new(
+ text: "An adviser with years of teaching experience can help you to become a maths teacher. Chat by phone, text, or email as little or often as you need.",
+ ) %>
diff --git a/app/views/content/life-as-a-teacher/explore-subjects/music.md b/app/views/content/life-as-a-teacher/explore-subjects/music.md
index 4ed98255c9..79f007f5c5 100644
--- a/app/views/content/life-as-a-teacher/explore-subjects/music.md
+++ b/app/views/content/life-as-a-teacher/explore-subjects/music.md
@@ -18,5 +18,4 @@ keywords:
content:
- "content/shared/subject-pages/header"
- "content/life-as-a-teacher/explore-subjects/music/article"
- - "content/shared/subject-pages/adviser-promo"
---
diff --git a/app/views/content/life-as-a-teacher/explore-subjects/music/_article.html.erb b/app/views/content/life-as-a-teacher/explore-subjects/music/_article.html.erb
index 3d1942274c..6d7ce7113d 100644
--- a/app/views/content/life-as-a-teacher/explore-subjects/music/_article.html.erb
+++ b/app/views/content/life-as-a-teacher/explore-subjects/music/_article.html.erb
@@ -65,4 +65,7 @@
<%= render 'content/shared/teaching/ect_support' %>
+ <%= render CallsToAction::AdviserComponent.new(
+ text: "An adviser with years of teaching experience can help you to become a music teacher. Chat by phone, text, or email as little or often as you need.",
+ ) %>
diff --git a/app/views/content/life-as-a-teacher/explore-subjects/physics.md b/app/views/content/life-as-a-teacher/explore-subjects/physics.md
index 90e7fa3e51..00e5515639 100644
--- a/app/views/content/life-as-a-teacher/explore-subjects/physics.md
+++ b/app/views/content/life-as-a-teacher/explore-subjects/physics.md
@@ -20,5 +20,4 @@ keywords:
content:
- "content/shared/subject-pages/header"
- "content/life-as-a-teacher/explore-subjects/physics/article"
- - "content/shared/subject-pages/adviser-promo"
---
diff --git a/app/views/content/life-as-a-teacher/explore-subjects/physics/_article.html.erb b/app/views/content/life-as-a-teacher/explore-subjects/physics/_article.html.erb
index 5ef1d3a2f3..ed39cdbdf6 100644
--- a/app/views/content/life-as-a-teacher/explore-subjects/physics/_article.html.erb
+++ b/app/views/content/life-as-a-teacher/explore-subjects/physics/_article.html.erb
@@ -80,4 +80,7 @@
<%= render 'content/shared/teaching/ect_support' %>
+ <%= render CallsToAction::AdviserComponent.new(
+ text: "An adviser with years of teaching experience can help you to become a physics teacher. Chat by phone, text, or email as little or often as you need.",
+ ) %>
diff --git a/app/views/content/life-as-a-teacher/explore-subjects/religious-education.md b/app/views/content/life-as-a-teacher/explore-subjects/religious-education.md
index b122dec231..2e32be6a6e 100644
--- a/app/views/content/life-as-a-teacher/explore-subjects/religious-education.md
+++ b/app/views/content/life-as-a-teacher/explore-subjects/religious-education.md
@@ -20,5 +20,4 @@ keywords:
content:
- "content/shared/subject-pages/header"
- "content/life-as-a-teacher/explore-subjects/religious-education/article"
- - "content/shared/subject-pages/adviser-promo"
---
diff --git a/app/views/content/life-as-a-teacher/explore-subjects/religious-education/_article.html.erb b/app/views/content/life-as-a-teacher/explore-subjects/religious-education/_article.html.erb
index aa53180e11..e97612c73b 100644
--- a/app/views/content/life-as-a-teacher/explore-subjects/religious-education/_article.html.erb
+++ b/app/views/content/life-as-a-teacher/explore-subjects/religious-education/_article.html.erb
@@ -69,5 +69,7 @@
<%= render 'content/shared/teaching/ect_support' %>
-
+ <%= render CallsToAction::AdviserComponent.new(
+ text: "An adviser with years of teaching experience can help you to become a religious education teacher. Chat by phone, text, or email as little or often as you need.",
+ ) %>
diff --git a/app/views/content/shared/subject-pages/_adviser-promo.html.erb b/app/views/content/shared/subject-pages/_adviser-promo.html.erb
deleted file mode 100644
index b649af39d4..0000000000
--- a/app/views/content/shared/subject-pages/_adviser-promo.html.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<%= render(CallsToAction::Promo::PromoComponent.new) do |promo| %>
- <% promo.with_left_section(classes: %w[tta-background]) %>
- <% promo.with_right_section(heading: "Get free one-to-one support") do %>
- An adviser with years of teaching experience can help you to become <%= @front_matter["subject"].with_indefinite_article %> teacher. Chat by phone, text, or email as little or often as you need.
- <%= link_to("Find out more about advisers", "/teacher-training-advisers", class: "button") %>
- <% end %>
-<% end %>
diff --git a/docs/content.md b/docs/content.md
index e1c743ed68..4382ab2884 100644
--- a/docs/content.md
+++ b/docs/content.md
@@ -470,9 +470,8 @@ Values should be named using only _lowercase_ characters `a` to `z`, the numbers
Create a subject folder under ‘content/life as a teacher’
-From a previous published subject page copy the 3 files:
+From a previous published subject page copy the 2 files:
-- _adviser-promo-subject-html.erb (replace with subject name)
- _article.html/erb
- _header.html.erb
@@ -480,8 +479,6 @@ Also copy and paste a previous subject ‘.md’ file and rename it with the sub
#### File changes:
-_adviser-promo-subject.html.erb - change line 4 to relate to the subject
-
_header.html.erb – no changes needed
The main content of subject pages should be written in HTML format using the following template as a guide:
@@ -515,7 +512,6 @@ keywords:
content:
- "content/life-as-a-teacher/subject/header"
- "content/life-as-a-teacher/subject/article"
- - "content/life-as-a-teacher/subject/adviser-promo-subject"
---
```
diff --git a/spec/views/content/shared/adviser_promo.html.erb_spec.rb b/spec/views/content/shared/adviser_promo.html.erb_spec.rb
deleted file mode 100644
index 43022d1ec8..0000000000
--- a/spec/views/content/shared/adviser_promo.html.erb_spec.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-require "rails_helper"
-
-describe "_adviser-promo.html.erb" do
- subject do
- assign(:front_matter, { "subject" => subject_name })
- render partial: "content/shared/subject-pages/adviser-promo"
- rendered
- end
-
- context "when a subject starts with a consonant it renders 'a'" do
- let(:subject_name) { "chemistry" }
-
- it { is_expected { subject }.to include("a chemistry teacher") }
- end
-
- context "when a subject starts with a vowel it renders 'an'" do
- let(:subject_name) { "art" }
-
- it { is_expected { subject }.to include("an art teacher") }
- end
-end