Merge branch 'feature_change_view_in_shelves_show' of git://github.com/philjak/BookStack into philjak-feature_change_view_in_shelves_show

This commit is contained in:
Dan Brown
2020-04-10 12:21:56 +01:00
2 changed files with 17 additions and 5 deletions

View File

@ -13,11 +13,19 @@
<div class="book-content">
<p class="text-muted">{!! nl2br(e($shelf->description)) !!}</p>
@if(count($shelf->visibleBooks) > 0)
<div class="entity-list">
@foreach($shelf->visibleBooks as $book)
@include('books.list-item', ['book' => $book])
@endforeach
</div>
@if($view === 'list')
<div class="entity-list">
@foreach($shelf->visibleBooks as $book)
@include('books.list-item', ['book' => $book])
@endforeach
</div>
@else
<div class="grid third">
@foreach($shelf->visibleBooks as $key => $book)
@include('books.grid-item', ['book' => $book])
@endforeach
</div>
@endif
@else
<div class="mt-xl">
<hr>
@ -87,6 +95,8 @@
</a>
@endif
@include('partials.view-toggle', ['view' => $view, 'type' => 'book'])
<hr class="primary-background">
@if(userCan('bookshelf-update', $shelf))