+
@include('partials.breadcrumbs', ['crumbs' => [
$page->book,
$page->chapter,
$page,
- $page->getUrl('/revisions') => trans('entities.pages_revisions')
+ $page->getUrl('/revisions') => [
+ 'text' => trans('entities.pages_revisions'),
+ 'icon' => 'history',
+ ]
]])
diff --git a/resources/views/pages/show.blade.php b/resources/views/pages/show.blade.php
index af610e358..8444155a6 100644
--- a/resources/views/pages/show.blade.php
+++ b/resources/views/pages/show.blade.php
@@ -3,7 +3,11 @@
@section('body')
- @include('pages._breadcrumbs', ['page' => $page])
+ @include('partials.breadcrumbs', ['crumbs' => [
+ $page->book,
+ $page->hasChapter() ? $page->chapter : null,
+ $page,
+ ]])
diff --git a/resources/views/partials/breadcrumbs.blade.php b/resources/views/partials/breadcrumbs.blade.php
index 54d7b74cb..d9c1b4681 100644
--- a/resources/views/partials/breadcrumbs.blade.php
+++ b/resources/views/partials/breadcrumbs.blade.php
@@ -13,34 +13,16 @@
{{ $crumb }}
@elseif (is_array($crumb))
-
- @icon($crumb['icon']) {{ $crumb['text'] }}
+
+ @icon($crumb['icon'])
+ {{ $crumb['text'] }}
@elseif($crumb instanceof \BookStack\Entities\Entity)
-
- @icon($crumb->getType()){{ $crumb->getShortName() }}
+
+ @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/shelves/create.blade.php b/resources/views/shelves/create.blade.php
index 6caa83554..72bf904fe 100644
--- a/resources/views/shelves/create.blade.php
+++ b/resources/views/shelves/create.blade.php
@@ -4,10 +4,16 @@
-
+
@include('partials.breadcrumbs', ['crumbs' => [
- '/shelves' => trans('entities.shelves'),
- '/create-shelf' => trans('entities.shelves_create')
+ '/shelves' => [
+ 'text' => trans('entities.shelves'),
+ 'icon' => 'bookshelf',
+ ],
+ '/create-shelf' => [
+ 'text' => trans('entities.shelves_create'),
+ 'icon' => 'add',
+ ]
]])
diff --git a/resources/views/shelves/delete.blade.php b/resources/views/shelves/delete.blade.php
index f5a84c8ad..2a78227bd 100644
--- a/resources/views/shelves/delete.blade.php
+++ b/resources/views/shelves/delete.blade.php
@@ -4,10 +4,13 @@
-
+
@include('partials.breadcrumbs', ['crumbs' => [
$shelf,
- $shelf->getUrl('/delete') => trans('entities.shelves_delete')
+ $shelf->getUrl('/delete') => [
+ 'text' => trans('entities.shelves_delete'),
+ 'icon' => 'delete',
+ ]
]])
diff --git a/resources/views/shelves/edit.blade.php b/resources/views/shelves/edit.blade.php
index 2199d1a54..81f4846a3 100644
--- a/resources/views/shelves/edit.blade.php
+++ b/resources/views/shelves/edit.blade.php
@@ -4,10 +4,13 @@
-
+
@include('partials.breadcrumbs', ['crumbs' => [
$shelf,
- $shelf->getUrl('/edit') => trans('entities.shelves_edit')
+ $shelf->getUrl('/edit') => [
+ 'text' => trans('entities.shelves_edit'),
+ 'icon' => 'edit',
+ ]
]])
diff --git a/resources/views/shelves/permissions.blade.php b/resources/views/shelves/permissions.blade.php
index 174c9c83b..df50be8dd 100644
--- a/resources/views/shelves/permissions.blade.php
+++ b/resources/views/shelves/permissions.blade.php
@@ -4,10 +4,13 @@
-
+
@include('partials.breadcrumbs', ['crumbs' => [
$shelf,
- $shelf->getUrl('/permissions') => trans('entities.shelves_permissions')
+ $shelf->getUrl('/permissions') => [
+ 'text' => trans('entities.shelves_permissions'),
+ 'icon' => 'lock',
+ ]
]])
diff --git a/resources/views/tri-layout.blade.php b/resources/views/tri-layout.blade.php
index 1eeaf970a..a77bb5d75 100644
--- a/resources/views/tri-layout.blade.php
+++ b/resources/views/tri-layout.blade.php
@@ -8,9 +8,9 @@
{{--@yield('toolbar')--}}
{{--
--}}
-