Merge pull request #205 from SkillsFundingAgency/MF-401_Cooki_consent

MF-401 Cookie consent banner
SkillsFundingAgency · Feb 12, 2020 · 6292001 · 6292001
2 parents f573197 + bc52d05
commit 6292001
Show file tree

Hide file tree

Showing 4 changed files with 97 additions and 93 deletions.
diff --git a/src/SFA.DAS.Reservations.Web/SFA.DAS.Reservations.Web.csproj b/src/SFA.DAS.Reservations.Web/SFA.DAS.Reservations.Web.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="2.2.0" />
     <PackageReference Include="Microsoft.Net.Http" Version="2.2.29" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.3" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.4" />
     <PackageReference Include="NLog.Web.AspNetCore" Version="4.8.0" />
     <PackageReference Include="SFA.DAS.Account.Api.Client" Version="1.6.1" />
     <PackageReference Include="SFA.DAS.Authorization.CommitmentPermissions" Version="6.0.23" />

diff --git a/src/SFA.DAS.Reservations.Web/Views/Shared/CookieBannerPartial.cshtml b/src/SFA.DAS.Reservations.Web/Views/Shared/CookieBannerPartial.cshtml
@@ -0,0 +1,24 @@
+<div id="global-cookie-message" data-module="cookie-banner" role="region" aria-label="cookie banner">
+    <div class="das-cookie-banner">
+        <div class="das-cookie-banner__wrapper govuk-width-container">
+            <h2 class="heading-large das-cookie-banner__header">Cookies</h2>
+            <p class="das-cookie-banner__message">The <abbr title="Education and Skills Funding Agency">ESFA</abbr> uses cookies to make the site simpler.</p>
+            <div class="das-cookie-banner__buttons">
+                <div class="das-cookie-banner__button-wrap das-cookie-banner__button-accept">
+                    <button class="govuk-button das-button--outline das-cookie-banner__button" type="submit" data-accept-cookies="true" id="btn-cookie-accept">Accept cookies</button>
+                </div>
+                <div class="das-cookie-banner__button-wrap das-cookie-banner__button-settings">
+                    <a class="govuk-button das-button--outline das-cookie-banner__button" role="button" id="btn-cookie-settings" 
+                       asp-external-controller="CookieConsent" asp-external-action="Settings" asp-external-subdomain="accounts" 
+                       class="das-navigation__link">Cookie settings</a>
+                </div>
+            </div>
+        </div>
+        <div class="das-cookie-banner__confirmation govuk-width-container" tabindex="-1">
+            <p class="das-cookie-banner__confirmation-message">
+                You've accepted all cookies. You can <a class="govuk-link" asp-external-controller="CookieConsent" asp-external-action="Settings" asp-external-subdomain="accounts" id="link-cookie-settings">change your cookie settings</a> at any time.
+            </p>
+            <button class="das-cookie-banner__hide-button" data-hide-cookie-banner="true" id="btn-hide-cookie-banner">Hide</button>
+        </div>
+    </div>
+</div>
diff --git a/src/SFA.DAS.Reservations.Web/Views/Shared/_CookieConsentPartial.cshtml b/src/SFA.DAS.Reservations.Web/Views/Shared/_CookieConsentPartial.cshtml
diff --git a/src/SFA.DAS.Reservations.Web/Views/Shared/_Layout.cshtml b/src/SFA.DAS.Reservations.Web/Views/Shared/_Layout.cshtml
@@ -52,83 +52,88 @@
 
     <a href="#main-content" class="govuk-skip-link">Skip to main content</a>
 
