From 59b175462e11f87b419e096a7eb2278bc47fb58c Mon Sep 17 00:00:00 2001 From: Pete Slater Date: Wed, 5 Apr 2023 03:32:53 -0500 Subject: [PATCH] API-6782 - Moving feedback banner to top of page template (#444) * API-6782 - Moving feedback banner to top of page template * API-6782 - Removing feedback banner view as no longer used * API-6782 - Adding feedback banner to home page --- .../include/FeedbackBannerView.scala.html | 41 ------------------- .../views/templates/GovUkWrapper.scala.html | 26 +++++------- .../views/templates/HomePageHeader.scala.html | 10 ++++- .../views/include/apiMainSpec.scala | 6 +-- 4 files changed, 22 insertions(+), 61 deletions(-) delete mode 100644 app/uk/gov/hmrc/apidocumentation/views/include/FeedbackBannerView.scala.html diff --git a/app/uk/gov/hmrc/apidocumentation/views/include/FeedbackBannerView.scala.html b/app/uk/gov/hmrc/apidocumentation/views/include/FeedbackBannerView.scala.html deleted file mode 100644 index 7be09103..00000000 --- a/app/uk/gov/hmrc/apidocumentation/views/include/FeedbackBannerView.scala.html +++ /dev/null @@ -1,41 +0,0 @@ -@* - * Copyright 2023 HM Revenue & Customs - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - *@ - -@import uk.gov.hmrc.apidocumentation.config.ApplicationConfig -@import uk.gov.hmrc.apidocumentation.models.FeedbackBanner - - -@this() - -@(feedbackBanner: FeedbackBanner)(implicit appConfig: ApplicationConfig) - -
-
-
-
-

Your feedback helps us improve our service

- -
-
- -

Help us improve our service

-

@{feedbackBanner.description}

-

Survey responses are anonymous and we will not ask for personal information.

-

Start survey

-
-
-
-
diff --git a/app/uk/gov/hmrc/apidocumentation/views/templates/GovUkWrapper.scala.html b/app/uk/gov/hmrc/apidocumentation/views/templates/GovUkWrapper.scala.html index b1ce5ccf..0b932dcb 100644 --- a/app/uk/gov/hmrc/apidocumentation/views/templates/GovUkWrapper.scala.html +++ b/app/uk/gov/hmrc/apidocumentation/views/templates/GovUkWrapper.scala.html @@ -20,7 +20,6 @@ @import uk.gov.hmrc.apidocumentation.models.{Breadcrumbs, GenericFeedbackBanner, _} @import play.twirl.api.HtmlFormat @import uk.gov.hmrc.apidocumentation.views.templates.FooterLinks -@import uk.gov.hmrc.apidocumentation.views.html.include.FeedbackBannerView @import uk.gov.hmrc.apidocumentation.views.html.include @import uk.gov.hmrc.apidocumentation.views.html.partials @import uk.gov.hmrc.apidocumentation.views.html.templates._ @@ -32,8 +31,7 @@ siteFooter: SiteFooter, siteHeader: SiteHeader, siteHelper: SiteHelper, - hmrcTrackingConsentSnippet: HmrcTrackingConsentSnippet, - feedbackBannerView: FeedbackBannerView + hmrcTrackingConsentSnippet: HmrcTrackingConsentSnippet ) @( pageTitle: Option[String] = None, @@ -43,12 +41,11 @@ bodyEndBlock: Option[Html] = None, breadcrumbs: Option[Breadcrumbs] = None, navLinks: Seq[NavLink] = Seq.empty, - leftNav: Option[Html] = None, - feedbackBanner: Option[FeedbackBanner] = Some(GenericFeedbackBanner) + leftNav: Option[Html] = None )(contentBlock: Html)(implicit applicationConfig: ApplicationConfig, messages: Messages, request: play.api.mvc.Request[Any], requestHeader: RequestHeader) @head = { -@hmrcTrackingConsentSnippet() + @hmrcTrackingConsentSnippet() } @@ -60,6 +57,13 @@ @beforeContentBlock = { +
+

+ + Your feedback (opens in new tab) will help us to improve this service. + +

+
@breadcrumbs.map { crumbs => @@ -71,20 +75,12 @@ } @footerBlock = { -
- @feedbackBanner match { - case Some(fb) => { - @feedbackBannerView(fb) - } - case _ => {} - } -
@siteFooter(new Footer(meta = Some(Meta(items = Some(footerLinks.items))))) } @bodyEndDefault = { @bodyEndBlock -@scripts + @scripts } @mainContentDefault = { diff --git a/app/uk/gov/hmrc/apidocumentation/views/templates/HomePageHeader.scala.html b/app/uk/gov/hmrc/apidocumentation/views/templates/HomePageHeader.scala.html index 493e4437..e7d97ada 100644 --- a/app/uk/gov/hmrc/apidocumentation/views/templates/HomePageHeader.scala.html +++ b/app/uk/gov/hmrc/apidocumentation/views/templates/HomePageHeader.scala.html @@ -14,6 +14,7 @@ * limitations under the License. *@ +@import uk.gov.hmrc.apidocumentation.config.ApplicationConfig @import uk.gov.hmrc.apidocumentation.views.html.templates.SiteHeader @import uk.gov.hmrc.apidocumentation.views.html.partials @import uk.gov.hmrc.apidocumentation.views.html.include @@ -21,11 +22,18 @@ @this(siteHeader: SiteHeader) -@(headerNavLinks: Option[Html] = None, navLinks: Seq[NavLink] = Seq.empty)(implicit messages: Messages) +@(headerNavLinks: Option[Html] = None, navLinks: Seq[NavLink] = Seq.empty)(implicit messages: Messages, applicationConfig: ApplicationConfig) @siteHeader(navLinks)
+
+

+ + Your feedback (opens in new tab) will help us to improve this service. + +

+
@include.api_header_nav(navLinks = headerNavLinks) diff --git a/test/uk/gov/hmrc/apidocumentation/views/include/apiMainSpec.scala b/test/uk/gov/hmrc/apidocumentation/views/include/apiMainSpec.scala index 9212a511..4cb37dba 100644 --- a/test/uk/gov/hmrc/apidocumentation/views/include/apiMainSpec.scala +++ b/test/uk/gov/hmrc/apidocumentation/views/include/apiMainSpec.scala @@ -35,7 +35,6 @@ class apiMainSpec extends CommonViewSpec { } "htmlView" must { - "render the page with feedback banner" in new Setup { val document = Jsoup.parse( usingTheHubView.render( @@ -46,9 +45,8 @@ class apiMainSpec extends CommonViewSpec { ).body ) - elementExistsById(document, "feedback") shouldBe true - elementExistsById(document, "show-survey") shouldBe true - document.getElementById("feedback-title").text() shouldBe "Your feedback helps us improve our service" + elementExistsById(document, "feedback-banner") shouldBe true + document.getElementById("feedback-title").text() shouldBe "Your feedback (opens in new tab) will help us to improve this service." } } }