X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/fff5bbcee458992443e3732fbcbbbe34f765fcc3..refs/pull/340/head:/resources/views/base.blade.php diff --git a/resources/views/base.blade.php b/resources/views/base.blade.php index 1deed0a3f..95a9d72b0 100644 --- a/resources/views/base.blade.php +++ b/resources/views/base.blade.php @@ -17,14 +17,16 @@ + @yield('head') @include('partials/custom-styles') - - @if(setting('app-custom-head', false)) + @if(setting('app-custom-head') && \Route::currentRouteName() !== 'settings') + {!! setting('app-custom-head') !!} + @endif @@ -45,7 +47,7 @@
-
+
@@ -53,32 +55,16 @@
- Books - @if(isset($currentUser) && userCan('settings-manage')) - Settings + {{ trans('entities.books') }} + @if(signedInUser() && userCan('settings-manage')) + {{ trans('settings.settings') }} @endif - @if(!isset($signedIn) || !$signedIn) - Sign In + @if(!signedInUser()) + {{ trans('auth.log_in') }} @endif
- @if(isset($signedIn) && $signedIn) -
- - {{ $currentUser->name }} - {{ $currentUser->getShortName(9) }} - - -
+ @if(signedInUser()) + @include('partials._header-dropdown', ['currentUser' => user()]) @endif
@@ -93,7 +79,7 @@
- Back to top + {{ trans('common.back_to_top') }}
@yield('bottom')