Merge branch 'master' of git://github.com/BookStackApp/BookStack into BookStackApp...

Conflicts:
	app/Http/Controllers/BookController.php
	resources/lang/en/common.php
	resources/views/books/create.blade.php
	resources/views/books/form.blade.php
	resources/views/books/index.blade.php
	resources/views/users/edit.blade.php
	tests/Entity/EntityTest.php

diff --cc app/Http/Controllers/BookController.php
Simple merge

diff --cc resources/assets/js/global.js
Simple merge

diff --cc resources/assets/sass/styles.scss
Simple merge

diff --cc resources/lang/en/common.php
index 9f35ddac7ed50f9f1704b2230121bcda7882e17c,06b98097072c61f8b704370f19b8150b15b655c5..8af2e4b2c0ccaa19331dc85e7a045e0cff509e7a
--- 1/resources/lang/en/common.php
--- 2/resources/lang/en/common.php
+++ b/resources/lang/en/common.php
@@@ -45,8 -44,8 +45,8 @@@ return 
      'no_items' => 'No items available',
      'back_to_top' => 'Back to top',
      'toggle_details' => 'Toggle Details',
- 
 +    'toggle_thumbnails' => 'Toggle Thumbnails',
 -
+     'details' => 'Details',
      /**
       * Header
       */

diff --cc resources/lang/en/settings.php
Simple merge

diff --cc resources/views/books/create.blade.php
index 4d1edf78bf4cfa204bc19d73e92b2fa55011fbb5,385e6b9d7a4e868f4a5b42acf4585c287068c8cd..4798459c21672b2068ecb1d2bb63c5ac932da595
--- 1/resources/views/books/create.blade.php
--- 2/resources/views/books/create.blade.php
+++ b/resources/views/books/create.blade.php
@@@ -1,13 -1,27 +1,28 @@@
- @extends('base')
+ @extends('simple-layout')
  
- @section('content')
+ @section('toolbar')
+     <div class="col-sm-8 faded">
+         <div class="breadcrumbs">
+             <a href="{{ baseUrl('/books') }}" class="text-button"><i class="zmdi zmdi-book"></i>{{ trans('entities.books') }}</a>
+             <span class="sep">&raquo;</span>
+             <a href="{{ baseUrl('/books/create') }}" class="text-button"><i class="zmdi zmdi-plus"></i>{{ trans('entities.books_create') }}</a>
+         </div>
+     </div>
+ @stop
  
- <div class="container small" ng-non-bindable>
-     <h1>{{ trans('entities.books_create') }}</h1>
-     <form action="{{ baseUrl("/books") }}" method="POST" enctype="multipart/form-data">
-         @include('books/form')
-     </form>
+ @section('body')
+ 
+ <div ng-non-bindable class="container small">
+     <p>&nbsp;</p>
+     <div class="card">
+         <h3><i class="zmdi zmdi-plus"></i> {{ trans('entities.books_create') }}</h3>
+         <div class="body">
 -            <form action="{{ baseUrl("/books") }}" method="POST">
++            <form action="{{ baseUrl("/books") }}" method="POST" enctype="multipart/form-data">
+                 @include('books/form')
+             </form>
+         </div>
+     </div>
  </div>
 -
 +<p class="margin-top large"><br></p>
 +    @include('components.image-manager', ['imageType' => 'cover'])
  @stop

diff --cc resources/views/books/edit.blade.php
index 322f3d7001d54bf55e83ed1cf37ad9d817802f3a,9d9c54fec6e521e909c6e5ce159c640c975dc3e5..6bf285f95f2f8fcbe2c76499370eec2e860f046f
--- 1/resources/views/books/edit.blade.php
--- 2/resources/views/books/edit.blade.php
+++ b/resources/views/books/edit.blade.php
@@@ -1,23 -1,24 +1,24 @@@
- @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('books._breadcrumbs', ['book' => $book])
-                 </div>
-             </div>
-         </div>
+ @section('toolbar')
+     <div class="col-sm-12 faded">
+         @include('books._breadcrumbs', ['book' => $book])
      </div>
+ @stop
+ 
+ @section('body')
  
      <div class="container small" ng-non-bindable>
-         <h1>{{ trans('entities.books_edit') }}</h1>
-         <form action="{{ $book->getUrl() }}" method="POST">
-             <input type="hidden" name="_method" value="PUT">
-             @include('books/form', ['model' => $book])
-         </form>
+         <p>&nbsp;</p>
+         <div class="card">
+             <h3><i class="zmdi zmdi-edit"></i> {{ trans('entities.books_edit') }}</h3>
+             <div class="body">
+                 <form action="{{ $book->getUrl() }}" method="POST">
+                     <input type="hidden" name="_method" value="PUT">
+                     @include('books/form', ['model' => $book])
+                 </form>
+             </div>
+         </div>
      </div>
 -
 +@include('components.image-manager', ['imageType' => 'cover'])
  @stop

diff --cc resources/views/books/form.blade.php
index e26edac4b8881da26ff2874e03dcbfb102101272,84a30e7e9982a40e7e0c5ecfe9c1bf752c9693b3..fc30093d2e05fc6e5d0b553a5ba74fb38c2be264
--- 1/resources/views/books/form.blade.php
--- 2/resources/views/books/form.blade.php
+++ b/resources/views/books/form.blade.php
@@@ -9,22 -9,8 +9,23 @@@
      <label for="description">{{ trans('common.description') }}</label>
      @include('form/textarea', ['name' => 'description'])
  </div>
- <div class="form-group">
-     <a href="{{ isset($book) ? $book->getUrl() : baseUrl('/books') }}" class="button muted">{{ trans('common.cancel') }}</a>
 +<div class="form-group" id="logo-control">
 +        <label for="user-avatar">{{ trans('common.cover_image') }}</label>
 +        <p class="small">{{ trans('common.cover_image_description') }}</p>
 +
 +        @include('components.image-picker', [
 +            'resizeHeight' => '192',
 +            'resizeWidth' => '120',
 +            'showRemove' => true,
 +            'defaultImage' => baseUrl('/default.png'),
 +            'currentImage' => @isset($model) ? $model->getBookCover(80) : baseUrl('/default.png') ,
 +            'currentId' => @isset($model) ? $model->image : 0,
 +            'name' => 'image',
 +            'imageClass' => 'cover'
 +        ])
 +</div>
+ 
+ <div class="form-group text-right">
+     <a href="{{ isset($book) ? $book->getUrl() : baseUrl('/books') }}" class="button outline">{{ trans('common.cancel') }}</a>
      <button type="submit" class="button pos">{{ trans('entities.books_save') }}</button>
  </div>

diff --cc resources/views/users/edit.blade.php
index c15e34974666346447ee533e5bfa60dc349ddffc,f860d12fd96a27dbb110f1a6705b9966f99a6e98..fc75593b824b7221e869437727c59768a1d42d46
--- 1/resources/views/users/edit.blade.php
--- 2/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@@ -90,4 -87,4 +87,4 @@@
  
      <p class="margin-top large"><br></p>
      @include('components.image-manager', ['imageType' => 'user'])
--@stop
++@stop