ExportFormatter: Add book description and check for empty book and chapter descriptio...

[bookstack] / resources / views / chapters / show.blade.php

diff --git a/resources/views/chapters/show.blade.php b/resources/views/chapters/show.blade.php
index 43248df5f61f224021ab7c8f5b12605536e2b507..45e43ad96a91dda5862e8f26d422e0d129ed5c6d 100644 (file)
--- a/resources/views/chapters/show.blade.php
+++ b/resources/views/chapters/show.blade.php
@@ -1,169 +1,186 @@
-@extends('tri-layout')
+@extends('layouts.tri')

 
 @section('container-attrs')
 
 @section('container-attrs')

-    id="entity-dashboard"
-    entity-id="{{ $chapter->id }}"
-    entity-type="chapter"
+    component="entity-search"
+    option:entity-search:entity-id="{{ $chapter->id }}"
+    option:entity-search:entity-type="chapter"

 @stop
 
 @stop
 

+@push('social-meta')
+    <meta property="og:description" content="{{ Str::limit($chapter->description, 100, '...') }}">
+@endpush
+
+@include('entities.body-tag-classes', ['entity' => $chapter])
+

 @section('body')
 
 @section('body')
 

-    <div class="mb-m">
-        @include('chapters._breadcrumbs', ['chapter' => $chapter])
+    <div class="mb-m print-hidden">
+        @include('entities.breadcrumbs', ['crumbs' => [
+            $chapter->book,
+            $chapter,
+        ]])

     </div>
 
     </div>
 

-    <div class="content-wrap card">
-        <h1 class="break-text" v-pre>{{ $chapter->name }}</h1>
-        <div class="chapter-content" v-show="!searching">
-            <p v-pre class="text-muted break-text">{!! nl2br(e($chapter->description)) !!}</p>
+    <main class="content-wrap card">
+        <h1 class="break-text">{{ $chapter->name }}</h1>
+        <div refs="entity-search@contentView" class="chapter-content">
+            <div class="text-muted break-text">{!! $chapter->descriptionHtml() !!}</div>

             @if(count($pages) > 0)
             @if(count($pages) > 0)

-                <div v-pre class="entity-list book-contents">
+                <div class="entity-list book-contents">

                     @foreach($pages as $page)
                     @foreach($pages as $page)

-                        @include('pages.list-item', ['page' => $page])
+                        @include('pages.parts.list-item', ['page' => $page])

                     @endforeach
                 </div>
             @else
                     @endforeach
                 </div>
             @else

-                {{--TODO--}}
-                <div v-pre class="well">
-                    <p class="text-muted italic">{{ trans('entities.chapters_empty') }}</p>
-                    <p>
+                <div class="mt-xl">
+                    <hr>
+                    <p class="text-muted italic mb-m mt-xl">{{ trans('entities.chapters_empty') }}</p>
+
+                    <div class="icon-list block inline">

                         @if(userCan('page-create', $chapter))
                         @if(userCan('page-create', $chapter))

-                            <a href="{{ $chapter->getUrl('/create-page') }}" class="button outline page">@icon('page'){{ trans('entities.books_empty_create_page') }}</a>
-                        @endif
-                        @if(userCan('page-create', $chapter) && userCan('book-update', $book))
-                            &nbsp;&nbsp;<em class="text-muted">-{{ trans('entities.books_empty_or') }}-</em>&nbsp;&nbsp; &nbsp;
+                            <a href="{{ $chapter->getUrl('/create-page') }}" class="icon-list-item text-page">
+                                <span class="icon">@icon('page')</span>
+                                <span>{{ trans('entities.books_empty_create_page') }}</span>
+                            </a>

                         @endif
                         @if(userCan('book-update', $book))
                         @endif
                         @if(userCan('book-update', $book))

-                            <a href="{{ $book->getUrl('/sort') }}" class="button outline book">@icon('book'){{ trans('entities.books_empty_sort_current_book') }}</a>
+                            <a href="{{ $book->getUrl('/sort') }}" class="icon-list-item text-book">
+                                <span class="icon">@icon('book')</span>
+                                <span>{{ trans('entities.books_empty_sort_current_book') }}</span>
+                            </a>

                         @endif
                         @endif

-                    </p>
+                    </div>
+

                 </div>
             @endif
         </div>
 
                 </div>
             @endif
         </div>
 

-        <div class="search-results" v-cloak v-show="searching">
-            {{--TODO--}}
-            <h3 class="text-muted">{{ trans('entities.search_results') }} <a v-if="searching" @click="clearSearch()" class="text-small">@icon('close'){{ trans('entities.search_clear') }}</a></h3>
-            <div v-if="!searchResults">
-                @include('partials/loading-icon')
-            </div>
-            <div v-html="searchResults"></div>
-        </div>
-    </div>
+        @include('entities.search-results')
+    </main>
+
+    @include('entities.sibling-navigation', ['next' => $next, 'previous' => $previous])

 
 @stop
 
 @section('right')
 
 
 @stop
 
 @section('right')
 

