7 files changed, 74 insertions, 42 deletions

diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb
deleted file mode 100644
index b0e310e9..00000000
--- a/app/views/admin/_menu.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<%= link_to icon("home", library: "tabler", "aria-hidden": true), admin_path, "aria-label": t(".dashboard"), title: t(".dashboard") %>
-<a href="#" onclick="admin_search.display_toggle(); return false;" aria-label="<%= t(".search") %>" title="<%= t(".search") %>"><%= icon("search", library: "tabler", "aria-hidden": true) %></a>
-<%= button_to logout_path, method: :delete, aria: { label: t(".log_out") }, title: t(".log_out") do %>
-  <%= icon("logout", library: "tabler", "aria-hidden": true) %>
-<% end %>
diff --git a/app/views/layouts/_nav_controls.html.erb b/app/views/layouts/_nav_controls.html.erb
new file mode 100644
index 00000000..d6053dab
--- /dev/null
+++ b/app/views/layouts/_nav_controls.html.erb
@@ -0,0 +1,36 @@
+<% if current_user %>
+  <%= link_to icon("home", library: "tabler", "aria-hidden": true), admin_path, "aria-label": t(".dashboard"), title: t(".dashboard") %>
+  <a href="#" onclick="admin_search.display_toggle(); return false;" aria-label="<%= t(".search") %>" title="<%= t(".search") %>"><%= icon("search", library: "tabler", "aria-hidden": true) %></a>
+<% end %>
+
+<span class="nav_group">
+  <%= link_to url_for(locale: (:en unless I18n.locale == :en)),
+        class: "nav_toggle nav_locale",
+        "aria-label" => t(".switch_locale"), title: t(".switch_locale") do %>
+    <%= I18n.locale == :en ? "DE" : "EN" %>
+  <% end %>
+  <%= check_box_tag "scheme_override", 1, false, class: "nav_toggle_input" %>
+  <%= label_tag "scheme_override", class: "nav_toggle",
+        "aria-label" => t(".scheme_override"), title: t(".scheme_override") do %>
+    <%= icon("contrast", library: "tabler", "aria-hidden": true) %>
+  <% end %>
+</span>
+
+<%= javascript_tag nonce: true do %>
+  (function () {
+    var box = document.getElementById("scheme_override");
+    try {
+      if (localStorage.getItem("override-prefers-color-scheme")) box.checked = true;
+      box.addEventListener("change", function () {
+        if (box.checked) localStorage.setItem("override-prefers-color-scheme", 1);
+        else localStorage.removeItem("override-prefers-color-scheme");
+      });
+    } catch (e) { /* storage unavailable: the toggle still works per page */ }
+  })();
+<% end %>
+
+<% if current_user %>
+  <%= button_to logout_path, method: :delete, aria: { label: t(".log_out") }, title: t(".log_out") do %>
+    <%= icon("logout", library: "tabler", "aria-hidden": true) %>
+  <% end %>
+<% end %>
diff --git a/app/views/layouts/_nav_switchers.html.erb b/app/views/layouts/_nav_switchers.html.erb
deleted file mode 100644
index 9c3b222e..00000000
--- a/app/views/layouts/_nav_switchers.html.erb
+++ /dev/null
@@ -1,23 +0,0 @@
-<%= link_to url_for(locale: (:en unless I18n.locale == :en)),
-      class: "nav_toggle",
-      "aria-label" => t(".switch_locale"), title: t(".switch_locale") do %>
-  <%= I18n.locale == :en ? "DE" : "EN" %>
-<% end %>
-<%= check_box_tag "scheme_override", 1, false, class: "nav_toggle_input" %>
-<%= label_tag "scheme_override", class: "nav_toggle",
-      "aria-label" => t(".scheme_override"), title: t(".scheme_override") do %>
-  <%= icon("contrast", library: "tabler", "aria-hidden": true) %>
-<% end %>
-
-<%= javascript_tag nonce: true do %>
-  (function () {
-    var box = document.getElementById("scheme_override");
-    try {
-      if (localStorage.getItem("override-prefers-color-scheme")) box.checked = true;
-      box.addEventListener("change", function () {
-        if (box.checked) localStorage.setItem("override-prefers-color-scheme", 1);
-        else localStorage.removeItem("override-prefers-color-scheme");
-      });
-    } catch (e) { /* storage unavailable: the toggle still works per page */ }
-  })();
-<% end %>
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
index 6ac9b756..04cc40ac 100644
--- a/app/views/layouts/admin.html.erb
+++ b/app/views/layouts/admin.html.erb
@@ -26,8 +26,7 @@
     <div id="wrapper">
       <div id="navigation">
         <div id="main_navigation">
