X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/7f95b51b00d0d5fa1e7bcf5574f2d58bddcbd504..refs/pull/2328/head:/resources/views/pages/show.blade.php

diff --git a/resources/views/pages/show.blade.php b/resources/views/pages/show.blade.php
index 282ae21d2..48c88434e 100644
--- a/resources/views/pages/show.blade.php
+++ b/resources/views/pages/show.blade.php
@@ -1,5 +1,29 @@
 @extends('tri-layout')
-@section('container-classes', 'mt-xl')
+
+@section('body')
+
+    <div class="mb-m print-hidden">
+        @include('partials.breadcrumbs', ['crumbs' => [
+            $page->book,
+            $page->hasChapter() ? $page->chapter : null,
+            $page,
+        ]])
+    </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>
+    </main>
+
+    @if ($commentsEnabled)
+        <div class="container small p-none comments-container mb-l print-hidden">
+            @include('comments.comments', ['page' => $page])
+            <div class="clearfix"></div>
+        </div>
+    @endif
+@stop
 
 @section('left')
 
@@ -10,36 +34,37 @@
     @endif
 
     @if ($page->attachments->count() > 0)
-        <div id="page-attachments" class="mb-xl">
+        <div id="page-attachments" class="mb-l">
             <h5>{{ trans('entities.pages_attachments') }}</h5>
             <div class="body">
-                @foreach($page->attachments as $attachment)
-                    <div class="attachment">
-                        <a href="{{ $attachment->getUrl() }}" @if($attachment->external) target="_blank" @endif>@icon($attachment->external ? 'export' : 'file'){{ $attachment->name }}</a>
-                    </div>
-                @endforeach
+                @include('attachments.list', ['attachments' => $page->attachments])
             </div>
         </div>
     @endif
 
     @if (isset($pageNav) && count($pageNav))
-        <div id="page-navigation" class="mb-xl">
+        <nav id="page-navigation" class="mb-xl" aria-label="{{ trans('entities.pages_navigation') }}">
             <h5>{{ trans('entities.pages_navigation') }}</h5>
             <div class="body">
                 <div class="sidebar-page-nav menu">
                     @foreach($pageNav as $navItem)
                         <li class="page-nav-item h{{ $navItem['level'] }}">
-                            <a href="{{ $navItem['link'] }}">{{ $navItem['text'] }}</a>
+                            <a href="{{ $navItem['link'] }}" class="limit-text block">{{ $navItem['text'] }}</a>
+                            <div class="primary-background sidebar-page-nav-bullet"></div>
                         </li>
                     @endforeach
                 </div>
             </div>
-        </div>
+        </nav>
     @endif
 
+    @include('partials.book-tree', ['book' => $book, 'sidebarTree' => $sidebarTree])
+@stop
+
+@section('right')
     <div id="page-details" class="entity-details mb-xl">
         <h5>{{ trans('common.details') }}</h5>
-        <div class="body text-muted text-small blended-links">
+        <div class="body text-small blended-links">
             @include('partials.entity-meta', ['entity' => $page])
 
             @if($book->restricted)
@@ -71,96 +96,62 @@
                     @endif
                 </div>
             @endif
-        </div>
-    </div>
-
-    @include('partials.book-tree', ['book' => $book, 'sidebarTree' => $sidebarTree])
-@stop
-
-@section('body')
-
-    <div class="mb-m">
-        @include('pages._breadcrumbs', ['page' => $page])
-    </div>
 