-    <div class="actions mb-xl">
-        <h5>{{ trans('common.actions') }}</h5>
-        <div class="icon-list text-primary">
+    <div class="mb-xl">
+        <h5>{{ trans('common.details') }}</h5>
+        <div class="blended-links">
+            @include('entities.meta', ['entity' => $chapter, 'watchOptions' => $watchOptions])

 
 

-            <div dropdown class="dropdown-container">
-                <div dropdown-toggle class="icon-list-item">
-                    <span class="icon">@icon('export')</span>
-                    <span>{{ trans('entities.export') }}</span>
+            @if($book->hasPermissions())
+                <div class="active-restriction">
+                    @if(userCan('restrictions-manage', $book))
+                        <a href="{{ $book->getUrl('/permissions') }}" class="entity-meta-item">
+                            @icon('lock')
+                            <div>{{ trans('entities.books_permissions_active') }}</div>
+                        </a>
+                    @else
+                        <div class="entity-meta-item">
+                            @icon('lock')
+                            <div>{{ trans('entities.books_permissions_active') }}</div>
+                        </div>
+                    @endif

                 </div>
                 </div>

-                <ul class="wide">
-                    <li><a href="{{ $chapter->getUrl('/export/html') }}" target="_blank">{{ trans('entities.export_html') }} <span class="text-muted float right">.html</span></a></li>
-                    <li><a href="{{ $chapter->getUrl('/export/pdf') }}" target="_blank">{{ trans('entities.export_pdf') }} <span class="text-muted float right">.pdf</span></a></li>
-                    <li><a href="{{ $chapter->getUrl('/export/plaintext') }}" target="_blank">{{ trans('entities.export_text') }} <span class="text-muted float right">.txt</span></a></li>
-                </ul>
-            </div>
+            @endif
+
+            @if($chapter->hasPermissions())
+                <div class="active-restriction">
+                    @if(userCan('restrictions-manage', $chapter))
+                        <a href="{{ $chapter->getUrl('/permissions') }}" class="entity-meta-item">
+                            @icon('lock')
+                            <div>{{ trans('entities.chapters_permissions_active') }}</div>
+                        </a>
+                    @else
+                        <div class="entity-meta-item">
+                            @icon('lock')
+                            <div>{{ trans('entities.chapters_permissions_active') }}</div>
+                        </div>
+                    @endif
+                </div>
+            @endif
+        </div>
+    </div>
+
+    <div class="actions mb-xl">
+        <h5>{{ trans('common.actions') }}</h5>
+        <div class="icon-list text-link">

 
             @if(userCan('page-create', $chapter))
 
             @if(userCan('page-create', $chapter))

-                <a href="{{ $chapter->getUrl('/create-page') }}" class="icon-list-item">
-                    <span class="icon">@icon('add')</span>
+                <a href="{{ $chapter->getUrl('/create-page') }}" data-shortcut="new" class="icon-list-item">
+                    <span>@icon('add')</span>

                     <span>{{ trans('entities.pages_new') }}</span>
                 </a>
             @endif
                     <span>{{ trans('entities.pages_new') }}</span>
                 </a>
             @endif

+
+            <hr class="primary-background"/>
+

             @if(userCan('chapter-update', $chapter))
             @if(userCan('chapter-update', $chapter))

-                <a href="{{ $chapter->getUrl('/edit') }}" class="icon-list-item">
-                    <span class="icon">@icon('edit')</span>
+                <a href="{{ $chapter->getUrl('/edit') }}" data-shortcut="edit" class="icon-list-item">
+                    <span>@icon('edit')</span>

                     <span>{{ trans('common.edit') }}</span>
                 </a>
             @endif
                     <span>{{ trans('common.edit') }}</span>
                 </a>
             @endif

+            @if(userCanOnAny('create', \BookStack\Entities\Models\Book::class) || userCan('chapter-create-all') || userCan('chapter-create-own'))
+                <a href="{{ $chapter->getUrl('/copy') }}" data-shortcut="copy" class="icon-list-item">
+                    <span>@icon('copy')</span>
+                    <span>{{ trans('common.copy') }}</span>
+                </a>
+            @endif

             @if(userCan('chapter-update', $chapter) && userCan('chapter-delete', $chapter))
             @if(userCan('chapter-update', $chapter) && userCan('chapter-delete', $chapter))

-                <a href="{{ $chapter->getUrl('/move') }}" class="icon-list-item">
-                    <span class="icon">@icon('folder')</span>
+                <a href="{{ $chapter->getUrl('/move') }}" data-shortcut="move" class="icon-list-item">
+                    <span>@icon('folder')</span>

                     <span>{{ trans('common.move') }}</span>
                 </a>
             @endif
             @if(userCan('restrictions-manage', $chapter))
                     <span>{{ trans('common.move') }}</span>
                 </a>
             @endif
             @if(userCan('restrictions-manage', $chapter))

