From 70d5379497829def7f2f9424c042856a8e8064a3 Mon Sep 17 00:00:00 2001 From: killij <51908793+killij@users.noreply.github.com> Date: Mon, 15 Jan 2024 08:29:24 +0000 Subject: [PATCH 1/3] fix: Remove 3/4 column embedded within outer 3/4 column --- .../Views/Shared/_AreaOfPractice.cshtml | 86 +++++++++---------- .../Views/Shared/_AreaOfPracticeList.cshtml | 4 +- .../Views/Shared/_RoleList.cshtml | 6 +- 3 files changed, 46 insertions(+), 50 deletions(-) diff --git a/Childrens-Social-Care-CPD/Views/Shared/_AreaOfPractice.cshtml b/Childrens-Social-Care-CPD/Views/Shared/_AreaOfPractice.cshtml index 6f37c065..2b92f2d3 100644 --- a/Childrens-Social-Care-CPD/Views/Shared/_AreaOfPractice.cshtml +++ b/Childrens-Social-Care-CPD/Views/Shared/_AreaOfPractice.cshtml @@ -26,63 +26,63 @@ }
-
- Areas of practice -

@Model.Title

-
+ + Areas of practice +

@Model.Title

+
-
-
+ +
+
+
+ Summary +
+
+ @Model.Summary +
+
+ + @if (!string.IsNullOrEmpty(Model.OtherNames)) + {
- Summary + Other names
- @Model.Summary + @Model.OtherNames
+ } +
- @if (!string.IsNullOrEmpty(Model.OtherNames)) - { -
-
- Other names -
-
- @Model.OtherNames -
-
- } -
- -
+
- @if (Model.WhatYoullDo != null) - { - await RenderAccordianSection("What you'll do", Model.WhatYoullDo, 1); - } + @if (Model.WhatYoullDo != null) + { + await RenderAccordianSection("What you'll do", Model.WhatYoullDo, 1); + } - @if (Model.SkillsAndKnowledge != null) - { - await RenderAccordianSection("Skills and knowledge", Model.SkillsAndKnowledge, 2); - } + @if (Model.SkillsAndKnowledge != null) + { + await RenderAccordianSection("Skills and knowledge", Model.SkillsAndKnowledge, 2); + } - @if (Model.WhoYouWillWorkWith != null) - { - await RenderAccordianSection("Who you'll work with", Model.WhoYouWillWorkWith, 3); - } + @if (Model.WhoYouWillWorkWith != null) + { + await RenderAccordianSection("Who you'll work with", Model.WhoYouWillWorkWith, 3); + } - @if (Model.HowYouWillWork != null) - { - await RenderAccordianSection("How you'll work", Model.HowYouWillWork, 4); - } + @if (Model.HowYouWillWork != null) + { + await RenderAccordianSection("How you'll work", Model.HowYouWillWork, 4); + } - @if (Model.CurrentOpportunities != null) - { - await RenderAccordianSection("Current opportunities", Model.CurrentOpportunities, 5); - } -
+ @if (Model.CurrentOpportunities != null) + { + await RenderAccordianSection("Current opportunities", Model.CurrentOpportunities, 5); + }
+
\ No newline at end of file diff --git a/Childrens-Social-Care-CPD/Views/Shared/_AreaOfPracticeList.cshtml b/Childrens-Social-Care-CPD/Views/Shared/_AreaOfPracticeList.cshtml index 938270df..2d1e0490 100644 --- a/Childrens-Social-Care-CPD/Views/Shared/_AreaOfPracticeList.cshtml +++ b/Childrens-Social-Care-CPD/Views/Shared/_AreaOfPracticeList.cshtml @@ -6,7 +6,5 @@ @inject IRenderer _inlineAreaOfPracticeListRenderer
-
- @_inlineAreaOfPracticeListRenderer.Render(Model) -
+ @_inlineAreaOfPracticeListRenderer.Render(Model)
diff --git a/Childrens-Social-Care-CPD/Views/Shared/_RoleList.cshtml b/Childrens-Social-Care-CPD/Views/Shared/_RoleList.cshtml index 71955fee..2749af5d 100644 --- a/Childrens-Social-Care-CPD/Views/Shared/_RoleList.cshtml +++ b/Childrens-Social-Care-CPD/Views/Shared/_RoleList.cshtml @@ -6,8 +6,6 @@ @inject IRenderer _inlineRoleListRenderer
-
-

@Model.Title

- @_inlineRoleListRenderer.Render(Model) -
+

@Model.Title

