diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 5eb85034..be10e505 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -183,3 +183,18 @@ ul>li>ul>li { .govuk-footer__copyright-logo { display: none; } + +#feedback-cta { + padding: govuk-spacing(5); + background-color: govuk-organisation-colour('department-for-education'); + + * { + color: govuk-colour('white'); + } + + .govuk-button { + background-color: govuk-organisation-colour('department-for-education'); + border-color: govuk-colour('white'); + box-shadow: none; + } +} diff --git a/app/views/home/_feedback.html.slim b/app/views/home/_feedback.html.slim new file mode 100644 index 00000000..d4174168 --- /dev/null +++ b/app/views/home/_feedback.html.slim @@ -0,0 +1,7 @@ +#feedback-cta + .dfe-width-container + .govuk-grid-row + .govuk-grid-column-full + = m(t('feedback.cta')) + + = govuk_link_to 'Give Feedback', Rails.configuration.feedback_url, class: 'govuk-button' diff --git a/app/views/home/index.html.slim b/app/views/home/index.html.slim index 03255ff8..b190f474 100644 --- a/app/views/home/index.html.slim +++ b/app/views/home/index.html.slim @@ -1,15 +1,15 @@ -- content_for(:page_title) do +- content_for(:page_title) do = page.title -- content_for(:aside) do +- content_for(:aside) do = render partial: 'shared/other_resources' - content_for :hero do - .govuk-grid-row class='govuk-!-margin-top-9' + .govuk-grid-row class='govuk-!-padding-top-4' .govuk-grid-column-three-quarters h1.govuk-heading-xl class='govuk-!-margin-bottom-4' = page.hero_title - p.govuk-body-l + p.govuk-body-l = page.hero_description .govuk-grid-row class='govuk-!-margin-top-4 govuk-!-margin-bottom-5' diff --git a/app/views/layouts/_banner.html.slim b/app/views/layouts/_banner.html.slim deleted file mode 100644 index b03d7e42..00000000 --- a/app/views/layouts/_banner.html.slim +++ /dev/null @@ -1,2 +0,0 @@ -= govuk_phase_banner(tag: { text: 'Beta' }, classes: 'noprint') do - = t 'phase_banner_html', feedback_link: govuk_link_to('feedback', Rails.configuration.feedback_url, target: :_blank, rel: 'noopener noreferrer') diff --git a/app/views/layouts/_footer.html.slim b/app/views/layouts/_footer.html.slim index a0ea6852..c6b9ea57 100644 --- a/app/views/layouts/_footer.html.slim +++ b/app/views/layouts/_footer.html.slim @@ -2,6 +2,8 @@ - footer.with_navigation do .govuk-footer__section.govuk-grid-column-two-thirds ul.govuk-footer__list.govuk-footer__list--columns-3 + li.govuk-footer__list-item + = govuk_link_to t('links.footer.feedback'), Rails.configuration.feedback_url, class: 'govuk-footer__link' - Page.footer.pages.each do |page| li.govuk-footer__list-item = govuk_link_to page.title, page.path, class: 'govuk-footer__link' diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim index b28355b7..192cfa5b 100644 --- a/app/views/layouts/application.html.slim +++ b/app/views/layouts/application.html.slim @@ -1,6 +1,6 @@ -doctype html +doctype html html.govuk-template lang='en' - head + head = render 'layouts/head' body#default-layout.govuk-template__body @@ -11,13 +11,11 @@ html.govuk-template lang='en' = render 'layouts/cookie_banner' = govuk_skip_link(href: '#main-content') - + = navigation main#main-content role='main' .dfe-width-container - = render 'layouts/banner' - .dfe-width-container class='govuk-!-padding-top-7 govuk-!-padding-bottom-7' = yield diff --git a/app/views/layouts/hero.html.slim b/app/views/layouts/hero.html.slim index 5e5c5da8..804c82de 100644 --- a/app/views/layouts/hero.html.slim +++ b/app/views/layouts/hero.html.slim @@ -1,6 +1,6 @@ -doctype html +doctype html html.govuk-template lang='en' - head + head = render 'layouts/head' body#hero-layout.govuk-template__body @@ -11,18 +11,16 @@ html.govuk-template lang='en' = render 'layouts/cookie_banner' = govuk_skip_link(href: '#main-content') - + = navigation main#main-content role='main' - .dfe-content-page--header class='govuk-!-padding-bottom-7' + .dfe-content-page--header class='govuk-!-padding-top-1 govuk-!-padding-bottom-1' .dfe-width-container - = render 'layouts/banner' = yield :hero - .dfe-width-container class='govuk-!-padding-top-7 govuk-!-padding-bottom-7' = yield aside role='complementary' = yield :aside - + = render 'home/feedback' = render 'layouts/footer' diff --git a/app/views/pages/_hero.html.slim b/app/views/pages/_hero.html.slim index f9a8b109..84c4e945 100644 --- a/app/views/pages/_hero.html.slim +++ b/app/views/pages/_hero.html.slim @@ -1,8 +1,8 @@ = govuk_breadcrumbs(breadcrumbs: breadcrumbs, collapse_on_mobile: true) -.govuk-grid-row class='govuk-!-margin-top-9' +.govuk-grid-row class='govuk-!-padding-top-1' .govuk-grid-column-three-quarters - h1.govuk-heading-xl class='govuk-!-margin-bottom-4' + h1.govuk-heading-xl class='govuk-!-padding-top-1' = title - p.govuk-body-l + p.govuk-body-l = description diff --git a/config/locales/en.yml b/config/locales/en.yml index 6a31e1c2..f1e743de 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -16,7 +16,12 @@ en: service: name: Help for early years providers email: help-for-early-years-providers@digital.education.gov.uk - phase_banner_html: This is a new service, your %{feedback_link} will help us improve it. + feedback: + cta: | + Give feedback to help us improve this website + links: + footer: + feedback: Feedback admin: articles: create: diff --git a/content.yml b/content.yml index a73a6494..f09c8032 100644 --- a/content.yml +++ b/content.yml @@ -3,59 +3,59 @@ # --- - support-for-practitioners - - reducing-paperwork - - working-in-partnership-with-parents-and-carers - - curriculum-planning - - early-years-practitioner-wellbeing-support - - training-qualifications-support-guidance - - integrated-reviews - - changes-to-the-early-years-foundation-stage-eyfs - - meeting-the-needs-of-all-children - - english-as-an-additional-language-eal - - sensory-food-education + - reducing-paperwork + - working-in-partnership-with-parents-and-carers + - curriculum-planning + - early-years-practitioner-wellbeing-support + - training-qualifications-support-guidance + - integrated-reviews + - changes-to-the-early-years-foundation-stage-eyfs + - meeting-the-needs-of-all-children + - english-as-an-additional-language-eal + - sensory-food-education - areas-of-learning - - communication-and-language + - communication-and-language - interactions - exploring-language - listening-and-understanding - - physical-development + - physical-development - core-strength-and-co-ordination - gross-motor-skills - fine-motor-skills - - personal-social-and-emotional-development + - personal-social-and-emotional-development - emotions - sense-of-self - relationships - - literacy + - literacy - reading-comprehension - exploring-words - writing - - mathematics + - mathematics - numbers - patterns-and-connections - spatial-reasoning - - understanding-the-world + - understanding-the-world - personal-experiences - diverse-world - widening-vocabulary - - expressive-arts-and-design + - expressive-arts-and-design - imagination-and-creativity - self-expression - communicating-through-arts - health-and-wellbeing - - oral-health - - food-safety - - internet-safety - - mental-health-for-early-years-children - - nutrition + - oral-health + - food-safety + - internet-safety + - mental-health-for-early-years-children + - nutrition - introducing-solid-foods - - a-healthy-plate + - a-healthy-plate - allergies - menu-planning - - cost-effective-healthy-food - - planning-food-activities-with-children + - cost-effective-healthy-food + - planning-food-activities-with-children - footer - accessibility diff --git a/spec/models/page_spec.rb b/spec/models/page_spec.rb index 5f960d70..7496353d 100644 --- a/spec/models/page_spec.rb +++ b/spec/models/page_spec.rb @@ -154,7 +154,7 @@ let(:slug) { 'support-for-practitioners' } specify { expect(page).to be_children } - specify { expect(page.pages.count).to be 9 } + specify { expect(page.pages.count).to be 10 } end describe 'Tier 2' do diff --git a/spec/system/homepage_spec.rb b/spec/system/homepage_spec.rb index 559e333a..492ab0a1 100644 --- a/spec/system/homepage_spec.rb +++ b/spec/system/homepage_spec.rb @@ -10,4 +10,12 @@ expect(page).to have_content 'Find helpful articles and resources to support you in your setting.' end end + + it 'displays the feedback section on the page' do + # Check for specific content on the page + expect(page).to have_content('Give feedback to help us improve this website') + + # Check for the feedback link/button + expect(page).to have_link(href: Rails.configuration.feedback_url) + end end