From 3901cdbf2a2237fdcd506715f6b2c3a1f4f6718c Mon Sep 17 00:00:00 2001
From: Michael Weimann <mail@michael-weimann.eu>
Date: Wed, 19 Apr 2023 21:19:22 +0200
Subject: [PATCH] Tweak navbar collapse as guest and fix language dropdown
 position (#1128)

* Fix language switcher position
* Tweak navbar collapse as guest
---
 .../layouts/parts/language_dropdown.twig      | 12 ++++++++++
 resources/views/layouts/parts/navbar.twig     | 23 +++++++++----------
 2 files changed, 23 insertions(+), 12 deletions(-)
 create mode 100644 resources/views/layouts/parts/language_dropdown.twig

diff --git a/resources/views/layouts/parts/language_dropdown.twig b/resources/views/layouts/parts/language_dropdown.twig
new file mode 100644
index 00000000..567a71d7
--- /dev/null
+++ b/resources/views/layouts/parts/language_dropdown.twig
@@ -0,0 +1,12 @@
+{% import 'macros/base.twig' as m %}
+
+{% if config('locales')|length > 1 %}
+    <li class="nav-item dropdown">
+        <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+            {{ m.icon('translate') }}
+        </a>
+        <ul class="dropdown-menu dropdown-menu-end">
+            {{ menuLanguages()|join(" ")|raw }}
+        </ul>
+    </li>
+{% endif %}
diff --git a/resources/views/layouts/parts/navbar.twig b/resources/views/layouts/parts/navbar.twig
index 9e8e43f0..bb84230a 100644
--- a/resources/views/layouts/parts/navbar.twig
+++ b/resources/views/layouts/parts/navbar.twig
@@ -22,7 +22,14 @@
     </li>
 {% endmacro %}
 
-<nav class="navbar fixed-top navbar-expand-xxl border-bottom {{ theme['navbar_classes'] }}">
+
+{% if is_guest() %}
+    {% set navbar_expand_class = 'navbar-expand-md' %}
+{% else %}
+    {% set navbar_expand_class = 'navbar-expand-xxl' %}
+{% endif %}
+
+<nav class="navbar fixed-top {{ navbar_expand_class }} border-bottom {{ theme['navbar_classes'] }}">
     <div class="container-fluid">
         <a class="navbar-brand" href="{{ url('/') }}">
             {{ m.angel() }}
@@ -49,6 +56,8 @@
             {% endif %}
             <ul class="navbar-nav ms-auto mb-2 mb-lg-0">
                 {% if is_guest() %}
+                    {% include "layouts/parts/language_dropdown.twig" %}
+
                     {% if has_permission_to('register') and config('registration_enabled') %}
                         {{ _self.toolbar_item(__('Register'), url('register'), 'register', 'plus') }}
                     {% endif %}
@@ -72,6 +81,7 @@
 
                     {{ menuUserHints() }}
 
+                    {% include "layouts/parts/language_dropdown.twig" %}
                     <li class="nav-item dropdown">
                         <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">
                             {{ m.angel() }} {{ user.displayName }}
@@ -91,17 +101,6 @@
                         </ul>
                     </li>
                 {% endif %}
-
-                {% if config('locales')|length > 1 %}
-                    <li class="nav-item dropdown">
-                        <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-                            {{ m.icon('translate') }}
-                        </a>
-                        <ul class="dropdown-menu dropdown-menu-end">
-                            {{ menuLanguages()|join(" ")|raw }}
-                        </ul>
-                    </li>
-                {% endif %}
             </ul>
         </div>
     </div>