+ @_inlineRoleListRenderer.Render(Model)
From 6a54815b94c01dd55a4d08ff7d11e5c58810b53f Mon Sep 17 00:00:00 2001 From: killij <51908793+killij@users.noreply.github.com> Date: Mon, 15 Jan 2024 09:09:01 +0000 Subject: [PATCH 2/3] fix: Column width for DetailedRole --- .../Views/Shared/_DetailedRole.cshtml | 98 +++++++++---------- 1 file changed, 47 insertions(+), 51 deletions(-) diff --git a/Childrens-Social-Care-CPD/Views/Shared/_DetailedRole.cshtml b/Childrens-Social-Care-CPD/Views/Shared/_DetailedRole.cshtml index df4ea4c2..b5e9e993 100644 --- a/Childrens-Social-Care-CPD/Views/Shared/_DetailedRole.cshtml +++ b/Childrens-Social-Care-CPD/Views/Shared/_DetailedRole.cshtml @@ -26,73 +26,69 @@ }
-
-

@Model.Title

-
+

@Model.Title

-
-
- @if(!string.IsNullOrEmpty(Model.SalaryRange)) +
+ @if(!string.IsNullOrEmpty(Model.SalaryRange)) + { +
+
+ Salary range +
+
+ @Model.SalaryRange depending on location, responsibilities and experience +
+
+ } +
+
+ Summary +
+
+ @Model.Summary +
+
+ + @if (!string.IsNullOrEmpty(Model.OtherNames)) {
- Salary range + Other names
- @Model.SalaryRange depending on location, responsibilities and experience + @Model.OtherNames
} -
-
- Summary -
-
- @Model.Summary -
-
+
- @if (!string.IsNullOrEmpty(Model.OtherNames)) - { -
-
- Other names -
-
- @Model.OtherNames -
-
- } -
+
-
- - @if (Model.WhatYoullDo != null) - { - await RenderAccordianSection("What you'll do", Model.WhatYoullDo, 1); - } + @if (Model.WhatYoullDo != null) + { + await RenderAccordianSection("What you'll do", Model.WhatYoullDo, 1); + } - @if (Model.SkillsAndKnowledge != null) - { - await RenderAccordianSection("Skills and knowledge", Model.SkillsAndKnowledge, 2); - } + @if (Model.SkillsAndKnowledge != null) + { + await RenderAccordianSection("Skills and knowledge", Model.SkillsAndKnowledge, 2); + } - @if (Model.HowToBecomeOne != null) - { - await RenderAccordianSection("How to become one", Model.HowToBecomeOne, 3); - } + @if (Model.HowToBecomeOne != null) + { + await RenderAccordianSection("How to become one", Model.HowToBecomeOne, 3); + } - @if (Model.CareerPathsAndProgression != null) - { - await RenderAccordianSection("Career paths and progression", Model.CareerPathsAndProgression, 4); - } + @if (Model.CareerPathsAndProgression != null) + { + await RenderAccordianSection("Career paths and progression", Model.CareerPathsAndProgression, 4); + } - @if (Model.CurrentOpportunities != null) - { - await RenderAccordianSection("Current opportunities", Model.CurrentOpportunities, 5); - } -
+ @if (Model.CurrentOpportunities != null) + { + await RenderAccordianSection("Current opportunities", Model.CurrentOpportunities, 5); + }
\ No newline at end of file From f762515890e081a3123ee6679942c97487085ff6 Mon Sep 17 00:00:00 2001 From: killij <51908793+killij@users.noreply.github.com> Date: Mon, 15 Jan 2024 09:09:49 +0000 Subject: [PATCH 3/3] fix: Stretch LinkCards to equalise their height across columns --- Childrens-Social-Care-CPD/Views/Shared/_ColumnLayout.cshtml | 4 ++-- Childrens-Social-Care-CPD/Views/Shared/_LinkCard.cshtml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Childrens-Social-Care-CPD/Views/Shared/_ColumnLayout.cshtml b/Childrens-Social-Care-CPD/Views/Shared/_ColumnLayout.cshtml index 9c090c46..44cdd648 100644 --- a/Childrens-Social-Care-CPD/Views/Shared/_ColumnLayout.cshtml +++ b/Childrens-Social-Care-CPD/Views/Shared/_ColumnLayout.cshtml @@ -10,10 +10,10 @@ @foreach (var group in Model.Items.Select((e, i) => new { ContentItem = e, Grouping = (i / Model.ColumnCount) }).GroupBy(e => e.Grouping)) { -
+
@foreach (var item in group) { -
+
@{ await Html.RenderContentfulPartialAsync(item.ContentItem); }
} diff --git a/Childrens-Social-Care-CPD/Views/Shared/_LinkCard.cshtml b/Childrens-Social-Care-CPD/Views/Shared/_LinkCard.cshtml index d5f8fa7c..930e0a1a 100644 --- a/Childrens-Social-Care-CPD/Views/Shared/_LinkCard.cshtml +++ b/Childrens-Social-Care-CPD/Views/Shared/_LinkCard.cshtml @@ -5,7 +5,7 @@ @model LinkCard @inject IRendererWithOptions _contentLinkRenderer -
+
@_contentLinkRenderer.Render(Model.TitleLink, new RendererOptions("govuk-link--no-visited-state dfe-card-link--header"))