Improve sorting Shelf Books

[bookstack] / resources / views / errors / 404.blade.php

diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php
index c9e600ceb7376489f6945f863b2b241da3037949..02f97fc546fcbc195ec04421731fba44b15cfb1d 100644 (file)
--- a/resources/views/errors/404.blade.php
+++ b/resources/views/errors/404.blade.php
@@ -1,31 +1,53 @@
-@extends('base')
+@extends('simple-layout')
 
 @section('content')
+<div class="container mt-l">
+
+    <div class="card mb-xl px-l pb-l pt-l">
+        <div class="grid half v-center">
+            <div>
+                <h1 class="list-heading">{{ $message ?? trans('errors.404_page_not_found') }}</h1>
+                <h5>{{ trans('errors.sorry_page_not_found') }}</h5>
+                <p>{{ trans('errors.sorry_page_not_found_permission_warning') }}</p>
+            </div>
+            <div class="text-right">
+                @if(!signedInUser())
+                    <a href="{{ url('/login') }}" class="button outline">{{ trans('auth.log_in') }}</a>
+                @endif
+                <a href="{{ url('/') }}" class="button outline">{{ trans('errors.return_home') }}</a>
+            </div>
+        </div>
 
+    </div>
 
-<div class="container">
-
-
-    <h1>{{ $message or trans('errors.404_page_not_found') }}</h1>
-    <p>{{ trans('errors.sorry_page_not_found') }}</p>
-    <p><a href="{{ baseUrl('/') }}" class="button">{{ trans('errors.return_home') }}</a></p>
-
-    <hr>
-
-    <div class="row">
-        <div class="col-md-4">
-            <h3 class="text-muted">{{ trans('entities.pages_popular') }}</h3>
-            @include('partials.entity-list', ['entities' => Views::getPopular(10, 0, [\BookStack\Page::class]), 'style' => 'compact'])
-        </div>
-        <div class="col-md-4">
-            <h3 class="text-muted">{{ trans('entities.books_popular') }}</h3>
-            @include('partials.entity-list', ['entities' => Views::getPopular(10, 0, [\BookStack\Book::class]), 'style' => 'compact'])
+    @if (setting('app-public') || !user()->isDefault())
+        <div class="grid third gap-xxl">
+            <div>
+                <div class="card mb-xl">
+                    <h3 class="card-title">{{ trans('entities.pages_popular') }}</h3>
+                    <div class="px-m">
+                        @include('partials.entity-list', ['entities' => Views::getPopular(10, 0, ['page']), 'style' => 'compact'])
+                    </div>
+                </div>
+            </div>
+            <div>
+                <div class="card mb-xl">
+                    <h3 class="card-title">{{ trans('entities.books_popular') }}</h3>
+                    <div class="px-m">
+                        @include('partials.entity-list', ['entities' => Views::getPopular(10, 0, ['book']), 'style' => 'compact'])
+                    </div>
+                </div>
+            </div>
+            <div>
+                <div class="card mb-xl">
+                    <h3 class="card-title">{{ trans('entities.chapters_popular') }}</h3>
+                    <div class="px-m">
+                        @include('partials.entity-list', ['entities' => Views::getPopular(10, 0, ['chapter']), 'style' => 'compact'])
+                    </div>
+                </div>
+            </div>
         </div>
-        <div class="col-md-4">
-            <h3 class="text-muted">{{ trans('entities.chapters_popular') }}</h3>
-            @include('partials.entity-list', ['entities' => Views::getPopular(10, 0, [\BookStack\Chapter::class]), 'style' => 'compact'])
-        </div>
-    </div>
+    @endif
 </div>
 
 @stop
\ No newline at end of file