-          <%= render :partial => 'admin/menu' if current_user %>
-          <%= render :partial => 'layouts/nav_switchers' %>
+          <%= render :partial => 'layouts/nav_controls' %>
         </div>
         <div id="search_widget" style="display: none;">
           <div>
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 8af3d46b..cfdae95c 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -278,10 +278,6 @@ de:
       date: "Datum"
       author: "Autor"
       type: "Typ"
-    menu:
-      dashboard: "Dashboard"
-      search: "Suche"
-      log_out: "Abmelden"
     index:
       title: "cccms Dashboard"
       search_placeholder: "Nodes und Tags durchsuchen…"
@@ -669,6 +665,9 @@ de:
       lock_lost_link: "zurück zur veröffentlichten Seite"
       insert_image: "Bild einfügen"
       insert_image_tooltip: "Eines der angehängten Bilder dieser Seite einfügen"
-    nav_switchers:
-      scheme_override: "Hell/Dunkel umschalten"
+    nav_controls:
+      dashboard: "Dashboard"
+      search: "Suche"
       switch_locale: "Sprache umschalten"
+      scheme_override: "Hell/Dunkel umschalten"
+      log_out: "Abmelden"
diff --git a/config/locales/en.yml b/config/locales/en.yml
index fc3ad216..3c4ea1c8 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -231,10 +231,6 @@ en:
       editor: "Editor"
       date: "Date"
       type: "Type"
-    menu:
-      dashboard: "Dashboard"
-      search: "Search"
-      log_out: "Log out"
     index:
       title: "cccms dashboard"
       search_placeholder: "Search nodes and tags…"
@@ -621,6 +617,9 @@ en:
       lock_lost_link: "return to the published page"
       insert_image: "Insert image"
       insert_image_tooltip: "Insert one of this page's attached images"
-    nav_switchers:
-      scheme_override: "Toggle light/dark"
+    nav_controls:
+      dashboard: "Dashboard"
+      search: "Search"
       switch_locale: "Toggle language"
+      scheme_override: "Toggle light/dark"
+      log_out: "Log out"
diff --git a/public/stylesheets/admin.css b/public/stylesheets/admin.css
index f697c4e2..4bcbf153 100644
--- a/public/stylesheets/admin.css
+++ b/public/stylesheets/admin.css
@@ -459,6 +459,21 @@ form.button_to svg  {
   height: 1.25rem;
 }
 
+#main_navigation .nav_group {
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+  margin-left: 1.25rem;
+}
+
+#main_navigation .nav_group:first-child {
+  margin-left: 0;
+}
+
+#main_navigation form.button_to {
+  margin-left: auto;
+}
+
 #main_navigation input.nav_toggle_input {
   position: absolute;
   width: 1px;
@@ -477,6 +492,18 @@ form.button_to svg  {
   background-color: var(--accent-surface);
 }
 
+#main_navigation form.button_to button:hover {
+  color: var(--on-solid);
+  background-color: var(--danger-solid);
+}
+
+#main_navigation a.nav_locale {
+  font-size: 0.8125rem;
+  font-weight: 700;
+  letter-spacing: 0.04em;
+  line-height: 1;
+}
+
 #dashboard_search {
   margin-bottom: 1.5rem;
 }