X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/c4eed37d8e20dbf235d54d00f5676288cd5481f6..refs/pull/358/head:/resources/views/base.blade.php diff --git a/resources/views/base.blade.php b/resources/views/base.blade.php index 961ead251..4287014c2 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')) + @if(setting('app-custom-head') && \Route::currentRouteName() !== 'settings') + {!! setting('app-custom-head') !!} + @endif @@ -39,7 +41,9 @@ @if(setting('app-logo', '') !== 'none')

@endif - {{ setting('app-name') }} + @if (setting('app-name-header')) + {{ setting('app-name') }} + @endif

@@ -51,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) - + @if(signedInUser()) + @include('partials._header-dropdown', ['currentUser' => user()]) @endif

@@ -91,7 +79,7 @@

- Back to top + {{ trans('common.back_to_top') }}

@yield('bottom')