From 5187d3fa7870548022a017fc65309c71e9a12b68 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 26 Aug 2017 14:36:48 +0100
Subject: [PATCH] Updated chapter views with new design

---
 resources/assets/sass/_buttons.scss           | 10 +++++
 resources/lang/en/entities.php                |  3 +-
 resources/views/books/restrictions.blade.php  |  3 +-
 resources/views/chapters/create.blade.php     | 26 ++++++++---
 resources/views/chapters/delete.blade.php     | 44 ++++++++++---------
 resources/views/chapters/edit.blade.php       | 25 ++++++++---
 resources/views/chapters/form.blade.php       |  4 +-
 resources/views/chapters/move.blade.php       | 43 ++++++++++--------
 .../views/chapters/restrictions.blade.php     | 27 ++++++------
 resources/views/chapters/show.blade.php       | 28 ++++++------
 10 files changed, 128 insertions(+), 85 deletions(-)

diff --git a/resources/assets/sass/_buttons.scss b/resources/assets/sass/_buttons.scss
index c07e6a37a..f9c6d9b9a 100644
--- a/resources/assets/sass/_buttons.scss
+++ b/resources/assets/sass/_buttons.scss
@@ -3,6 +3,8 @@
   background-color: $backgroundColor;
   color: $textColor;
   text-transform: uppercase;
+  border: 1px solid $backgroundColor;
+  vertical-align: top;
   &:hover {
     background-color: lighten($backgroundColor, 8%);
     //box-shadow: $bs-med;
@@ -83,6 +85,14 @@ $button-border-radius: 2px;
       color: #FFF;
     }
   }
