Merge branch 'develop' into feature/customized-theme

This commit is contained in:
Jakob Schrettenbrunner 2017-09-05 01:47:43 +02:00
commit 2ac1e08f47
16 changed files with 524 additions and 161 deletions

View file

@ -77,7 +77,7 @@
{{--<li>--}}
{{--<a href="#" data-action="control-sidebar" data-toggle="tooltip" data-placement="bottom" title="{{ @trans('strings.servers') }}"><i class="fa fa-server"></i></a>--}}
{{--</li>--}}
@if(Auth::user()->isRootAdmin())
@if(Auth::user()->root_admin)
<li>
<li><a href="{{ route('admin.index') }}" data-toggle="tooltip" data-placement="bottom" title="{{ @trans('strings.admin_cp') }}"><i class="fa fa-gears"></i></a></li>
</li>