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')
+

 

-

{{ trans('entities.books_permissions') }}

+

{{ trans('entities.books_permissions') }}

@include('form/restriction-form', ['model' => $book])
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') + +@stop + +@section('body')
-

{{ trans('entities.chapters_create') }}

-
- @include('chapters/form') -
+
+

{{ trans('entities.chapters_create') }}

+
+
+ @include('chapters/form') +
+
+
@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') +
+ @include('chapters._breadcrumbs', ['chapter' => $chapter]) +
+@stop -
-
-
-
- @include('chapters._breadcrumbs', ['chapter' => $chapter]) -
+@section('body') + +
+

 

+
+

{{ trans('entities.chapters_delete') }}

+ +
+

{{ trans('entities.chapters_delete_explain', ['chapterName' => $chapter->name]) }}

+

{{ trans('entities.chapters_delete_confirm') }}

+ +
+ {!! csrf_field() !!} + + {{ trans('common.cancel') }} + +
-
-

{{ trans('entities.chapters_delete') }}

-

{{ trans('entities.chapters_delete_explain', ['chapterName' => $chapter->name]) }}

-

{{ trans('entities.chapters_delete_confirm') }}

- -
- {!! csrf_field() !!} - - {{ trans('common.cancel') }} - -
-
- @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') +
+ @include('chapters._breadcrumbs', ['chapter' => $chapter]) +
+@stop + +@section('body')
-

{{ trans('entities.chapters_edit') }}

-
- - @include('chapters/form', ['model' => $chapter]) -
+

 

+
+

{{ trans('entities.chapters_edit') }}

+
+
+ + @include('chapters/form', ['model' => $chapter]) +
+
+
@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'])
-
- {{ trans('common.cancel') }} +
+ {{ trans('common.cancel') }}
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') - -
-
-
-
- @include('chapters._breadcrumbs', ['chapter' => $chapter]) -
-
-
+@section('toolbar') +
+ @include('chapters._breadcrumbs', ['chapter' => $chapter])
+@stop + +@section('body')
-

{{ trans('entities.chapters_move') }}

-
- {!! csrf_field() !!} - +
+

{{ trans('entities.chapters_move') }}

+
+ + {!! csrf_field() !!} + + + @include('components.entity-selector', ['name' => 'entity_selection', 'selectorSize' => 'large', 'entityTypes' => 'book']) + +
+ {{ trans('common.cancel') }} + +
+ +
+
+ - @include('components.entity-selector', ['name' => 'entity_selection', 'selectorSize' => 'large', 'entityTypes' => 'book']) - {{ trans('common.cancel') }} - -
@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') +
+ @include('chapters._breadcrumbs', ['chapter' => $chapter]) +
+@stop -
-
-
-
- @include('chapters._breadcrumbs', ['chapter' => $chapter]) -
+@section('body') + +
+

 

+
+

{{ trans('entities.chapters_permissions') }}

+
+ @include('form/restriction-form', ['model' => $chapter])
-
-

{{ trans('entities.chapters_permissions') }}

- @include('form/restriction-form', ['model' => $chapter]) -
- @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
@else -
-

{{ trans('entities.chapters_empty') }}

-

- @if(userCan('page-create', $chapter)) - {{ trans('entities.books_empty_create_page') }} - @endif - @if(userCan('page-create', $chapter) && userCan('book-update', $book)) -   -{{ trans('entities.books_empty_or') }}-    - @endif - @if(userCan('book-update', $book)) - {{ trans('entities.books_empty_sort_current_book') }} - @endif -

-
+
+

{{ trans('entities.chapters_empty') }}

+

+ @if(userCan('page-create', $chapter)) + {{ trans('entities.books_empty_create_page') }} + @endif + @if(userCan('page-create', $chapter) && userCan('book-update', $book)) +   -{{ trans('entities.books_empty_or') }}-     + @endif + @if(userCan('book-update', $book)) + {{ trans('entities.books_empty_sort_current_book') }} + @endif +

+
@endif