X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/b3d4c199aefd6066c444898eada3c8bb43dc5cb5..refs/pull/5313/head:/resources/views/errors/404.blade.php

diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php
index a0e34e83d..dc24a558d 100644
--- a/resources/views/errors/404.blade.php
+++ b/resources/views/errors/404.blade.php
@@ -1,33 +1,55 @@
-@extends('base')
-
+@extends('layouts.simple')
+@inject('popular', \BookStack\Entities\Queries\QueryPopular::class)
 @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>
+                    @include('errors.parts.not-found-text', [
+                        'title' => $message ?? trans('errors.404_page_not_found'),
+                        'subtitle' => $subtitle ?? trans('errors.sorry_page_not_found'),
+                        'details' => $details ?? trans('errors.sorry_page_not_found_permission_warning'),
+                    ])
+                </div>
+                <div class="text-right">
+                    @if(user()->isGuest())
+                        <a href="{{ url('/http/source.bookstackapp.com/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>
-
-    @if (setting('app-public') || !user()->isDefault())
-        <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()->isGuest())
+            <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('entities.list', ['entities' => $popular->run(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('entities.list', ['entities' => $popular->run(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('entities.list', ['entities' => $popular->run(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>
+        @endif
+    </div>
 
 @stop
\ No newline at end of file