-    <header class="govuk-header das-header--no-border @(Configuration["AuthType"].Equals("provider", StringComparison.CurrentCultureIgnoreCase) ? "das-header--provider-legacy" : "")" role="banner" data-module="header">
-        <div class="govuk-header__container govuk-width-container">
-
-            <div class="govuk-header__logo">
-                <a href="https://www.gov.uk/" class="govuk-header__link govuk-header__link--homepage">
-                    <span class="govuk-header__logotype">
-
-                        <svg role="presentation" focusable="false" class="govuk-header__logotype-crown" xmlns="http://www.w3.org/2000/svg" viewbox="0 0 132 97" height="32" width="36">
-                            <path fill="currentColor" fill-rule="evenodd" d="M25 30.2c3.5 1.5 7.7-.2 9.1-3.7 1.5-3.6-.2-7.8-3.9-9.2-3.6-1.4-7.6.3-9.1 3.9-1.4 3.5.3 7.5 3.9 9zM9 39.5c3.6 1.5 7.8-.2 9.2-3.7 1.5-3.6-.2-7.8-3.9-9.1-3.6-1.5-7.6.2-9.1 3.8-1.4 3.5.3 7.5 3.8 9zM4.4 57.2c3.5 1.5 7.7-.2 9.1-3.8 1.5-3.6-.2-7.7-3.9-9.1-3.5-1.5-7.6.3-9.1 3.8-1.4 3.5.3 7.6 3.9 9.1zm38.3-21.4c3.5 1.5 7.7-.2 9.1-3.8 1.5-3.6-.2-7.7-3.9-9.1-3.6-1.5-7.6.3-9.1 3.8-1.3 3.6.4 7.7 3.9 9.1zm64.4-5.6c-3.6 1.5-7.8-.2-9.1-3.7-1.5-3.6.2-7.8 3.8-9.2 3.6-1.4 7.7.3 9.2 3.9 1.3 3.5-.4 7.5-3.9 9zm15.9 9.3c-3.6 1.5-7.7-.2-9.1-3.7-1.5-3.6.2-7.8 3.7-9.1 3.6-1.5 7.7.2 9.2 3.8 1.5 3.5-.3 7.5-3.8 9zm4.7 17.7c-3.6 1.5-7.8-.2-9.2-3.8-1.5-3.6.2-7.7 3.9-9.1 3.6-1.5 7.7.3 9.2 3.8 1.3 3.5-.4 7.6-3.9 9.1zM89.3 35.8c-3.6 1.5-7.8-.2-9.2-3.8-1.4-3.6.2-7.7 3.9-9.1 3.6-1.5 7.7.3 9.2 3.8 1.4 3.6-.3 7.7-3.9 9.1zM69.7 17.7l8.9 4.7V9.3l-8.9 2.8c-.2-.3-.5-.6-.9-.9L72.4 0H59.6l3.5 11.2c-.3.3-.6.5-.9.9l-8.8-2.8v13.1l8.8-4.7c.3.3.6.7.9.9l-5 15.4v.1c-.2.8-.4 1.6-.4 2.4 0 4.1 3.1 7.5 7 8.1h.2c.3 0 .7.1 1 .1.4 0 .7 0 1-.1h.2c4-.6 7.1-4.1 7.1-8.1 0-.8-.1-1.7-.4-2.4V34l-5.1-15.4c.4-.2.7-.6 1-.9zM66 92.8c16.9 0 32.8 1.1 47.1 3.2 4-16.9 8.9-26.7 14-33.5l-9.6-3.4c1 4.9 1.1 7.2 0 10.2-1.5-1.4-3-4.3-4.2-8.7L108.6 76c2.8-2 5-3.2 7.5-3.3-4.4 9.4-10 11.9-13.6 11.2-4.3-.8-6.3-4.6-5.6-7.9 1-4.7 5.7-5.9 8-.5 4.3-8.7-3-11.4-7.6-8.8 7.1-7.2 7.9-13.5 2.1-21.1-8 6.1-8.1 12.3-4.5 20.8-4.7-5.4-12.1-2.5-9.5 6.2 3.4-5.2 7.9-2 7.2 3.1-.6 4.3-6.4 7.8-13.5 7.2-10.3-.9-10.9-8-11.2-13.8 2.5-.5 7.1 1.8 11 7.3L80.2 60c-4.1 4.4-8 5.3-12.3 5.4 1.4-4.4 8-11.6 8-11.6H55.5s6.4 7.2 7.9 11.6c-4.2-.1-8-1-12.3-5.4l1.4 16.4c3.9-5.5 8.5-7.7 10.9-7.3-.3 5.8-.9 12.8-11.1 13.8-7.2.6-12.9-2.9-13.5-7.2-.7-5 3.8-8.3 7.1-3.1 2.7-8.7-4.6-11.6-9.4-6.2 3.7-8.5 3.6-14.7-4.6-20.8-5.8 7.6-5 13.9 2.2 21.1-4.7-2.6-11.9.1-7.7 8.8 2.3-5.5 7.1-4.2 8.1.5.7 3.3-1.3 7.1-5.7 7.9-3.5.7-9-1.8-13.5-11.2 2.5.1 4.7 1.3 7.5 3.3l-4.7-15.4c-1.2 4.4-2.7 7.2-4.3 8.7-1.1-3-.9-5.3 0-10.2l-9.5 3.4c5 6.9 9.9 16.7 14 33.5 14.8-2.1 30.8-3.2 47.7-3.2z"></path>
-                            <image src="/assets/images/govuk-logotype-crown.png" class="govuk-header__logotype-crown-fallback-image"></image>
-                        </svg>
-                        <span class="govuk-header__logotype-text">
-                            GOV.UK
+    @if (Configuration["AuthType"].Equals("employer", StringComparison.CurrentCultureIgnoreCase))
+    {
+        @Html.Partial("CookieBannerPartial")
+    }
+
+        <header class="govuk-header das-header--no-border @(Configuration["AuthType"].Equals("provider", StringComparison.CurrentCultureIgnoreCase) ? "das-header--provider-legacy" : "")" role="banner" data-module="header">
+            <div class="govuk-header__container govuk-width-container">
+
+                <div class="govuk-header__logo">
+                    <a href="https://www.gov.uk/" class="govuk-header__link govuk-header__link--homepage">
+                        <span class="govuk-header__logotype">
+
+                            <svg role="presentation" focusable="false" class="govuk-header__logotype-crown" xmlns="http://www.w3.org/2000/svg" viewbox="0 0 132 97" height="32" width="36">
+                                <path fill="currentColor" fill-rule="evenodd" d="M25 30.2c3.5 1.5 7.7-.2 9.1-3.7 1.5-3.6-.2-7.8-3.9-9.2-3.6-1.4-7.6.3-9.1 3.9-1.4 3.5.3 7.5 3.9 9zM9 39.5c3.6 1.5 7.8-.2 9.2-3.7 1.5-3.6-.2-7.8-3.9-9.1-3.6-1.5-7.6.2-9.1 3.8-1.4 3.5.3 7.5 3.8 9zM4.4 57.2c3.5 1.5 7.7-.2 9.1-3.8 1.5-3.6-.2-7.7-3.9-9.1-3.5-1.5-7.6.3-9.1 3.8-1.4 3.5.3 7.6 3.9 9.1zm38.3-21.4c3.5 1.5 7.7-.2 9.1-3.8 1.5-3.6-.2-7.7-3.9-9.1-3.6-1.5-7.6.3-9.1 3.8-1.3 3.6.4 7.7 3.9 9.1zm64.4-5.6c-3.6 1.5-7.8-.2-9.1-3.7-1.5-3.6.2-7.8 3.8-9.2 3.6-1.4 7.7.3 9.2 3.9 1.3 3.5-.4 7.5-3.9 9zm15.9 9.3c-3.6 1.5-7.7-.2-9.1-3.7-1.5-3.6.2-7.8 3.7-9.1 3.6-1.5 7.7.2 9.2 3.8 1.5 3.5-.3 7.5-3.8 9zm4.7 17.7c-3.6 1.5-7.8-.2-9.2-3.8-1.5-3.6.2-7.7 3.9-9.1 3.6-1.5 7.7.3 9.2 3.8 1.3 3.5-.4 7.6-3.9 9.1zM89.3 35.8c-3.6 1.5-7.8-.2-9.2-3.8-1.4-3.6.2-7.7 3.9-9.1 3.6-1.5 7.7.3 9.2 3.8 1.4 3.6-.3 7.7-3.9 9.1zM69.7 17.7l8.9 4.7V9.3l-8.9 2.8c-.2-.3-.5-.6-.9-.9L72.4 0H59.6l3.5 11.2c-.3.3-.6.5-.9.9l-8.8-2.8v13.1l8.8-4.7c.3.3.6.7.9.9l-5 15.4v.1c-.2.8-.4 1.6-.4 2.4 0 4.1 3.1 7.5 7 8.1h.2c.3 0 .7.1 1 .1.4 0 .7 0 1-.1h.2c4-.6 7.1-4.1 7.1-8.1 0-.8-.1-1.7-.4-2.4V34l-5.1-15.4c.4-.2.7-.6 1-.9zM66 92.8c16.9 0 32.8 1.1 47.1 3.2 4-16.9 8.9-26.7 14-33.5l-9.6-3.4c1 4.9 1.1 7.2 0 10.2-1.5-1.4-3-4.3-4.2-8.7L108.6 76c2.8-2 5-3.2 7.5-3.3-4.4 9.4-10 11.9-13.6 11.2-4.3-.8-6.3-4.6-5.6-7.9 1-4.7 5.7-5.9 8-.5 4.3-8.7-3-11.4-7.6-8.8 7.1-7.2 7.9-13.5 2.1-21.1-8 6.1-8.1 12.3-4.5 20.8-4.7-5.4-12.1-2.5-9.5 6.2 3.4-5.2 7.9-2 7.2 3.1-.6 4.3-6.4 7.8-13.5 7.2-10.3-.9-10.9-8-11.2-13.8 2.5-.5 7.1 1.8 11 7.3L80.2 60c-4.1 4.4-8 5.3-12.3 5.4 1.4-4.4 8-11.6 8-11.6H55.5s6.4 7.2 7.9 11.6c-4.2-.1-8-1-12.3-5.4l1.4 16.4c3.9-5.5 8.5-7.7 10.9-7.3-.3 5.8-.9 12.8-11.1 13.8-7.2.6-12.9-2.9-13.5-7.2-.7-5 3.8-8.3 7.1-3.1 2.7-8.7-4.6-11.6-9.4-6.2 3.7-8.5 3.6-14.7-4.6-20.8-5.8 7.6-5 13.9 2.2 21.1-4.7-2.6-11.9.1-7.7 8.8 2.3-5.5 7.1-4.2 8.1.5.7 3.3-1.3 7.1-5.7 7.9-3.5.7-9-1.8-13.5-11.2 2.5.1 4.7 1.3 7.5 3.3l-4.7-15.4c-1.2 4.4-2.7 7.2-4.3 8.7-1.1-3-.9-5.3 0-10.2l-9.5 3.4c5 6.9 9.9 16.7 14 33.5 14.8-2.1 30.8-3.2 47.7-3.2z"></path>
+                                <image src="/assets/images/govuk-logotype-crown.png" class="govuk-header__logotype-crown-fallback-image"></image>
+                            </svg>
+                            <span class="govuk-header__logotype-text">
+                                GOV.UK
+                            </span>
                         </span>
