Merge branch 'Feature/VideoResources' of https://github.com/DFE-Digit…

…al/childrens-social-care-cpd into Feature/VideoResources
DFE-Digital · Sep 28, 2023 · f76baf0 · f76baf0
2 parents 5feb536 + 82617d4
commit f76baf0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git 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";
 

diff --git 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
   }
 
@@ -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 {