From cebe1c6d311fd5e1edf8f6ede9a9447e44ac7d11 Mon Sep 17 00:00:00 2001
From: Patrick Jentsch <p.jentsch@uni-bielefeld.de>
Date: Fri, 17 Jan 2020 11:46:30 +0100
Subject: [PATCH] move dropdown menu code

---
 app/templates/base.html.j2 | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/app/templates/base.html.j2 b/app/templates/base.html.j2
index d548207a..dd0f2fa9 100644
--- a/app/templates/base.html.j2
+++ b/app/templates/base.html.j2
@@ -23,18 +23,6 @@
   </head>
   <body>
     <header>
-      <div id="nav-notifications-dropdown" class="dropdown-content grey-text text-darken-4">
-        <p>Notifications</p>
-      </div>
-      <ul id="nav-account-dropdown" class="dropdown-content">
-        {% if current_user.is_authenticated %}
-        <li><a href="{{ url_for('profile.index') }}"><i class="material-icons">settings</i>Settings</a></li>
-        <li><a href="{{ url_for('auth.logout') }}"><i class="material-icons">power_settings_new</i>Log out</a></li>
-        {% else %}
-        <li><a href="{{ url_for('auth.login') }}"><i class="material-icons">person</i>Log in</a></li>
-        <li><a href="{{ url_for('auth.register') }}"><i class="material-icons">person_add</i>Register</a></li>
-        {% endif %}
-      </ul>
       <div class="navbar-fixed">
         <nav>
           <div class="nav-wrapper">
@@ -56,6 +44,20 @@
         </nav>
       </div>
 
+      <!-- Dropdown menus for the navbar -->
+      <div id="nav-notifications-dropdown" class="dropdown-content grey-text text-darken-4">
+        <p>Notifications</p>
+      </div>
+      <ul id="nav-account-dropdown" class="dropdown-content">
+        {% if current_user.is_authenticated %}
+        <li><a href="{{ url_for('profile.index') }}"><i class="material-icons">settings</i>Settings</a></li>
+        <li><a href="{{ url_for('auth.logout') }}"><i class="material-icons">power_settings_new</i>Log out</a></li>
+        {% else %}
+        <li><a href="{{ url_for('auth.login') }}"><i class="material-icons">person</i>Log in</a></li>
+        <li><a href="{{ url_for('auth.register') }}"><i class="material-icons">person_add</i>Register</a></li>
+        {% endif %}
+      </ul>
+
       <ul id="slide-out" class="sidenav sidenav-fixed">
         <li><a href="{{ url_for('main.index') }}"><i class="material-icons">opacity</i>nopaque</a></li>
         <li><a href="#"><i class="material-icons">linear_scale</i>Workflow</a></li>
-- 
GitLab