kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-07 06:31:22 +00:00
Code Issues Projects Releases Wiki Activity

Move the menu items Profile and Logout to the user menu in the main header

Browse Source
This commit is contained in:
Lucas Guima
2020-04-27 22:29:14 -03:00
parent 85b43055a7
commit f6a675f2e2
2 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
resources/views/v1/layout/default.twig
View File

@@ -86,9 +86,27 @@
{% if not SANDSTORM %} {% if not SANDSTORM %}
<li class="dropdown user user-menu"> <li class="dropdown user user-menu">
<span style="cursor:default;color:#fff;padding: 15px;display: block;line-height: 20px;"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">
<span class="hidden-xs">{{ Auth.user.email }}</span> <span class="visible-xs">@</span>
</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> </li>
{% endif %} {% endif %}
<li id="sidebar-toggle"> <li id="sidebar-toggle">

16
resources/views/v1/partials/menu-sidebar.twig
View File

@@ -172,7 +172,7 @@
</ul> </ul>
</li> </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="#"> <a href="#">
<i class="fa fa-bars fa-fw"></i> <i class="fa fa-bars fa-fw"></i>
<span>{{ 'options'|_ }}</span> <span>{{ 'options'|_ }}</span>
@@ -182,11 +182,6 @@
</a> </a>
<ul class="treeview-menu"> <ul class="treeview-menu">
<li class="{{ activeRoutePartial('profile') }}">
<a class="{{ activeRouteStrict('profile.index') }}" href="{{ route('profile.index') }}">
{{ 'profile'|_ }}
</a>
</li>
<li class="{{ activeRoutePartial('preferences') }}"> <li class="{{ activeRoutePartial('preferences') }}">
<a class="{{ activeRouteStrict('preferences.index') }}" href="{{ route('preferences.index') }}"> <a class="{{ activeRouteStrict('preferences.index') }}" href="{{ route('preferences.index') }}">
<span>{{ 'preferences'|_ }}</span> <span>{{ 'preferences'|_ }}</span>
@@ -206,13 +201,4 @@
{% endif %} {% endif %}
</ul> </ul>
</li> </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> </ul>