ZIP Imports: Added API examples, finished testing

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

diff --git a/resources/views/pages/show.blade.php b/resources/views/pages/show.blade.php
index 45d2e2d7f7c9139eaa454e4c2bdf9ecdcaa1503f..137d43bdb1af376794963266d216864e8e92633b 100644 (file)
--- a/resources/views/pages/show.blade.php
+++ b/resources/views/pages/show.blade.php
@@ -17,23 +17,19 @@
     </div>
 
     <main class="content-wrap card">
     </div>
 
     <main class="content-wrap card">

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

             @include('pages.parts.page-display')
         </div>
             @include('pages.parts.page-display')
         </div>

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

     </main>
 
     @include('entities.sibling-navigation', ['next' => $next, 'previous' => $previous])
 
     </main>
 
     @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


@@ -64,7 +60,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>


@@ -79,9 +75,9 @@
     <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->restricted)
+            @if($book->hasPermissions())

                 <div class="active-restriction">
                     @if(userCan('restrictions-manage', $book))
                         <a href="{{ $book->getUrl('/permissions') }}" class="entity-meta-item">
                 <div class="active-restriction">
                     @if(userCan('restrictions-manage', $book))
                         <a href="{{ $book->getUrl('/permissions') }}" class="entity-meta-item">


@@ -97,7 +93,7 @@
                 </div>
             @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))
                         <a href="{{ $page->chapter->getUrl('/permissions') }}" class="entity-meta-item">
                 <div class="active-restriction">
                     @if(userCan('restrictions-manage', $page->chapter))
                         <a href="{{ $page->chapter->getUrl('/permissions') }}" class="entity-meta-item">


@@ -113,7 +109,7 @@
                 </div>
             @endif
 
                 </div>
             @endif
 

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

                 <div class="active-restriction">
                     @if(userCan('restrictions-manage', $page))
                         <a href="{{ $page->getUrl('/permissions') }}" class="entity-meta-item">
                 <div class="active-restriction">
                     @if(userCan('restrictions-manage', $page))
                         <a href="{{ $page->getUrl('/permissions') }}" class="entity-meta-item">


@@ -141,41 +137,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
             @if(userCanOnAny('create', \BookStack\Entities\Models\Book::class) || userCanOnAny('create', \BookStack\Entities\Models\Chapter::class) || userCan('page-create-all') || userCan('page-create-own'))
                     <span>@icon('edit')</span>
                     <span>{{ trans('common.edit') }}</span>
                 </a>
             @endif
             @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') }}" class="icon-list-item">
+                <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>


@@ -183,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'))