@include('partials.entity-meta', ['entity' => $chapter])
@if($book->restricted)
@@ -94,46 +166,4 @@
@include('partials/book-tree', ['book' => $book, 'sidebarTree' => $sidebarTree])
@stop
-@section('body')
-
-
{{ $chapter->name }}
-
-
{!! nl2br(e($chapter->description)) !!}
-
- @if(count($pages) > 0)
-
-
- @foreach($pages as $page)
- @include('pages/list-item', ['page' => $page])
-
- @endforeach
-
- @else
-
- @endif
-
-
-
-
-
- @include('partials/loading-icon')
-
-
-
-
-
-@stop
diff --git a/resources/views/pages/_breadcrumbs.blade.php b/resources/views/pages/_breadcrumbs.blade.php
index f10f7ebe8..f28bb464a 100644
--- a/resources/views/pages/_breadcrumbs.blade.php
+++ b/resources/views/pages/_breadcrumbs.blade.php
@@ -1,5 +1,5 @@
-@include('partials.breadcrumbs', [
- 'page' => $page,
- 'chapter' => $page->hasChapter() ? $page->chapter : null,
- 'book' => $page->book,
-])
\ No newline at end of file
+@include('partials.breadcrumbs', ['crumbs' => [
+ $page->book,
+ $page->hasChapter() ? $page->chapter : null,
+ $page,
+]])
\ No newline at end of file
diff --git a/resources/views/pages/list-item.blade.php b/resources/views/pages/list-item.blade.php
index f3c79791a..1e26cf1d5 100644
--- a/resources/views/pages/list-item.blade.php
+++ b/resources/views/pages/list-item.blade.php
@@ -1,51 +1,5 @@
-
-
@icon('page')
-
-
-
-
-
-
- @if(isset($page->searchSnippet))
-
{!! $page->searchSnippet !!}
- @else
-
{{ $page->getExcerpt() }}
- @endif
-
-
- @if(isset($style) && $style === 'detailed')
-
-
- @include('partials.entity-meta', ['entity' => $page])
-
-
-
- @endif
-
+@component('partials.entity-list-item-basic', ['entity' => $page])
+
+
{{ $page->getExcerpt() }}
-
-
-
-
\ No newline at end of file
+@endcomponent
\ No newline at end of file
diff --git a/resources/views/pages/show.blade.php b/resources/views/pages/show.blade.php
index f7f8e2cf2..773d74a1e 100644
--- a/resources/views/pages/show.blade.php
+++ b/resources/views/pages/show.blade.php
@@ -1,5 +1,39 @@
@extends('tri-layout')
-@section('container-classes', 'mt-xl')
+
+@section('body')
+
+
+ @include('pages._breadcrumbs', ['page' => $page])
+
+
+
+
+
+
+
+
@icon('link') @icon('include', ['style' => 'display:none;'])
+
+
+ @icon('copy')
+
+ @if(userCan('page-update', $page))
+
@icon('edit')
+ @endif
+
+
+
+ @include('pages.page-display')
+
+
+
+ @if ($commentsEnabled)
+
+ @endif
+@stop
@section('left')
@@ -77,41 +111,6 @@
@include('partials.book-tree', ['book' => $book, 'sidebarTree' => $sidebarTree])
@stop
-@section('body')
-
-
- @include('pages._breadcrumbs', ['page' => $page])
-
-
-
-
-
-
-
-
@icon('link') @icon('include', ['style' => 'display:none;'])
-
-
- @icon('copy')
-
- @if(userCan('page-update', $page))
-
@icon('edit')
- @endif
-
-
-
- @include('pages.page-display')
-
-
-
- @if ($commentsEnabled)
-
- @endif
-@stop
-
@section('right')
Actions
diff --git a/resources/views/partials/breadcrumbs.blade.php b/resources/views/partials/breadcrumbs.blade.php
index cda9e5047..d30712530 100644
--- a/resources/views/partials/breadcrumbs.blade.php
+++ b/resources/views/partials/breadcrumbs.blade.php
@@ -1,19 +1,42 @@
- @if (isset($book) && userCan('view', $book))
-
- @icon('book'){{ $book->getShortName() }}
-
-
@icon('chevron-right')
- @endif
- @if(isset($chapter) && userCan('view', $chapter))
-
- @icon('chapter'){{ $chapter->getShortName() }}
-
-
@icon('chevron-right')
- @endif
- @if(isset($page) && userCan('view', $page))
-
- @icon('page'){{ $page->getShortName() }}
-
- @endif
+
+ @foreach($crumbs as $key => $crumb)
+ @if (is_null($crumb))
+
+ @endif
+ @if ($breadcrumbCount !== 0)
+
@icon('chevron-right')
+ @endif
+
+ @if (is_string($crumb))
+
+ {{ $crumb }}
+
+ @else
+
+ @icon($crumb->getType()){{ $crumb->getShortName() }}
+
+ @endif
+
+ @endforeach
+
+ {{--@if (isset($book) && userCan('view', $book))--}}
+ {{--
--}}
+ {{--@icon('book'){{ $book->getShortName() }}--}}
+ {{-- --}}
+ {{--
@icon('chevron-right')
--}}
+ {{--@endif--}}
+ {{--@if(isset($chapter) && userCan('view', $chapter))--}}
+ {{--
--}}
+ {{--@icon('chapter'){{ $chapter->getShortName() }}--}}
+ {{-- --}}
+ {{--@if (isset($page))--}}
+ {{--
@icon('chevron-right')
--}}
+ {{--@endif--}}
+ {{--@endif--}}
+ {{--@if(isset($page) && userCan('view', $page))--}}
+ {{--
--}}
+ {{--@icon('page'){{ $page->getShortName() }}--}}
+ {{-- --}}
+ {{--@endif--}}
\ No newline at end of file
diff --git a/resources/views/tri-layout.blade.php b/resources/views/tri-layout.blade.php
index 9ae65b037..1eeaf970a 100644
--- a/resources/views/tri-layout.blade.php
+++ b/resources/views/tri-layout.blade.php
@@ -4,11 +4,11 @@
@section('content')
-
- @yield('toolbar')
-
+ {{--
--}}
+ {{--@yield('toolbar')--}}
+ {{--
--}}
-