TypeScript: Updated compile target, addressed issues

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

diff --git a/resources/views/pages/show.blade.php b/resources/views/pages/show.blade.php
index 2cbc7fe470bd807517a472e385ba1d66c0ce2dae..137d43bdb1af376794963266d216864e8e92633b 100644 (file)
--- a/resources/views/pages/show.blade.php
+++ b/resources/views/pages/show.blade.php
@@ -27,15 +27,9 @@
 
     @include('entities.sibling-navigation', ['next' => $next, 'previous' => $previous])
 
 
     @include('entities.sibling-navigation', ['next' => $next, 'previous' => $previous])
 

-    @if ($commentsEnabled)
-        @if(($previous || $next))
-            <div class="px-xl">
-                <hr class="darker">
-            </div>
-        @endif
-
-        <div class="px-xl comments-container mb-l print-hidden">
-            @include('comments.comments', ['page' => $page])
+    @if ($commentTree->enabled())
+        <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


@@ -81,7 +75,7 @@
     <div id="page-details" class="entity-details mb-xl">
         <h5>{{ trans('common.details') }}</h5>
         <div class="blended-links">
     <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">
 
             @if($book->hasPermissions())
                 <div class="active-restriction">


@@ -185,7 +179,10 @@
 
             <hr class="primary-background"/>
 
 
             <hr class="primary-background"/>
 

-            @if(signedInUser())
+            @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.favourite-action', ['entity' => $page])
             @endif
             @if(userCan('content-export'))