Fixes typo causing the message not to be displayed

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

diff --git a/resources/views/chapters/show.blade.php b/resources/views/chapters/show.blade.php
index 9eb27f2257a0cc02d3334e92c37e3dcde0b8688d..93eee6424c055bab1ec53dc4263310df215b631e 100644 (file)
--- a/resources/views/chapters/show.blade.php
+++ b/resources/views/chapters/show.blade.php
@@ -2,24 +2,35 @@
 
 @section('content')
 
 
 @section('content')
 

-    <div class="faded-small">
+    <div class="faded-small toolbar">

         <div class="container">
             <div class="row">
         <div class="container">
             <div class="row">

-                <div class="col-md-4 faded">
-                    <div class="breadcrumbs">
-                        <a href="{{$book->getUrl()}}"><i class="zmdi zmdi-book"></i>{{ $book->name }}</a>
-                    </div>
+                <div class="col-sm-8 faded" ng-non-bindable>
+                    @include('chapters._breadcrumbs', ['chapter' => $chapter])

                 </div>
                 </div>

-                <div class="col-md-8 faded">
+                <div class="col-sm-4 faded">

                     <div class="action-buttons">
                     <div class="action-buttons">

-                        @if($currentUser->can('chapter-create'))
-                            <a href="{{$chapter->getUrl() . '/create-page'}}" class="text-pos"><i class="zmdi zmdi-plus"></i>New Page</a>
+                        @if(userCan('page-create', $chapter))
+                            <a href="{{ $chapter->getUrl('/create-page') }}" class="text-pos text-button"><i class="zmdi zmdi-plus"></i>{{ trans('entities.pages_new') }}</a>

                         @endif
                         @endif

-                        @if($currentUser->can('chapter-update'))
-                            <a href="{{$chapter->getUrl() . '/edit'}}" class="text-primary"><i class="zmdi zmdi-edit"></i>Edit</a>
+                        @if(userCan('chapter-update', $chapter))
+                            <a href="{{ $chapter->getUrl('/edit') }}" class="text-primary text-button"><i class="zmdi zmdi-edit"></i>{{ trans('common.edit') }}</a>

                         @endif
                         @endif

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

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


@@ -28,50 +39,65 @@
     </div>
 
 
     </div>
 
 

-    <div class="container">
+    <div class="container" ng-non-bindable>

         <div class="row">
         <div class="row">

-            <div class="col-md-3">
-                @include('pages/sidebar-tree-list', ['book' => $book])
-            </div>
-            <div class="col-md-9">
-                <div class="page-content">
-                    <h1>{{ $chapter->name }}</h1>
-                    <p class="text-muted">{{ $chapter->description }}</p>
+            <div class="col-md-8">
+                <h1>{{ $chapter->name }}</h1>
+                <p class="text-muted">{{ $chapter->description }}</p>

 
 

-                    @if(count($chapter->pages) > 0)
-                        <div class="page-list">
-                            <hr>
-                            @foreach($chapter->pages as $page)
-                                <div >
-                                    <h3>
-                                        <a href="{{ $page->getUrl() }}">
-                                            <i class="zmdi zmdi-file-text"></i>{{ $page->name }}
-                                        </a>
-                                    </h3>
-                                    <p class="text-muted">
-                                        {{$page->getExcerpt(180)}}
-                                    </p>
-                                </div>
-                                <hr>
-                            @endforeach
-                        </div>
-                    @else
+                @if(count($pages) > 0)
+                    <div class="page-list">

                         <hr>
                         <hr>

-                        <p class="text-muted">No pages are currently in this chapter.</p>
-                        <p>
-                            <a href="{{$chapter->getUrl() . '/create-page'}}" class="text-page"><i class="zmdi zmdi-file-text"></i>Create a new page</a>
-                            &nbsp;&nbsp;<em class="text-muted">-or-</em>&nbsp;&nbsp;&nbsp;
-                            <a href="{{$book->getUrl() . '/sort'}}" class="text-book"><i class="zmdi zmdi-book"></i>Sort the current book</a>
-                        </p>
-                        <hr>
-                    @endif
-
-                    <p class="text-muted small">
-                        Created {{$chapter->created_at->diffForHumans()}} @if($chapter->createdBy) by {{$chapter->createdBy->name}} @endif
-                        <br>
-                        Last Updated {{$chapter->updated_at->diffForHumans()}} @if($chapter->createdBy) by {{$chapter->updatedBy->name}} @endif
+                        @foreach($pages as $page)
+                            @include('pages/list-item', ['page' => $page])
+                            <hr>
+                        @endforeach
+                    </div>
+                @else
+                    <hr>
+                    <p class="text-muted">{{ trans('entities.chapters_empty') }}</p>
+                    <p>
+                        @if(userCan('page-create', $chapter))
+                            <a href="{{ $chapter->getUrl('/create-page') }}" class="text-page"><i class="zmdi zmdi-file-text"></i>{{ trans('entities.books_empty_create_page') }}</a>
+                        @endif
+                        @if(userCan('page-create', $chapter) && userCan('book-update', $book))
+                            &nbsp;&nbsp;<em class="text-muted">-{{ trans('entities.books_empty_or') }}-</em>&nbsp;&nbsp;&nbsp;
+                        @endif
+                        @if(userCan('book-update', $book))
+                            <a href="{{ $book->getUrl('/sort') }}" class="text-book"><i class="zmdi zmdi-book"></i>{{ trans('entities.books_empty_sort_current_book') }}</a>
+                        @endif

                     </p>
                     </p>

-                </div>
+                    <hr>
+                @endif
+
+                @include('partials.entity-meta', ['entity' => $chapter])
+            </div>
+            <div class="col-md-3 col-md-offset-1">
+                <div class="margin-top large"></div>
+                @if($book->restricted || $chapter->restricted)
+                    <div class="text-muted">
+
+                        @if($book->restricted)
+                            <p class="text-muted">
+                                @if(userCan('restrictions-manage', $book))
+                                    <a href="{{ $book->getUrl('/permissions') }}"><i class="zmdi zmdi-lock-outline"></i>{{ trans('entities.books_permissions_active') }}</a>
+                                @else
+                                    <i class="zmdi zmdi-lock-outline"></i>{{ trans('entities.books_permissions_active') }}
+                                @endif
+                            </p>
+                        @endif
+
+                        @if($chapter->restricted)
+                            @if(userCan('restrictions-manage', $chapter))
+                                <a href="{{ $chapter->getUrl('/permissions') }}"><i class="zmdi zmdi-lock-outline"></i>{{ trans('entities.chapters_permissions_active') }}</a>
+                            @else
+                                <i class="zmdi zmdi-lock-outline"></i>{{ trans('entities.chapters_permissions_active') }}
+                            @endif
+                        @endif
+                    </div>
+                @endif
+
+                @include('pages/sidebar-tree-list', ['book' => $book, 'sidebarTree' => $sidebarTree])

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