X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/0774ecc89c23d067296abac0298c2e02120917df..refs/pull/358/head:/resources/views/base.blade.php diff --git a/resources/views/base.blade.php b/resources/views/base.blade.php index 59bbe6fbb..4287014c2 100644 --- a/resources/views/base.blade.php +++ b/resources/views/base.blade.php @@ -1,40 +1,32 @@ - + - {{ isset($pageTitle) ? $pageTitle . ' | ' : '' }}{{ Setting::get('app-name', 'BookStack') }} + {{ isset($pageTitle) ? $pageTitle . ' | ' : '' }}{{ setting('app-name') }} + - + - + + + @yield('head') - @if(Setting::get('app-color')) - + + @include('partials/custom-styles') + + @if(setting('app-custom-head') && \Route::currentRouteName() !== 'settings') + + {!! setting('app-custom-head') !!} + @endif @@ -45,15 +37,17 @@
-
-
+
@@ -61,32 +55,16 @@
- Books - @if(isset($currentUser) && $currentUser->can('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->name }} - - -
+ @if(signedInUser()) + @include('partials._header-dropdown', ['currentUser' => user()]) @endif
@@ -101,7 +79,7 @@
- Back to top + {{ trans('common.back_to_top') }}
@yield('bottom')