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

diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php
index e13e1fce9..a4e5a0dd4 100644
--- a/resources/views/errors/404.blade.php
+++ b/resources/views/errors/404.blade.php
@@ -1,16 +1,22 @@
-@extends('simple-layout')
+@extends('layouts.simple')
 
 @section('content')
 <div class="container mt-l">
 
-    <div class="card mb-xl px-l pb-xl pt-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>
+                @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">
-                <a href="{{ baseUrl('/') }}" class="button outline">{{ trans('errors.return_home') }}</a>
+                @if(!signedInUser())
+                    <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>
 
@@ -20,25 +26,25 @@
         <div class="grid third gap-xxl">
             <div>
                 <div class="card mb-xl">
-                    <h3>{{ trans('entities.pages_popular') }}</h3>
+                    <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'])
+                        @include('entities.list', ['entities' => (new \BookStack\Entities\Queries\Popular)->run(10, 0, ['page']), 'style' => 'compact'])
                     </div>
                 </div>
             </div>
             <div>
                 <div class="card mb-xl">
-                    <h3>{{ trans('entities.books_popular') }}</h3>
+                    <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'])
+                        @include('entities.list', ['entities' => (new \BookStack\Entities\Queries\Popular)->run(10, 0, ['book']), 'style' => 'compact'])
                     </div>
                 </div>
             </div>
             <div>
                 <div class="card mb-xl">
-                    <h3>{{ trans('entities.chapters_popular') }}</h3>
+                    <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'])
+                        @include('entities.list', ['entities' => (new \BookStack\Entities\Queries\Popular)->run(10, 0, ['chapter']), 'style' => 'compact'])
                     </div>
                 </div>
             </div>