-                    </span>
-                </a>
-            </div>
-            <div class="govuk-header__content">
-                @if (Configuration["AuthType"].Equals("employer", StringComparison.CurrentCultureIgnoreCase))
-                {
-                    if (ViewContext.RouteData.Values["employerAccountId"] == null)
+                    </a>
+                </div>
+                <div class="govuk-header__content">
+                    @if (Configuration["AuthType"].Equals("employer", StringComparison.CurrentCultureIgnoreCase))
                     {
-                        <a asp-external-controller="accounts"
-                           asp-external-subdomain="accounts"
-                           asp-external-folder="service"
-                           class="govuk-header__link govuk-header__link--service-name">Manage apprenticeships</a>
+                        if (ViewContext.RouteData.Values["employerAccountId"] == null)
+                        {
+                            <a asp-external-controller="accounts"
+                               asp-external-subdomain="accounts"
+                               asp-external-folder="service"
+                               class="govuk-header__link govuk-header__link--service-name">Manage apprenticeships</a>
+                        }
+                        else
+                        {
+                            <a asp-external-controller="teams"
+                               asp-external-subdomain="accounts"
+                               asp-external-folder="accounts"
+                               asp-external-id="@ViewContext.RouteData.Values["employerAccountId"]"
+                               class="govuk-header__link govuk-header__link--service-name">Manage apprenticeships</a>
+                        }
                     }
-                    else
+                    else if (Configuration["AuthType"].Equals("provider", StringComparison.CurrentCultureIgnoreCase))
                     {
-                        <a asp-external-controller="teams"
-                           asp-external-subdomain="accounts"
-                           asp-external-folder="accounts"
-                           asp-external-id="@ViewContext.RouteData.Values["employerAccountId"]"
-                           class="govuk-header__link govuk-header__link--service-name">Manage apprenticeships</a>
+                        <a asp-external-controller="" class="govuk-header__link govuk-header__link--service-name">Apprenticeships</a>
                     }
-                }
-                else if (Configuration["AuthType"].Equals("provider", StringComparison.CurrentCultureIgnoreCase))
-                {
-                    <a asp-external-controller="" class="govuk-header__link govuk-header__link--service-name">Apprenticeships</a>
-                }
+                </div>
             </div>
