Merge branch 'master' into expandable-menus

Gemfile

@@ -69,7 +69,7 @@ gem "loaf", ">= 0.10.0"
 gem "prometheus-client"
 
 gem "sentry-rails", ">= 5.10.0"
-gem "sentry-ruby", "~> 5.10.0"
+gem "sentry-ruby", "~> 5.17.3"
 
 gem "skylight", "~> 5.3.4"
 

Gemfile.lock

@@ -151,6 +151,7 @@ GEM
       erubi (~> 1.4)
       parser (>= 2.4)
       smart_properties
+    bigdecimal (3.1.7)
     bindex (0.8.1)
     bootsnap (1.16.0)
       msgpack (~> 1.2)
@@ -174,7 +175,8 @@ GEM
     childprocess (3.0.0)
     coderay (1.1.3)
     concurrent-ruby (1.2.3)
-    crack (0.4.5)
+    crack (1.0.0)
+      bigdecimal
       rexml
     crass (1.0.6)
     declarative (0.0.20)
@@ -234,8 +236,8 @@ GEM
     ffi (1.15.5)
     foreman (0.87.2)
     gems (1.2.0)
-    globalid (1.1.0)
-      activesupport (>= 5.0)
+    globalid (1.2.1)
+      activesupport (>= 6.1)
     google-api-client (0.53.0)
       google-apis-core (~> 0.1)
       google-apis-generator (~> 0.1)
@@ -282,15 +284,15 @@ GEM
       activemodel (>= 6.1)
       activesupport (>= 6.1)
       html-attributes-utils (~> 1)
-    hashdiff (1.0.1)
+    hashdiff (1.1.0)
     hashids (1.0.6)
     html-attributes-utils (1.0.0)
       activesupport (>= 6.1.4.4)
     htmlentities (4.3.4)
     httpclient (2.8.3)
-    i18n (1.14.1)
+    i18n (1.14.4)
       concurrent-ruby (~> 1.0)
-    invisible_captcha (2.1.0)
+    invisible_captcha (2.3.0)
       rails (>= 5.2)
     iso_country_codes (0.7.8)
     jwt (2.7.1)
@@ -321,9 +323,12 @@ GEM
     loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    mail (2.7.1)
+    mail (2.8.1)
       mini_mime (>= 0.1.1)
-    marcel (1.0.2)
+      net-imap
+      net-pop
+      net-smtp
+    marcel (1.0.4)
     matrix (0.4.2)
     mdl (0.12.0)
       kramdown (~> 2.3)
@@ -333,8 +338,8 @@ GEM
       mixlib-shellout
     method_source (1.0.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.5)
-    minitest (5.22.2)
+    mini_portile2 (2.8.6)
+    minitest (5.22.3)
     mixlib-cli (2.1.8)
     mixlib-config (3.0.27)
       tomlrb
@@ -351,7 +356,7 @@ GEM
       timeout
     net-smtp (0.4.0.1)
       net-protocol
-    nio4r (2.7.0)
+    nio4r (2.7.1)
     nokogiri (1.16.2)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -378,7 +383,7 @@ GEM
     puma (6.4.2)
       nio4r (~> 2.0)
     racc (1.7.3)
-    rack (2.2.8.1)
+    rack (2.2.9)
     rack-attack (6.7.0)
       rack (>= 1.0, < 4)
     rack-cors (2.0.2)
@@ -410,7 +415,7 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    rails_semantic_logger (4.12.0)
+    rails_semantic_logger (4.14.0)
       rack
       railties (>= 5.1)
       semantic_logger (~> 4.13)
@@ -422,7 +427,7 @@ GEM
       thor (~> 1.0)
       zeitwerk (~> 2.5)
     rainbow (3.1.1)
-    rake (13.1.0)
+    rake (13.2.1)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
@@ -497,21 +502,22 @@ GEM
     selenium-webdriver (3.142.7)
       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
-    semantic_logger (4.14.0)
+    semantic_logger (4.15.0)
       concurrent-ruby (~> 1.0)
     semantic_range (3.0.0)
-    sentry-rails (5.10.0)
+    sentry-rails (5.17.3)
       railties (>= 5.0)
-      sentry-ruby (~> 5.10.0)
-    sentry-ruby (5.10.0)
+      sentry-ruby (~> 5.17.3)
+    sentry-ruby (5.17.3)
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
     shakapacker (7.2.1)
       activesupport (>= 5.2)
       package_json
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
       semantic_range (>= 2.3.0)
-    shoulda-matchers (6.1.0)
+    shoulda-matchers (6.2.0)
       activesupport (>= 5.2.0)
     signet (0.18.0)
       addressable (~> 2.8)
