Merge pull request #704 from guidance-guarantee-programme/Website-amends

Website amends
guidance-guarantee-programme · Dec 7, 2016 · a5284e7 · a5284e7
2 parents 5de7e2d + ca8f150
commit a5284e7
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 10 deletions.
diff --git 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') %>
 
 <h1>Your appointment summary</h1>

diff --git 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
@@ -1,3 +1,4 @@
+<% content_for(:page_title, t('service.title', page_title: "Book an appointment at #{@booking_request.location_name}")) %>
 <div class="l-grid-row">
   <div class="l-column-two-thirds">
     <h1 class="t-location-name">Book an appointment at <%= @booking_request.location_name %></h1>

diff --git 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')) %>
 <div class="l-grid-row">
   <div class="l-column-two-thirds">
     <h1>Your details</h1>

diff --git 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') %>
 
 <h1>Feedback</h1>

diff --git 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')) %>
 <h1>Thank you for your help</h1>
 
 <p>If you have more extensive feedback, please visit our <a href="/contact">contact page.</a></p>
diff --git a/app/views/home/show.html.erb b/app/views/home/show.html.erb
@@ -108,11 +108,11 @@
 
     <div class="l-column-two-thirds">
       <ul class="quick-links">
-        <li class="quick-links__link"><a href="/pension-pot-value">How much is my pension worth?</a></li>
+        <li class="quick-links__link"><a href="/pension-pot-value">Check how much is in your pot</a></li>
         <li class="quick-links__link"><a href="/tax">Tax and pensions</a></li>
         <li class="quick-links__link"><a href="/state-pension">The State Pension</a></li>
-        <li class="quick-links__link"><a href="/scams">Scams</a></li>
-        <li class="quick-links__link"><a href="/pension-statements">Help talking to your provider</a></li>
+        <li class="quick-links__link"><a href="/scams">How to avoid a pension scam</a></li>
+        <li class="quick-links__link"><a href="/pension-statements">Understand your pension statement</a></li>
       </ul>
     </div>
   </div>

diff --git 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')) %>
 
 <h1>Something went wrong, please try again</h1>
 

diff --git 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}")) %>
 
 <h1>Appointment locations near <%= @postcode.squish.upcase %></h1>
 

diff --git 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 %>
   <script>

diff --git a/app/views/locations/search.html.erb b/app/views/locations/search.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')) %>
 
 <div class="l-grid-row">
   <div class="l-column-two-thirds">

diff --git a/app/views/locations/show.html.erb b/app/views/locations/show.html.erb
@@ -1,4 +1,4 @@
-<% content_for(:page_title, "#{@location.name} - Pension Wise") %>
+<% content_for(:page_title, t('service.title', page_title: @location.name)) %>
 <% content_for(:meta_description, "Find out the address, booking hours and how to book a Pension Wise appointment at #{@location.name} Citizens Advice") %>
 
 <% content_for(:data_layer) do %>

diff --git 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.