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 aefcb96e1105e810a41dd1da407b302409ab56ca..e3a31dd5ebf1bcd18b6ce0977565ed6ef7db5d11 100644 (file)
--- a/resources/views/pages/show.blade.php
+++ b/resources/views/pages/show.blade.php
@@ -29,7 +29,7 @@
 
     @if ($commentTree->enabled())
         @if(($previous || $next))
-            <div class="px-xl">
+            <div class="px-xl print-hidden">
                 <hr class="darker">
             </div>
         @endif
@@ -81,7 +81,7 @@
     <div id="page-details" class="entity-details mb-xl">
         <h5>{{ trans('common.details') }}</h5>
         <div class="blended-links">
-            @include('entities.meta', ['entity' => $page])
+            @include('entities.meta', ['entity' => $page, 'watchOptions' => $watchOptions])
 
             @if($book->hasPermissions())
                 <div class="active-restriction">
@@ -185,10 +185,10 @@
 
             <hr class="primary-background"/>
 
-            @if($watchOptions->canWatch() && !$watchOptions->isWatching($page))
+            @if($watchOptions->canWatch() && !$watchOptions->isWatching())
                 @include('entities.watch-action', ['entity' => $page])
             @endif
-            @if(signedInUser())
+            @if(!user()->isGuest())
                 @include('entities.favourite-action', ['entity' => $page])
             @endif
             @if(userCan('content-export'))