Merge pull request #227 from hmrc/PODS-9824

Pods 9824
hmrc · Oct 18, 2024 · e69245b · e69245b
2 parents 14b529c + 8251a27
commit e69245b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 23 deletions.
diff --git a/app/views/EmailView.scala.html b/app/views/EmailView.scala.html
@@ -32,10 +32,6 @@
 
 @layout(messages("email.title", messages(viewModel.entityType)), formHasErrors = form.hasErrors) {
 
-    <h1 class="govuk-heading-xl">@messages("email.title", viewModel.entityName)</h1>
-
-    <p class="govuk-body">@messages("email.hint", viewModel.entityName)</p>
-
     @formHelper(action = viewModel.submitUrl, Symbol("autoComplete") -> "off") {
 
         @if(form.errors.nonEmpty) {
@@ -47,9 +43,15 @@ <h1 class="govuk-heading-xl">@messages("email.title", viewModel.entityName)</h1>
                 field = form("value"),
                 label = Label(
                     content = Text(messages("email.title", viewModel.entityName)),
-                    classes = "govuk-fieldset__legend--s govuk-visually-hidden"
+                    isPageHeading = true,
+                    classes = "govuk-label--xl"
                 ),
-                classes = "govuk-!-width-three-quarters"
+                classes = "govuk-!-width-three-quarters",
+                hint = Some(
+                    Hint(
+                        content = Text(messages("email.hint", viewModel.entityName))
+                    )
+                )
             ).asEmail()
         )
 

diff --git a/app/views/PhoneView.scala.html b/app/views/PhoneView.scala.html
@@ -32,10 +32,6 @@
 
 @layout(messages("phone.title", messages(viewModel.entityType)), formHasErrors = form.hasErrors) {
 
-    <h1 class="govuk-heading-xl">@messages("phone.title", viewModel.entityName)</h1>
-
-    <p class="govuk-body">@messages("phone.hint", viewModel.entityName)</p>
-
     @formHelper(action = viewModel.submitUrl, Symbol("autoComplete") -> "off") {
 
         @if(form.errors.nonEmpty) {
@@ -47,11 +43,14 @@ <h1 class="govuk-heading-xl">@messages("phone.title", viewModel.entityName)</h1>
                 field = form("value"),
                 label = Label(
                     content = Text(messages("phone.title", viewModel.entityName)),
-                    isPageHeading = false,
-                    classes = "govuk-fieldset__legend--s govuk-visually-hidden"
+                    isPageHeading = true,
+                    classes = "govuk-label--xl"
                 ),
                 classes = "govuk-input--width-20",
-                inputType = "tel"
+                inputType = "tel",
+                hint = Some(Hint(
+                    content = Text(messages("phone.hint", viewModel.entityName))
+                ))
             )
         )
 

diff --git a/app/views/individual/EmailView.scala.html b/app/views/individual/EmailView.scala.html
@@ -33,9 +33,6 @@
             @govukErrorSummary(ErrorSummary().withFormErrorsAsText(form))
         }
 
-        <h1 class="govuk-heading-xl">@messages("individual.email.title")</h1>
-        <p class="govuk-body">@messages("individual.email.hint")</p>
-
         @govukInput(
             Input(
                 id = field.id,
@@ -44,10 +41,11 @@ <h1 class="govuk-heading-xl">@messages("individual.email.title")</h1>
                 inputType = "email",
                 classes = "govuk-!-width-three-quarters",
                 label = Label(
-                    isPageHeading = false,
-                    classes = "govuk-fieldset__legend--s govuk-visually-hidden",
+                    isPageHeading = true,
+                    classes = "govuk-label--xl",
                     content = Text(messages("individual.email.title"))
                 ),
+                hint = Some(Hint(content = Text(messages("individual.email.hint")))),
                 errorMessage = field.error.map(e => ErrorMessage.errorMessageWithDefaultStringsTranslated(content = Text(messages(e.message, e.args:_*))))
             )
         )

diff --git a/app/views/individual/PhoneView.scala.html b/app/views/individual/PhoneView.scala.html
@@ -33,20 +33,18 @@
             @govukErrorSummary(ErrorSummary().withFormErrorsAsText(form))
         }
 
-        <h1 class="govuk-heading-xl">@messages("individual.phone.title")</h1>
-        <p class="govuk-body">@messages("individual.phone.hint")</p>
-
         @govukInput(
             Input(
                 id = field.id,
                 name = field.name,
                 value = field.value,
                 inputType = "tel",
                 label = Label(
-                    isPageHeading = false,
-                    classes = "govuk-fieldset__legend--s govuk-visually-hidden",
+                    isPageHeading = true,
+                    classes = "govuk-label--xl",
                     content = Text(messages("individual.phone.title"))
                 ),
+                hint = Some(Hint(content = Text(messages("individual.phone.hint")))),
                 errorMessage = field.error.map(e => ErrorMessage.errorMessageWithDefaultStringsTranslated(content = Text(messages(e.message, e.args:_*))))
             )
         )