Skip to content

Commit

Permalink
Merge pull request #108 from SkillsFundingAgency/CV-538-Cookie-Consent
Browse files Browse the repository at this point in the history 
Cv 538 cookie consent
  • Loading branch information
@Najamuddin-Muhammad
Najamuddin-Muhammad authored Apr 27, 2020
2 parents 9508d70 + a5c6afa commit ba716c6
Show file tree
Hide file tree
Showing 15 changed files with 50 additions and 40 deletions.
2 changes: 1 addition & 1 deletion src/SFA.DAS.EmployerCommitmentsV2.Web/SFA.DAS.EmployerCommitmentsV2.Web.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<PackageReference Include="SFA.DAS.Authorization.Mvc" Version="6.0.59" />
<PackageReference Include="SFA.DAS.CommitmentsV2.Api.Client" Version="4.1.1395" />
<PackageReference Include="SFA.DAS.CommitmentsV2.Shared" Version="4.1.1395" />
<PackageReference Include="SFA.DAS.Employer.Shared.UI" Version="2.0.10" />
<PackageReference Include="SFA.DAS.Employer.Shared.UI" Version="2.0.14" />
<PackageReference Include="SFA.DAS.Configuration.AzureTableStorage" Version="3.0.77" />
<PackageReference Include="SFA.DAS.EmployerUrlHelper" Version="3.0.22" />
<PackageReference Include="SFA.DAS.NLog.Targets.Redis" Version="1.2.1" />
Expand Down
2 changes: 1 addition & 1 deletion src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Cohort/Apprentice.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

<partial name="_DraftApprenticeship" for="@Model" />

<button type="submit" class="govuk-button">Save and continue</button>
<button id="continue-button" type="submit" class="govuk-button">Save and continue</button>
</form>

</div>
Expand Down
2 changes: 1 addition & 1 deletion src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Cohort/Assign.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
</fieldset>
</div>

<button type="submit" class="govuk-button">Continue</button>
<button id="continue-button" type="submit" class="govuk-button">Continue</button>
</form>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Cohort/ConfirmDelete.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
</div>
</fieldset>
</div>
<button class="govuk-button" type="submit">Save and continue</button>
<button id="continue-button" class="govuk-button" type="submit">Save and continue</button>
</form>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Cohort/ConfirmProvider.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
</fieldset>
</div>

<button type="submit" class="govuk-button">Continue</button>
<button id="continue-button" type="submit" class="govuk-button">Continue</button>
</form>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Cohort/Details.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@
</fieldset>
</div>

<button type="submit" class="govuk-button">Save and submit</button>
<button type="submit" id="continue-button" class="govuk-button">Save and submit</button>

<p>
<a href="@Url.CommitmentsLink($"accounts/{Model.AccountHashedId}/apprentices/cohorts")" class="govuk-link">Save and exit</a>
Expand Down
2 changes: 1 addition & 1 deletion src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Cohort/Index.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<li>make sure the PAYE scheme that each apprentice is paid through is in your account - <a href="@LinkGenerator.PayeSchemes(Model.AccountHashedId)" target="_blank" rel="noreferrer">view PAYE schemes in this account</a></li>
</ul>

<a asp-action="SelectProvider" asp-all-route-data="@Model.ToDictionary()" role="button" draggable="false" class="govuk-button govuk-button--start">
<a asp-action="SelectProvider" id="continue-button" asp-all-route-data="@Model.ToDictionary()" role="button" draggable="false" class="govuk-button govuk-button--start">
Start now
</a>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Cohort/Message.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
@Html.TextAreaFor(m => m.Message, new { @class = "govuk-textarea", cols = 40, rows = 10 })
</div>

<button type="submit" class="govuk-button">Send</button>
<button id="continue-button" type="submit" class="govuk-button">Send</button>
</form>

