]> BookStack Code Mirror - bookstack/blobdiff - resources/views/public.blade.php
Merge branch 'master' into translations
[bookstack] / resources / views / public.blade.php
index 2de4d968a650fe6310684e2be8d1c3f636f60617..05cf043fd69a4a9855d21e32b53b3fb645849b73 100644 (file)
     <!-- Scripts -->
     <script src="{{ baseUrl("/libs/jquery/jquery.min.js?version=2.1.4") }}"></script>
     @include('partials/custom-styles')
+
+    <!-- Custom user content -->
+    @if(setting('app-custom-head'))
+        {!! setting('app-custom-head') !!}
+    @endif
 </head>
 <body class="@yield('body-class')" ng-app="bookStack">
 
-@include('partials/notifications')
+@include('partials.notifications')
 
 <header id="header">
     <div class="container">
@@ -31,7 +36,9 @@
                     @if(setting('app-logo', '') !== 'none')
                         <img class="logo-image" src="{{ setting('app-logo', '') === '' ? baseUrl('/logo.png') : baseUrl(setting('app-logo', '')) }}" alt="Logo">
                     @endif
-                    <span class="logo-text">{{ setting('app-name') }}</span>
+                    @if (setting('app-name-header'))
+                        <span class="logo-text">{{ setting('app-name') }}</span>
+                    @endif
                 </a>
             </div>
             <div class="col-md-6">
                         @yield('header-buttons')
                     </div>
                     @if(isset($signedIn) && $signedIn)
-                        <div class="dropdown-container" dropdown>
-                            <span class="user-name" dropdown-toggle>
-                                <img class="avatar" src="{{$currentUser->getAvatar(30)}}" alt="{{ $currentUser->name }}">
-                                <span class="name" ng-non-bindable>{{ $currentUser->getShortName(9) }}</span> <i class="zmdi zmdi-caret-down"></i>
-                            </span>
-                            <ul>
-                                <li>
-                                    <a href="{{ baseUrl("/user/{$currentUser->id}") }}" class="text-primary"><i class="zmdi zmdi-account zmdi-hc-fw zmdi-hc-lg"></i>View Profile</a>
-                                </li>
-                                <li>
-                                    <a href="{{ baseUrl("/settings/users/{$currentUser->id}") }}" class="text-primary"><i class="zmdi zmdi-edit zmdi-hc-fw zmdi-hc-lg"></i>Edit Profile</a>
-                                </li>
-                                <li>
-                                    <a href="{{ baseUrl('/logout') }}" class="text-neg"><i class="zmdi zmdi-run zmdi-hc-fw zmdi-hc-lg"></i>Logout</a>
-                                </li>
-                            </ul>
-                        </div>
+                        @include('partials._header-dropdown', ['currentUser' => $currentUser])
                     @endif
                 </div>
             </div>