Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Results box component - Routes Wizard #4412

Closed
wants to merge 254 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
254 commits
Select commit Hold shift + click to select a range
6fecff7
secondary subject page
joegibb Nov 15, 2024
cbbf31b
changes for now
joegibb Nov 18, 2024
50804bc
more changes
joegibb Nov 18, 2024
8a53f57
Revert "updating a couple more mentions of overseas"
Sarah-DfE Nov 18, 2024
7dbfbcf
Updating a mention of overseas on non-uk page
Sarah-DfE Nov 18, 2024
33b6a60
Apply suggestions from code review
Sarah-DfE Nov 18, 2024
1956f7b
recent changes
joegibb Nov 20, 2024
b327894
linting issues
joegibb Nov 20, 2024
98ff9c0
fix links
joegibb Nov 20, 2024
d283975
Reverting to 'overseas' to fix fail
Sarah-DfE Nov 20, 2024
3b49d56
respond to comments on secondary page
joegibb Nov 20, 2024
0d6bdfc
Changes 2 mentions over outside the UK back to overseas to try and fi…
Sarah-DfE Nov 20, 2024
c3efc5c
Changing reference to overseas in call back file to see if that fixed…
Sarah-DfE Nov 20, 2024
e3c410f
changing another mentions of out-side the UK back to overseas to see …
Sarah-DfE Nov 20, 2024
8634078
fix linting
joegibb Nov 20, 2024
4bd28a0
send changes to secondary page
joegibb Nov 25, 2024
fae0ba0
update qts double link
joegibb Nov 25, 2024
7a22ddc
Apply suggestions from code review
joegibb Nov 25, 2024
856a7b3
change title in category
joegibb Nov 25, 2024
a587d66
respond to comment
joegibb Nov 26, 2024
f5185e4
respons to comments
joegibb Nov 29, 2024
434bfe1
fix linting
joegibb Nov 29, 2024
1cc863b
add in what you'll teach header
joegibb Nov 29, 2024
5dbc93b
update content
emmaachesongray Dec 2, 2024
4119158
changes to the iQTS page
Sarah-DfE Dec 3, 2024
f2b9fb0
changes to day in the life page
joegibb Dec 3, 2024
34878a9
test
joegibb Dec 3, 2024
4d1c51c
adding quote with image component - (needs quote and link adding)
jenhadfield-dfe Dec 3, 2024
03516b2
linting
jenhadfield-dfe Dec 3, 2024
15ef2d8
add in what you'll teach header
joegibb Dec 4, 2024
3740672
Merge remote-tracking branch 'refs/remotes/origin/create-secondary-su…
joegibb Dec 4, 2024
07d0eea
test
joegibb Dec 4, 2024
ed7c057
respond to comments
joegibb Dec 4, 2024
f424cd0
fix linting
joegibb Dec 4, 2024
314a794
Apply suggestions from code review
emmaachesongray Dec 4, 2024
db73ad7
content tweak
emmaachesongray Dec 4, 2024
4f1b4e4
Merge branch 'career-progression-new-page' of https://github.com/DFE-…
emmaachesongray Dec 4, 2024
b1f1aee
re-order content and remove partial
emmaachesongray Dec 4, 2024
ace358f
Add quote component
emmaachesongray Dec 4, 2024
b3aa513
fist go at building routes promo
jenhadfield-dfe Dec 4, 2024
aeeefd7
Update app/views/content/life-as-a-teacher/age-groups-and-specialisms…
joegibb Dec 5, 2024
c3b2b1e
get rid of religious education
joegibb Dec 5, 2024
7c06b0b
veterans page
emmaachesongray Dec 5, 2024
bc9f204
carer and disabled pages
emmaachesongray Dec 5, 2024
59fe119
funding pages
emmaachesongray Dec 5, 2024
1150759
add promo to markdown files
emmaachesongray Dec 5, 2024
96b97eb
updating link and typo
Sarah-DfE Dec 5, 2024
9ee5193
Merge pull request #4407 from DFE-Digital/replace-adviser-promo-fundi…
emmaachesongray Dec 5, 2024
7bb7e51
basic ResultsBoxComponent template created using PurpleBoxComponent f…
sarahcrack Dec 6, 2024
b539dd1
update from policy feedback
emmaachesongray Dec 8, 2024
13b3f50
replace adviser promo
emmaachesongray Dec 8, 2024
b53a558
Update international-qualified-teacher-status.md
Sarah-DfE Dec 9, 2024
d15c99c
updates to iQTS page
Sarah-DfE Dec 9, 2024
6fe5de5
Fix linting errors
emmaachesongray Dec 9, 2024
b542630
remove whitespace
emmaachesongray Dec 9, 2024
a38acf4
updated title
Sarah-DfE Dec 9, 2024
d67079f
Merge branch 'iqts-content-updates' of https://github.com/DFE-Digital…
Sarah-DfE Dec 9, 2024
c1b5f8b
Apply suggestions from code review
emmaachesongray Dec 9, 2024
f8bc2c1
updating you are to you're
Sarah-DfE Dec 9, 2024
60c2c41
added row formatting and styling to course info section in results box
sarahcrack Dec 9, 2024
a5f3fc3
Apply suggestions from code review
emmaachesongray Dec 9, 2024
66e4019
content tweaks
emmaachesongray Dec 9, 2024
5391087
tweak npq content
emmaachesongray Dec 9, 2024
c264d6a
quote tweak
emmaachesongray Dec 9, 2024
e9dca08
Fix height of images in landing hero component (#4408)
spencerldixon Dec 9, 2024
c05ca3c
Merge pull request #4409 from DFE-Digital/replace-adviser-promo-apply…
emmaachesongray Dec 9, 2024
813ef60
Merge branch 'master' into replace-overseas-on-all-pages
Sarah-DfE Dec 9, 2024
5548aa4
added border class to ResultsBoxComponent/made title optional to allo…
sarahcrack Dec 9, 2024
3103798
updating region to country
Sarah-DfE Dec 9, 2024
d19bc00
udpated font size for text
sarahcrack Dec 9, 2024
40ff93c
checking works in markdown
jenhadfield-dfe Dec 9, 2024
f138146
Correcting typo
gemmadallmandfe Dec 9, 2024
eff2f6b
Removing manual date from frontmatter
gemmadallmandfe Dec 9, 2024
55bf386
Merge pull request #4356 from DFE-Digital/replace-overseas-on-all-pages
Sarah-DfE Dec 9, 2024
9321590
Enable dfe analytics module
vipin-dfe Dec 9, 2024
fb0e417
Update ruby configuration for Big Query
vipin-dfe Dec 9, 2024
9137ad0
Update CI to enable dfe analytics module
vipin-dfe Dec 9, 2024
8699bb8
Update review comment
vipin-dfe Dec 9, 2024
1c2931a
created test for ResultsBoxComponent and included LinkAsButton compon…
sarahcrack Dec 9, 2024
5804ea3
Merge pull request #4299 from DFE-Digital/enable_dfe_analytics
vipin-dfe Dec 9, 2024
efa784f
Apply suggestions from code review
emmaachesongray Dec 9, 2024
0c7dc93
fixed linting issue in erb file
sarahcrack Dec 9, 2024
29b989c
fix quote component
emmaachesongray Dec 9, 2024
81ef009
removing duplicated content
Sarah-DfE Dec 9, 2024
1158fbb
fixed test errors and linting issues
sarahcrack Dec 9, 2024
a2fd2a8
update adviser promos
emmaachesongray Dec 9, 2024
1cc8059
update promo components
emmaachesongray Dec 9, 2024
7640f5f
fix linting
emmaachesongray Dec 9, 2024
92e1797
Fix linting
emmaachesongray Dec 9, 2024
f3b0479
linting
emmaachesongray Dec 9, 2024
bec1e79
fix linting
emmaachesongray Dec 9, 2024
c0c066d
Merge pull request #4413 from DFE-Digital/replace-adviser-promo-life-…
emmaachesongray Dec 10, 2024
b68c460
Apply suggestions from code review
emmaachesongray Dec 10, 2024
802e180
tweak content
emmaachesongray Dec 10, 2024
949fa23
alphabetised the lists of providers
Sarah-DfE Dec 10, 2024
303fa6f
Update AO list
martyn-w Dec 10, 2024
ab69f2c
Fix Invalid template interpolation value error
saliceti Dec 10, 2024
87ee40f
Merge pull request #4417 from DFE-Digital/2182-git-bug-invalid-templa…
saliceti Dec 10, 2024
2ed61a9
Merge pull request #4416 from DFE-Digital/ao-update-10-12-2024
gemmadallmandfe Dec 10, 2024
98edf46
Fix CI build persmissions
vipin-dfe Dec 10, 2024
c4c7179
Merge pull request #4418 from DFE-Digital/fix_ci_permissions
vipin-dfe Dec 10, 2024
5193ef4
update cta
emmaachesongray Dec 10, 2024
1e5c07d
Fix CI destroy permission for review app
vipin-dfe Dec 10, 2024
5c5bfb3
Updates to the TDA page
Sarah-DfE Dec 10, 2024
8705a4b
changes to salaried teacher training page - donestic
Sarah-DfE Dec 10, 2024
efb2e6e
adjust styling
emmaachesongray Dec 10, 2024
e36503d
updating salaried teacher training fees across the site
Sarah-DfE Dec 10, 2024
75eb93b
Add project id
vipin-dfe Dec 10, 2024
8a798f4
removing superfluous info
Sarah-DfE Dec 10, 2024
4220a3b
updating non-UK expander
Sarah-DfE Dec 10, 2024
cbbd4e7
updating more mentions of salried teacher training
Sarah-DfE Dec 10, 2024
2d82b4f
Merge pull request #4395 from DFE-Digital/career-progression-new-page
emmaachesongray Dec 10, 2024
f89700e
adding a link for SEO
Sarah-DfE Dec 10, 2024
643ead1
Merge pull request #4399 from DFE-Digital/iqts-content-updates
Sarah-DfE Dec 10, 2024
98432db
Update mailing list content
emmaachesongray Dec 10, 2024
4cb5091
Merge pull request #4419 from DFE-Digital/fix_ci_destroy_permissions
vipin-dfe Dec 10, 2024
9127f21
Merge pull request #4414 from DFE-Digital/replace-adviser-promo-train…
emmaachesongray Dec 10, 2024
0ee1ee4
update spec test
emmaachesongray Dec 10, 2024
b7fe7ed
updating changes from review
Sarah-DfE Dec 10, 2024
878c8cd
Enable federated auth for big query
vipin-dfe Dec 10, 2024
3adae5a
spec
emmaachesongray Dec 10, 2024
fc91753
Merge pull request #4423 from DFE-Digital/enable_federated_auth_prod
vipin-dfe Dec 10, 2024
caaa387
Apply suggestions from code review
emmaachesongray Dec 10, 2024
fb0eb75
Apply suggestions from code review
Sarah-DfE Dec 10, 2024
96bf4e2
update remaining promos
emmaachesongray Dec 10, 2024
b31d57f
update webchat code (#4410)
martyn-w Dec 10, 2024
77c5b85
tweaks to updates
Sarah-DfE Dec 10, 2024
cb1dabf
adding in TDA to cover off all salaried courses
Sarah-DfE Dec 10, 2024
80f21b0
Update links to Teach in further education site
gemmadallmandfe Dec 11, 2024
775c075
Correcting typo
gemmadallmandfe Dec 11, 2024
67f839b
Update app/views/mailing_list/steps/_name.html.erb
emmaachesongray Dec 11, 2024
d9751b3
Merge pull request #4424 from DFE-Digital/replace-adviser-promo-non-uk
emmaachesongray Dec 11, 2024
932d114
adding find promo
Sarah-DfE Dec 11, 2024
5760873
updating a typo
Sarah-DfE Dec 11, 2024
f62b77f
Change date formats on check answers page in adviser funnel (#4373)
sarahcrack Dec 11, 2024
2e98d51
hopefully adding the find a course promo
Sarah-DfE Dec 11, 2024
76819e2
updating find promo
Sarah-DfE Dec 11, 2024
0eb034f
Fixing linting error
Sarah-DfE Dec 11, 2024
a0a0184
fixing find promo
Sarah-DfE Dec 11, 2024
07fe595
Merge pull request #4425 from DFE-Digital/Update-links-to-Teach-in-Fu…
gemmadallmandfe Dec 11, 2024
03aeddd
updating PGCE page with SEO terms
Sarah-DfE Dec 11, 2024
4995efc
adding a PGCE link to the quals page
Sarah-DfE Dec 11, 2024
7d24f89
update find teacher training content
emmaachesongray Dec 11, 2024
0261d61
adding an extra sentence about TDAs
Sarah-DfE Dec 11, 2024
ae876e1
updating TDA bit
Sarah-DfE Dec 11, 2024
5d60817
Update app/views/content/funding-and-support/salaried-teacher-trainin…
Sarah-DfE Dec 11, 2024
861ac99
update content and remove redundant files
emmaachesongray Dec 11, 2024
1a8a028
Merge pull request #4422 from DFE-Digital/update-mailing-list-start-page
emmaachesongray Dec 11, 2024
24e5529
Missed an 'A' off
Sarah-DfE Dec 11, 2024
63debf4
Fixes issue with wrapping on section containers that cause the conten…
spencerldixon Dec 11, 2024
70c986e
updating keywords
Sarah-DfE Dec 11, 2024
f8e323b
Revert "Fixes issue with wrapping on section containers that cause th…
martyn-w Dec 11, 2024
93e9ca6
removed show_title and ArgumentError as no longer needed, added test …
sarahcrack Dec 11, 2024
7da5116
Merge pull request #4428 from DFE-Digital/update-adviser-promo-subjec…
emmaachesongray Dec 11, 2024
9ba25ad
Update holding message on About GIT events page
gemmadallmandfe Dec 11, 2024
01cb039
Merge pull request #4431 from DFE-Digital/Update-events-holding-messa…
gemmadallmandfe Dec 12, 2024
bce3417
Update accessibility statement for WCAG 2.2
gemmadallmandfe Dec 12, 2024
647c7c4
Update mailing list postcode step
emmaachesongray Dec 12, 2024
e60cbf7
update config file
emmaachesongray Dec 12, 2024
3a538ca
update spec tests
emmaachesongray Dec 12, 2024
d5b9de7
Merge pull request #4432 from DFE-Digital/Update-accessibility-statem…
gemmadallmandfe Dec 12, 2024
f944610
updated assessment only provider listings (#4434)
sarahcrack Dec 12, 2024
77b6285
Content tweaks
emmaachesongray Dec 12, 2024
f5574e0
SEO changes to the teachers pension page
Sarah-DfE Dec 12, 2024
bbd03c4
removing quote marks
Sarah-DfE Dec 13, 2024
1fe1ac3
Apply suggestions from code review
Sarah-DfE Dec 13, 2024
e2e21ef
Update subject question on events and mailing list
emmaachesongray Dec 13, 2024
fb4b7fe
respond to policy comments
joegibb Dec 16, 2024
f1d970a
run tests again
joegibb Dec 16, 2024
2d59e6d
update and error fix
emmaachesongray Dec 16, 2024
eb37527
removing sentence after policy review
Sarah-DfE Dec 16, 2024
b76d47c
update spec tests
emmaachesongray Dec 16, 2024
29a7110
update body content
emmaachesongray Dec 16, 2024
f3b8d71
fix issues
joegibb Dec 16, 2024
87afde3
run test again
joegibb Dec 16, 2024
0fb8696
amendment from policy
Sarah-DfE Dec 16, 2024
c3ad1ae
change wording on benefits partial
joegibb Dec 16, 2024
277da0d
test rebuild
martyn-w Dec 16, 2024
2c22911
Merge branch 'master' into create-secondary-subject-page
martyn-w Dec 16, 2024
5939959
change genrous to secure on pension pages
joegibb Dec 17, 2024
13b23a6
fix issue
joegibb Dec 17, 2024
1f9c517
update postcode question
emmaachesongray Dec 17, 2024
7dc524d
Revert "update postcode question"
emmaachesongray Dec 17, 2024
164dc5b
update question wording
emmaachesongray Dec 17, 2024
86fd8e8
add content and remove promo from page
jenhadfield-dfe Dec 17, 2024
c809163
add missing promo
martyn-w Dec 17, 2024
ac696a3
Revert "test rebuild"
martyn-w Dec 17, 2024
5beb672
test
joegibb Dec 17, 2024
284ed75
changing to make it clear that some courses may charge fees
Sarah-DfE Dec 23, 2024
1bc4cc3
changes to teacher pay page
Sarah-DfE Dec 27, 2024
39b61f7
updating the line taht refers to non-uk citizens
Sarah-DfE Dec 27, 2024
6ed5706
removing slash before link
Sarah-DfE Dec 31, 2024
4799b38
splitting a long sentence up
Sarah-DfE Dec 31, 2024
af5302d
changing a two to a 2
Sarah-DfE Dec 31, 2024
07b7c57
combining a paragraph
Sarah-DfE Dec 31, 2024
595358d
removing 'an'
Sarah-DfE Dec 31, 2024
6ff058c
updating acronym
Sarah-DfE Jan 2, 2025
cae01ec
Merge pull request #4426 from DFE-Digital/SEO-updates-for-the-PGCE-page
Sarah-DfE Jan 2, 2025
5049430
Merge pull request #4436 from DFE-Digital/teacher-pensions-SEO-improv…
Sarah-DfE Jan 2, 2025
018ae73
Adding tweaks from Gemma's review
Sarah-DfE Jan 2, 2025
4305b6f
adding a h3 for TDA
Sarah-DfE Jan 2, 2025
5d86498
Update app/views/content/funding-and-support/salaried-teacher-trainin…
Sarah-DfE Jan 2, 2025
fdb5754
Merge pull request #4439 from DFE-Digital/change-pension-wording-in-p…
Sarah-DfE Jan 2, 2025
785b86e
update event question
emmaachesongray Jan 2, 2025
23b5709
Merge pull request #4421 from DFE-Digital/salaried-teacher-training-u…
Sarah-DfE Jan 2, 2025
53d021b
create a partial guidance
joegibb Jan 2, 2025
778a11e
creating a partial guidance
joegibb Jan 2, 2025
08e6b4a
change 'what is' to 'what's'
emmaachesongray Jan 2, 2025
63f13e2
add frontmatter to paritals
joegibb Jan 6, 2025
eaecf1b
Merge pull request #4433 from DFE-Digital/update-mailing-list-postcode
emmaachesongray Jan 6, 2025
5a95937
removed border_class from component; border_color can now be interpol…
sarahcrack Jan 6, 2025
b00564a
Merge pull request #4438 from DFE-Digital/update-mailing-list-subject…
emmaachesongray Jan 6, 2025
2fd18bf
policy requested sentence removing
Sarah-DfE Jan 6, 2025
dcafe00
Merge pull request #4453 from DFE-Digital/SEO-updates-to-teacher-pay-…
Sarah-DfE Jan 6, 2025
d221859
removing for now as not needed
jenhadfield-dfe Jan 6, 2025
9eab5b0
Bump erb_lint from 0.5.0 to 0.7.0 (#4458)
dependabot[bot] Jan 6, 2025
2341ff9
Bump terser-webpack-plugin from 5.3.10 to 5.3.11 (#4462)
dependabot[bot] Jan 6, 2025
914f4bb
Merge branch 'feature/routes_wizard' into results-box-component
sarahcrack Jan 6, 2025
c981d70
text update
jenhadfield-dfe Jan 6, 2025
47e71a3
added results box to completed page of routes wizard
sarahcrack Jan 6, 2025
cfa5d12
fixed erb linting errors
sarahcrack Jan 6, 2025
3ba9ae3
Merge pull request #4404 from DFE-Digital/routes-promo
jenhadfield-dfe Jan 6, 2025
93492b8
updating SEO content guiadnce
Sarah-DfE Jan 6, 2025
f5da688
update content
emmaachesongray Jan 6, 2025
1712aad
update spec tests
emmaachesongray Jan 6, 2025
d4ed925
Merge pull request #4467 from DFE-Digital/seo-changes-to-guidance
Sarah-DfE Jan 7, 2025
83f9d63
Adds width to image blocks to prevent collapse with flexbox (#4430)
spencerldixon Jan 7, 2025
e53cebb
couple of tweaks from policy - removing email address for now
Sarah-DfE Jan 7, 2025
7f7f812
Merge pull request #4420 from DFE-Digital/TDA-page-updates
Sarah-DfE Jan 7, 2025
b72a378
Update docs/content.md
joegibb Jan 7, 2025
d6b35df
Bump trix from 2.1.4 to 2.1.12 (#4464)
dependabot[bot] Jan 7, 2025
df473e6
Change title header
emmaachesongray Jan 7, 2025
b886794
add link to page on other pages
joegibb Jan 7, 2025
b0575c6
fix linting errors
joegibb Jan 7, 2025
c6c0b60
add inset text
emmaachesongray Jan 7, 2025
22a75eb
update expander
emmaachesongray Jan 7, 2025
faeb475
Merge pull request #4465 from DFE-Digital/create-guidance-for-partials
joegibb Jan 8, 2025
b270dfc
Bump webpack from 5.95.0 to 5.97.1 (#4460)
dependabot[bot] Jan 8, 2025
6827889
Merge pull request #4468 from DFE-Digital/update-adviser-start-page
emmaachesongray Jan 8, 2025
e99f6c4
Merge pull request #4454 from DFE-Digital/update-assessment-only-page…
Sarah-DfE Jan 8, 2025
68b31c7
Merge pull request #4469 from DFE-Digital/add-non-uk-to-career-change…
emmaachesongray Jan 8, 2025
a4b804d
change School to school
joegibb Jan 8, 2025
ea30c7d
add adviser promo
joegibb Jan 8, 2025
ae59210
Bump nokogiri from 1.16.5 to 1.18.1 (#4459)
dependabot[bot] Jan 8, 2025
bacdeea
Bump @babel/runtime from 7.24.6 to 7.26.0 (#4461)
dependabot[bot] Jan 8, 2025
626c37e
Merge pull request #4363 from DFE-Digital/create-secondary-subject-page
joegibb Jan 8, 2025
0ff2e62
Update app/views/content/life-as-a-teacher/age-groups-and-specialisms…
emmaachesongray Jan 8, 2025
aa8efb6
Merge pull request #4470 from DFE-Digital/update-non-uk-expander-earl…
emmaachesongray Jan 8, 2025
fce48be
Merge remote-tracking branch 'origin/master' into results-box-component
sarahcrack Jan 8, 2025
f414ce8
Revert "Merge remote-tracking branch 'origin/master' into results-box…
martyn-w Jan 8, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions app/components/content/results_box_component.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<div class="results-box-component">
<% if title %>
<div class="results-box__title">
<%= title %>
</div>
<% end %>
<section class="results-box results-box--<%= border_color %>">
<h2 class="results-box__heading">
<%= heading %>
</h2>
<div class="results-box__course-info-container results-box__text">
<div class="results-box__info-row">
<div class="results-box__label">Course fee</div>
<div class="results-box__value"><%= fee %></div>
</div>
<hr>
<div class="results-box__info-row">
<div class="results-box__label">Course length </div>
<div class="results-box__value"><%= course_length %></div>
</div>
<hr>
<div class="results-box__info-row">
<div class="results-box__label">Funding </div>
<div class="results-box__value"><%= funding %></div>
</div>
<hr>
</div>
<div class="results-box__text results-box__full-width-text"><%= text %></div>
<div class="results-box__cta">
<%= render Content::LinkAsButtonComponent.new(link_text: @link_text, href: @link_target) %>
</div>
</section>
</div>
21 changes: 21 additions & 0 deletions app/components/content/results_box_component.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
module Content
class ResultsBoxComponent < ViewComponent::Base
attr_reader :title, :heading, :fee, :course_length, :funding, :text, :link_text, :link_target, :border_color

include ContentHelper

def initialize(heading:, fee:, course_length:, funding:, text:, link_text:, link_target:, title: nil, border_color: :grey)
super

@title = substitute_values(title)
@heading = substitute_values(heading)
@fee = substitute_values(fee)
@course_length = substitute_values(course_length)
@funding = substitute_values(funding)
@text = substitute_values(text)
@link_text = link_text
@link_target = link_target
@border_color = border_color
end
end
end
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ related_content:
Tuition fee and maintenance loans: "/funding-and-support/tuition-fee-and-maintenance-loans"
Bursaries and scholarships: "/funding-and-support/scholarships-and-bursaries"
Explore life as a teacher: "/life-as-a-teacher"
promo_content:
- content/funding-and-support/promos/get-adviser-support-promo
cta_adviser:
adviser:
text: "An adviser with years of teaching experience can help you understand what support you could get during your training. Chat by phone, text or email, as little or as often as you need."
navigation: 20.30
navigation_title: Funding and support if you're a parent or carer
navigation_description: Find out what extra grants and schemes are available if you have children or other caring responsibilities.
Expand Down Expand Up @@ -105,3 +106,5 @@ To be eligible, you need to:
* have a household income of less than $finance_adultdependantsgrant_income$

[Find out more about the Adult Dependants’ Grants and how to apply](https://www.gov.uk/adult-dependants-grant).

$adviser$
7 changes: 5 additions & 2 deletions app/views/content/funding-and-support/if-youre-a-veteran.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ description: |-
related_content:
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:
- content/funding-and-support/promos/get-adviser-veterans-promo
cta_adviser:
adviser:
text: "You can get dedicated guidance and support with your journey into teacher training from one of our veteran teacher training advisers. Chat by phone, text or email, as little or as often as you need."
navigation: 20.35
navigation_title: Funding and support if you're a veteran
navigation_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.
Expand Down Expand Up @@ -76,3 +77,5 @@ You’ll need different qualifications depending on [who you want to teach](/lif
If you’re unsure about whether your qualifications achieved through military service meet the standard required, talk to your course provider, or a [teacher training adviser](/teacher-training-advisers).

You may also be able to do a top up degree to boost your qualifications to meet the standard required. Talk to your teacher training adviser and course provider to find out about your options.

$adviser$
7 changes: 5 additions & 2 deletions app/views/content/funding-and-support/if-youre-disabled.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ description: |-
related_content:
Explore the benefits of teaching: "/life-as-a-teacher/pay-and-benefits"
Age groups you could teach: "/life-as-a-teacher/age-groups-and-specialisms/age-groups-you-could-teach"
promo_content:
- content/funding-and-support/promos/get-adviser-support-promo
cta_adviser:
adviser:
text: "An adviser with years of teaching experience can help you understand what support you could get during your training. Chat by phone, text or email, as little or as often as you need."
navigation: 20.25
navigation_title: Funding and support if you're disabled
navigation_description: Find out about the support you can get while training to teach if you're disabled.
Expand Down Expand Up @@ -81,3 +82,5 @@ Providers must not discriminate against you. They cannot:
Anyone who’s offered a place on a teacher training course is asked to complete a fitness questionnaire before starting training. Training providers should only ask relevant questions to make sure you’re able to teach.

Find out more about [your rights under the Equality Act 2010](https://www.equalityhumanrights.com/equality/equality-act-2010/your-rights-under-equality-act-2010) and how it protects different characteristics.

$adviser$

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ related_content:
If you've worked as an unqualified teacher: "/train-to-be-a-teacher/assessment-only-route-to-qts"
external_content:
- content/train-to-be-a-teacher/promos/find-your-course
promo_content:
- content/funding-and-support/promos/get-adviser-funding-promo
cta_adviser:
adviser:
text: "An adviser with years of teaching experience can answer all your questions about salaried teacher training. Chat by phone, text or email, as little or as often as you need."
navigation: 20.20
navigation_description: Find out about School Direct salaried courses, postgraduate teaching apprenticeships and training delivered by Teach First.
keywords:
Expand Down Expand Up @@ -103,3 +104,5 @@ It’s usually wise to apply for non-salaried courses as well to increase your c
Teach First delivers a 2 year employment-based route to teaching for high performing graduates and career changers. You’ll earn a salary while working towards QTS with a PGCE.

To apply and find out more, you should [visit the Teach First website](https://www.teachfirst.org.uk/).

$adviser$
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ related_content:
Teacher pay: "/life-as-a-teacher/pay-and-benefits/teacher-pay"
external_content:
- content/train-to-be-a-teacher/promos/find-your-course
promo_content:
- content/funding-and-support/promos/get-adviser-funding-promo
cta_adviser:
adviser:
text: "An adviser with years of teaching experience can answer all your questions about scholarships and bursaries. Chat by phone, text or email, as little or as often as you need."
navigation: 20.15
navigation_title: Bursaries and scholarships
navigation_description: Find out if you're eligible for extra funding depending on the subject you're training to teach.
Expand Down Expand Up @@ -111,3 +112,5 @@ Find out more about the [subjects you could teach](/life-as-a-teacher/explore-su
If you're not eligible for a bursary or scholarship, there may be other funding options available, such as [tuition fees and maintenance loans](/funding-and-support/tuition-fees).

For advice on funding, you can speak to a [teacher training adviser](/teacher-training-advisers). They can help you work out what support you could be eligible for.

$adviser$
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ related_content:
Age groups you could teach: "/life-as-a-teacher/age-groups-and-specialisms/age-groups-you-could-teach"
Improve your subject knowledge: "/how-to-apply-for-teacher-training/subject-knowledge-enhancement"
Teacher pay : "/life-as-a-teacher/pay-and-benefits/teacher-pay"
promo_content:
- content/funding-and-support/promos/get-adviser-funding-promo
cta_adviser:
adviser:
text: "An adviser with years of teaching experience can answer all your questions about student finance. Chat by phone, text or email, as little or as often as you need."
calls_to_action:
student-finance-calculator:
name: simple
Expand Down Expand Up @@ -115,3 +116,5 @@ Find out about student finance in the Channel Islands and the Isle of Man:
* [student finance guidance from the Government of Jersey](https://www.gov.je/Working/Careers/16To19YearOlds/EnteringHigherEducation/FinancingHigherEducationCourses/FundingDegreeProfessionalQualifications/Pages/index.aspx)
* [student finance guidance from the States of Guernsey](https://www.gov.gg/article/152744/Policies)
* [student awards guidance from the Isle of Man Government website](https://www.gov.im/student-grants)

$adviser$
7 changes: 5 additions & 2 deletions app/views/content/funding-and-support/tuition-fees.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ related_content:
Salaried teacher training: "/funding-and-support/salaried-teacher-training"
external_content:
- content/train-to-be-a-teacher/promos/find-your-course
promo_content:
- content/funding-and-support/promos/get-adviser-funding-promo
cta_adviser:
adviser:
text: "An adviser with years of teaching experience can answer all your questions about tuition fees. Chat by phone, text or email, as little or as often as you need."
navigation: 20.10
navigation_description: Find out the cost of postgraduate teacher training courses with tuition fees.
keywords:
Expand Down Expand Up @@ -55,3 +56,5 @@ $postgraduate-fees$

## Additional costs
You’ll also need to be able to cover your living costs and any travel expenses if you need to travel to school placements. Find out about [student finance for teacher training](/funding-and-support/tuition-fee-and-maintenance-loans).

$adviser$
22 changes: 20 additions & 2 deletions app/views/routes_into_teaching/steps/completed.html.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
<h2>You told us that you:</h2>

<p>You can <%= link_to "change your answers", routes_into_teaching_steps_path %> if you need to.</p>

<%= session[:routes_into_teaching].inspect %>
<%= render Content::ResultsBoxComponent.new(
title: "Most popular route",
heading: "Postgraduate Initial Teacher Training with fees",
fee: "Yes",
course_length: "9 months (full-time) or up to 2 years (part-time)",
funding: "Scholarships or bursaries, as well as student loans, are available if you're eligible",
text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.",
link_text: "Find out more",
link_target: "/steps-to-become-a-teacher",
border_color: :yellow,
) %>
<%= render Content::ResultsBoxComponent.new(
heading: "Postgraduate Initial Teacher Training with fees",
fee: "Yes",
course_length: "9 months (full-time) or up to 2 years (part-time)",
funding: "Scholarships or bursaries, as well as student loans, are available if you're eligible",
text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.",
link_text: "Find out more",
link_target: "/steps-to-become-a-teacher",
) %>
100 changes: 100 additions & 0 deletions app/webpacker/styles/components/results-box.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
.results-box {
background: $white;
color: $white;

&--yellow {
border: 2px solid $yellow;
}

&--grey {
border: 2px solid $grey
}

&__background {
display: none;
padding: 1em;
}

&__title {
background: $yellow;
color: $black;
font-weight: bolder;
display: inline-block;
padding: 0.25em 0.5em;
}

&__heading {
@include font-size("small");
color: $black;
background-color: $white;
line-height: 1.25em;
max-width: 80%;
}

&__text {
@include font-size("small");
color: $black;
background-color: $white;
}

&__course-info-container {
margin-top: 2.5rem;
}

&__info-row {
display: flex;
justify-content: flex-start;
align-items: flex-start;
}

&__label {
flex: 1;
text-align: left;
font-weight: bold;
}

&__value {
flex: 2;
text-align: left;
}

hr {
margin-top: 0.7em;
margin-bottom: 0.5em;
}

&__full-width-text {
padding: 1rem 0;
text-align: left;
margin-top: 1em;
margin-bottom: 1em;
}

&__cta {
margin-top: 1rem;
margin-bottom: 1rem;
}

&__heading,
&__text,
&__cta {
margin-inline: 2rem;
}

@include mq($from: mobile, $until: tablet) {
.results-box__info-row {
flex-direction: column;
align-items: flex-start;
}

.results-box__label,
.results-box__value {
flex: none;
width: 100%;
}

.results-box__label {
margin-bottom: 0.25rem;
}
}
}
1 change: 1 addition & 0 deletions app/webpacker/styles/git.scss
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
@import "./components/mailing-list";
@import "./components/purple-box";
@import "./components/feedback";
@import "./components/results-box";

@import "./campaigns/numbered-headings";

Expand Down
Loading
Loading