Updated a bunch of book views

diff --git a/app/Http/Controllers/BookController.php b/app/Http/Controllers/BookController.php
index b5e2a4a8553257d7228607b33074026d5c97b943..95cd8bdebb53e5c9f0e4941d563a0b51219880ca 100644 (file)
--- a/app/Http/Controllers/BookController.php
+++ b/app/Http/Controllers/BookController.php
@@ -275,12 +275,12 @@ class BookController extends Controller
      * @param $bookSlug
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function showRestrict($bookSlug)
+    public function showPermissions($bookSlug)
     {
         $book = $this->entityRepo->getBySlug('book', $bookSlug);
         $this->checkOwnablePermission('restrictions-manage', $book);
         $roles = $this->userRepo->getRestrictableRoles();
-        return view('books/restrictions', [
+        return view('books.permissions', [
             'book' => $book,
             'roles' => $roles
         ]);
@@ -289,11 +289,12 @@ class BookController extends Controller
     /**
      * Set the restrictions for this book.
      * @param $bookSlug
-     * @param $bookSlug
      * @param Request $request
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     * @throws \BookStack\Exceptions\NotFoundException
+     * @throws \Throwable
      */
-    public function restrict($bookSlug, Request $request)
+    public function permissions($bookSlug, Request $request)
     {
         $book = $this->entityRepo->getBySlug('book', $bookSlug);
         $this->checkOwnablePermission('restrictions-manage', $book);

diff --git a/resources/assets/sass/_blocks.scss b/resources/assets/sass/_blocks.scss
index b000c7ed6f240f8f4958ca4647e094bd55c9af16..1baec7a92520c9a48da49d0211f43a6e4eeb6ca3 100644 (file)
--- a/resources/assets/sass/_blocks.scss
+++ b/resources/assets/sass/_blocks.scss
@@ -175,7 +175,7 @@
   background-color: #FFF;
   box-shadow: $bs-card;
   border-radius: 3px;
-  padding-bottom: $-xs;
+  border: 1px solid transparent;
   h3 {
     padding: $-m;
     padding-bottom: $-xs;

diff --git a/resources/assets/sass/_grid.scss b/resources/assets/sass/_grid.scss
index e6eb489b92b8ca92d713b121a5ad9490b6dccb68..302b667073bf7ef5e70551f705c4d245429534b1 100644 (file)
--- a/resources/assets/sass/_grid.scss
+++ b/resources/assets/sass/_grid.scss
@@ -57,6 +57,9 @@ body.flexbox {
   margin-bottom: $-xl;
   overflow: auto;
   min-height: 60vh;
+  &.auto-height {
+    min-height: 0;
+  }
 }
 
 .tri-layout-container {
@@ -199,6 +202,14 @@ div[class^="col-"] img {
   &.third {
     grid-template-columns: 1fr 1fr 1fr;
   }
+  &.left-focus {
+    grid-template-columns: 2fr 1fr;
+  }
+  &.large-gap {
+    grid-column-gap: $-xl;
+    grid-row-gap: $-xl;
+    justify-items: start;
+  }
 }
 
 .grid-card {
@@ -255,6 +266,9 @@ div[class^="col-"] img {
   .grid.third {
     grid-template-columns: 1fr 1fr;
   }
+  .grid.left-focus {
+    grid-template-columns: 1fr;
+  }
 }
 
 @include smaller-than($s) {

diff --git a/resources/assets/sass/_lists.scss b/resources/assets/sass/_lists.scss
index 622dd32b168b8ec5ba9961b75253717e9f986b33..9bae934d84cebaf843a948cd26813b3ea303d827 100644 (file)
--- a/resources/assets/sass/_lists.scss
+++ b/resources/assets/sass/_lists.scss
@@ -91,6 +91,9 @@
     padding-left: 1.5rem;
     padding-bottom: .2rem;
   }
+  .icon {
+    z-index: 2;
+  }
   &:after, .sub-menu:after {
     content: '';
     display: block;
@@ -100,7 +103,7 @@
     bottom: 1rem;
     border-left: 2px solid #DDD;
     opacity: 0.6;
-    z-index: 1;
+    z-index: 0;
   }
 }
 

diff --git a/resources/views/books/delete.blade.php b/resources/views/books/delete.blade.php
index 0ac98e8956708babedacff60b39abf207e9aa3c8..e505898665b2678731f386b4c2f417e28a237e8c 100644 (file)
--- a/resources/views/books/delete.blade.php
+++ b/resources/views/books/delete.blade.php
@@ -1,28 +1,27 @@
 @extends('simple-layout')
 
-@section('toolbar')
-    <div class="col-sm-12 faded">
-        @include('books._breadcrumbs', ['book' => $book])
-    </div>
-@stop
-
 @section('body')
 
     <div class="container small">
-        <p>&nbsp;</p>
-        <div class="card">
-            <h3>@icon('delete') {{ trans('entities.books_delete') }}</h3>
-            <div class="body">
-                <p>{{ trans('entities.books_delete_explain', ['bookName' => $book->name]) }}</p>
-                <p class="text-neg">{{ trans('entities.books_delete_confirmation') }}</p>
 
-                <form action="{{$book->getUrl()}}" method="POST">
-                    {!! csrf_field() !!}
-                    <input type="hidden" name="_method" value="DELETE">
-                    <a href="{{$book->getUrl()}}" class="button outline">{{ trans('common.cancel') }}</a>
-                    <button type="submit" class="button neg">{{ trans('common.confirm') }}</button>
-                </form>
-            </div>
+        <div class="my-l">
+            @include('partials.breadcrumbs', ['crumbs' => [
+                $book,
+                $book->getUrl('/delete') => trans('entities.books_delete')
+            ]])
+        </div>
+
+        <div class="card content-wrap auto-height">
+            <h1 class="list-heading">{{ trans('entities.books_delete') }}</h1>
+            <p>{{ trans('entities.books_delete_explain', ['bookName' => $book->name]) }}</p>
+            <p class="text-neg"><strong>{{ trans('entities.books_delete_confirmation') }}</strong></p>
+
+            <form action="{{$book->getUrl()}}" method="POST" class="text-right">
+                {!! csrf_field() !!}
+                <input type="hidden" name="_method" value="DELETE">
+                <a href="{{$book->getUrl()}}" class="button outline">{{ trans('common.cancel') }}</a>
+                <button type="submit" class="button primary">{{ trans('common.confirm') }}</button>
+            </form>
         </div>
 
     </div>

diff --git a/resources/views/books/permissions.blade.php b/resources/views/books/permissions.blade.php
new file mode 100644 (file)
index 0000000..b1ff3b0
--- /dev/null
+++ b/resources/views/books/permissions.blade.php
@@ -0,0 +1,20 @@
+@extends('simple-layout')
+
+@section('body')
+
+    <div class="container">
+
+        <div class="my-l">
+            @include('partials.breadcrumbs', ['crumbs' => [
+                $book,
+                $book->getUrl('/permissions') => trans('entities.books_permissions')
+            ]])
+        </div>
+
+        <div class="card content-wrap">
+            <h1 class="list-heading">{{ trans('entities.books_permissions') }}</h1>
+            @include('form.entity-permissions', ['model' => $book])
+        </div>
+    </div>
+
+@stop

diff --git a/resources/views/books/restrictions.blade.php b/resources/views/books/restrictions.blade.php
deleted file mode 100644 (file)
index 2a6eb0b..0000000
--- a/resources/views/books/restrictions.blade.php
+++ /dev/null
@@ -1,21 +0,0 @@
-@extends('simple-layout')
-
-@section('toolbar')
-    <div class="col-sm-12 faded">
-        @include('books._breadcrumbs', ['book' => $book])
-    </div>
-@stop
-
-@section('body')
-
-    <div class="container">
-        <p>&nbsp;</p>
-        <div class="card">
-            <h3>@icon('lock') {{ trans('entities.books_permissions') }}</h3>
-            <div class="body">
-                @include('form/restriction-form', ['model' => $book])
-            </div>
-        </div>
-    </div>
-
-@stop

diff --git a/resources/views/books/sort.blade.php b/resources/views/books/sort.blade.php
index 77e95448f37292c40593257a342f8ca317bb2c11..00ab90f4fc05a9c73975800d468e7ff79252f193 100644 (file)
--- a/resources/views/books/sort.blade.php
+++ b/resources/views/books/sort.blade.php
@@ -1,53 +1,54 @@
 @extends('simple-layout')
 
-@section('toolbar')
-    <div class="col-sm-12 faded">
-        @include('books._breadcrumbs', ['book' => $book])
-    </div>
-@stop
-
 @section('body')
 
     <div class="container">
 
-        <div class="row">
-            <div class="col-md-8">
-                <div class="card">
-                    <h3>@icon('sort') {{ trans('entities.books_sort') }}</h3>
-                    <div class="body">
-                        <div id="sort-boxes">
-                            @include('books/sort-box', ['book' => $book, 'bookChildren' => $bookChildren])
-                        </div>
+        <div class="my-l">
+            @include('partials.breadcrumbs', ['crumbs' => [
+                $book,
+                $book->getUrl('/sort') => trans('entities.books_sort')
+            ]])
+        </div>
 
-                        <form action="{{ $book->getUrl('/sort') }}" method="POST">
-                            {!! csrf_field() !!}
-                            <input type="hidden" name="_method" value="PUT">
-                            <input type="hidden" id="sort-tree-input" name="sort-tree">
-                            <div class="list">
-                                <a href="{{ $book->getUrl() }}" class="button outline">{{ trans('common.cancel') }}</a>
-                                <button class="button pos" type="submit">{{ trans('entities.books_sort_save') }}</button>
-                            </div>
-                        </form>
+        <div class="grid left-focus large-gap">
+            <div>
+                <div class="card content-wrap">
+                    <h1 class="list-heading">{{ trans('entities.books_sort') }}</h1>
+                    <div id="sort-boxes">
+                        @include('books/sort-box', ['book' => $book, 'bookChildren' => $bookChildren])
                     </div>
+
+                    <form action="{{ $book->getUrl('/sort') }}" method="POST">
+                        {!! csrf_field() !!}
+                        <input type="hidden" name="_method" value="PUT">
+                        <input type="hidden" id="sort-tree-input" name="sort-tree">
+                        <div class="list text-right">
+                            <a href="{{ $book->getUrl() }}" class="button outline">{{ trans('common.cancel') }}</a>
+                            <button class="button primary" type="submit">{{ trans('entities.books_sort_save') }}</button>
+                        </div>
+                    </form>
                 </div>
             </div>
-            @if(count($books) > 1)
-            <div class="col-md-4">
-                <div class="card">
-                    <h3>@icon('book') {{ trans('entities.books_sort_show_other') }}</h3>
-                    <div class="body" id="additional-books">
-                        @foreach($books as $otherBook)
-                            @if($otherBook->id !== $book->id)
-                                <div>
-                                    <a href="{{ $otherBook->getUrl('/sort-item') }}" class="text-book">@icon('book'){{ $otherBook->name }}</a>
-                                </div>
-                            @endif
-                        @endforeach
+
+            <div>
+                @if(count($books) > 1)
+                    <div class="card content-wrap">
+                        <h2 class="list-heading">{{ trans('entities.books_sort_show_other') }}</h2>
+                        <div id="additional-books">
+                            @foreach($books as $otherBook)
+                                @if($otherBook->id !== $book->id)
+                                    <div>
+                                        <a href="{{ $otherBook->getUrl('/sort-item') }}" class="text-book">@icon('book'){{ $otherBook->name }}</a>
+                                    </div>
+                                @endif
+                            @endforeach
+                        </div>
                     </div>
-                </div>
+                @endif
             </div>
-            @endif
         </div>
+
     </div>
 
 @stop

diff --git a/resources/views/chapters/create.blade.php b/resources/views/chapters/create.blade.php
index 765756055c2392008698ed932ebad4cc7acd271c..e8325c2478939fd126d733d2ef7ba0ce7a19e841 100644 (file)
--- a/resources/views/chapters/create.blade.php
+++ b/resources/views/chapters/create.blade.php
@@ -1,26 +1,21 @@
 @extends('simple-layout')
 
-@section('toolbar')
-    <div class="col-sm-12 faded">
-        <div class="breadcrumbs">
-            <a href="{{ $book->getUrl() }}" class="text-book text-button">@icon('book'){{ $book->getShortName() }}</a>
-            <span class="sep">&raquo;</span>
-            <a href="{{ $book->getUrl('/create-chapter')}}" class="text-button">@icon('add'){{ trans('entities.chapters_create') }}</a>
-        </div>
-    </div>
-@stop
-
 @section('body')
-
     <div class="container small">
-        <div class="card">
-            <h3>@icon('add') {{ trans('entities.chapters_create') }}</h3>
-            <div class="body">
-                <form action="{{ $book->getUrl('/create-chapter') }}" method="POST">
-                    @include('chapters/form')
-                </form>
-            </div>
+
+        <div class="my-l">
+            @include('partials.breadcrumbs', ['crumbs' => [
+                $book,
+                $book->getUrl('create-chapter') => trans('entities.chapters_create')
+            ]])
+        </div>
+
+        <div class="content-wrap card">
+            <h1 class="list-heading">{{ trans('entities.chapters_create') }}</h1>
+            <form action="{{ $book->getUrl('/create-chapter') }}" method="POST">
+                @include('chapters/form')
+            </form>
         </div>
-    </div>
 
+    </div>
 @stop
\ No newline at end of file

diff --git a/resources/views/chapters/edit.blade.php b/resources/views/chapters/edit.blade.php
index 04c5aa724e17be000bfe6397b033ba2ae5adac41..8bf22dbb9b30e9851fe52297ce8a6edf53dcd23c 100644 (file)
--- a/resources/views/chapters/edit.blade.php
+++ b/resources/views/chapters/edit.blade.php
@@ -1,24 +1,25 @@
 @extends('simple-layout')
 
-@section('toolbar')
-    <div class="col-sm-12 faded">
-        @include('chapters._breadcrumbs', ['chapter' => $chapter])
-    </div>
-@stop
-
 @section('body')
 
     <div class="container small">
-        <p>&nbsp;</p>
-        <div class="card">
-            <h3>@icon('edit') {{ trans('entities.chapters_edit') }}</h3>
-            <div class="body">
-                <form action="{{  $chapter->getUrl() }}" method="POST">
-                    <input type="hidden" name="_method" value="PUT">
-                    @include('chapters/form', ['model' => $chapter])
-                </form>
-            </div>
+
+        <div class="my-l">
+            @include('partials.breadcrumbs', ['crumbs' => [
+                $book,
+                $chapter,
+                $chapter->getUrl('/edit') => trans('entities.chapters_edit')
+            ]])
         </div>
+
+        <div class="content-wrap card">
+            <h1 class="list-heading">{{ trans('entities.chapters_edit') }}</h1>
+            <form action="{{  $chapter->getUrl() }}" method="POST">
+                <input type="hidden" name="_method" value="PUT">
+                @include('chapters/form', ['model' => $chapter])
+            </form>
+        </div>
+
     </div>
 
 @stop
\ No newline at end of file

diff --git a/resources/views/chapters/form.blade.php b/resources/views/chapters/form.blade.php
index fde46084449d31ec0fd732ad4d7043ee9fc6bedf..014caf2d3e99a3608e8e18479637141a80d598ad 100644 (file)
--- a/resources/views/chapters/form.blade.php
+++ b/resources/views/chapters/form.blade.php
@@ -22,5 +22,5 @@
 
 <div class="form-group text-right">
     <a href="{{ isset($chapter) ? $chapter->getUrl() : $book->getUrl() }}" class="button outline">{{ trans('common.cancel') }}</a>
-    <button type="submit" class="button pos">{{ trans('entities.chapters_save') }}</button>
+    <button type="submit" class="button primary">{{ trans('entities.chapters_save') }}</button>
 </div>

diff --git a/resources/views/chapters/restrictions.blade.php b/resources/views/chapters/restrictions.blade.php
index 70eb224ae6e68656b2c5c0505fadd3b174853d40..cf5fa1964caf2b0c1e57fce5581ede470e126639 100644 (file)
--- a/resources/views/chapters/restrictions.blade.php
+++ b/resources/views/chapters/restrictions.blade.php
@@ -13,7 +13,7 @@
         <div class="card">
             <h3>@icon('lock') {{ trans('entities.chapters_permissions') }}</h3>
             <div class="body">
-                @include('form/restriction-form', ['model' => $chapter])
+                @include('form.entity-permissions', ['model' => $chapter])
             </div>
         </div>
     </div>

diff --git a/resources/views/form/restriction-form.blade.php b/resources/views/form/entity-permissions.blade.php
similarity index 93%
rename from resources/views/form/restriction-form.blade.php
rename to resources/views/form/entity-permissions.blade.php
index c32fe005a087cb18384e8969e5300441b9e805a3..9dce0b59ed4b801df7829f641a47f610311b4fec 100644 (file)
--- a/resources/views/form/restriction-form.blade.php
+++ b/resources/views/form/entity-permissions.blade.php
@@ -8,7 +8,6 @@
         @include('form/checkbox', ['name' => 'restricted', 'label' => trans('entities.permissions_enable')])
     </div>
 
-
     <table class="table">
         <tr>
             <th>{{ trans('common.role') }}</th>
@@ -29,6 +28,6 @@
 
     <div class="text-right">
         <a href="{{ $model->getUrl() }}" class="button outline">{{ trans('common.cancel') }}</a>
-        <button type="submit" class="button pos">{{ trans('entities.permissions_save') }}</button>
+        <button type="submit" class="button primary">{{ trans('entities.permissions_save') }}</button>
     </div>
 </form>
\ No newline at end of file

diff --git a/resources/views/pages/restrictions.blade.php b/resources/views/pages/restrictions.blade.php
index a7a1e18b741eb9b2f33e474091b0f9de9da21496..2761123f6cc537e604d159d27f42e37944c2440b 100644 (file)
--- a/resources/views/pages/restrictions.blade.php
+++ b/resources/views/pages/restrictions.blade.php
@@ -12,7 +12,7 @@
         <div class="card">
             <h3>@icon('lock') {{ trans('entities.pages_permissions') }}</h3>
             <div class="body">
-                @include('form.restriction-form', ['model' => $page])
+                @include('form.entity-permissions', ['model' => $page])
             </div>
         </div>
     </div>

diff --git a/resources/views/shelves/restrictions.blade.php b/resources/views/shelves/restrictions.blade.php
index 472078ad2444cc07b9ae8582fb10e05894f33876..dbbff4bab22ce368a88ea92ee013bed3710e7cdd 100644 (file)
--- a/resources/views/shelves/restrictions.blade.php
+++ b/resources/views/shelves/restrictions.blade.php
@@ -13,7 +13,7 @@
         <div class="card">
             <h3>@icon('lock') {{ trans('entities.shelves_permissions') }}</h3>
             <div class="body">
-                @include('form/restriction-form', ['model' => $shelf])
+                @include('form.entity-permissions', ['model' => $shelf])
             </div>
         </div>
 

diff --git a/routes/web.php b/routes/web.php
index bfdd0e580d43c5e613988e5d175c76639b63513b..164dda4bde075a6b54542cea839af5d7d03693d7 100644 (file)
--- a/routes/web.php
+++ b/routes/web.php
@@ -40,8 +40,8 @@ Route::group(['middleware' => 'auth'], function () {
         Route::delete('/{id}', 'BookController@destroy');
         Route::get('/{slug}/sort-item', 'BookController@getSortItem');
         Route::get('/{slug}', 'BookController@show');
-        Route::get('/{bookSlug}/permissions', 'BookController@showRestrict');
-        Route::put('/{bookSlug}/permissions', 'BookController@restrict');
+        Route::get('/{bookSlug}/permissions', 'BookController@showPermissions');
+        Route::put('/{bookSlug}/permissions', 'BookController@permissions');
         Route::get('/{slug}/delete', 'BookController@showDelete');
         Route::get('/{bookSlug}/sort', 'BookController@sort');
         Route::put('/{bookSlug}/sort', 'BookController@saveSort');