From 30c97c3915f6646cd34a0b13fadc14036d040edb Mon Sep 17 00:00:00 2001
From: Louis Charette <charette.louis@gmail.com>
Date: Sun, 12 Nov 2023 18:15:03 -0500
Subject: [PATCH] Update UF5 Setup

---
 .gitmodules                                   | 11 ++--
 config/versions.yaml                          | 54 +++++++++++--------
 sites/5.0                                     |  1 +
 sites/5.0-beta                                |  1 -
 sites/develop                                 |  1 -
 sites/latest                                  |  2 +-
 .../templates/partials/navigation.html.twig   |  4 +-
 .../partials/versionSelect.html.twig          |  8 +--
 8 files changed, 46 insertions(+), 36 deletions(-)
 create mode 160000 sites/5.0
 delete mode 160000 sites/5.0-beta
 delete mode 160000 sites/develop

diff --git a/.gitmodules b/.gitmodules
index 2beec8cc..f32ce856 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,4 @@
-[submodule "sites/develop"]
-	path = sites/develop
-	url = https://github.com/userfrosting/learn.git
-	branch = develop
+
 [submodule "sites/4.0"]
 	path = sites/4.0
 	url = https://github.com/userfrosting/learn.git
@@ -30,7 +27,7 @@
 	path = sites/4.6
 	url = https://github.com/userfrosting/learn.git
 	branch = 4.6
-[submodule "sites/5.0-beta"]
-	path = sites/5.0-beta
+[submodule "sites/5.0"]
+	path = sites/5.0
 	url = https://github.com/userfrosting/learn.git
-	branch = 5.0-beta
+	branch = 5.0
diff --git a/config/versions.yaml b/config/versions.yaml
index e0f292a4..a19ab73e 100644
--- a/config/versions.yaml
+++ b/config/versions.yaml
@@ -1,28 +1,38 @@
 branches:
     'latest':
         path: ''
-        label: 'Latest'
-    '4.0':
-        path: '/4.0'
-        label: '4.0'
-    '4.1':
-        path: '/4.1'
-        label: '4.1'
-    '4.2':
-        path: '/4.2'
-        label: '4.2'
-    '4.3':
-        path: '/4.3'
-        label: '4.3'
-    '4.4':
-        path: '/4.4'
-        label: '4.4'
-    '4.5':
-        path: '/4.5'
-        label: '4.5'
+        label: '5.0'
+        visible: true
+    '5.0':
+        path: '/5.0'
+        label: '5.0'
+        visible: false
     '4.6':
         path: '/4.6'
         label: '4.6'
-    '5.0-beta':
-        path: '/5.0-beta'
-        label: '5.0 Beta'
+        visible: true
+    '4.5':
+        path: '/4.5'
+        label: '4.5'
+        visible: true
+    '4.4':
+        path: '/4.4'
+        label: '4.4'
+        visible: true
+    '4.3':
+        path: '/4.3'
+        label: '4.3'
+        visible: true
+    '4.2':
+        path: '/4.2'
+        label: '4.2'
+        visible: true
+    '4.1':
+        path: '/4.1'
+        label: '4.1'
+        visible: true
+    '4.0':
+        path: '/4.0'
+        label: '4.0'
+        visible: true
+
diff --git a/sites/5.0 b/sites/5.0
new file mode 160000
index 00000000..a3e77deb
--- /dev/null
+++ b/sites/5.0
@@ -0,0 +1 @@
+Subproject commit a3e77deb16fc0249c65db64d30ab56710ba9dc47
diff --git a/sites/5.0-beta b/sites/5.0-beta
deleted file mode 160000
index 11fe4c9f..00000000
--- a/sites/5.0-beta
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 11fe4c9fd5ef544cb10983d07ce4280228214f3c
diff --git a/sites/develop b/sites/develop
deleted file mode 160000
index efaa0c58..00000000
--- a/sites/develop
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit efaa0c58dd972141ac58d279abe2b3e4b2bd6e14
diff --git a/sites/latest b/sites/latest
index 93cb4c47..6e636605 120000
--- a/sites/latest
+++ b/sites/latest
@@ -1 +1 @@
-./4.6/
\ No newline at end of file
+5.0
\ No newline at end of file
diff --git a/themes/sitetheme/templates/partials/navigation.html.twig b/themes/sitetheme/templates/partials/navigation.html.twig
index 8b62bd1a..de11e606 100644
--- a/themes/sitetheme/templates/partials/navigation.html.twig
+++ b/themes/sitetheme/templates/partials/navigation.html.twig
@@ -29,7 +29,9 @@
                     </a>
                     <ul id="dropdown2" class="dropdown-content">
                         {% for version in config.versions.branches %}
-                            <li><a href="{{ uri.rootUrl }}{{ version.path }}{{ uri.path }}">{{ version.label }}</a></li>
+                            {% if version.visible %}
+                                <li><a href="{{ uri.rootUrl }}{{ version.path }}{{ uri.path }}">{{ version.label }}</a></li>
+                            {% endif %}
                         {% endfor %}
                     </ul>
                 </li>
diff --git a/themes/sitetheme/templates/partials/versionSelect.html.twig b/themes/sitetheme/templates/partials/versionSelect.html.twig
index 45e7da48..ab7a0433 100644
--- a/themes/sitetheme/templates/partials/versionSelect.html.twig
+++ b/themes/sitetheme/templates/partials/versionSelect.html.twig
@@ -2,9 +2,11 @@
     <label>Version: </label>
     <select>
         {% for label, version in config.versions.branches %}
-            <option {% if config.environment == label %}selected="selected" {% endif %}value="{{ uri.rootUrl }}{{ version.path }}{{ uri.path }}">
-                {{ version.label }}
-            </option>
+            {% if version.visible %}
+                <option {% if config.environment == label %}selected="selected" {% endif %}value="{{ uri.rootUrl }}{{ version.path }}{{ uri.path }}">
+                    {{ version.label }}
+                </option>
+            {% endif %}
         {% endfor %}
     </select>
 </div>