]> BookStack Code Mirror - bookstack/blobdiff - resources/views/public.blade.php
projects / bookstack / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fixed model extending mis-use
[bookstack] / resources / views / public.blade.php
diff --git a/resources/views/public.blade.php b/resources/views/public.blade.php
index 7145b4fbee5ed133b8c52dc5d5203d78a077ff2d..ea2069b866162abdc345528295ead45234eda09c 100644 (file)
--- a/resources/views/public.blade.php
+++ b/resources/views/public.blade.php
@@ -1,53 +1,53 @@
 <!DOCTYPE html>
 <html>
 <head>
 <!DOCTYPE html>
 <html>
 <head>
-    <title>BookStack</title>
+    <title>{{ setting('app-name') }}</title>
 
     <!-- Meta -->
     <meta name="viewport" content="width=device-width">
 
     <!-- Meta -->
     <meta name="viewport" content="width=device-width">
+    <meta name="token" content="{{ csrf_token() }}">
+    <meta name="base-url" content="{{ baseUrl('/') }}">
     <meta charset="utf-8">
 
     <!-- Styles and Fonts -->
     <meta charset="utf-8">
 
     <!-- Styles and Fonts -->
-    <link rel="stylesheet" href="{{ elixir('css/styles.css') }}">
-    <link rel="stylesheet" media="print" href="{{ elixir('css/print-styles.css') }}">
-    <link href='//fonts.googleapis.com/css?family=Roboto:400,400italic,500,500italic,700,700italic,300italic,100,300' rel='stylesheet' type='text/css'>
-    <link rel="stylesheet" href="/libs/material-design-iconic-font/css/material-design-iconic-font.min.css">
+    <link rel="stylesheet" href="{{ versioned_asset('css/styles.css') }}">
+    <link rel="stylesheet" media="print" href="{{ versioned_asset('css/print-styles.css') }}">
+    <link rel="stylesheet" href="{{ baseUrl("/libs/material-design-iconic-font/css/material-design-iconic-font.min.css") }}">
 
     <!-- Scripts -->
 
     <!-- Scripts -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
+    <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>
 </head>
-<body class="@yield('body-class')" id="app">
+<body class="@yield('body-class')" ng-app="bookStack">
 
 
-@include('partials/notifications')
+@include('partials.notifications')
 
 <header id="header">
     <div class="container">
         <div class="row">
 
 <header id="header">
     <div class="container">
         <div class="row">
-            <div class="col-md-6">
+            <div class="col-sm-6">
 
 
-                <a href="/" class="logo">
-                    <img class="logo-image" src="/logo.png" alt="Logo">
-                    <span class="logo-text">{{ Setting::get('app-name', 'BookStack') }}</span>
+                <a href="{{ baseUrl('/') }}" class="logo">
+                    @if(setting('app-logo', '') !== 'none')
+                        <img class="logo-image" src="{{ setting('app-logo', '') === '' ? baseUrl('/logo.png') : baseUrl(setting('app-logo', '')) }}" alt="Logo">
+                    @endif
+                    @if (setting('app-name-header'))
+                        <span class="logo-text">{{ setting('app-name') }}</span>
+                    @endif
                 </a>
             </div>
                 </a>
             </div>
-            <div class="col-md-6">
+            <div class="col-sm-6">
                 <div class="float right">
                     <div class="links text-center">
                         @yield('header-buttons')
                     </div>
                     @if(isset($signedIn) && $signedIn)
                 <div class="float right">
                     <div class="links text-center">
                         @yield('header-buttons')
                     </div>
                     @if(isset($signedIn) && $signedIn)
-                        <img class="avatar" src="{{$currentUser->getAvatar(30)}}" alt="{{ $currentUser->name }}">
-                        <div class="dropdown-container" data-dropdown>
-                                <span class="user-name" data-dropdown-toggle>
-                                    {{ $currentUser->name }} <i class="zmdi zmdi-caret-down"></i>
-                                </span>
-                            <ul>
-                                <li>
-                                    <a href="/logout" class="text-neg"><i class="zmdi zmdi-run zmdi-hc-lg"></i>Logout</a>
-                                </li>
-                            </ul>
-                        </div>
+                        @include('partials._header-dropdown', ['currentUser' => $currentUser])
                     @endif
                 </div>
             </div>
                     @endif
                 </div>
             </div>
@@ -59,6 +59,6 @@
     @yield('content')
 </section>
 
     @yield('content')
 </section>
 
-<script src="{{ elixir('js/common.js') }}"></script>
+<script src="{{ versioned_asset('js/common.js') }}"></script>
 </body>
 </html>
 </body>
 </html>
The core source code for the BookStack project.