From 8b678ad7f8143bc5aac3ac35984d05965ce97ea4 Mon Sep 17 00:00:00 2001 From: Alex Jackson Date: Wed, 7 Jul 2021 12:43:07 +0100 Subject: [PATCH 1/4] HEEDLS-544 Change My Details expander to card --- .../Views/MyAccount/Index.cshtml | 130 ++---------------- .../Views/MyAccount/_BasicContentCard.cshtml | 39 ++++++ .../Views/MyAccount/_MyDetailsCard.cshtml | 75 ++++++++++ 3 files changed, 123 insertions(+), 121 deletions(-) create mode 100644 DigitalLearningSolutions.Web/Views/MyAccount/_BasicContentCard.cshtml create mode 100644 DigitalLearningSolutions.Web/Views/MyAccount/_MyDetailsCard.cshtml diff --git a/DigitalLearningSolutions.Web/Views/MyAccount/Index.cshtml b/DigitalLearningSolutions.Web/Views/MyAccount/Index.cshtml index edb636ebd0..955a445cfd 100644 --- a/DigitalLearningSolutions.Web/Views/MyAccount/Index.cshtml +++ b/DigitalLearningSolutions.Web/Views/MyAccount/Index.cshtml @@ -13,138 +13,26 @@ @if (User.IsDelegateOnlyAccount()) { ViewData["Application"] = "Learning Portal"; - @section NavMenuItems { - - } -} else { - @section NavMenuItems { - - } -} +@section NavMenuItems { + +}} else { +@section NavMenuItems { + +}}

My account

-
-
-
-
-
- Centre: -
-
- @Model.Centre -
-
- - @if (Model.User?.Length > 0) { -
-
- User: -
-
- @Model.User -
-
- } - - @if (Model.DelegateNumber?.Length > 0) { -
-
- Delegate id: -
-
- @Model.DelegateNumber -
-
- } -
-
-
-
-
-
-
-
- - - My Details - - -
-
-
-
- First name: -
-
- @Model.FirstName -
-
- -
-
- Last name: -
-
- @Model.Surname -
-
- -
-
- Email address: -
-
- @Model.User -
-
- - @if (Model.DelegateNumber != null) { -
-
- Job group: -
-
- @Model.JobGroup -
-
- - foreach (var customField in Model.CustomFields) { - - } - } - -
-
- Profile picture (optional): -
-
- @if (Model.ProfilePicture != null) { - Profile Picture - } else { - Default Profile Picture - } -
-
-
- - - Edit details - - - Change password - + -
-
+
- Manage notifications + View notification preferences
diff --git a/DigitalLearningSolutions.Web/Views/MyAccount/_BasicContentCard.cshtml b/DigitalLearningSolutions.Web/Views/MyAccount/_BasicContentCard.cshtml new file mode 100644 index 0000000000..787f7b58e7 --- /dev/null +++ b/DigitalLearningSolutions.Web/Views/MyAccount/_BasicContentCard.cshtml @@ -0,0 +1,39 @@ +@using DigitalLearningSolutions.Web.ViewModels.MyAccount +@model MyAccountViewModel + +
+
+
+
+
+ Centre: +
+
+ @Model.Centre +
+
+ + @if (Model.User?.Length > 0) { +
+
+ User: +
+
+ @Model.User +
+
+ } + + @if (Model.DelegateNumber?.Length > 0) { +
+
+ Delegate id: +
+
+ @Model.DelegateNumber +
+
+ } +
+
+
diff --git a/DigitalLearningSolutions.Web/Views/MyAccount/_MyDetailsCard.cshtml b/DigitalLearningSolutions.Web/Views/MyAccount/_MyDetailsCard.cshtml new file mode 100644 index 0000000000..ad346f2bbe --- /dev/null +++ b/DigitalLearningSolutions.Web/Views/MyAccount/_MyDetailsCard.cshtml @@ -0,0 +1,75 @@ +@using DigitalLearningSolutions.Web.ViewModels.MyAccount +@model MyAccountViewModel + +
+
+

+ My Details +

