Merge branch 'master' into delete-the-head-of-science-inspiring-stude…

…nts-in-blackpool-blog

app/views/content/funding-and-support/if-youre-a-veteran.md

@@ -5,7 +5,6 @@ subcategory: Extra support
 description: |-
     Find out how to get support training to teach if you're a veteran transitioning from or you've already left the armed forces.
 related_content:
-    David’s journey from the army to teacher training: "/blog/from-the-army-to-teacher-training"
     Explore life as a teacher: "/life-as-a-teacher"
     Teach in further education without a degree: "https://www.teach-in-further-education.campaign.gov.uk/"
 promo_content:

app/views/content/life-as-a-teacher/teaching-as-a-career/early-career-teachers.md

@@ -5,7 +5,6 @@ description: |-
   Find out about the support early career teachers get when they start teaching, including mentor support and training based on the early career framework (ECF).
 related_content:
     Initial teacher training : "/train-to-be-a-teacher/initial-teacher-training"
-    Advice from an early career teacher : "/blog/being-myself-in-the-classroom"
     Managing behaviour in the classroom : "/blog/managing-behaviour-in-the-classroom"
 promo_content:
     - content/train-to-be-a-teacher/promos/adviser-promo-ect

app/views/content/non-uk-teachers/_why-teach.html.erb

@@ -11,7 +11,6 @@
       </p>
 
       <ul>
-        <li><%= link_to("Read Brooke's story about coming to England to teach", "/blog/my-move-from-canada-to-teach-in-england") %></li>
         <li><%= link_to("Find out about teacher pay and benefits in England", "/life-as-a-teacher/pay-and-benefits") %></li>
       </ul>
     </div>

app/views/content/train-to-be-a-teacher/if-you-have-a-degree.md

@@ -35,7 +35,12 @@ expander:
     title: fees and funding
     text: "Teacher training course fees for non-UK citizens cost an average of $fees_pgitt_internationalaverage$. Most non-UK citizens will not be eligible for tuition fee loans and maintenance loans. If you train to teach languages or physics, you may be eligible for a bursary or scholarship."
     link_title: Learn more about fees and financial support for non-UK trainee teachers.
-    link_url: /non-uk-teachers/fees-and-funding-for-non-uk-trainees   
+    link_url: /non-uk-teachers/fees-and-funding-for-non-uk-trainees
+quote:
+  olivia:
+    text: "You'll learn a lot about yourself during your teacher training year, and it 's the most rewarding journey to be on."
+    name: "Olivia, drama teacher"
+    classes: quote--indent
 ---
 
 You need a bachelor's degree (in any subject) to teach in primary, secondary and special schools in England.
@@ -72,6 +77,8 @@ The important thing to remember is that regardless of your course provider, all
 
 You can [find out what to expect on your teacher training](/train-to-be-a-teacher/initial-teacher-training). 
 
+$olivia$
+
 ## Where will my training take place?
 
 Because all teacher training must involve placements in at least 2 schools, your training will not all happen in the same place. Some courses may also have a separate location for your theoretical learning. 

config/images.yml

@@ -265,11 +265,6 @@
   variants:
     - "static/images/content/blog/thumbnails/notepad.jpg"
 
-"static/images/content/blog/olivia.jpg":
-  alt: "Teacher training course student Olivia with the Outwood Grange Academies Trust."
-  variants:
-    - "static/images/content/blog/thumbnails/olivia.jpg"
-
 "static/images/content/blog/right_provider.jpg":
   alt: ""
   variants:
@@ -312,11 +307,6 @@
 "static/images/content/blog/thumbnails/stories-zainab.jpg":
   alt: "Zainab Kasmani, English teacher"
 
-"static/images/content/blog/brooke-harvey.jpg":
-  alt: "Brooke Harvey, a Canadian national who moved to England to teach, standing in front of a bookcase."
-  variants:
-    - "static/images/content/blog/thumbnails/brooke-harvey.jpg"
-
 "static/images/content/blog/thumbnails/stories-nathan.jpg":
   alt: "Nathan Sproule, teacher"
 
@@ -329,9 +319,6 @@
 "static/images/content/blog/thumbnails/stories-katie.jpg":
   alt: "Head of faculty, Katie Lockett"
 
-"static/images/content/blog/thumbnails/david-payling.jpg":
-  alt: "Veteran and trainee teacher, David Payling"
-
 # homepage
 "static/images/content/homepage/here-to-help.jpg":
   # Back of an adviser's T-shirt saying 'here to help' at a teacher training event.

config/redirects.yml

@@ -374,6 +374,9 @@ redirects:
   "/blog/product-engineer-turned-science-teacher":  "/life-as-a-teacher/explore-subjects/engineers-teach-physics"
   "/blog/my-first-week-as-a-trainee-teacher": "/train-to-be-a-teacher/initial-teacher-training"
   "/blog/the-head-of-science-inspiring-students-in-blackpool":  "/life-as-a-teacher"
+  "/blog/my-move-from-canada-to-teach-in-england": "/non-uk-teachers/teach-in-england-if-you-trained-overseas"
+  "/blog/from-the-army-to-teacher-training":  "/funding-and-support/if-youre-a-veteran"
+  "/blog/being-myself-in-the-classroom":  "/train-to-be-a-teacher/initial-teacher-training"
 
   # Blog tags
   "/blog/tag/get-into-teaching-events": "/events/about-get-into-teaching-events"

spec/features/blog_spec.rb

@@ -36,8 +36,6 @@
     end
   end
 
-  include_context "paginating blog posts", "/blog", 10, false
-
   scenario "viewing a post" do
     path = "my-career-change-to-teaching"
     fm = Pages::Frontmatter.list.fetch("/blog/#{path}")