From c0f01e487e95619271cfd31c9f53122551a28f3b Mon Sep 17 00:00:00 2001
From: cairnsj <51908793+cairnsj@users.noreply.github.com>
Date: Thu, 28 Sep 2023 14:31:32 +0100
Subject: [PATCH 1/4] Update _SideMenu.cshtml

---
 Childrens-Social-Care-CPD/Views/Shared/_SideMenu.cshtml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Childrens-Social-Care-CPD/Views/Shared/_SideMenu.cshtml b/Childrens-Social-Care-CPD/Views/Shared/_SideMenu.cshtml
index 4a4d251d..b942b204 100644
--- a/Childrens-Social-Care-CPD/Views/Shared/_SideMenu.cshtml
+++ b/Childrens-Social-Care-CPD/Views/Shared/_SideMenu.cshtml
@@ -6,7 +6,9 @@
     <ul class="dfe-vertical-nav__section">
         @foreach (var menuItem in Model.Items)
         {
-            var css = ViewBag.ContextModel.PageName == menuItem.Uri
+            string pageName = $"/{ViewBag.ContextModel.PageName}";
+            string uri = menuItem.Uri.StartsWith("/") ? menuItem.Uri : $"/{menuItem.Uri}";
+            var css = pageName.StartsWith(uri)
                 ? "dfe-vertical-nav__section-item  dfe-vertical-nav__section-item--current"
                 : "dfe-vertical-nav__section-item";
 

From 278f67e115ffff6ac30843813b8c4d4185eb6c5b Mon Sep 17 00:00:00 2001
From: Al West <al@tsew.net>
Date: Thu, 28 Sep 2023 14:50:25 +0100
Subject: [PATCH 2/4] Switch to using automatically renewing SSL certificate
 from GlobalSign

---
 Terraform/appgw.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Terraform/appgw.tf b/Terraform/appgw.tf
index 9a6cbe72..c79c0269 100644
--- a/Terraform/appgw.tf
+++ b/Terraform/appgw.tf
@@ -79,7 +79,7 @@ resource "azurerm_application_gateway" "appgw" {
     frontend_ip_configuration_name = var.frontend_ip_configuration_name[terraform.workspace]
     frontend_port_name             = var.frontend_ssl_port_name[terraform.workspace]
     protocol                       = "Https"
-    ssl_certificate_name           = "develop-child-family-social-work-career"
+    ssl_certificate_name           = "develop-child-family-social-work-career-23"
     host_names                     = data.azurerm_resource_group.rg.name == "s185p01-childrens-social-care-cpd-rg" ? ["www.develop-child-family-social-work-career.education.gov.uk", "develop-child-family-social-work-career.education.gov.uk", ] : null
   }
 

From e718e3d74c744698997bd9d299fe16c6abe322d7 Mon Sep 17 00:00:00 2001
From: cairnsj <51908793+cairnsj@users.noreply.github.com>
Date: Thu, 28 Sep 2023 15:09:32 +0100
Subject: [PATCH 3/4] Update _SideMenu.cshtml

---
 Childrens-Social-Care-CPD/Views/Shared/_SideMenu.cshtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Childrens-Social-Care-CPD/Views/Shared/_SideMenu.cshtml b/Childrens-Social-Care-CPD/Views/Shared/_SideMenu.cshtml
index b942b204..afc1a032 100644
--- a/Childrens-Social-Care-CPD/Views/Shared/_SideMenu.cshtml
+++ b/Childrens-Social-Care-CPD/Views/Shared/_SideMenu.cshtml
@@ -7,7 +7,7 @@
         @foreach (var menuItem in Model.Items)
         {
             string pageName = $"/{ViewBag.ContextModel.PageName}";
-            string uri = menuItem.Uri.StartsWith("/") ? menuItem.Uri : $"/{menuItem.Uri}";
+            string uri = menuItem.Uri.StartsWith('/') ? menuItem.Uri : $"/{menuItem.Uri}";
             var css = pageName.StartsWith(uri)
                 ? "dfe-vertical-nav__section-item  dfe-vertical-nav__section-item--current"
                 : "dfe-vertical-nav__section-item";

From c5b7f38f1ae22942930150908b9ea254ff5bc143 Mon Sep 17 00:00:00 2001
From: Al West <al@tsew.net>
Date: Thu, 28 Sep 2023 15:30:44 +0100
Subject: [PATCH 4/4] Fix reference to SSL certifcate

---
 Terraform/appgw.tf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Terraform/appgw.tf b/Terraform/appgw.tf
index c79c0269..853c2d06 100644
--- a/Terraform/appgw.tf
+++ b/Terraform/appgw.tf
@@ -89,8 +89,8 @@ resource "azurerm_application_gateway" "appgw" {
   }
 
   ssl_certificate {
-    name                = "develop-child-family-social-work-career"
-    key_vault_secret_id = "${var.key_vault_url[terraform.workspace]}secrets/develop-child-family-social-work-career"
+    name                = "develop-child-family-social-work-career-23"
+    key_vault_secret_id = "${var.key_vault_url[terraform.workspace]}secrets/develop-child-family-social-work-career-23"
   }
 
   ssl_policy {