DDCNLS-2946 resolved merge conflicsts

hmrc · Jul 4, 2018 · 3dcefcb · 3dcefcb
2 parents 8a06bb8 + e149658
commit 3dcefcb
Show file tree

Hide file tree

Showing 26 changed files with 216 additions and 50 deletions.
diff --git a/app/uk/gov/hmrc/nisp/utils/Constants.scala b/app/uk/gov/hmrc/nisp/utils/Constants.scala
@@ -51,4 +51,6 @@ object Constants {
   val niRecordMinAge = 16
 
   var yearStringLength = 4
+
+  val titleSplitter = " - "
 }
diff --git a/app/uk/gov/hmrc/nisp/views/excluded_mci.scala.html b/app/uk/gov/hmrc/nisp/views/excluded_mci.scala.html
@@ -42,12 +42,11 @@
     @main(MainTemplateParams(
             userLoggedIn = true,
             browserTitle = Some(Messages("nisp.main.title")),
-            pageTitle = None,
+            pageTitle = Some(messages("nisp.excluded.mci.title")),
             articleClasses = Some("mainpage"),
             gaDimensions = Some(analyticsAdditionalJs),
             hideBreadcrumb = true
     )) {
-        <h1 class="heading-large">@Html(Messages("nisp.excluded.mci.title"))</h1>
         <p class="lede">@Html(Messages("nisp.excluded.mci.info"))</p>
         <h2 class="heading-medium">@Html(Messages("nisp.excluded.mci.howToFix"))</h2>
         <ul class="list-bullet">

diff --git a/app/uk/gov/hmrc/nisp/views/feedback.scala.html b/app/uk/gov/hmrc/nisp/views/feedback.scala.html
@@ -22,6 +22,12 @@
 @(partialUrl: String, formBody: Option[Html])(implicit messages: Messages, request: Request[_],
 formPartialRetriever: FormPartialRetriever, partialRetriever: CachedStaticHtmlPartialRetriever, application: Application, templateRenderer: uk.gov.hmrc.renderer.TemplateRenderer)
 
+
+<script>
+        document.title = "@messages("nisp.feedback.title")"
+</script>
+
 @main(MainTemplateParams(showBetaBanner = false)) {
     @formBody.getOrElse(formPartialRetriever.getPartialContent(partialUrl))
 }
+
diff --git a/app/uk/gov/hmrc/nisp/views/feedback_thankyou.scala.html b/app/uk/gov/hmrc/nisp/views/feedback_thankyou.scala.html
@@ -21,7 +21,13 @@
 @(partialUrl: String, redirectUrl: String)(implicit messages: Messages, request: Request[_],
 cachedStaticHtmlPartialRetriever: CachedStaticHtmlPartialRetriever, application: Application, formPartialRetriever: uk.gov.hmrc.play.partials.FormPartialRetriever, templateRenderer: uk.gov.hmrc.renderer.TemplateRenderer)
 
+
+<script>
+        document.title = "@messages("nisp.feedback.title")"
+</script>
+
 @main(MainTemplateParams(showBetaBanner = false)) {
     @cachedStaticHtmlPartialRetriever.getPartialContent(partialUrl)
     <a id="Start" href='@redirectUrl' role="button" tabindex="0" data-journey-click="checkmystatepension:feedback:return" class="button">@Messages("nisp.goback")</a>
 }
+
diff --git a/app/uk/gov/hmrc/nisp/views/finalPage.scala.html b/app/uk/gov/hmrc/nisp/views/finalPage.scala.html
@@ -24,9 +24,9 @@
 
 @main(MainTemplateParams(
  browserTitle = Some(Messages("nisp.finishpage.title")),
+ pageTitle = Some(messages("nisp.thankyou.title")),
  sidebarLinks = Some(includes.questionnaireSidebar())
 )) {
-<h1 class="heading-large">@Messages("nisp.thankyou.title")</h1>
 
 <p>@Html(Messages("nisp.thankyou.received"))</p>
 <p>@Html(Messages("nisp.useagain", routes.LandingController.show.url))</p>

diff --git a/app/uk/gov/hmrc/nisp/views/identity_verification_landing.scala.html b/app/uk/gov/hmrc/nisp/views/identity_verification_landing.scala.html
@@ -22,10 +22,12 @@
 @import uk.gov.hmrc.nisp.views.viewParams.MainTemplateParams
 @()(implicit messages: Messages, request: Request[_], partialRetriever: CachedStaticHtmlPartialRetriever, application: Application, formPartialRetriever: uk.gov.hmrc.play.partials.FormPartialRetriever, templateRenderer: uk.gov.hmrc.renderer.TemplateRenderer)
 
-@main(MainTemplateParams(articleEnabled=false, hideNavBar = true)) {
+@main(MainTemplateParams(articleEnabled=false, hideNavBar = true, h1Class = Some("heading-xlarge"), pageTitle = Some(messages("nisp.landing.title")))) {
+
+
+
 <div class="grid-wrapper">
     <div class="grid-2-3">
-        <h1 class="heading-xlarge">@Messages("nisp.landing.title")</h1>
         <div class="panel-indent">@Html(Messages("nisp.landing.estimateprovided"))</div>
     </div>
 </div>

diff --git a/app/uk/gov/hmrc/nisp/views/iv/failurepages/locked_out.scala.html b/app/uk/gov/hmrc/nisp/views/iv/failurepages/locked_out.scala.html
@@ -28,10 +28,11 @@
 
 @main(MainTemplateParams(
  articleClasses = Some("mainpage"),
- analyticsAdditionalJs = Some(analyticsAdditionalJs)
+ analyticsAdditionalJs = Some(analyticsAdditionalJs),
+ pageTitle = Some(messages("nisp.iv.failure.lockedout.title")),
+ h1Class = Some("heading-xlarge")
 )) {
 
-<h1 class="heading-xlarge">@Messages("nisp.iv.failure.lockedout.title")</h1>
 
 <p class="lede">@Messages("nisp.iv.failure.lockedout.intro")</p>
 

diff --git a/app/uk/gov/hmrc/nisp/views/iv/failurepages/not_authorised.scala.html b/app/uk/gov/hmrc/nisp/views/iv/failurepages/not_authorised.scala.html
@@ -18,7 +18,6 @@
 @import uk.gov.hmrc.nisp.utils.Constants
 @import uk.gov.hmrc.play.partials.CachedStaticHtmlPartialRetriever
 @import play.api.Application
-@import uk.gov.hmrc.nisp.auth._
 
 @import uk.gov.hmrc.nisp.views.viewParams.MainTemplateParams
 @(showFirstParagraph: Boolean = true)(implicit messages: Messages, request: Request[_],
@@ -30,11 +29,10 @@
 
 @main(MainTemplateParams(
  articleClasses = Some("mainpage"),
- analyticsAdditionalJs = Some(analyticsAdditionalJs)
+ analyticsAdditionalJs = Some(analyticsAdditionalJs),
+ pageTitle= Some(messages("nisp.iv.failure.general.title")), h1Class = Some("heading-xlarge")
 )) {
 
-<h1 class="heading-large margin-bottom">@Messages("nisp.iv.failure.general.title")</h1>
-
 <p class="margin-bottom">@Messages("nisp.iv.failure.general.youcan")</p>
 
 <ul class="list list-bullet">

diff --git a/app/uk/gov/hmrc/nisp/views/iv/failurepages/technical_issue.scala.html b/app/uk/gov/hmrc/nisp/views/iv/failurepages/technical_issue.scala.html
@@ -29,11 +29,11 @@
 
 @main(MainTemplateParams(
  articleClasses = Some("mainpage"),
- analyticsAdditionalJs = Some(analyticsAdditionalJs)
+ analyticsAdditionalJs = Some(analyticsAdditionalJs),
+ pageTitle = Some(messages("nisp.iv.failure.technical.title")),
+ h1Class = Some("heading-xlarge")
 )) {
 
-<h1 class="heading-xlarge">@Html(Messages("nisp.iv.failure.technical.title"))</h1>
-
 <p class="lede">@Messages("nisp.iv.failure.technical.message")</p>
 
 <p>@Messages("nisp.iv.failure.technical.tryagain")</p>

diff --git a/app/uk/gov/hmrc/nisp/views/iv/failurepages/timeout.scala.html b/app/uk/gov/hmrc/nisp/views/iv/failurepages/timeout.scala.html
@@ -29,11 +29,11 @@
 
 @main(MainTemplateParams(
  articleClasses = Some("mainpage"),
- analyticsAdditionalJs = Some(analyticsAdditionalJs)
+ analyticsAdditionalJs = Some(analyticsAdditionalJs),
+ pageTitle = Some(messages("nisp.iv.failure.timeout.title")),
+ h1Class = Some("heading-xlarge")
 )) {
 
-<h1 class="heading-xlarge">@Messages("nisp.iv.failure.timeout.title")</h1>
-
 <p class="lede">@Messages("nisp.iv.failure.timeout.message")</p>
 
 <p>@Html(Messages("nisp.iv.failure.timeout.data"))</p>

diff --git a/app/uk/gov/hmrc/nisp/views/main.scala.html b/app/uk/gov/hmrc/nisp/views/main.scala.html
@@ -25,6 +25,7 @@
 @import uk.gov.hmrc.play.language.LanguageUtils.Dates._
 @import uk.gov.hmrc.nisp.controllers.routes
 @import uk.gov.hmrc.http.SessionKeys
+@import uk.gov.hmrc.nisp.utils.Constants
 
 
 @import uk.gov.hmrc.nisp.views.viewParams.MainTemplateParams
@@ -60,9 +61,8 @@
 
 
 @contentWithTitle =  {
-
-@mainTemplateParams.pageTitle.map { title =>
-<h1 class="heading-large top-title-heading heading-bottom-margin"> @Html(title) </h1>
+    @mainTemplateParams.pageTitle.map { title =>
+    <h1 class=@headerClass> @Html(title) </h1>
 }
 @mainContent
 
@@ -198,9 +198,17 @@ <h1 class="heading-large top-title-heading heading-bottom-margin"> @Html(title)
     }
 }
 
+@headerClass = @{
+    if (mainTemplateParams.h1Class.isDefined){
+        mainTemplateParams.h1Class.get + " top-title-heading heading-bottom-margin"
+    }else{
+        "heading-large top-title-heading heading-bottom-margin"
+    }
+}
+
 @{
     templateRenderer.renderDefaultTemplate(ApplicationConfig.frontendTemplatePath, article, Map[String, Any](
-        "pageTitle" -> mainTemplateParams.pageTitle,
+        "pageTitle" -> mainTemplateParams.pageTitle.map{x => x + Constants.titleSplitter + messages("nisp.title.extension") + Constants.titleSplitter + messages("nisp.gov-uk")},
         "linkElems" -> linkElems,
         "scriptElems" -> scriptElement,
         "assetsPath" -> mainTemplateParams.applicationConfig.assetsPrefix,

diff --git a/app/uk/gov/hmrc/nisp/views/nirecordVoluntaryContributions.scala.html b/app/uk/gov/hmrc/nisp/views/nirecordVoluntaryContributions.scala.html
@@ -26,11 +26,11 @@
 @defining(Some(user)) { implicit userOption =>
 @main(MainTemplateParams(
     browserTitle = Some(Messages("nisp.nirecord.voluntarycontributions.title")),
+    pageTitle = Some(Messages("nisp.nirecord.voluntarycontributions.heading")),
     userLoggedIn = true,
     sidebarLinks = None)
 ) {
 
-<h1 class="heading-large top-title-heading">@Messages("nisp.nirecord.voluntarycontributions.heading")</h1>
 <p class="lede">@Messages("nisp.nirecord.voluntarycontributions.title.message")</p>
 
 

diff --git a/app/uk/gov/hmrc/nisp/views/questionnaire.scala.html b/app/uk/gov/hmrc/nisp/views/questionnaire.scala.html
@@ -24,9 +24,9 @@
 
 @main(MainTemplateParams(
     browserTitle = Some(Messages("nisp.questionnaire.title")),
+    pageTitle = Some(Messages("nisp.questionnaire.header")),
     IsQuestionnaire = false,
     sidebarLinks = Some(includes.questionnaireSidebar()),
-    pageTitle = Some(Messages("nisp.questionnaire.header")),
     hideNavBar = true)
 ) {
     <p>@Html(Messages("nisp.questionnaire.please"))</p>

diff --git a/app/uk/gov/hmrc/nisp/views/termsAndConditions.scala.html b/app/uk/gov/hmrc/nisp/views/termsAndConditions.scala.html
@@ -23,11 +23,11 @@
 
 @main(MainTemplateParams(
  browserTitle = Some(Messages("nisp.tandcs.title")),
+ pageTitle = Some(messages("nisp.tandcs.title")),
  sidebarLinks = None,
  hideNavBar = true
 )) {
 
-<h1 class="heading-large top-title-heading">@Messages("nisp.tandcs.title")</h1>
 <h2 class="heading-medium">@Messages("nisp.tandcs.heading")</h2>
 <p>@Html(Messages("nisp.tandcs.use"))</p>
 <p>@Html(Messages("nisp.tandcs.information"))</p>

diff --git a/app/uk/gov/hmrc/nisp/views/viewParams/MainTemplateParams.scala b/app/uk/gov/hmrc/nisp/views/viewParams/MainTemplateParams.scala
@@ -22,6 +22,7 @@ import uk.gov.hmrc.nisp.config.ApplicationConfig
 case class MainTemplateParams(
   browserTitle: Option[String] = None,
   pageTitle: Option[String] = None,
+  h1Class: Option[String] = None,
   sidebarLinks: Option[Html] = None,
   sidebarClasses: Option[String] = None,
   userLoggedIn: Boolean = false,

diff --git a/conf/application.conf b/conf/application.conf
@@ -25,6 +25,11 @@ play.modules.enabled += "com.kenshoo.play.metrics.PlayModule"
 
 play.http.requestHandler = "play.api.http.GlobalSettingsHttpRequestHandler"
 
+play.filters.csrf.header.bypassHeaders {
+    X-Requested-With = "*"
+    Csrf-Token = "nocheck"
+}
+
 application.langs = "en,cy"
 
 application.session.httpOnly= true

diff --git a/conf/messages b/conf/messages
@@ -22,6 +22,7 @@ nisp.breadcrumb.nirecord.voluntaryContrib = Voluntary contributions
 nisp.breadcrumb.nirecord.gapsandhowtocheck = Gaps in your record and how to check them
 nisp.breadcrumb.excluded = Excluded
 nisp.breadcrumb.cope = Cope Page
+nisp.title.extension = Check your State Pension
 
 #*************************
 # Landing page messages
@@ -44,7 +45,7 @@ nisp.landing.noteligible = Contact the <a href="https://www.gov.uk/future-pensio
 # Main page messages
 #**********************
 
-nisp.main.title = Your State Pension summary – Check your State Pension – GOV.UK
+nisp.main.title = Your State Pension summary
 nisp.main.h1.title = Your State Pension summary
 nisp.main.caveats = Your forecast
 nisp.main.continueContribute = You need to continue to contribute National Insurance to reach your forecast
@@ -236,12 +237,14 @@ nisp.questionnaire.sidebar.moreonpensionservice = More on State Pensions
 nisp.thankyou.title = Thank you
 nisp.thankyou.received = We’ve received your feedback.
 nisp.finishpage.title = We’ve received your feedback: Check your State Pension
+nisp.feedback.title = Send your feedback - Check your State Pension - GOV.UK
+nisp.feedback.finished.title = Your feedback - Check your State Pension - GOV.UK
 
 #*******************
 # Session timeout
 #*******************
 
-nisp.timeout.title = You’ve been signed out: Check your State Pension
+nisp.timeout.title = You’ve been signed out
 nisp.timeout.heading = You’ve been signed out
 nisp.timeout.body = For your security we signed you out because you did not use the service for 15 minutes or more.
 
@@ -259,7 +262,7 @@ nisp.signedOut.havingMoreInRetirement = <a href="https://www.yourpension.gov.uk/
 # NI record page
 #******************
 
-nisp.nirecord.title = Your National Insurance record – Check your State Pension – GOV.UK
+nisp.nirecord.title = Your National Insurance record
 nisp.nirecord.heading = Your National Insurance record
 nisp.nirecord.heading.uk = Your UK National Insurance record
 nisp.nirecord.yournirecordgapyears = Years which are not full.
@@ -315,7 +318,7 @@ nisp.nirecord.helpline.openTimes = Monday to Friday: 8am to 6pm
 # Gaps in your record page
 #****************************
 
-nisp.nirecord.gapsinyourrecord.title = Gaps in your record and how to check them: Check your State Pension
+nisp.nirecord.gapsinyourrecord.title = Gaps in your record and how to check them
 nisp.nirecord.gapsinyourrecord.heading = Gaps in your record and how to check them
 nisp.nirecord.gapsinyourrecord.title.message = In most cases, you will have a gap in your record as you did not contribute enough National Insurance.
 nisp.nirecord.gapsinyourrecord.listheader = This could be because you were:
@@ -348,7 +351,7 @@ nisp.nirecord.gapsinyourrecord.nationalinsurancecredits.link = More on National
 # Voluntary contribution page
 #*******************************
 
-nisp.nirecord.voluntarycontributions.title = Voluntary contributions: Check your State Pension
+nisp.nirecord.voluntarycontributions.title = Voluntary contributions
 nisp.nirecord.voluntarycontributions.heading = Voluntary contributions
 nisp.nirecord.voluntarycontributions.title.message = Before considering paying voluntary contributions you should:
 

diff --git a/conf/messages.cy b/conf/messages.cy
@@ -22,7 +22,7 @@ nisp.breadcrumb.nirecord.voluntaryContrib = Cyfraniadau gwirfoddol
 nisp.breadcrumb.nirecord.gapsandhowtocheck = Bylchau yn eich cofnod a sut i’w gwirio
 nisp.breadcrumb.excluded = Wedi’i eithrio
 nisp.breadcrumb.cope = Tudalen Cope
-
+nisp.title.extension = Gwirio eich Pensiwn y Wladwriaeth
 #*************************
 # Landing page messages
 #*************************
@@ -44,7 +44,7 @@ nisp.landing.noteligible = Cysylltwch â <a href="https://www.gov.uk/future-pens
 # Main page messages
 #**********************
 
-nisp.main.title = Crynodeb o’ch Pensiwn y Wladwriaeth – Gwirio’ch Pensiwn y Wladwriaeth – GOV.UK
+nisp.main.title = Crynodeb o’ch Pensiwn y Wladwriaeth
 nisp.main.h1.title = Crynodeb o’ch Pensiwn y Wladwriaeth
 nisp.main.caveats = Eich rhagolwg
 nisp.main.continueContribute = Bydd angen i chi barhau i gyfrannu Yswiriant Gwladol i gyrraedd eich rhagolwg
@@ -234,12 +234,14 @@ nisp.questionnaire.sidebar.moreonpensionservice = Mwy am Bensiynau’r Wladwriae
 nisp.thankyou.title = Diolch yn fawr
 nisp.thankyou.received = Rydym wedi derbyn eich adborth.
 nisp.finishpage.title = Rydym wedi derbyn eich adborth: Gwirio eich Pensiwn y Wladwriaeth
+nisp.feedback.title = Anfon eich adborth - Gwirio eich Pensiwn y Wladwriaeth - GOV.UK
+nisp.feedback.finished.title = Eich adborth - Gwirio eich Pensiwn y Wladwriaeth - GOV.UK
 
 #*******************
 # Session timeout
 #*******************
 
-nisp.timeout.title = Rydych wedi cael eich allgofnodi: Gwirio eich Pensiwn y Wladwriaeth
+nisp.timeout.title = Rydych wedi cael eich allgofnodi
 nisp.timeout.heading = Rydych wedi cael eich allgofnodi
 nisp.timeout.body = Er mwyn eich diogelwch rydym wedi eich allgofnodi oherwydd nad ydych wedi defnyddio’r gwasanaeth am 15 munud neu fwy.
 
@@ -257,7 +259,7 @@ nisp.signedOut.havingMoreInRetirement = <a href="https://www.yourpension.gov.uk/
 # NI record page
 #******************
 
-nisp.nirecord.title = Eich cofnod Yswiriant Gwladol – Gwirio’ch Pensiwn y Wladwriaeth – GOV.UK
+nisp.nirecord.title = Eich cofnod Yswiriant Gwladol
 nisp.nirecord.heading = Eich cofnod Yswiriant Gwladol
 nisp.nirecord.heading.uk = Eich cofnod Yswiriant Gwladol y DU
 nisp.nirecord.yournirecordgapyears = Blynyddoedd sydd ddim yn llawn.
@@ -318,7 +320,7 @@ nisp.nirecord.helpline.openTimes = Dydd Llun i ddydd Gwener: 8am i 6pm
 # Gaps in your record page
 #****************************
 
-nisp.nirecord.gapsinyourrecord.title = Bylchau yn eich cofnod a sut i’w gwirio: Gwirio eich Pensiwn y Wladwriaeth
+nisp.nirecord.gapsinyourrecord.title = Bylchau yn eich cofnod a sut i’w gwirio
 nisp.nirecord.gapsinyourrecord.heading = Bylchau yn eich cofnod a sut i’w gwirio
 nisp.nirecord.gapsinyourrecord.title.message = Yn y rhan fwyaf o achosion, bydd gennych fwlch yn eich cofnod oherwydd na wnaethoch gyfrannu digon o Yswiriant Gwladol.
 nisp.nirecord.gapsinyourrecord.listheader = Gallai hyn fod oherwydd eich bod:
@@ -351,7 +353,7 @@ nisp.nirecord.gapsinyourrecord.nationalinsurancecredits.link = Mwy am gredydau Y
 # Voluntary contributions page
 #********************************
 
-nisp.nirecord.voluntarycontributions.title = Cyfraniadau gwirfoddol: Gwirio eich Pensiwn y Wladwriaeth
+nisp.nirecord.voluntarycontributions.title = Cyfraniadau gwirfoddol
 nisp.nirecord.voluntarycontributions.heading = Cyfraniadau gwirfoddol
 nisp.nirecord.voluntarycontributions.title.message = Cyn i chi ystyried talu cyfraniadau gwirfoddol dylech: