Merge pull request #3 from OsmosysSoftware/revert-1-issue-181

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

diff --git a/resources/views/pages/show.blade.php b/resources/views/pages/show.blade.php
index 286d443874001fd7c22bb2017574f193790bb163..6b2dc3c2319a7c7656fe4fb86c9926ed57dcb787 100644 (file)
--- a/resources/views/pages/show.blade.php
+++ b/resources/views/pages/show.blade.php
@@ -6,37 +6,39 @@
         <div class="container">
             <div class="row">
                 <div class="col-sm-6 faded">
         <div class="container">
             <div class="row">
                 <div class="col-sm-6 faded">

-                    <div class="breadcrumbs">
-                        <a href="{{$book->getUrl()}}" class="text-book text-button"><i class="zmdi zmdi-book"></i>{{ $book->getShortName() }}</a>
-                        @if($page->hasChapter())
-                            <span class="sep">&raquo;</span>
-                            <a href="{{ $page->chapter->getUrl() }}" class="text-chapter text-button">
-                                <i class="zmdi zmdi-collection-bookmark"></i>
-                                {{$page->chapter->getShortName()}}
-                            </a>
-                        @endif
-                    </div>
+                    @include('pages._breadcrumbs', ['page' => $page])

                 </div>
                 <div class="col-sm-6 faded">
                     <div class="action-buttons">
                         <span dropdown class="dropdown-container">
                 </div>
                 <div class="col-sm-6 faded">
                     <div class="action-buttons">
                         <span dropdown class="dropdown-container">

-                            <div dropdown-toggle class="text-button text-primary"><i class="zmdi zmdi-open-in-new"></i>Export</div>
+                            <div dropdown-toggle class="text-button text-primary"><i class="zmdi zmdi-open-in-new"></i>{{ trans('entities.export') }}</div>

                             <ul class="wide">
                             <ul class="wide">

-                                <li><a href="{{$page->getUrl()}}/export/html" target="_blank">Contained Web File <span class="text-muted float right">.html</span></a></li>
-                                <li><a href="{{$page->getUrl()}}/export/pdf" target="_blank">PDF File <span class="text-muted float right">.pdf</span></a></li>
-                                <li><a href="{{$page->getUrl()}}/export/plaintext" target="_blank">Plain Text File <span class="text-muted float right">.txt</span></a></li>
+                                <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>
                         </span>
                         @if(userCan('page-update', $page))
                             </ul>
                         </span>
                         @if(userCan('page-update', $page))

-                            <a href="{{$page->getUrl()}}/revisions" class="text-primary text-button"><i class="zmdi zmdi-replay"></i>Revisions</a>
-                            <a href="{{$page->getUrl()}}/edit" class="text-primary text-button" ><i class="zmdi zmdi-edit"></i>Edit</a>
+                            <a href="{{ $page->getUrl('/edit') }}" class="text-primary text-button" ><i class="zmdi zmdi-edit"></i>{{ trans('common.edit') }}</a>

                         @endif
                         @endif

-                        @if(userCan('restrictions-manage', $page))
-                            <a href="{{$page->getUrl()}}/restrict" class="text-primary text-button"><i class="zmdi zmdi-lock-outline"></i>Restrict</a>
-                        @endif
-                        @if(userCan('page-delete', $page))
-                            <a href="{{$page->getUrl()}}/delete" class="text-neg text-button"><i class="zmdi zmdi-delete"></i>Delete</a>
+                        @if(userCan('page-update', $page) || userCan('restrictions-manage', $page) || userCan('page-delete', $page))
+                            <div dropdown class="dropdown-container">
+                                <a dropdown-toggle class="text-primary text-button"><i class="zmdi zmdi-more-vert"></i></a>
+                                <ul>
+                                    @if(userCan('page-update', $page))
+                                        <li><a href="{{ $page->getUrl('/move') }}" class="text-primary" ><i class="zmdi zmdi-folder"></i>{{ trans('common.move') }}</a></li>
+                                        <li><a href="{{ $page->getUrl('/revisions') }}" class="text-primary"><i class="zmdi zmdi-replay"></i>{{ trans('entities.revisions') }}</a></li>
+                                    @endif
+                                    @if(userCan('restrictions-manage', $page))
+                                        <li><a href="{{ $page->getUrl('/permissions') }}" class="text-primary"><i class="zmdi zmdi-lock-outline"></i>{{ trans('entities.permissions') }}</a></li>
+                                    @endif
+                                    @if(userCan('page-delete', $page))
+                                        <li><a href="{{ $page->getUrl('/delete') }}" class="text-neg"><i class="zmdi zmdi-delete"></i>{{ trans('common.delete') }}</a></li>
+                                    @endif
+                                </ul>
+                            </div>

                         @endif
                         @endif