-                <a href="{{ $chapter->getUrl('/permissions') }}" class="icon-list-item">
-                    <span class="icon">@icon('lock')</span>
+                <a href="{{ $chapter->getUrl('/permissions') }}" data-shortcut="permissions" class="icon-list-item">
+                    <span>@icon('lock')</span>

                     <span>{{ trans('entities.permissions') }}</span>
                 </a>
             @endif
             @if(userCan('chapter-delete', $chapter))
                     <span>{{ trans('entities.permissions') }}</span>
                 </a>
             @endif
             @if(userCan('chapter-delete', $chapter))

-                <a href="{{ $chapter->getUrl('/delete') }}" class="icon-list-item">
-                    <span class="icon">@icon('delete')</span>
+                <a href="{{ $chapter->getUrl('/delete') }}" data-shortcut="delete" class="icon-list-item">
+                    <span>@icon('delete')</span>

                     <span>{{ trans('common.delete') }}</span>
                 </a>
             @endif
 
                     <span>{{ trans('common.delete') }}</span>
                 </a>
             @endif
 

-            {{--@if(userCan('page-create', $book))--}}
-                {{--<a href="{{ $book->getUrl('/create-page') }}" class="icon-list-item">--}}
-                    {{--<span class="icon">@icon('add')</span>--}}
-                    {{--<span>{{ trans('entities.pages_new') }}</span>--}}
-                {{--</a>--}}
-            {{--@endif--}}
-        </div>
-    </div>
+            @if($chapter->book && userCan('book-update', $chapter->book))
+                <hr class="primary-background"/>
+                <a href="{{ $chapter->book->getUrl('/sort') }}" data-shortcut="sort" class="icon-list-item">
+                    <span>@icon('sort')</span>
+                    <span>{{ trans('entities.chapter_sort_book') }}</span>
+                </a>
+            @endif

 
 

-    <div class="col-sm-6 col-xs-9 faded">
-        <div class="action-buttons">
+            <hr class="primary-background"/>

 
 

+            @if($watchOptions->canWatch() && !$watchOptions->isWatching())
+                @include('entities.watch-action', ['entity' => $chapter])
+            @endif
+            @if(!user()->isGuest())
+                @include('entities.favourite-action', ['entity' => $chapter])
+            @endif
+            @if(userCan('content-export'))
+                @include('entities.export-menu', ['entity' => $chapter])
+            @endif

         </div>
     </div>
 @stop
 
         </div>
     </div>
 @stop
 

-
-

 @section('left')
 
 @section('left')
 

+    @include('entities.search-form', ['label' => trans('entities.chapters_search_this')])
+

     @if($chapter->tags->count() > 0)
         <div class="mb-xl">
     @if($chapter->tags->count() > 0)
         <div class="mb-xl">

-            @include('components.tag-list', ['entity' => $chapter])
+            @include('entities.tag-list', ['entity' => $chapter])

         </div>
     @endif
 
         </div>
     @endif
 

-    <div class="mb-xl">
-        <form @submit.prevent="searchBook" class="search-box">
-            <input v-model="searchTerm" @change="checkSearchForm()" type="text" name="term" placeholder="{{ trans('entities.chapters_search_this') }}">
-            <button type="submit">@icon('search')</button>
-            <button v-if="searching" v-cloak class="text-neg" @click="clearSearch()" type="button">@icon('close')</button>
-        </form>
-    </div>
-
-    <div class="mb-xl">
-        <h5>{{ trans('common.details') }}</h5>
-        <div class="blended-links text-small text-muted">
-            @include('partials.entity-meta', ['entity' => $chapter])
-
-            @if($book->restricted)
-                <div class="active-restriction">
-                    @if(userCan('restrictions-manage', $book))
-                        <a href="{{ $book->getUrl('/permissions') }}">@icon('lock'){{ trans('entities.books_permissions_active') }}</a>
-                    @else
-                        @icon('lock'){{ trans('entities.books_permissions_active') }}
-                    @endif
-                </div>
-            @endif
-
-            @if($chapter->restricted)
-                <div class="active-restriction">
-                    @if(userCan('restrictions-manage', $chapter))
-                        <a href="{{ $chapter->getUrl('/permissions') }}">@icon('lock'){{ trans('entities.chapters_permissions_active') }}</a>
-                    @else
-                        @icon('lock'){{ trans('entities.chapters_permissions_active') }}
-                    @endif
-                </div>
-            @endif
-        </div>
-    </div>
-
-    @include('partials/book-tree', ['book' => $book, 'sidebarTree' => $sidebarTree])
+    @include('entities.book-tree', ['book' => $book, 'sidebarTree' => $sidebarTree])

 @stop
 
 
 @stop