</div>
Expand Down
2 changes: 1 addition & 1 deletion src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Cohort/SelectProvider.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
A UK Provider Reference Number (UKPRN) is a unique, 8-digit number that identifies a training provider. Your training provider can tell you their UKPRN.
</div>
</details>
<button type="submit" class="govuk-button">
<button id="continue-button" type="submit" class="govuk-button">
Continue
</button>
</form>
Expand Down
2 changes: 1 addition & 1 deletion ...SFA.DAS.EmployerCommitmentsV2.Web/Views/DraftApprenticeship/AddDraftApprenticeship.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

<partial name="_DraftApprenticeship" for="@Model" />

<button type="submit" class="govuk-button">Save and continue</button>
<button type="submit" id="continue-button" class="govuk-button">Save and continue</button>
</form>

</div>
Expand Down
2 changes: 1 addition & 1 deletion ....DAS.EmployerCommitmentsV2.Web/Views/DraftApprenticeship/DeleteDraftApprenticeship.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
</fieldset>
</div>

<button class="govuk-button" type="submit" data-module="govuk-button">
<button class="govuk-button" type="submit" id="continue-button" data-module="govuk-button">
Save and continue
</button>
</form>
Expand Down
2 changes: 1 addition & 1 deletion src/SFA.DAS.EmployerCommitmentsV2.Web/Views/DraftApprenticeship/Edit.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<form id="addApprenticeship" novalidate method="post">
@Html.AntiForgeryToken()
<partial name="_DraftApprenticeship" for="@Model" />
<button type="submit" class="govuk-button">Save</button>
<button type="submit" id="continue-button" class="govuk-button">Save</button>

<a class="govuk-button govuk-button--warning das-float-right" href="@Url.RouteUrl("DeleteDraftApprenticeship", new { Model.DraftApprenticeshipHashedId, Model.CohortReference, Model.AccountHashedId, Origin = DeleteDraftApprenticeshipOrigin.EditDraftApprenticeship })">
Delete
Expand Down
30 changes: 30 additions & 0 deletions src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Shared/_CookieConsentBanner.cshtml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
@using SFA.DAS.EmployerUrlHelper.Mvc

@{
var accountHashedId = (string)ViewContext.RouteData.Values["accountHashedId"];
}

<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"
href="@Url.AccountsLink($"/accounts/{accountHashedId}/CookieConsent")"
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" href="@Url.AccountsLink($"/{accountHashedId}/CookieConsent/Settings")" 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>
25 changes: 0 additions & 25 deletions src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Shared/_CookieConsentPartial.cshtml
View file

This file was deleted.

11 changes: 8 additions & 3 deletions src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Shared/_Layout.cshtml
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
@using SFA.DAS.EmployerCommitmentsV2.Web.Extensions
@using SFA.DAS.Employer.Shared.UI.Models
@using SFA.DAS.EmployerCommitmentsV2.Web.Extensions
<!DOCTYPE html>
<html lang="en" class="govuk-template ">

@{
string accountHashedId = (string)ViewContext.RouteData.Values["accountHashedId"];
var accountHashedId = (string)ViewContext.RouteData.Values["accountHashedId"];
ViewBag.HideHeaderBorder = true;
var footerModel = new FooterModel { AccountId = accountHashedId, UsePrivacyV2 = true };
}

<head>
Expand Down Expand Up @@ -53,6 +55,9 @@
document.body.className = ((document.body.className) ? document.body.className + ' js-enabled' : 'js-enabled');
</script>
<a href="#main-content" class="govuk-skip-link">Skip to main content</a>

<partial name="_CookieConsentBanner" />

<partial name="_Header" />
<partial name="_Menu" model="@accountHashedId" />
<partial name="_ZenDeskWidget" />
Expand All @@ -67,7 +72,7 @@
</main>
</div>

<partial name="_Footer" />
<partial name="_Footer" model="@footerModel"/>
<partial name="_GoogleAnalyticsInfo" />


Expand Down

0 comments on commit ba716c6

Please sign in to comment.