]> 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
Page Attachments - Improved UI, Now initially complete
[bookstack] / resources / views / public.blade.php
diff --git a/resources/views/public.blade.php b/resources/views/public.blade.php
index eaff2c2d8770ffc65f016213bfae74f8384ade31..542d5c8679add17afe29e4070f456616fc21cbf8 100644 (file)
--- a/resources/views/public.blade.php
+++ b/resources/views/public.blade.php
@@ -1,42 +1,65 @@
 <!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 name="viewport" content="width=device-width">
-    <link rel="stylesheet" href="/css/app.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="/bower/material-design-iconic-font/dist/css/material-design-iconic-font.min.css">
+    <meta name="token" content="{{ csrf_token() }}">
+    <meta name="base-url" content="{{ baseUrl('/') }}">
+    <meta charset="utf-8">
 
 
-    <!-- Scripts -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
-    <script src="/js/common.js"></script>
+    <!-- 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>
+    @include('partials/custom-styles')
 </head>
 </head>
-<body class="@yield('body-class')">
+<body class="@yield('body-class')" ng-app="bookStack">
 
 
-@if(Session::has('success'))
-    <div class="notification anim pos">
-        <i class="zmdi zmdi-mood"></i> <span>{{ Session::get('success') }}</span>
-    </div>
-@endif
-
-@if(Session::has('error'))
-    <div class="notification anim neg stopped">
-        <i class="zmdi zmdi-alert-circle"></i> <span>{{ Session::get('error') }}</span>
-    </div>
-@endif
+@include('partials/notifications')
 
 <header id="header">
     <div class="container">
         <div class="row">
             <div class="col-md-6">
 
 <header id="header">
     <div class="container">
         <div class="row">
             <div class="col-md-6">
-                <a href="/" class="logo">{{ Setting::get('app-name', 'BookStack') }}</a>
+
+                <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-md-6">
                 <div class="float right">
                     <div class="links text-center">
                         @yield('header-buttons')
                     </div>
             </div>
             <div class="col-md-6">
                 <div class="float right">
                     <div class="links text-center">
                         @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>
+                    @endif
                 </div>
             </div>
         </div>
                 </div>
             </div>
         </div>
@@ -47,5 +70,6 @@
     @yield('content')
 </section>
 
     @yield('content')
 </section>
 
+<script src="{{ versioned_asset('js/common.js') }}"></script>
 </body>
 </html>
 </body>
 </html>
The core source code for the BookStack project.