-    <div class="content-wrap card">
-        <div class="page-content flex" page-display="{{ $page->id }}">
-
-            <div class="pointer-container" id="pointer">
-                <div class="pointer anim {{ userCan('page-update', $page) ? 'is-page-editable' : ''}}" >
-                    <span class="icon text-primary">@icon('link') @icon('include', ['style' => 'display:none;'])</span>
-                    <span class="input-group">
-                    <input readonly="readonly" type="text" id="pointer-url" placeholder="url">
-                    <button class="button icon" data-clipboard-target="#pointer-url" type="button" title="{{ trans('entities.pages_copy_link') }}">@icon('copy')</button>
-                </span>
-                    @if(userCan('page-update', $page))
-                        <a href="{{ $page->getUrl('/edit') }}" id="pointer-edit" data-edit-href="{{ $page->getUrl('/edit') }}"
-                           class="button icon heading-edit-icon" title="{{ trans('entities.pages_edit_content_link')}}">@icon('edit')</a>
-                    @endif
+            @if($page->template)
+                <div>
+                    @icon('template'){{ trans('entities.pages_is_template') }}
                 </div>
-            </div>
-
-            @include('pages.page-display')
+            @endif
         </div>
     </div>
 
-    @if ($commentsEnabled)
-      <div class="container small nopad comments-container mb-l">
-          @include('comments.comments', ['page' => $page])
-          <div class="clearfix"></div>
-      </div>
-    @endif
-@stop
-
-@section('right')
     <div class="actions mb-xl">
-        <h5>Actions</h5>
+        <h5>{{ trans('common.actions') }}</h5>
 
         <div class="icon-list text-primary">
-            {{--Export--}}
-            <div dropdown class="dropdown-container block">
-                <div dropdown-toggle class="icon-list-item">
-                    <span class="icon">@icon('export')</span>
-                    <span>{{ trans('entities.export') }}</span>
-                </div>
-                <ul class="wide">
-                    <li><a href="{{ $page->getUrl('/export/html') }}" target="_blank">{{ trans('entities.export_html') }} <span class="text-muted float right">.html</span></a></li>
-                    <li><a href="{{ $page->getUrl('/export/pdf') }}" target="_blank">{{ trans('entities.export_pdf') }} <span class="text-muted float right">.pdf</span></a></li>
-                    <li><a href="{{ $page->getUrl('/export/plaintext') }}" target="_blank">{{ trans('entities.export_text') }} <span class="text-muted float right">.txt</span></a></li>
-                </ul>
-            </div>
 
             {{--User Actions--}}
             @if(userCan('page-update', $page))
                 <a href="{{ $page->getUrl('/edit') }}" class="icon-list-item">
-                    <span class="icon">@icon('edit')</span>
+                    <span>@icon('edit')</span>
                     <span>{{ trans('common.edit') }}</span>
                 </a>
+            @endif
+            @if(userCanOnAny('page-create'))
                 <a href="{{ $page->getUrl('/copy') }}" class="icon-list-item">
-                    <span class="icon">@icon('copy')</span>
+                    <span>@icon('copy')</span>
                     <span>{{ trans('common.copy') }}</span>
                 </a>
-                <a href="{{ $page->getUrl('/move') }}" class="icon-list-item">
-                    <span class="icon">@icon('folder')</span>
-                    <span>{{ trans('common.move') }}</span>
-                </a>
+            @endif
+            @if(userCan('page-update', $page))
+                @if(userCan('page-delete', $page))
+	                <a href="{{ $page->getUrl('/move') }}" class="icon-list-item">
+	                    <span>@icon('folder')</span>
+	                    <span>{{ trans('common.move') }}</span>
+	                </a>
+                @endif
                 <a href="{{ $page->getUrl('/revisions') }}" class="icon-list-item">
-                    <span class="icon">@icon('history')</span>
+                    <span>@icon('history')</span>
                     <span>{{ trans('entities.revisions') }}</span>
                 </a>
             @endif
             @if(userCan('restrictions-manage', $page))
                 <a href="{{ $page->getUrl('/permissions') }}" class="icon-list-item">
-                    <span class="icon">@icon('lock')</span>
+                    <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">
-                    <span class="icon">@icon('delete')</span>
+                    <span>@icon('delete')</span>
                     <span>{{ trans('common.delete') }}</span>
                 </a>
             @endif
+
+            <hr class="primary-background"/>
+
+            {{--Export--}}
+            @include('partials.entity-export-menu', ['entity' => $page])
         </div>
 
     </div>