From 7796b34998cd434ac80fc77f52c5bcfc8cf27406 Mon Sep 17 00:00:00 2001 From: chrisfoster186 Date: Tue, 17 Mar 2020 08:47:49 +0000 Subject: [PATCH 1/8] Testing for cookie consent banner --- .../Views/Shared/_CookieConsentBanner.cshtml | 24 ++++++++++++++++++ .../Views/Shared/_CookieConsentPartial.cshtml | 25 ------------------- .../Views/Shared/_Layout.cshtml | 5 +++- 3 files changed, 28 insertions(+), 26 deletions(-) create mode 100644 src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Shared/_CookieConsentBanner.cshtml delete mode 100644 src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Shared/_CookieConsentPartial.cshtml diff --git a/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Shared/_CookieConsentBanner.cshtml b/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Shared/_CookieConsentBanner.cshtml new file mode 100644 index 000000000..c13b7d18c --- /dev/null +++ b/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Shared/_CookieConsentBanner.cshtml @@ -0,0 +1,24 @@ + \ No newline at end of file diff --git a/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Shared/_CookieConsentPartial.cshtml b/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Shared/_CookieConsentPartial.cshtml deleted file mode 100644 index a535ea4a4..000000000 --- a/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Shared/_CookieConsentPartial.cshtml +++ /dev/null @@ -1,25 +0,0 @@ -@using Microsoft.AspNetCore.Http.Features - -@{ - var consentFeature = Context.Features.Get(); - var showBanner = !consentFeature?.CanTrack ?? false; - var cookieString = consentFeature?.CreateConsentCookie(); -} - -@if (showBanner) -{ - - -} diff --git a/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Shared/_Layout.cshtml b/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Shared/_Layout.cshtml index ec4323996..760210a66 100644 --- a/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Shared/_Layout.cshtml +++ b/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Shared/_Layout.cshtml @@ -53,7 +53,10 @@ document.body.className = ((document.body.className) ? document.body.className + ' js-enabled' : 'js-enabled'); Skip to main content - + + + +
From 59c96a8e406baee850f00da96ebc7000aec9d978 Mon Sep 17 00:00:00 2001 From: chrisfoster186 Date: Tue, 17 Mar 2020 10:59:06 +0000 Subject: [PATCH 2/8] Adds url helper for settings link --- .../Views/Shared/_CookieConsentBanner.cshtml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Shared/_CookieConsentBanner.cshtml b/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Shared/_CookieConsentBanner.cshtml index c13b7d18c..94ff23301 100644 --- a/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Shared/_CookieConsentBanner.cshtml +++ b/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Shared/_CookieConsentBanner.cshtml @@ -1,4 +1,5 @@ - diff --git a/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Cohort/Assign.cshtml b/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Cohort/Assign.cshtml index 4604f5398..d448f473b 100644 --- a/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Cohort/Assign.cshtml +++ b/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Cohort/Assign.cshtml @@ -47,7 +47,7 @@
- + diff --git a/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Cohort/ConfirmDelete.cshtml b/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Cohort/ConfirmDelete.cshtml index 1bbe85b7e..bf6a0c19e 100644 --- a/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Cohort/ConfirmDelete.cshtml +++ b/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Cohort/ConfirmDelete.cshtml @@ -72,7 +72,7 @@ - + diff --git a/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Cohort/ConfirmProvider.cshtml b/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Cohort/ConfirmProvider.cshtml index bdd466653..05f6eae7f 100644 --- a/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Cohort/ConfirmProvider.cshtml +++ b/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Cohort/ConfirmProvider.cshtml @@ -53,7 +53,7 @@ - + diff --git a/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Cohort/Index.cshtml b/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Cohort/Index.cshtml index feb4f759a..38d4eeae6 100644 --- a/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Cohort/Index.cshtml +++ b/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Cohort/Index.cshtml @@ -24,7 +24,7 @@
  • make sure the PAYE scheme that each apprentice is paid through is in your account - view PAYE schemes in this account
    • - + Start now diff --git a/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Cohort/Message.cshtml b/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Cohort/Message.cshtml index 582bc5a06..323fc77c7 100644 --- a/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Cohort/Message.cshtml +++ b/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Cohort/Message.cshtml @@ -24,7 +24,7 @@ @Html.TextAreaFor(m => m.Message, new { @class = "govuk-textarea", cols = 40, rows = 10 }) - + diff --git a/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Cohort/SelectProvider.cshtml b/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Cohort/SelectProvider.cshtml index 4a2c70933..0fb22169b 100644 --- a/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Cohort/SelectProvider.cshtml +++ b/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Cohort/SelectProvider.cshtml @@ -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. - From e86dac42d54ab944794b95c155dd16a7168a1b3b Mon Sep 17 00:00:00 2001 From: chrisfoster186 Date: Tue, 7 Apr 2020 10:39:03 +0100 Subject: [PATCH 5/8] Another url fix --- .../Views/Shared/_CookieConsentBanner.cshtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Shared/_CookieConsentBanner.cshtml b/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Shared/_CookieConsentBanner.cshtml index 8da32754b..a7f305f21 100644 --- a/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Shared/_CookieConsentBanner.cshtml +++ b/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Shared/_CookieConsentBanner.cshtml @@ -15,7 +15,7 @@
    Cookie settings
    From df451c32b715d9dcb369536a3083874f6cb0335a Mon Sep 17 00:00:00 2001 From: Shahzad Date: Wed, 8 Apr 2020 10:07:54 +0100 Subject: [PATCH 6/8] CV-538 cookie url changes. --- .../SFA.DAS.EmployerCommitmentsV2.Web.csproj | 2 +- .../Views/Shared/_Layout.cshtml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SFA.DAS.EmployerCommitmentsV2.Web/SFA.DAS.EmployerCommitmentsV2.Web.csproj b/src/SFA.DAS.EmployerCommitmentsV2.Web/SFA.DAS.EmployerCommitmentsV2.Web.csproj index b252c73f8..d6f1a22fb 100644 --- a/src/SFA.DAS.EmployerCommitmentsV2.Web/SFA.DAS.EmployerCommitmentsV2.Web.csproj +++ b/src/SFA.DAS.EmployerCommitmentsV2.Web/SFA.DAS.EmployerCommitmentsV2.Web.csproj @@ -26,7 +26,7 @@ - + diff --git a/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Shared/_Layout.cshtml b/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Shared/_Layout.cshtml index cc1f9678a..c283c1fdb 100644 --- a/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Shared/_Layout.cshtml +++ b/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Shared/_Layout.cshtml @@ -70,7 +70,7 @@ - + From 3bbbc804511e8850bb88ce95999b463880f1f206 Mon Sep 17 00:00:00 2001 From: Shahzad Date: Tue, 14 Apr 2020 10:35:36 +0100 Subject: [PATCH 7/8] CV-584 id button --- .../Views/Cohort/Details.cshtml | 2 +- .../Views/DraftApprenticeship/AddDraftApprenticeship.cshtml | 2 +- .../Views/DraftApprenticeship/DeleteDraftApprenticeship.cshtml | 2 +- .../Views/DraftApprenticeship/Edit.cshtml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Cohort/Details.cshtml b/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Cohort/Details.cshtml index 7469d4224..d14476254 100644 --- a/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Cohort/Details.cshtml +++ b/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Cohort/Details.cshtml @@ -210,7 +210,7 @@ - +

    Save and exit diff --git a/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/DraftApprenticeship/AddDraftApprenticeship.cshtml b/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/DraftApprenticeship/AddDraftApprenticeship.cshtml index 42eb583e3..ff5550e27 100644 --- a/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/DraftApprenticeship/AddDraftApprenticeship.cshtml +++ b/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/DraftApprenticeship/AddDraftApprenticeship.cshtml @@ -23,7 +23,7 @@ - + diff --git a/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/DraftApprenticeship/DeleteDraftApprenticeship.cshtml b/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/DraftApprenticeship/DeleteDraftApprenticeship.cshtml index d30764289..6fabd7674 100644 --- a/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/DraftApprenticeship/DeleteDraftApprenticeship.cshtml +++ b/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/DraftApprenticeship/DeleteDraftApprenticeship.cshtml @@ -71,7 +71,7 @@ - diff --git a/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/DraftApprenticeship/Edit.cshtml b/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/DraftApprenticeship/Edit.cshtml index f8d2f5dcf..ec089b49e 100644 --- a/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/DraftApprenticeship/Edit.cshtml +++ b/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/DraftApprenticeship/Edit.cshtml @@ -19,7 +19,7 @@

    @Html.AntiForgeryToken() - + Delete From 67f09aecacf46f768610349c8813f2eb83b5de35 Mon Sep 17 00:00:00 2001 From: Shahzad Date: Wed, 15 Apr 2020 09:47:18 +0100 Subject: [PATCH 8/8] CV-538 ecv2 updated with latest shared ui. --- .../SFA.DAS.EmployerCommitmentsV2.Web.csproj | 2 +- .../Views/Shared/_Layout.cshtml | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/SFA.DAS.EmployerCommitmentsV2.Web/SFA.DAS.EmployerCommitmentsV2.Web.csproj b/src/SFA.DAS.EmployerCommitmentsV2.Web/SFA.DAS.EmployerCommitmentsV2.Web.csproj index d6f1a22fb..15967850d 100644 --- a/src/SFA.DAS.EmployerCommitmentsV2.Web/SFA.DAS.EmployerCommitmentsV2.Web.csproj +++ b/src/SFA.DAS.EmployerCommitmentsV2.Web/SFA.DAS.EmployerCommitmentsV2.Web.csproj @@ -26,7 +26,7 @@ - + diff --git a/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Shared/_Layout.cshtml b/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Shared/_Layout.cshtml index c283c1fdb..697d4efa8 100644 --- a/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Shared/_Layout.cshtml +++ b/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Shared/_Layout.cshtml @@ -1,10 +1,12 @@ -@using SFA.DAS.EmployerCommitmentsV2.Web.Extensions +@using SFA.DAS.Employer.Shared.UI.Models +@using SFA.DAS.EmployerCommitmentsV2.Web.Extensions @{ var accountHashedId = (string)ViewContext.RouteData.Values["accountHashedId"]; ViewBag.HideHeaderBorder = true; + var footerModel = new FooterModel { AccountId = accountHashedId, UsePrivacyV2 = true }; } @@ -53,10 +55,10 @@ document.body.className = ((document.body.className) ? document.body.className + ' js-enabled' : 'js-enabled'); Skip to main content - - - + + +
    @@ -70,7 +72,7 @@
    - +