X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/80865b30a5d6a82e86d21e272ae58977d4430a64..refs/pull/205/head:/resources/views/base.blade.php diff --git a/resources/views/base.blade.php b/resources/views/base.blade.php index e3cac3621..1deed0a3f 100644 --- a/resources/views/base.blade.php +++ b/resources/views/base.blade.php @@ -1,22 +1,31 @@ - + - {{ isset($pageTitle) ? $pageTitle . ' | ' : '' }}{{ Setting::get('app-name', 'BookStack') }} + {{ isset($pageTitle) ? $pageTitle . ' | ' : '' }}{{ setting('app-name') }} + - + - + + @yield('head') + + @include('partials/custom-styles') + + + @if(setting('app-custom-head', false)) + {!! setting('app-custom-head') !!} + @endif @@ -26,15 +35,17 @@

- - @if(Setting::get('app-logo', '') !== 'none') -

+ + @if(setting('app-logo', '') !== 'none') +

+ @endif + @if (setting('app-name-header')) + {{ setting('app-name') }} @endif - {{ Setting::get('app-name', 'BookStack') }}

- @@ -42,29 +53,29 @@

- Books - @if(isset($currentUser) && $currentUser->can('settings-manage')) - Settings + Books + @if(isset($currentUser) && userCan('settings-manage')) + Settings @endif @if(!isset($signedIn) || !$signedIn) - Sign In + Sign In @endif

@if(isset($signedIn) && $signedIn)