Merge branch 'main' into give-europe-its-own-navlinks

guardian · Nov 19, 2024 · b2276fd · b2276fd
2 parents 30c4bb2 + 3e1fa65
commit b2276fd
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 44 deletions.
diff --git a/common/app/navigation/NavLinks.scala b/common/app/navigation/NavLinks.scala
@@ -19,7 +19,7 @@ object NavLinks {
   val indigenousAustralia = NavLink("Indigenous Australia", "/australia-news/indigenous-australians")
   val indigenousAustraliaOpinion = NavLink("Indigenous", "/commentisfree/series/indigenousx")
   val usNews = NavLink("US", "/us-news", longTitle = Some("US news"))
-  val usElections2024 = NavLink("US elections 2024", "/us-news/us-elections-2024")
+  val usPolitics = NavLink("US politics", "/us-news/us-politics")
 
   val education = {
     val teachers = NavLink("Teachers", "/teacher-network")
@@ -279,16 +279,16 @@ object NavLinks {
     iconName = Some("home"),
     List(
       ukNews,
-      usElections2024,
+      usPolitics,
       world,
       climateCrisis,
+      middleEast,
       ukraine,
       football,
       newsletters,
       ukBusiness,
       ukEnvironment,
       politics,
-      education,
       society,
       science,
       tech,
@@ -317,9 +317,10 @@ object NavLinks {
   val usNewsPillar = ukNewsPillar.copy(children =
     List(
       usNews,
-      usElections2024,
+      usPolitics,
       world,
       usEnvironment,
+      middleEast,
       ukraine,
       usSoccer,
       usBusiness,
@@ -332,9 +333,10 @@ object NavLinks {
   val intNewsPillar = ukNewsPillar.copy(
     children = List(
       world,
-      usElections2024,
+      usPolitics,
       ukNews,
       climateCrisis,
+      middleEast,
       ukraine,
       ukEnvironment,
       science,

diff --git a/common/test/resources/reference-navigation.json b/common/test/resources/reference-navigation.json
@@ -88,8 +88,8 @@
 					"classList": []
 				},
 				{
-					"title": "US elections 2024",
-					"url": "/us-news/us-elections-2024",
+					"title": "US politics",
+					"url": "/us-news/us-politics",
 					"children": [],
 					"classList": []
 				},
@@ -163,6 +163,12 @@
 					"children": [],
 					"classList": []
 				},
+				{
+					"title": "Middle East",
+					"url": "/world/middleeast",
+					"children": [],
+					"classList": []
+				},
 				{
 					"title": "Ukraine",
 					"url": "/world/ukraine",
@@ -341,37 +347,6 @@
 					"children": [],
 					"classList": []
 				},
-				{
-					"title": "Education",
-					"url": "/education",
-					"children": [
-						{
-							"title": "Schools",
-							"url": "/education/schools",
-							"children": [],
-							"classList": []
-						},
-						{
-							"title": "Teachers",
-							"url": "/teacher-network",
-							"children": [],
-							"classList": []
-						},
-						{
-							"title": "Universities",
-							"url": "/education/universities",
-							"children": [],
-							"classList": []
-						},
-						{
-							"title": "Students",
-							"url": "/education/students",
-							"children": [],
-							"classList": []
-						}
-					],
-					"classList": []
-				},
 				{
 					"title": "Society",
 					"url": "/society",
@@ -1025,8 +1000,8 @@
 					"classList": []
 				},
 				{
-					"title": "US elections 2024",
-					"url": "/us-news/us-elections-2024",
+					"title": "US politics",
+					"url": "/us-news/us-politics",
 					"children": [],
 					"classList": []
 				},
@@ -1131,6 +1106,12 @@
 					],
 					"classList": []
 				},
+				{
+					"title": "Middle East",
+					"url": "/world/middleeast",
+					"children": [],
+					"classList": []
+				},
 				{
 					"title": "Ukraine",
 					"url": "/world/ukraine",
@@ -2510,8 +2491,8 @@
 					"classList": []
 				},
 				{
-					"title": "US elections 2024",
-					"url": "/us-news/us-elections-2024",
+					"title": "US politics",
+					"url": "/us-news/us-politics",
 					"children": [],
 					"classList": []
 				},
@@ -2602,6 +2583,12 @@
 					"children": [],
 					"classList": []
 				},
+				{
+					"title": "Middle East",
+					"url": "/world/middleeast",
+					"children": [],
+					"classList": []
+				},
 				{
 					"title": "Ukraine",
 					"url": "/world/ukraine",
@@ -3516,8 +3503,8 @@
 					"classList": []
 				},
 				{
-					"title": "US elections 2024",
-					"url": "/us-news/us-elections-2024",
+					"title": "US politics",
+					"url": "/us-news/us-politics",
 					"children": [],
 					"classList": []
 				},
@@ -3608,6 +3595,12 @@
 					"children": [],
 					"classList": []
 				},
+				{
+					"title": "Middle East",
+					"url": "/world/middleeast",
+					"children": [],
+					"classList": []
+				},
 				{
 					"title": "Ukraine",
 					"url": "/world/ukraine",