From f6a675f2e218bd578c49628d11213ccc2f57b1d7 Mon Sep 17 00:00:00 2001
From: Lucas Guima <lucasguima.felipe@gmail.com>
Date: Mon, 27 Apr 2020 22:29:14 -0300
Subject: [PATCH] Move the menu items Profile and Logout to the user menu in
 the main header

---
 resources/views/v1/layout/default.twig        | 24 ++++++++++++++++---
 resources/views/v1/partials/menu-sidebar.twig | 16 +------------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/resources/views/v1/layout/default.twig b/resources/views/v1/layout/default.twig
index deeb9d0cb62..1fc7d4bbcb4 100644
--- a/resources/views/v1/layout/default.twig
+++ b/resources/views/v1/layout/default.twig
@@ -86,9 +86,27 @@
 
                     {% if not SANDSTORM %}
                         <li class="dropdown user user-menu">
-                        <span style="cursor:default;color:#fff;padding: 15px;display: block;line-height: 20px;">
-                            <span class="hidden-xs">{{ Auth.user.email }}</span>
-                        </span>
+                            <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>
                         </li>
                     {% endif %}
                     <li id="sidebar-toggle">
diff --git a/resources/views/v1/partials/menu-sidebar.twig b/resources/views/v1/partials/menu-sidebar.twig
index 4f88501ac01..1279bcf1cc7 100644
--- 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('profile') }} {{ activeRoutePartial('preferences') }} {{ activeRoutePartial('currencies') }} treeview" id="option-menu">
+  <li class="{{ activeRoutePartial('admin') }} {{ activeRoutePartial('preferences') }} {{ activeRoutePartial('currencies') }} treeview" id="option-menu">
     <a href="#">
       <i class="fa fa-bars fa-fw"></i>
       <span>{{ 'options'|_ }}</span>
@@ -182,11 +182,6 @@
     </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>
@@ -206,13 +201,4 @@
       {% 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>