+
+
+
+
+ First name: +
+
+ @Model.FirstName +
+
+ +
+
+ Last name: +
+
+ @Model.Surname +
+
+ +
+
+ Email address: +
+
+ @Model.User +
+
+ + @if (Model.DelegateNumber != null) { +
+
+ Job group: +
+
+ @Model.JobGroup +
+
+ + foreach (var customField in Model.CustomFields) { + + } + } + +
+
+ Profile picture (optional): +
+
+ @if (Model.ProfilePicture != null) { + Profile Picture + } else { + Default Profile Picture + } +
+
+
+ + + Edit details + + + Change password + +
+
+
From a85aa40ba2752e57144a41aa4f01ec682ebd7249 Mon Sep 17 00:00:00 2001 From: Alex Jackson Date: Thu, 8 Jul 2021 14:22:35 +0100 Subject: [PATCH 2/4] HEEDLS-544 Remove tag styles from notification status --- .../NotificationPreferences/_NotificationPreferenceList.cshtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DigitalLearningSolutions.Web/Views/NotificationPreferences/_NotificationPreferenceList.cshtml b/DigitalLearningSolutions.Web/Views/NotificationPreferences/_NotificationPreferenceList.cshtml index 70cda6e48a..f2647b8527 100644 --- a/DigitalLearningSolutions.Web/Views/NotificationPreferences/_NotificationPreferenceList.cshtml +++ b/DigitalLearningSolutions.Web/Views/NotificationPreferences/_NotificationPreferenceList.cshtml @@ -11,7 +11,7 @@ @Html.Raw(notification.Description)
- + @(notification.Accepted ? "Subscribed" : "Unsubscribed")
From 9ade21be61deeebbca42ecb53704a36b8e571bda Mon Sep 17 00:00:00 2001 From: Alex Jackson Date: Thu, 8 Jul 2021 14:38:04 +0100 Subject: [PATCH 3/4] HEEDLS-544 Fix invalid h3 --- .../Views/MyAccount/_MyDetailsCard.cshtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DigitalLearningSolutions.Web/Views/MyAccount/_MyDetailsCard.cshtml b/DigitalLearningSolutions.Web/Views/MyAccount/_MyDetailsCard.cshtml index ad346f2bbe..d91b4f83c8 100644 --- a/DigitalLearningSolutions.Web/Views/MyAccount/_MyDetailsCard.cshtml +++ b/DigitalLearningSolutions.Web/Views/MyAccount/_MyDetailsCard.cshtml @@ -3,9 +3,9 @@
-

+

My Details -

+
From f0ee0ba541717d936c4bb08922ade4cb13a41bea Mon Sep 17 00:00:00 2001 From: Alex Jackson Date: Tue, 13 Jul 2021 12:44:13 +0100 Subject: [PATCH 4/4] HEEDLS-544 Review markups --- .../Styles/myAccount/notificationPreferences.scss | 4 ++++ .../Views/MyAccount/Index.cshtml | 2 +- ...icContentCard.cshtml => _AccountSummaryCard.cshtml} | 6 +++--- .../Views/MyAccount/_MyDetailsCard.cshtml | 10 +++++----- 4 files changed, 13 insertions(+), 9 deletions(-) rename DigitalLearningSolutions.Web/Views/MyAccount/{_BasicContentCard.cshtml => _AccountSummaryCard.cshtml} (91%) diff --git a/DigitalLearningSolutions.Web/Styles/myAccount/notificationPreferences.scss b/DigitalLearningSolutions.Web/Styles/myAccount/notificationPreferences.scss index a096eead23..55bd47c7cc 100644 --- a/DigitalLearningSolutions.Web/Styles/myAccount/notificationPreferences.scss +++ b/DigitalLearningSolutions.Web/Styles/myAccount/notificationPreferences.scss @@ -28,6 +28,10 @@ text-align: right; padding-left: nhsuk-spacing(3); } + + @include govuk-media-query($until: desktop) { + margin-bottom: nhsuk-spacing(3); + } } .preference-tag { diff --git a/DigitalLearningSolutions.Web/Views/MyAccount/Index.cshtml b/DigitalLearningSolutions.Web/Views/MyAccount/Index.cshtml index 955a445cfd..8aef7b6fcf 100644 --- a/DigitalLearningSolutions.Web/Views/MyAccount/Index.cshtml +++ b/DigitalLearningSolutions.Web/Views/MyAccount/Index.cshtml @@ -24,7 +24,7 @@

My account

- +
diff --git a/DigitalLearningSolutions.Web/Views/MyAccount/_BasicContentCard.cshtml b/DigitalLearningSolutions.Web/Views/MyAccount/_AccountSummaryCard.cshtml similarity index 91% rename from DigitalLearningSolutions.Web/Views/MyAccount/_BasicContentCard.cshtml rename to DigitalLearningSolutions.Web/Views/MyAccount/_AccountSummaryCard.cshtml index 787f7b58e7..ea89760b80 100644 --- a/DigitalLearningSolutions.Web/Views/MyAccount/_BasicContentCard.cshtml +++ b/DigitalLearningSolutions.Web/Views/MyAccount/_AccountSummaryCard.cshtml @@ -6,7 +6,7 @@
- Centre: + Centre
@Model.Centre @@ -16,7 +16,7 @@ @if (Model.User?.Length > 0) {
- User: + User
@Model.User @@ -27,7 +27,7 @@ @if (Model.DelegateNumber?.Length > 0) {
- Delegate id: + Delegate id
@Model.DelegateNumber diff --git a/DigitalLearningSolutions.Web/Views/MyAccount/_MyDetailsCard.cshtml b/DigitalLearningSolutions.Web/Views/MyAccount/_MyDetailsCard.cshtml index d91b4f83c8..0a4f73aed8 100644 --- a/DigitalLearningSolutions.Web/Views/MyAccount/_MyDetailsCard.cshtml +++ b/DigitalLearningSolutions.Web/Views/MyAccount/_MyDetailsCard.cshtml @@ -10,7 +10,7 @@
- First name: + First name
@Model.FirstName @@ -19,7 +19,7 @@
- Last name: + Last name
@Model.Surname @@ -28,7 +28,7 @@
- Email address: + Email address
@Model.User @@ -38,7 +38,7 @@ @if (Model.DelegateNumber != null) {
- Job group: + Job group
@Model.JobGroup @@ -52,7 +52,7 @@
- Profile picture (optional): + Profile picture (optional)
@if (Model.ProfilePicture != null) {