Top-level log in

pehala · Sep 16, 2023 · f8a3b66 · f8a3b66
1 parent 8947e2e
commit f8a3b66
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/backend/menus.py b/backend/menus.py
@@ -22,21 +22,19 @@
 )
 
 account_children = (
-    MenuItem(
-        _("Log in"),
-        reverse("login"),
-        check=lambda request: not request.user.is_authenticated,
-    ),
     MenuItem(
         _("Logout"),
         reverse("logout"),
-        check=lambda request: request.user.is_authenticated,
     ),
     MenuItem(
         _("Change password"),
         reverse("password_change"),
-        check=lambda request: request.user.is_authenticated,
     ),
 )
 
-Menu.add_item("account", MenuItem(_("Account"), reverse("login"), children=account_children))
+Menu.add_item(
+    "account",
+    MenuItem(
+        _("Account"), reverse("login"), children=account_children, check=lambda request: request.user.is_authenticated
+    ),
+)
diff --git a/frontend/static/styles.sass b/frontend/static/styles.sass
@@ -154,4 +154,7 @@ p
 /* Set the fixed height of the footer here */
 .footer
   height: 60px
-  background-color: #f5f5f5
+  background-color: #f5f5f5
+
+.custom-link
+ color: $colDefault
diff --git a/frontend/templates/base/index.html b/frontend/templates/base/index.html
@@ -87,12 +87,14 @@
                     </div>
                 </li>
             </ul>
-            {% if user.is_authenticated %}
-                <span class="navbar-text mr-2">{% trans "Logged as" %} <b>{{ user.username }}</b></span>
-            {% endif %}
             <ul class="my-lg-0 navbar-nav navbar-right">
                 {% include "menu/bootstrap4-menu.html" with menu=menus.account %}
             </ul>
+            {% if user.is_authenticated %}
+                <span class="navbar-text mr-2">{% trans "Logged as" %} <b>{{ user.username }}</b></span>
+            {% else %}
+                <a href="{% url 'login' %}" class="btn btn-link custom-link" role="button">{% trans "Log in" %}</a>
+            {% endif %}
 
         </div>
     </nav>