+  &.book {
+    border-color: $color-book;
+    color: $color-book;
+    &:hover, &:focus, &:active {
+      background-color: $color-book;
+      color: #FFF;
+    }
+  }
 }
 
 .text-button {
diff --git a/resources/lang/en/entities.php b/resources/lang/en/entities.php
index 5b76559ea..76555fee4 100644
--- a/resources/lang/en/entities.php
+++ b/resources/lang/en/entities.php
@@ -110,8 +110,7 @@ return [
     'chapters_create' => 'Create New Chapter',
     'chapters_delete' => 'Delete Chapter',
     'chapters_delete_named' => 'Delete Chapter :chapterName',
-    'chapters_delete_explain' => 'This will delete the chapter with the name \':chapterName\', All pages will be removed
-        and added directly to the parent book.',
+    'chapters_delete_explain' => 'This will delete the chapter with the name \':chapterName\'. All pages will be removed and added directly to the parent book.',
     'chapters_delete_confirm' => 'Are you sure you want to delete this chapter?',
     'chapters_edit' => 'Edit Chapter',
     'chapters_edit_named' => 'Edit Chapter :chapterName',
diff --git a/resources/views/books/restrictions.blade.php b/resources/views/books/restrictions.blade.php
index f87625a67..5c7604c86 100644
--- a/resources/views/books/restrictions.blade.php
+++ b/resources/views/books/restrictions.blade.php
@@ -9,8 +9,9 @@
 @section('body')
 
     <div class="container" ng-non-bindable>
+        <p>&nbsp;</p>
         <div class="card">
-            <h3>{{ trans('entities.books_permissions') }}</h3>
+            <h3><i class="zmdi zmdi-lock-outline"></i> {{ trans('entities.books_permissions') }}</h3>
             <div class="body">
                 @include('form/restriction-form', ['model' => $book])
             </div>
diff --git a/resources/views/chapters/create.blade.php b/resources/views/chapters/create.blade.php
index afdbfa99d..8b2e2f667 100644
--- a/resources/views/chapters/create.blade.php
+++ b/resources/views/chapters/create.blade.php
@@ -1,12 +1,26 @@
-@extends('base')
+@extends('simple-layout')
 
-@section('content')
+@section('toolbar')
+    <div class="col-sm-12 faded">
+        <div class="breadcrumbs">
+            <a href="{{$book->getUrl()}}" class="text-book text-button"><i class="zmdi zmdi-book"></i>{{ $book->getShortName() }}</a>
+            <span class="sep">&raquo;</span>
+            <a href="{{ baseUrl('/books/chapter/create') }}" class="text-button"><i class="zmdi zmdi-plus"></i>{{ trans('entities.chapters_create') }}</a>
+        </div>
+    </div>
+@stop
+
+@section('body')
 
     <div class="container small" ng-non-bindable>
-        <h1>{{ trans('entities.chapters_create') }}</h1>
-        <form action="{{ $book->getUrl('/chapter/create') }}" method="POST">
-            @include('chapters/form')
-        </form>
+        <div class="card">
+            <h3><i class="zmdi zmdi-plus"></i> {{ trans('entities.chapters_create') }}</h3>
+            <div class="body">
+                <form action="{{ $book->getUrl('/chapter/create') }}" method="POST">
+                    @include('chapters/form')
+                </form>
+            </div>
+        </div>
     </div>
 
 @stop
\ No newline at end of file
diff --git a/resources/views/chapters/delete.blade.php b/resources/views/chapters/delete.blade.php
index bacb8dca3..3ea64044a 100644
--- a/resources/views/chapters/delete.blade.php
+++ b/resources/views/chapters/delete.blade.php
@@ -1,28 +1,30 @@
-@extends('base')
+@extends('simple-layout')
 
-@section('content')
+@section('toolbar')
+    <div class="col-sm-12 faded">
+        @include('chapters._breadcrumbs', ['chapter' => $chapter])
+    </div>
+@stop
 
-    <div class="faded-small toolbar">
-        <div class="container">
-            <div class="row">
-                <div class="col-sm-12 faded">
-                    @include('chapters._breadcrumbs', ['chapter' => $chapter])
-                </div>
+@section('body')
+
+    <div class="container small" ng-non-bindable>
+        <p>&nbsp;</p>
+        <div class="card">
+            <h3><i class="zmdi zmdi-delete"></i> {{ trans('entities.chapters_delete') }}</h3>
+
+            <div class="body">
+                <p>{{ trans('entities.chapters_delete_explain', ['chapterName' => $chapter->name]) }}</p>
+                <p class="text-neg">{{ trans('entities.chapters_delete_confirm') }}</p>
+
+                <form action="{{ $chapter->getUrl() }}" method="POST">
+                    {!! csrf_field() !!}
+                    <input type="hidden" name="_method" value="DELETE">
+                    <a href="{{ $chapter->getUrl() }}" class="button outline">{{ trans('common.cancel') }}</a>
+                    <button type="submit" class="button neg">{{ trans('common.confirm') }}</button>
+                </form>
             </div>
         </div>
     </div>
 
-    <div class="container small" ng-non-bindable>
-        <h1>{{ trans('entities.chapters_delete') }}</h1>
-        <p>{{ trans('entities.chapters_delete_explain', ['chapterName' => $chapter->name]) }}</p>
-        <p class="text-neg">{{ trans('entities.chapters_delete_confirm') }}</p>
-
-        <form action="{{ $chapter->getUrl() }}" method="POST">
-            {!! csrf_field() !!}
-            <input type="hidden" name="_method" value="DELETE">
-            <a href="{{ $chapter->getUrl() }}" class="button primary">{{ trans('common.cancel') }}</a>
-            <button type="submit" class="button neg">{{ trans('common.confirm') }}</button>
-        </form>
-    </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 272543e67..b97be6831 100644
--- a/resources/views/chapters/edit.blade.php
+++ b/resources/views/chapters/edit.blade.php
@@ -1,13 +1,24 @@
-@extends('base')
+@extends('simple-layout')
 
-@section('content')
+@section('toolbar')
+    <div class="col-sm-12 faded">
+        @include('chapters._breadcrumbs', ['chapter' => $chapter])
+    </div>
+@stop
+
+@section('body')
 
     <div class="container small" ng-non-bindable>
-        <h1>{{ trans('entities.chapters_edit') }}</h1>
-        <form action="{{  $chapter->getUrl() }}" method="POST">
-            <input type="hidden" name="_method" value="PUT">
-            @include('chapters/form', ['model' => $chapter])
-        </form>
+        <p>&nbsp;</p>
+        <div class="card">
+            <h3><i class="zmdi zmdi-edit"></i> {{ 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>
     </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 54722a58a..9e3b8e472 100644
--- a/resources/views/chapters/form.blade.php
+++ b/resources/views/chapters/form.blade.php
@@ -11,7 +11,7 @@
     @include('form/textarea', ['name' => 'description'])
 </div>
 
-<div class="form-group">
-    <a href="{{ back()->getTargetUrl() }}" class="button muted">{{ trans('common.cancel') }}</a>
+<div class="form-group text-right">
+    <a href="{{ back()->getTargetUrl() }}" class="button outline">{{ trans('common.cancel') }}</a>
     <button type="submit" class="button pos">{{ trans('entities.chapters_save') }}</button>
 </div>
diff --git a/resources/views/chapters/move.blade.php b/resources/views/chapters/move.blade.php
index 9e6ddb521..a656c4fae 100644
--- a/resources/views/chapters/move.blade.php
+++ b/resources/views/chapters/move.blade.php
@@ -1,29 +1,34 @@
-@extends('base')
+@extends('simple-layout')
 
-@section('content')
-
-    <div class="faded-small toolbar">
-        <div class="container">
-            <div class="row">
-                <div class="col-sm-12 faded">
-                    @include('chapters._breadcrumbs', ['chapter' => $chapter])
-                </div>
-            </div>
-        </div>
+@section('toolbar')
+    <div class="col-sm-12 faded">
+        @include('chapters._breadcrumbs', ['chapter' => $chapter])
     </div>
+@stop
+
+@section('body')
 
     <div class="container">
-        <h1>{{ trans('entities.chapters_move') }}</h1>
 
-        <form action="{{ $chapter->getUrl('/move') }}" method="POST">
-            {!! csrf_field() !!}
-            <input type="hidden" name="_method" value="PUT">
+        <div class="card">
+            <h3><i class="zmdi zmdi-folder"></i> {{ trans('entities.chapters_move') }}</h3>
+            <div class="body">
+                <form action="{{ $chapter->getUrl('/move') }}" method="POST">
+                    {!! csrf_field() !!}
+                    <input type="hidden" name="_method" value="PUT">
+
+                    @include('components.entity-selector', ['name' => 'entity_selection', 'selectorSize' => 'large', 'entityTypes' => 'book'])
+
+                    <div class="form-group text-right">
+                        <a href="{{ $chapter->getUrl() }}" class="button outline">{{ trans('common.cancel') }}</a>
+                        <button type="submit" class="button pos">{{ trans('entities.chapters_move') }}</button>
+                    </div>
+                </form>
+            </div>
+        </div>
+
 
-            @include('components.entity-selector', ['name' => 'entity_selection', 'selectorSize' => 'large', 'entityTypes' => 'book'])
 
-            <a href="{{ $chapter->getUrl() }}" class="button muted">{{ trans('common.cancel') }}</a>
-            <button type="submit" class="button pos">{{ trans('entities.chapters_move') }}</button>
-        </form>
     </div>
 
 @stop
diff --git a/resources/views/chapters/restrictions.blade.php b/resources/views/chapters/restrictions.blade.php
index 7b908ee15..c2981c68a 100644
--- a/resources/views/chapters/restrictions.blade.php
+++ b/resources/views/chapters/restrictions.blade.php
@@ -1,20 +1,21 @@
-@extends('base')
+@extends('simple-layout')
 
-@section('content')
+@section('toolbar')
+    <div class="col-sm-12 faded">
+        @include('chapters._breadcrumbs', ['chapter' => $chapter])
+    </div>
+@stop
 
-    <div class="faded-small toolbar">
-        <div class="container">
-            <div class="row">
-                <div class="col-sm-12 faded">
-                    @include('chapters._breadcrumbs', ['chapter' => $chapter])
-                </div>
+@section('body')
+
+    <div class="container" ng-non-bindable>
+        <p>&nbsp;</p>
+        <div class="card">
+            <h3><i class="zmdi zmdi-lock-outline"></i> {{ trans('entities.chapters_permissions') }}</h3>
+            <div class="body">
+                @include('form/restriction-form', ['model' => $chapter])
             </div>
         </div>
     </div>
 
-    <div class="container" ng-non-bindable>
-        <h1>{{ trans('entities.chapters_permissions') }}</h1>
-        @include('form/restriction-form', ['model' => $chapter])
-    </div>
-
 @stop
diff --git a/resources/views/chapters/show.blade.php b/resources/views/chapters/show.blade.php
index 701084280..ac2dbfffd 100644
--- a/resources/views/chapters/show.blade.php
+++ b/resources/views/chapters/show.blade.php
@@ -110,20 +110,20 @@
                     @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>
-                <hr>
+                <div class="well">
+                    <p class="text-muted italic">{{ trans('entities.chapters_empty') }}</p>
+                    <p>
+                        @if(userCan('page-create', $chapter))
+                            <a href="{{ $chapter->getUrl('/create-page') }}" class="button outline 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="button outline book"><i class="zmdi zmdi-book"></i>{{ trans('entities.books_empty_sort_current_book') }}</a>
+                        @endif
+                    </p>
+                </div>
             @endif
         </div>