Skip to content

Commit

Permalink
APIS-6422: Amend cookie details page (hmrc#477)
Browse files Browse the repository at this point in the history 
* APIS-6422: Amend cookie details page

* APIS-6422: PR bot recommendation
  • Loading branch information
@johnsgp
johnsgp authored Sep 26, 2023
1 parent 31cb2a8 commit 6ae2ce7
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 61 deletions.
57 changes: 17 additions & 40 deletions app/uk/gov/hmrc/apidocumentation/views/CookiesView.scala.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*@

@import uk.gov.hmrc.apidocumentation.config._
@import uk.gov.hmrc.apidocumentation.controllers
@import uk.gov.hmrc.apidocumentation.views.html.include._

@this(main: main)
Expand Down Expand Up @@ -59,6 +60,16 @@ <h3 class="govuk-heading-s">@Messages("help.cookies.how_used.sessions.heading")<
<td class="govuk-table__cell">@Messages("help.cookies.how_used.sessions.table.mdtpdf.purpose")</td>
<td class="govuk-table__cell">@Messages("help.cookies.how_used.sessions.table.mdtpdf.expires")</td>
</tr>
<tr class="govuk-table__row">
<td class="govuk-table__cell">@Messages("help.cookies.how_used.sessions.table.DEVICE_SESS_ID.name")</td>
<td class="govuk-table__cell">@Messages("help.cookies.how_used.sessions.table.DEVICE_SESS_ID.purpose")</td>
<td class="govuk-table__cell">@Messages("help.cookies.how_used.sessions.table.DEVICE_SESS_ID.expires")</td>
</tr>
<tr class="govuk-table__row">
<td class="govuk-table__cell">@Messages("help.cookies.how_used.sessions.table.PLAY2AUTH_SESS_ID.name")</td>
<td class="govuk-table__cell">@Messages("help.cookies.how_used.sessions.table.PLAY2AUTH_SESS_ID.purpose")</td>
<td class="govuk-table__cell">@Messages("help.cookies.how_used.sessions.table.PLAY2AUTH_SESS_ID.expires")</td>
</tr>
<tr class="govuk-table__row">
<td class="govuk-table__cell">@Messages("help.cookies.how_used.sessions.table.PLAY_FLASH.name")</td>
<td class="govuk-table__cell">@Messages("help.cookies.how_used.sessions.table.PLAY_FLASH.purpose")</td>
Expand Down Expand Up @@ -179,46 +190,12 @@ <h3 class="govuk-heading-s">@Messages("help.cookies.optimizely")</h3>
</table>
<p class="govuk-body">You can opt out from having Optimizely collect your information by <a class="govuk-link" href="https://www.optimizely.com/legal/opt-out/" target="_blank" rel="noopener noreferrer">visiting their opt out page (opens in a new tab)</a> and entering our Developer Hub URL in their opt out form:<br><br><code>https://developer.service.hmrc.gov.uk/api-documentation</code> </p>

<h3 class="govuk-heading-s">@Messages("help.cookies.sm")</h3>
<h3 class="govuk-heading-s">@Messages("help.cookies.optimalWorkshop")</h3>
<p class="govuk-body">We use <a
class="govuk-link" href="http://www.surveymonkey.com/" target="_blank" rel="noopener noreferrer">SurveyMonkey (opens in a new tab)</a> to collect responses to our survey. If you take part, SurveyMonkey saves cookies to your computer to track your progress.</p>

<table class="govuk-table">
<thead class="govuk-table__head">
<tr class="govuk-table__row">
<th scope="col" class="govuk-table__header">@Messages("help.cookies.table.header.name")</th>
<th scope="col" class="govuk-table__header">@Messages("help.cookies.optimizely.table.header.purpose")</th>
<th scope="col" class="govuk-table__header">@Messages("help.cookies.table.header.expires")</th>
</tr>
</thead>
<tbody class="govuk-table__body">
<tr class="govuk-table__row">
<td class="govuk-table__cell">@Messages("help.cookies.sm.table.1.name")</td>
<td class="govuk-table__cell">@Messages("help.cookies.sm.table.1.purpose")</td>
<td class="govuk-table__cell">@Messages("help.cookies.sm.table.1.expires")</td>
</tr>
<tr class="govuk-table__row">
<td class="govuk-table__cell">@Messages("help.cookies.sm.table.2.name")</td>
<td class="govuk-table__cell">@Messages("help.cookies.sm.table.2.purpose")</td>
<td class="govuk-table__cell">@Messages("help.cookies.sm.table.2.expires")</td>
</tr>
<tr class="govuk-table__row">
<td class="govuk-table__cell">@Messages("help.cookies.sm.table.3.name")</td>
<td class="govuk-table__cell">@Messages("help.cookies.sm.table.3.purpose")</td>
<td class="govuk-table__cell">@Messages("help.cookies.sm.table.3.expires")</td>
</tr>
<tr class="govuk-table__row">
<td class="govuk-table__cell">@Messages("help.cookies.sm.table.4.name")</td>
<td class="govuk-table__cell">@Messages("help.cookies.sm.table.4.purpose")</td>
<td class="govuk-table__cell">@Messages("help.cookies.sm.table.4.expires")</td>
</tr>
<tr class="govuk-table__row">
<td class="govuk-table__cell">@Messages("help.cookies.sm.table.5.name")</td>
<td class="govuk-table__cell">@Messages("help.cookies.sm.table.5.purpose")</td>
<td class="govuk-table__cell">@Messages("help.cookies.sm.table.5.expires")</td>
</tr>
</tbody>
</table>
class="govuk-link" href="http://www.optimalworkshop.com/" target="_blank" rel="noopener noreferrer">Optimal Workshop (opens in a new tab)</a> to collect responses to our survey. If you take part, Optimal Workshop saves cookies to your computer to track your progress.</p>
<p class="govuk-body">You can find out more <a
class="govuk-link" href="https://help.surveymonkey.com/articles/en_US/kb/About-the-cookies-we-use" target="_blank" rel="noopener noreferrer">about the cookies that SurveyMonkey uses (opens in a new tab)</a> and how to opt out.</p>
class="govuk-link" href="https://app.optimalworkshop.com/cookies" target="_blank" rel="noopener noreferrer">about the cookies that Optimal Workshop uses (opens in a new tab)</a>.</p>

<h3 class="govuk-heading-s">Change your settings</h3>
<p class="govuk-body">You can <a class="govuk-link" href="@controllers.routes.HelpPagesController.cookiesPage()">change which cookies you're happy for us to use</a>.</p>
}
4 changes: 2 additions & 2 deletions conf/logback.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@
<appender-ref ref="STDOUT_IGNORE_NETTY"/>
</logger>

<logger name="uk.gov" level="${logger.uk.gov:-WARN}"/>
<logger name="uk.gov" level="WARN"/>

<logger name="application" level="${logger.application:-WARN}"/>
<logger name="application" level="WARN"/>

<logger name="connector" level="${logger.application:-WARN}">
<appender-ref ref="STDOUT"/>
Expand Down
26 changes: 8 additions & 18 deletions conf/messages
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,12 @@ help.cookies.how_used.sessions.table.mdtpp.expires=When you close your browser
help.cookies.how_used.sessions.table.mdtpdf.name=mdtpdf
help.cookies.how_used.sessions.table.mdtpdf.purpose=Stores session data
help.cookies.how_used.sessions.table.mdtpdf.expires=When you close your browser
help.cookies.how_used.sessions.table.DEVICE_SESS_ID.name=DEVICE_SESS_ID
help.cookies.how_used.sessions.table.DEVICE_SESS_ID.purpose=Remembers a successful sign in using an access code
help.cookies.how_used.sessions.table.DEVICE_SESS_ID.expires=7 days
help.cookies.how_used.sessions.table.PLAY2AUTH_SESS_ID.name=PLAY2AUTH_SESS_ID
help.cookies.how_used.sessions.table.PLAY2AUTH_SESS_ID.purpose=Stores session data
help.cookies.how_used.sessions.table.PLAY2AUTH_SESS_ID.expires=24 hours
help.cookies.how_used.sessions.table.PLAY_FLASH.name=PLAY_FLASH
help.cookies.how_used.sessions.table.PLAY_FLASH.purpose=Stores session data
help.cookies.how_used.sessions.table.PLAY_FLASH.expires=When you close your browser
Expand All @@ -75,28 +81,12 @@ help.cookies.optimizely.info=Sometimes we use Optimizely software to test differ
help.cookies.optimizely.table.header.purpose=Purpose
help.cookies.optimizely.table.1.name=optimizelyEndUserId
help.cookies.optimizely.table.1.purpose=This helps us identify how you use GOV.UK so we can make the site better
help.cookies.optimizely.table.1.expires=10 years
help.cookies.optimizely.table.1.expires=6 months
help.cookies.optimizely.table.2.name=optimizelyRedirectData
help.cookies.optimizely.table.2.purpose=This helps us identify how you use GOV.UK so we can make the site better
help.cookies.optimizely.table.2.expires=5 seconds

help.cookies.sm=Our satisfaction survey (SurveyMonkey)
help.cookies.sm.table.header.purpose=Purpose
help.cookies.sm.table.1.name=mbox
help.cookies.sm.table.1.purpose=This is used to keep your progress through the survey
help.cookies.sm.table.1.expires=30 minutes
help.cookies.sm.table.2.name=SSOE
help.cookies.sm.table.2.purpose=This is used for testing different content and features on the survey website to help make it better
help.cookies.sm.table.2.expires=When you close your browser
help.cookies.sm.table.3.name=TS5159a2 and TSd0b041
help.cookies.sm.table.3.purpose=These are used to manage survey traffic by sending your computer to a specific server
help.cookies.sm.table.3.expires=When you close your browser
help.cookies.sm.table.4.name=ep201
help.cookies.sm.table.4.purpose=This is used to help us identify how you use the survey
help.cookies.sm.table.4.expires=30 minutes
help.cookies.sm.table.5.name=ep202
help.cookies.sm.table.5.purpose=This works with ep201 to help us identify how you use the survey
help.cookies.sm.table.5.expires=1 year
help.cookies.optimalWorkshop=Our satisfaction survey (Optimal Workshop)

footer.links.cookies.text = Cookies
footer.links.privacy_policy.text = Privacy Policy
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
resolvers += "HMRC-open-artefacts-maven" at "https://open.artefacts.tax.service.gov.uk/maven2"
resolvers += Resolver.url("HMRC-open-artefacts-ivy", url("https://open.artefacts.tax.service.gov.uk/ivy2"))(Resolver.ivyStylePatterns)

addSbtPlugin("uk.gov.hmrc" % "sbt-auto-build" % "3.9.0")
addSbtPlugin("uk.gov.hmrc" % "sbt-auto-build" % "3.14.0")
addSbtPlugin("uk.gov.hmrc" % "sbt-distributables" % "2.2.0")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.19")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.9.3")
Expand Down

0 comments on commit 6ae2ce7

Please sign in to comment.