Revert "Move the menu items Profile and Logout to the user menu in th…

…e main header" This reverts commit f6a675f.
lguima · Apr 28, 2020 · 61bd2dc · 61bd2dc
1 parent f6a675f
commit 61bd2dc
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 22 deletions.
diff --git a/resources/views/v1/layout/default.twig b/resources/views/v1/layout/default.twig
@@ -86,27 +86,9 @@
 
                     {% if not SANDSTORM %}
                         <li class="dropdown user user-menu">
-                            <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                                <span class="visible-xs">@</span>
-                                <span class="hidden-xs">{{ Auth.user.email }}</span>
-                            </a>
-
-                            <ul class="dropdown-menu" style="width: unset;">
-                                <li class="user-footer">
-                                    <div class="col-xs-6 text-center">
-                                        <a href="{{ route('profile.index') }}" class="btn btn-default btn-flat">
-                                            <span>{{ 'profile'|_ }}</span>
-                                        </a>
-                                    </div>
-                                    {% if not SANDSTORM %}
-                                        <div class="col-xs-6 text-center">
-                                            <a href="{{ route('logout') }}" class="btn btn-default btn-flat">
-                                                <span>{{ 'logout'|_ }}</span>
-                                            </a>
-                                        </div>
-                                    {% endif %}
-                                </li>
-                            </ul>
+                        <span style="cursor:default;color:#fff;padding: 15px;display: block;line-height: 20px;">
+                            <span class="hidden-xs">{{ Auth.user.email }}</span>
+                        </span>
                         </li>
                     {% endif %}
                     <li id="sidebar-toggle">

diff --git a/resources/views/v1/partials/menu-sidebar.twig b/resources/views/v1/partials/menu-sidebar.twig
@@ -172,7 +172,7 @@
     </ul>
   </li>
 
-  <li class="{{ activeRoutePartial('admin') }} {{ activeRoutePartial('preferences') }} {{ activeRoutePartial('currencies') }} treeview" id="option-menu">
+  <li class="{{ activeRoutePartial('admin') }} {{ activeRoutePartial('profile') }} {{ activeRoutePartial('preferences') }} {{ activeRoutePartial('currencies') }} treeview" id="option-menu">
     <a href="#">
       <i class="fa fa-bars fa-fw"></i>
       <span>{{ 'options'|_ }}</span>
@@ -182,6 +182,11 @@
     </a>
 
     <ul class="treeview-menu">
+      <li class="{{ activeRoutePartial('profile') }}">
+        <a class="{{ activeRouteStrict('profile.index') }}" href="{{ route('profile.index') }}">
+          {{ 'profile'|_ }}
+        </a>
+      </li>
       <li class="{{ activeRoutePartial('preferences') }}">
         <a class="{{ activeRouteStrict('preferences.index') }}" href="{{ route('preferences.index') }}">
           <span>{{ 'preferences'|_ }}</span>
@@ -201,4 +206,13 @@
       {% endif %}
     </ul>
   </li>
+
+  {% if not SANDSTORM %}
+    <li>
+      <a href="{{ route('logout') }}">
+        <i class="fa fa-sign-out fa-fw"></i>
+        <span>{{ 'logout'|_ }}</span>
+      </a>
+    </li>
+  {% endif %}
 </ul>