+

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


@@ -47,13 +49,13 @@
     <div class="container" id="page-show" ng-non-bindable>
         <div class="row">
             <div class="col-md-9 print-full-width">
     <div class="container" id="page-show" ng-non-bindable>
         <div class="row">
             <div class="col-md-9 print-full-width">

-                <div class="page-content anim fadeIn">
+                <div class="page-content">

 
                     <div class="pointer-container" id="pointer">
                         <div class="pointer anim">
 
                     <div class="pointer-container" id="pointer">
                         <div class="pointer anim">

-                            <i class="zmdi zmdi-link"></i>
-                            <input readonly="readonly" type="text" placeholder="url">
-                            <button class="button icon" title="Copy Link" data-clipboard-text=""><i class="zmdi zmdi-copy"></i></button>
+                            <span class="icon text-primary"><i class="zmdi zmdi-link"></i></span>
+                            <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') }}"><i class="zmdi zmdi-copy"></i></button>

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


@@ -61,14 +63,11 @@
 
                     <hr>
 
 
                     <hr>
 

-                    <p class="text-muted small">
-                        Created {{$page->created_at->diffForHumans()}} @if($page->createdBy) by {{$page->createdBy->name}} @endif
-                        <br>
-                        Last Updated {{$page->updated_at->diffForHumans()}} @if($page->updatedBy) by {{$page->updatedBy->name}} @endif
-                    </p>
+                    @include('partials.entity-meta', ['entity' => $page])

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

+

             <div class="col-md-3 print-hidden">
                 <div class="margin-top large"></div>
                 @if($book->restricted || ($page->chapter && $page->chapter->restricted) || $page->restricted)
             <div class="col-md-3 print-hidden">
                 <div class="margin-top large"></div>
                 @if($book->restricted || ($page->chapter && $page->chapter->restricted) || $page->restricted)


@@ -76,39 +75,41 @@
 
                         @if($book->restricted)
                             @if(userCan('restrictions-manage', $book))
 
                         @if($book->restricted)
                             @if(userCan('restrictions-manage', $book))

-                                <a href="{{ $book->getUrl() }}/restrict"><i class="zmdi zmdi-lock-outline"></i>Book restricted</a>
+                                <a href="{{ $book->getUrl('/permissions') }}"><i class="zmdi zmdi-lock-outline"></i>{{ trans('entities.books_permissions_active') }}</a>

                             @else
                             @else

-                                <i class="zmdi zmdi-lock-outline"></i>Book restricted
+                                <i class="zmdi zmdi-lock-outline"></i>{{ trans('entities.books_permissions_active') }}

                             @endif
                             <br>
                         @endif
 
                         @if($page->chapter && $page->chapter->restricted)
                             @if(userCan('restrictions-manage', $page->chapter))
                             @endif
                             <br>
                         @endif
 
                         @if($page->chapter && $page->chapter->restricted)
                             @if(userCan('restrictions-manage', $page->chapter))

-                                <a href="{{ $page->chapter->getUrl() }}/restrict"><i class="zmdi zmdi-lock-outline"></i>Chapter restricted</a>
+                                <a href="{{ $page->chapter->getUrl('/permissions') }}"><i class="zmdi zmdi-lock-outline"></i>{{ trans('entities.chapters_permissions_active') }}</a>

                             @else
                             @else

-                                <i class="zmdi zmdi-lock-outline"></i>Chapter restricted
+                                <i class="zmdi zmdi-lock-outline"></i>{{ trans('entities.chapters_permissions_active') }}

                             @endif
                             <br>
                         @endif
 
                         @if($page->restricted)
                             @if(userCan('restrictions-manage', $page))
                             @endif
                             <br>
                         @endif
 
                         @if($page->restricted)
                             @if(userCan('restrictions-manage', $page))

-                                <a href="{{ $page->getUrl() }}/restrict"><i class="zmdi zmdi-lock-outline"></i>Page restricted</a>
+                                <a href="{{ $page->getUrl('/permissions') }}"><i class="zmdi zmdi-lock-outline"></i>{{ trans('entities.pages_permissions_active') }}</a>

                             @else
                             @else

-                                <i class="zmdi zmdi-lock-outline"></i>Page restricted
+                                <i class="zmdi zmdi-lock-outline"></i>{{ trans('entities.pages_permissions_active') }}

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

-                @include('pages/sidebar-tree-list', ['book' => $book, 'sidebarTree' => $sidebarTree])

 
 

+
+
+                @include('pages/sidebar-tree-list', ['book' => $book, 'sidebarTree' => $sidebarTree, 'pageNav' => $pageNav])

             </div>
             </div>

+

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

-    @include('partials/highlight')

 @stop
 
 @section('scripts')
 @stop
 
 @section('scripts')