From c681b548c4b683cefd30b01310ce891361f00f88 Mon Sep 17 00:00:00 2001 From: alexkouz Date: Tue, 6 Dec 2016 13:32:25 +0000 Subject: [PATCH 1/3] Update state_pension.md Changed two H3s into H2s to aid page accessibility. --- content/state_pension.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/state_pension.md b/content/state_pension.md index c30748d58..cd5ca50c9 100644 --- a/content/state_pension.md +++ b/content/state_pension.md @@ -8,11 +8,11 @@ The pension you get from the government is called the State Pension. You get it ^Pension Wise only provides guidance on [defined contribution](/pension-types) pensions – for help with the State Pension speak to The Pensions Advisory Service on 0300 123 1047^ -### New State Pension +## New State Pension If you reached State Pension age on or after 6 April 2016 you'll get the [new State Pension](https://www.gov.uk/new-state-pension). The full new State Pension payment is £155.65 a week. -### Basic State Pension +## Basic State Pension If you reached State Pension age before 6 April 2016, you'll get the [basic State Pension](https://www.gov.uk/state-pension/overview). The most you can currently get from the basic State Pension is £119.30 a week. From d30ad49b2289522a9fec4f43d97288dadae10a70 Mon Sep 17 00:00:00 2001 From: alexkouz Date: Tue, 6 Dec 2016 13:45:36 +0000 Subject: [PATCH 2/3] Update show.html.erb Updated the popular pages link titles to make more consistent with the H1s of the pages themselves. --- app/views/home/show.html.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/home/show.html.erb b/app/views/home/show.html.erb index 47e9fc8fc..07d8a49d9 100644 --- a/app/views/home/show.html.erb +++ b/app/views/home/show.html.erb @@ -108,11 +108,11 @@
From ca8f150ad9e07a5271d1d32a448fdafdee6320b6 Mon Sep 17 00:00:00 2001 From: Peter Guntrip Date: Tue, 6 Dec 2016 13:52:08 +0000 Subject: [PATCH 3/3] Add missing page titles to various pages --- app/views/appointment_summaries/create.html.erb | 1 + app/views/appointment_summaries/new.html.erb | 1 + app/views/booking_requests/step_one.html.erb | 1 + app/views/booking_requests/step_two.html.erb | 1 + app/views/feedbacks/new.html.erb | 1 + app/views/feedbacks/thanks.html.erb | 1 + app/views/locations/failed_lookup.html.erb | 2 +- app/views/locations/index.html.erb | 2 +- app/views/locations/invalid_postcode.html.erb | 2 +- app/views/locations/search.html.erb | 2 +- app/views/locations/show.html.erb | 2 +- 11 files changed, 11 insertions(+), 5 deletions(-) diff --git a/app/views/appointment_summaries/create.html.erb b/app/views/appointment_summaries/create.html.erb index 38ed02ac0..b692e3cb1 100644 --- a/app/views/appointment_summaries/create.html.erb +++ b/app/views/appointment_summaries/create.html.erb @@ -1,3 +1,4 @@ +<% content_for(:page_title, t('service.title', page_title: 'Your appointment summary')) %> <% content_for(:meta_description, 'View, print or download a summary of your Pension Wise appointment') %>

Your appointment summary

diff --git a/app/views/appointment_summaries/new.html.erb b/app/views/appointment_summaries/new.html.erb index 01eef6ae5..6cf7a59ae 100644 --- a/app/views/appointment_summaries/new.html.erb +++ b/app/views/appointment_summaries/new.html.erb @@ -1,3 +1,4 @@ +<% content_for(:page_title, t('service.title', page_title: 'How to view your appointment summary')) %> <% content_for(:meta_description, 'Choose the information you want in the summary of your Pension Wise appointment') %> <%= form_for @appointment_summary, url: appointment_summaries_path, html: { class: 't-appointment-summary-generator' } do |f| %> diff --git a/app/views/booking_requests/step_one.html.erb b/app/views/booking_requests/step_one.html.erb index 1b7ac999b..c9f0945dd 100644 --- a/app/views/booking_requests/step_one.html.erb +++ b/app/views/booking_requests/step_one.html.erb @@ -1,3 +1,4 @@ +<% content_for(:page_title, t('service.title', page_title: "Book an appointment at #{@booking_request.location_name}")) %>

Book an appointment at <%= @booking_request.location_name %>

diff --git a/app/views/booking_requests/step_two.html.erb b/app/views/booking_requests/step_two.html.erb index a9089102e..4026b941f 100644 --- a/app/views/booking_requests/step_two.html.erb +++ b/app/views/booking_requests/step_two.html.erb @@ -1,3 +1,4 @@ +<% content_for(:page_title, t('service.title', page_title: 'Your details')) %>

Your details

diff --git a/app/views/feedbacks/new.html.erb b/app/views/feedbacks/new.html.erb index 275b8487b..7a03008ca 100644 --- a/app/views/feedbacks/new.html.erb +++ b/app/views/feedbacks/new.html.erb @@ -1,3 +1,4 @@ +<% content_for(:page_title, t('service.title', page_title: 'Feedback')) %> <% content_for(:meta_description, 'Give your feedback to help us improve our site') %>

Feedback

diff --git a/app/views/feedbacks/thanks.html.erb b/app/views/feedbacks/thanks.html.erb index b300bfd75..96831ad5d 100644 --- a/app/views/feedbacks/thanks.html.erb +++ b/app/views/feedbacks/thanks.html.erb @@ -1,3 +1,4 @@ +<% content_for(:page_title, t('service.title', page_title: 'Thank you')) %>

Thank you for your help

If you have more extensive feedback, please visit our contact page.

diff --git a/app/views/locations/failed_lookup.html.erb b/app/views/locations/failed_lookup.html.erb index 8ea808a76..e9552abd2 100644 --- a/app/views/locations/failed_lookup.html.erb +++ b/app/views/locations/failed_lookup.html.erb @@ -1,4 +1,4 @@ -<% content_for(:page_title, 'Find an appointment location near you - Pension Wise') %> +<% content_for(:page_title, t('service.title', page_title: 'Find an appointment location near you')) %>

Something went wrong, please try again

diff --git a/app/views/locations/index.html.erb b/app/views/locations/index.html.erb index 28a899586..983c1e330 100644 --- a/app/views/locations/index.html.erb +++ b/app/views/locations/index.html.erb @@ -1,4 +1,4 @@ -<% content_for(:page_title, "Appointment locations near #{@postcode.squish.upcase} - Pension Wise") %> +<% content_for(:page_title, t('service.title', page_title: "Appointment locations near #{@postcode.squish.upcase}")) %>

Appointment locations near <%= @postcode.squish.upcase %>

diff --git a/app/views/locations/invalid_postcode.html.erb b/app/views/locations/invalid_postcode.html.erb index ff31df593..ddd43553a 100644 --- a/app/views/locations/invalid_postcode.html.erb +++ b/app/views/locations/invalid_postcode.html.erb @@ -1,4 +1,4 @@ -<% content_for(:page_title, 'Find an appointment location near you - Pension Wise') %> +<% content_for(:page_title, t('service.title', page_title: 'Find an appointment location near you')) %> <% content_for(:data_layer) do %>