@@ -554,11 +560,11 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webmock (3.19.1)
+    webmock (3.23.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    websocket-driver (0.7.5)
+    websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     xpath (3.2.0)
@@ -634,7 +640,7 @@ DEPENDENCIES
   secure_headers
   selenium-webdriver (~> 3.142)
   sentry-rails (>= 5.10.0)
-  sentry-ruby (~> 5.10.0)
+  sentry-ruby (~> 5.17.3)
   shakapacker (= 7.2.1)
   shoulda-matchers
   simplecov

app/components/content/adviser_component.html.erb

@@ -8,7 +8,7 @@
   <div class="content">
     <div class="inset">
       <p>
-        <%= intro %>
+        <%= intro || content %>
       </p>
 
       <%= form_with builder: GOVUKDesignSystemFormBuilder::FormBuilder, url: teacher_training_adviser_step_path(:identity), scope: :teacher_training_adviser_steps_identity, method: :put do |f| %>

app/components/content/adviser_component.rb

@@ -2,7 +2,7 @@ module Content
   class AdviserComponent < ViewComponent::Base
     attr_reader :title, :intro, :color, :margin, :heading
 
-    def initialize(title:, intro:, color: "pink", margin: true, heading: :m)
+    def initialize(title:, intro: nil, color: "pink", margin: true, heading: :m)
       super
 
       @title = title

app/components/footer_component.html.erb

@@ -12,7 +12,7 @@
 
 <%= render Footer::CookieAcceptanceComponent.new %>
 
-<footer class="site-footer" role="contentinfo">
+<footer class="site-footer">
   <div class="site-footer__wrapper limit-content-width">
     <div class="site-footer-top">
       <div class="site-footer-top__social">

app/components/header_component.html.erb

@@ -6,7 +6,7 @@
   </div>
 </div>
 
-<header class="limit-content-width" data-controller="navigation" role="banner" data-module="govuk-header">
+<header class="limit-content-width" data-controller="navigation" data-module="govuk-header">
   <%= render Header::ExtraNavigationComponent.new(search_input_id: "searchbox__input--desktop") %>
   <%= render Header::LogoComponent.new %>
   <div class="menu-button" id="mobile-navigation-menu-button">

app/helpers/application_helper.rb

@@ -18,7 +18,6 @@ def body_tag(attributes = {}, &block)
 
   def main_tag(attributes = {}, &block)
     attributes[:id] = "main-content"
-    attributes[:role] = "main"
 
     tag.main(**attributes, &block)
   end

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

@@ -6,7 +6,6 @@ description: |-
     Find out about the support you can get while training to teach if you're disabled.
 related_content:
     Becoming a teacher with a hearing impairment: "/blog/overcoming-challenges-to-become-a-teacher-hearing-impairment"
-    Becoming a teacher with autism: "/blog/overcoming-challenges-to-become-a-teacher-autism"
     Who do you want to teach?: "/is-teaching-right-for-me/who-do-you-want-to-teach"
 promo_content:
     - content/funding-and-support/promos/get-adviser-support-promo

app/views/content/how-to-apply-for-teacher-training/subject-knowledge-enhancement.md

@@ -50,19 +50,13 @@ You'll choose your SKE course provider, but your teacher training provider can h
 
 ### SKE subjects
 
-SKE courses are currently available in 9 secondary subjects:
+SKE courses are currently available in 5 secondary subjects:
 
-* biology
 * chemistry
 * computing
-* design and technology
-* English
 * languages
 * mathematics
 * physics
-* religious education
-
-You can also do one in primary mathematics.
 
 ### The benefits of an SKE course
 

app/views/content/how-to-apply-for-teacher-training/teacher-training-personal-statement.md

@@ -35,6 +35,11 @@ external_content:
     - content/train-to-be-a-teacher/promos/apply-for-your-course
 promo_content:
     - content/train-to-be-a-teacher/promos/adviser-promo-apply
+quote:
+  q-Felix:
+    text: "Having a teacher training adviser was really beneficial when editing my personal statement and preparing for interviews. My top tips for the application process would be to get an adviser, and to think about what transferrable skills you have when writing your personal statement and answering interview questions."
+    name: "Felix, former teacher trainee"
+    classes: quote--indent
 
 ---
 
@@ -99,3 +104,5 @@ Getting some school experience can also be a good way to make sure teaching is r
 You can get help with your personal statement from our [teacher training advisers](/teacher-training-advisers). They have years of teaching experience and can give you free, one-to-one support by phone, text, or email. 
 
 Advisers can also help you understand more about what teaching is really like, which can help improve your application. 
+
+$q-Felix$

app/views/content/is-teaching-right-for-me/engineers-teach-physics/_article.html.erb

@@ -63,7 +63,7 @@
      <p>You'll also be invited to an annual community day and have the opportunity to network with existing physics teachers.
      </p>
 
-    <p>You can <a href="https://www.find-postgraduate-teacher-training.service.gov.uk/">search for physics teacher training courses</a> and then filter by 'Engineers teach physics'.
+    <p><a href="https://www.find-postgraduate-teacher-training.service.gov.uk/results?engineers_teach_physics=true&study_type%5B%5D=full_time&study_type%5B%5D=part_time&qualification%5B%5D=qts&qualification%5B%5D=pgce_with_qts&qualification%5B%5D=pgce+pgde&degree_required=two_two&applications_open=false&applications_open=true&l=2&subjects%5B%5D=F3">Find engineers teach physics teacher training courses</a>.
      </p>
   </section>
 

app/views/content/is-teaching-right-for-me/teacher-pay-and-benefits.md

@@ -154,7 +154,7 @@ For comparison, you'd work 227 days per year (on average) if you worked full tim
 
 ## Teachers' pension scheme
 
-The teachers’ pension scheme is one of the most generous in the country and includes an employer contribution of 23.6%.
+The teachers’ pension scheme is one of the most generous in the country and includes an employer contribution of 28.6%.
 
 It is a 'defined benefit' pension and is: