]> BookStack Code Mirror - bookstack/blobdiff - resources/views/base.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 / base.blade.php
diff --git a/resources/views/base.blade.php b/resources/views/base.blade.php
index 59860b03764106027eb01614967c17725738f135..95a9d72b0dcff779bfea147298a97ca208a37129 100644 (file)
--- a/resources/views/base.blade.php
+++ b/resources/views/base.blade.php
@@ -1,56 +1,89 @@
 <!DOCTYPE html>
 <!DOCTYPE html>
-<html>
+<html class="@yield('body-class')">
 <head>
 <head>
-    <title>BookStack</title>
+    <title>{{ isset($pageTitle) ? $pageTitle . ' | ' : '' }}{{ setting('app-name') }}</title>
+
+    <!-- Meta -->
     <meta name="viewport" content="width=device-width">
     <meta name="viewport" content="width=device-width">
-    <link rel="stylesheet" href="/css/app.css">
-    <link href='http://fonts.googleapis.com/css?family=Roboto:400,400italic,500,500italic,700,700italic,300italic,100,300' rel='stylesheet' type='text/css'>
-    <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
-    <script src="/bower/bootstrap/dist/js/bootstrap.js"></script>
-    <script>
-        $.fn.smoothScrollTo = function() {
-            if(this.length === 0) return;
-            $('body').animate({
-                scrollTop: this.offset().top - 60 // Adjust to change final scroll position top margin
-            }, 800); // Adjust to change animations speed (ms)
-            return this;
-        };
-        $.expr[":"].contains = $.expr.createPseudo(function(arg) {
-            return function( elem ) {
-                return $(elem).text().toUpperCase().indexOf(arg.toUpperCase()) >= 0;
-            };
-        });
-    </script>
+    <meta name="token" content="{{ csrf_token() }}">
+    <meta name="base-url" content="{{ baseUrl('/') }}">
+    <meta charset="utf-8">
+
+    <!-- Styles and Fonts -->
+    <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 -->
+    <script src="{{ baseUrl('/libs/jquery/jquery.min.js?version=2.1.4') }}"></script>
+    <script src="{{ baseUrl('/libs/jquery/jquery-ui.min.js?version=1.11.4') }}"></script>
+    <script src="{{ baseUrl('/translations') }}"></script>
+
     @yield('head')
     @yield('head')
+
+    @include('partials/custom-styles')
+
+    @if(setting('app-custom-head') && \Route::currentRouteName() !== 'settings')
+        <!-- Custom user content -->
+        {!! setting('app-custom-head') !!}
+        <!-- End custom user content -->
+    @endif
 </head>
 </head>
-<body>
+<body class="@yield('body-class')" ng-app="bookStack">
+
+    @include('partials/notifications')
 
 
-    <header>
+    <header id="header">
         <div class="container">
         <div class="container">
-            <div class="padded-vertical row clearfix">
-                <div class="col-md-3">
-                    <div ><img class="logo float left" src="/bookstack.svg" alt="BookStack"></div>
+            <div class="row">
+                <div class="col-lg-4 col-sm-4" ng-non-bindable>
+                    <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>
+                <div class="col-lg-4 col-sm-3 text-center">
+                    <form action="{{ baseUrl('/search') }}" method="GET" class="search-box">
+                        <input id="header-search-box-input" type="text" name="term" tabindex="2" value="{{ isset($searchTerm) ? $searchTerm : '' }}">
+                        <button id="header-search-box-button" type="submit" class="text-button"><i class="zmdi zmdi-search"></i></button>
+                    </form>
                 </div>
                 </div>
-                <div class="col-md-9">
-                    <ul class="menu float">
-                        <li><a href="/books"><i class="fa fa-book"></i>Books</a></li>
-                    </ul>
-                    <div class="search-box float right">
-                        <form action="/pages/search/all" id="search-form" method="GET">
-                            {!! csrf_field() !!}
-                            <input type="text" placeholder="Search all pages..." name="term" id="search-input">
-                        </form>
+                <div class="col-lg-4 col-sm-5">
+                    <div class="float right">
+                        <div class="links text-center">
+                            <a href="{{ baseUrl('/books') }}"><i class="zmdi zmdi-book"></i>{{ trans('entities.books') }}</a>
+                            @if(signedInUser() && userCan('settings-manage'))
+                                <a href="{{ baseUrl('/settings') }}"><i class="zmdi zmdi-settings"></i>{{ trans('settings.settings') }}</a>
+                            @endif
+                            @if(!signedInUser())
+                                <a href="{{ baseUrl('/login') }}"><i class="zmdi zmdi-sign-in"></i>{{ trans('auth.log_in') }}</a>
+                            @endif
+                        </div>
+                        @if(signedInUser())
+                            @include('partials._header-dropdown', ['currentUser' => user()])
+                        @endif
+
                     </div>
                 </div>
             </div>
         </div>
     </header>
 
                     </div>
                 </div>
             </div>
         </div>
     </header>
 
-    <section class="container">
+    <section id="content" class="block">
         @yield('content')
     </section>
 
         @yield('content')
     </section>
 
+    <div id="back-to-top">
+        <div class="inner">
+            <i class="zmdi zmdi-chevron-up"></i> <span>{{ trans('common.back_to_top') }}</span>
+        </div>
+    </div>
 @yield('bottom')
 @yield('bottom')
+<script src="{{ versioned_asset('js/common.js') }}"></script>
+@yield('scripts')
 </body>
 </html>
 </body>
 </html>
The core source code for the BookStack project.