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

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

diff --git a/resources/views/pages/show.blade.php b/resources/views/pages/show.blade.php
index 13125464a7114396012f3685fa56e38ae23b81b9..e3a31dd5ebf1bcd18b6ce0977565ed6ef7db5d11 100644 (file)
--- a/resources/views/pages/show.blade.php
+++ b/resources/views/pages/show.blade.php
@@ -1,9 +1,15 @@
-@extends('tri-layout')
+@extends('layouts.tri')
+
+@push('social-meta')
+    <meta property="og:description" content="{{ Str::limit($page->text, 100, '...') }}">
+@endpush
+
+@include('entities.body-tag-classes', ['entity' => $page])

 
 @section('body')
 
     <div class="mb-m print-hidden">
 
 @section('body')
 
     <div class="mb-m print-hidden">

-        @include('partials.breadcrumbs', ['crumbs' => [
+        @include('entities.breadcrumbs', ['crumbs' => [

             $page->book,
             $page->hasChapter() ? $page->chapter : null,
             $page,
             $page->book,
             $page->hasChapter() ? $page->chapter : null,
             $page,


@@ -11,15 +17,25 @@
     </div>
 
     <main class="content-wrap card">
     </div>
 
     <main class="content-wrap card">

-        <div class="page-content clearfix" page-display="{{ $page->id }}">
-            @include('pages.pointer', ['page' => $page])
-            @include('pages.page-display')
+        <div component="page-display"
+             option:page-display:page-id="{{ $page->id }}"
+             class="page-content clearfix">
+            @include('pages.parts.page-display')

         </div>
         </div>

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

     </main>
 
     </main>
 

-    @if ($commentsEnabled)
-        <div class="container small p-none comments-container mb-l print-hidden">
-            @include('comments.comments', ['page' => $page])
+    @include('entities.sibling-navigation', ['next' => $next, 'previous' => $previous])
+
+    @if ($commentTree->enabled())
+        @if(($previous || $next))
+            <div class="px-xl print-hidden">
+                <hr class="darker">
+            </div>
+        @endif
+
+        <div class="comments-container mb-l print-hidden">
+            @include('comments.comments', ['commentTree' => $commentTree, 'page' => $page])

             <div class="clearfix"></div>
         </div>
     @endif
             <div class="clearfix"></div>
         </div>
     @endif


@@ -29,7 +45,7 @@
 
     @if($page->tags->count() > 0)
         <section>
 
     @if($page->tags->count() > 0)
         <section>

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

         </section>
     @endif
 
         </section>
     @endif
 


@@ -50,7 +66,7 @@
                     @foreach($pageNav as $navItem)
                         <li class="page-nav-item h{{ $navItem['level'] }}">
                             <a href="{{ $navItem['link'] }}" class="text-limit-lines-1 block">{{ $navItem['text'] }}</a>
                     @foreach($pageNav as $navItem)
                         <li class="page-nav-item h{{ $navItem['level'] }}">
                             <a href="{{ $navItem['link'] }}" class="text-limit-lines-1 block">{{ $navItem['text'] }}</a>

-                            <div class="primary-background sidebar-page-nav-bullet"></div>
+                            <div class="link-background sidebar-page-nav-bullet"></div>

                         </li>
                     @endforeach
                 </div>
                         </li>
                     @endforeach
                 </div>


@@ -58,48 +74,67 @@
         </nav>
     @endif
 
         </nav>
     @endif
 

-    @include('partials.book-tree', ['book' => $book, 'sidebarTree' => $sidebarTree])
+    @include('entities.book-tree', ['book' => $book, 'sidebarTree' => $sidebarTree])

 @stop
 
 @section('right')
     <div id="page-details" class="entity-details mb-xl">
         <h5>{{ trans('common.details') }}</h5>
 @stop
 
 @section('right')
     <div id="page-details" class="entity-details mb-xl">
         <h5>{{ trans('common.details') }}</h5>

-        <div class="body text-small blended-links">
-            @include('partials.entity-meta', ['entity' => $page])
+        <div class="blended-links">
+            @include('entities.meta', ['entity' => $page, 'watchOptions' => $watchOptions])

 
 

-            @if($book->restricted)
+            @if($book->hasPermissions())

                 <div class="active-restriction">
                     @if(userCan('restrictions-manage', $book))
                 <div class="active-restriction">
                     @if(userCan('restrictions-manage', $book))

-                        <a href="{{ $book->getUrl('/permissions') }}">@icon('lock'){{ trans('entities.books_permissions_active') }}</a>
+                        <a href="{{ $book->getUrl('/permissions') }}" class="entity-meta-item">
+                            @icon('lock')
+                            <div>{{ trans('entities.books_permissions_active') }}</div>
+                        </a>

                     @else
                     @else

-                        @icon('lock'){{ trans('entities.books_permissions_active') }}
+                        <div class="entity-meta-item">
+                            @icon('lock')
+                            <div>{{ trans('entities.books_permissions_active') }}</div>
+                        </div>

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

-            @if($page->chapter && $page->chapter->restricted)
+            @if($page->chapter && $page->chapter->hasPermissions())

                 <div class="active-restriction">
                     @if(userCan('restrictions-manage', $page->chapter))
                 <div class="active-restriction">
                     @if(userCan('restrictions-manage', $page->chapter))

-                        <a href="{{ $page->chapter->getUrl('/permissions') }}">@icon('lock'){{ trans('entities.chapters_permissions_active') }}</a>
+                        <a href="{{ $page->chapter->getUrl('/permissions') }}" class="entity-meta-item">
+                            @icon('lock')
+                            <div>{{ trans('entities.chapters_permissions_active') }}</div>
+                        </a>

                     @else
                     @else

-                        @icon('lock'){{ trans('entities.chapters_permissions_active') }}
+                        <div class="entity-meta-item">
+                            @icon('lock')
+                            <div>{{ trans('entities.chapters_permissions_active') }}</div>
+                        </div>

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

-            @if($page->restricted)
+            @if($page->hasPermissions())

                 <div class="active-restriction">
                     @if(userCan('restrictions-manage', $page))
                 <div class="active-restriction">
                     @if(userCan('restrictions-manage', $page))

-                        <a href="{{ $page->getUrl('/permissions') }}">@icon('lock'){{ trans('entities.pages_permissions_active') }}</a>
+                        <a href="{{ $page->getUrl('/permissions') }}" class="entity-meta-item">
+                            @icon('lock')
+                            <div>{{ trans('entities.pages_permissions_active') }}</div>
+                        </a>

                     @else
                     @else

-                        @icon('lock'){{ trans('entities.pages_permissions_active') }}
+                        <div class="entity-meta-item">
+                            @icon('lock')
+                            <div>{{ trans('entities.pages_permissions_active') }}</div>
+                        </div>

                     @endif
                 </div>
             @endif
 
             @if($page->template)
                     @endif
                 </div>
             @endif
 
             @if($page->template)

-                <div>
-                    @icon('template'){{ trans('entities.pages_is_template') }}
+                <div class="entity-meta-item">
+                    @icon('template')
+                    <div>{{ trans('entities.pages_is_template') }}</div>

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


@@ -108,41 +143,41 @@
     <div class="actions mb-xl">
         <h5>{{ trans('common.actions') }}</h5>
 
     <div class="actions mb-xl">
         <h5>{{ trans('common.actions') }}</h5>
 

-        <div class="icon-list text-primary">
+        <div class="icon-list text-link">

 
             {{--User Actions--}}
             @if(userCan('page-update', $page))
 
             {{--User Actions--}}
             @if(userCan('page-update', $page))

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

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

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

                     <span>@icon('copy')</span>
                     <span>{{ trans('common.copy') }}</span>
                 </a>
             @endif
             @if(userCan('page-update', $page))
                 @if(userCan('page-delete', $page))
                     <span>@icon('copy')</span>
                     <span>{{ trans('common.copy') }}</span>
                 </a>
             @endif
             @if(userCan('page-update', $page))
                 @if(userCan('page-delete', $page))

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

                            <span>@icon('folder')</span>
                            <span>{{ trans('common.move') }}</span>
                        </a>
                 @endif
                            <span>@icon('folder')</span>
                            <span>{{ trans('common.move') }}</span>
                        </a>
                 @endif

-                <a href="{{ $page->getUrl('/revisions') }}" class="icon-list-item">
-                    <span>@icon('history')</span>
-                    <span>{{ trans('entities.revisions') }}</span>
-                </a>

             @endif
             @endif

+            <a href="{{ $page->getUrl('/revisions') }}" data-shortcut="revisions" class="icon-list-item">
+                <span>@icon('history')</span>
+                <span>{{ trans('entities.revisions') }}</span>
+            </a>

             @if(userCan('restrictions-manage', $page))
             @if(userCan('restrictions-manage', $page))

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

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

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

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


@@ -150,8 +185,15 @@
 
             <hr class="primary-background"/>
 
 
             <hr class="primary-background"/>
 

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

         </div>
 
     </div>
         </div>
 
     </div>