-        </div>
-
-    </header>
-
-    <partial name="_Navigation" />
 
-    <partial name="_SubNavigation" />
+        </header>
 
-    <div class="govuk-width-container">
-        @RenderBody()
-    </div>
+        <partial name="_Navigation" />
 
-    @if (Configuration["AuthType"].Equals("employer", StringComparison.CurrentCultureIgnoreCase))
-    {
-        <partial name="_EmployerFooter" />
-    }
-    else if (Configuration["AuthType"].Equals("provider", StringComparison.CurrentCultureIgnoreCase))
-    {
-        <partial name="_ProviderFooter" />
-    }
-
-    <partial name="GoogleAnalyticsInfo"/>
-
-    <script src="libs/govuk-frontend/all.js"></script>
-    <script src="libs/jquery/jquery.min.js"></script>
-    <script src="js/das-all.js"></script>
-    <script src="libs/accessible-autocomplete/accessible-autocomplete.min.js"></script>
-    <script src="js/app.min.js"></script>
-    <script src="/js/app.js" no-cdn></script>
-    <script>
-        window.GOVUKFrontend.initAll();
-        window.DASFrontend.initAll();
-    </script>
-    <partial name="_ZendeskWidget"/>
+        <partial name="_SubNavigation" />
 
+        <div class="govuk-width-container">
+            @RenderBody()
+        </div>
 
-</body>
+        @if (Configuration["AuthType"].Equals("employer", StringComparison.CurrentCultureIgnoreCase))
+        {
+            <partial name="_EmployerFooter" />
+        }
+        else if (Configuration["AuthType"].Equals("provider", StringComparison.CurrentCultureIgnoreCase))
+        {
+            <partial name="_ProviderFooter" />
+        }
+
+        <partial name="GoogleAnalyticsInfo" />
+
+        <script src="libs/govuk-frontend/all.js"></script>
+        <script src="libs/jquery/jquery.min.js"></script>
+        <script src="js/das-all.js"></script>
+        <script src="libs/accessible-autocomplete/accessible-autocomplete.min.js"></script>
+        <script src="js/app.min.js"></script>
+        <script src="/js/app.js" no-cdn></script>
+        <script>
+            window.GOVUKFrontend.initAll();
+            window.DASFrontend.initAll();
+        </script>
+        <partial name="_ZendeskWidget" />
+
+
+    </body>
 
 </html>