From 844976c85bd9816b5427090b732eda5d32227c47 Mon Sep 17 00:00:00 2001 From: Abijeet Date: Wed, 12 Jul 2017 11:40:50 +0530 Subject: [PATCH] Revert "Revert "Bookstack grid view."" --- app/Book.php | 20 ++++++++- app/Http/Controllers/BookController.php | 10 ++--- app/User.php | 2 +- ...7_07_05_102650_add_cover_image_display.php | 40 ++++++++++++++++++ public/default.png | Bin 0 -> 3338 bytes resources/assets/js/global.js | 7 +++ resources/assets/sass/styles.scss | 29 ++++++++++++- resources/lang/de/common.php | 3 +- resources/lang/de/settings.php | 1 + resources/lang/en/common.php | 2 + resources/lang/en/settings.php | 1 + resources/lang/es/common.php | 3 +- resources/lang/es/settings.php | 1 + resources/lang/fr/common.php | 3 +- resources/lang/fr/settings.php | 1 + resources/lang/nl/common.php | 3 +- resources/lang/nl/settings.php | 1 + resources/lang/pt_BR/common.php | 3 +- resources/lang/pt_BR/settings.php | 1 + resources/lang/sk/common.php | 3 +- resources/lang/sk/settings.php | 1 + resources/views/books/create.blade.php | 5 ++- resources/views/books/edit.blade.php | 2 +- resources/views/books/form.blade.php | 14 ++++++ resources/views/books/grid-item.blade.php | 15 +++++++ resources/views/books/index.blade.php | 30 ++++++++----- resources/views/users/edit.blade.php | 7 +++ 27 files changed, 179 insertions(+), 29 deletions(-) create mode 100644 database/migrations/2017_07_05_102650_add_cover_image_display.php create mode 100644 public/default.png create mode 100644 resources/views/books/grid-item.blade.php diff --git a/app/Book.php b/app/Book.php index 06c00945d..b4cafd65b 100644 --- a/app/Book.php +++ b/app/Book.php @@ -3,7 +3,7 @@ class Book extends Entity { - protected $fillable = ['name', 'description']; + protected $fillable = ['name', 'description', 'image']; /** * Get the url for this book. @@ -18,6 +18,24 @@ class Book extends Entity return baseUrl('/books/' . urlencode($this->slug)); } + public function getBookCover($size = 120) + { + $default = baseUrl('/default.png'); + $image = $this->image; + if ($image === 0 || $image === '0' || $image === null) + return $default; + try { + $cover = $this->cover ? baseUrl($this->cover->getThumb(120, 192, false)) : $default; + } catch (\Exception $err) { + $cover = $default; + } + return $cover; + } + + public function cover() + { + return $this->belongsTo(Image::class, 'image'); + } /* * Get the edit url for this book. * @return string diff --git a/app/Http/Controllers/BookController.php b/app/Http/Controllers/BookController.php index 4313a4e20..eecb7839f 100644 --- a/app/Http/Controllers/BookController.php +++ b/app/Http/Controllers/BookController.php @@ -39,9 +39,9 @@ class BookController extends Controller $books = $this->entityRepo->getAllPaginated('book', 16); $recents = $this->signedIn ? $this->entityRepo->getRecentlyViewed('book', 4, 0) : false; $popular = $this->entityRepo->getPopular('book', 3, 0); - $display = $this->currentUser->display; + $books_display = $this->currentUser->books_display; $this->setPageTitle('Books'); - return view('books/index', ['books' => $books, 'recents' => $recents, 'popular' => $popular, 'display' => $display]); //added displaly to access user display + return view('books/index', ['books' => $books, 'recents' => $recents, 'popular' => $popular, 'books_display' => $books_display] ); } /** @@ -115,9 +115,9 @@ class BookController extends Controller 'name' => 'required|string|max:255', 'description' => 'string|max:1000' ]); - $book = $this->entityRepo->updateFromInput('book', $book, $request->all()); - Activity::add($book, 'book_update', $book->id); - return redirect($book->getUrl()); + $book = $this->entityRepo->updateFromInput('book', $book, $request->all()); + Activity::add($book, 'book_update', $book->id); + return redirect($book->getUrl()); } /** diff --git a/app/User.php b/app/User.php index 8033557e4..703322cbd 100644 --- a/app/User.php +++ b/app/User.php @@ -22,7 +22,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon * The attributes that are mass assignable. * @var array */ - protected $fillable = ['name', 'email', 'image_id']; + protected $fillable = ['name', 'email', 'image_id', 'books_display' ]; /** * The attributes excluded from the model's JSON form. diff --git a/database/migrations/2017_07_05_102650_add_cover_image_display.php b/database/migrations/2017_07_05_102650_add_cover_image_display.php new file mode 100644 index 000000000..396112744 --- /dev/null +++ b/database/migrations/2017_07_05_102650_add_cover_image_display.php @@ -0,0 +1,40 @@ +string('books_display',10)->default('grid'); + }); + + Schema::table('books', function (Blueprint $table) { + $table->integer('image'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('users', function (Blueprint $table) { + $table->dropColumn('books_display'); + }); + + Schema::table('books', function (Blueprint $table) { + $table->dropColumn('image'); + }); + } +} diff --git a/public/default.png b/public/default.png new file mode 100644 index 0000000000000000000000000000000000000000..1d7b737e7da36a919d9d389cbd980938cfae2435 GIT binary patch literal 3338 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 bn=^=B?2Oq~axR;Jfq}u()z4*}Q$iB}wBXCo literal 0 HcmV?d00001 diff --git a/resources/assets/js/global.js b/resources/assets/js/global.js index 2ef062a5b..bd55777e8 100644 --- a/resources/assets/js/global.js +++ b/resources/assets/js/global.js @@ -154,6 +154,13 @@ $('[data-action="expand-entity-list-details"]').click(function() { $('.entity-list.compact').find('p').not('.empty-text').slideToggle(240); }); +// Toggle thumbnails +$(document).ready(function(){ + $('[data-action="expand-thumbnail"]').click(function(){ + $('.galleryItem').toggleClass("collapse").find('img').slideToggle(50); + }); +}); + // Popup close $('.popup-close').click(function() { $(this).closest('.overlay').fadeOut(240); diff --git a/resources/assets/sass/styles.scss b/resources/assets/sass/styles.scss index afb9d531b..aa3ac1069 100644 --- a/resources/assets/sass/styles.scss +++ b/resources/assets/sass/styles.scss @@ -63,6 +63,11 @@ body.dragging, body.dragging * { &.square { border-radius: 3px; } + &.cover { + height: 192px; + width: 120px; + border-radius: 3px; + } } // System wide notifications @@ -274,5 +279,25 @@ $btt-size: 40px; } } - - +.galleryItem { + margin-bottom: 32px; + height: 330px; + overflow: hidden; + border: 1px solid #9e9e9e; + h3 { + font-size: 1.2em; + text-align: center; + } + p { + font-size: 0.8em; + text-align: center; + } + img { + height: 192px; + width: 120px; + margin-top: 5%; + } + &.collapse { + height: 130px; + } +} diff --git a/resources/lang/de/common.php b/resources/lang/de/common.php index 7ad1743a0..c3ee51abb 100644 --- a/resources/lang/de/common.php +++ b/resources/lang/de/common.php @@ -17,6 +17,7 @@ return [ 'name' => 'Name', 'description' => 'Beschreibung', 'role' => 'Rolle', + 'cover_image' => 'Titelbild', /** * Actions @@ -43,7 +44,7 @@ return [ 'no_items' => 'Keine Einträge gefunden.', 'back_to_top' => 'nach oben', 'toggle_details' => 'Details zeigen/verstecken', - + 'toggle_thumbnails' => 'Thumbnails zeigen/verstecken', /** * Header */ diff --git a/resources/lang/de/settings.php b/resources/lang/de/settings.php index 668eecf33..21d65321f 100644 --- a/resources/lang/de/settings.php +++ b/resources/lang/de/settings.php @@ -91,6 +91,7 @@ return [ 'users_external_auth_id' => 'Externe Authentifizierungs-ID', 'users_password_warning' => 'Füllen Sie die folgenden Felder nur aus, wenn Sie Ihr Passwort ändern möchten:', 'users_system_public' => 'Dieser Benutzer repräsentiert alle Gast-Benutzer, die diese Seite betrachten. Er kann nicht zum Anmelden benutzt werden, sondern wird automatisch zugeordnet.', + 'users_books_display_type' => 'Wählen Sie die Art der Ansicht aus', 'users_delete' => 'Benutzer löschen', 'users_delete_named' => 'Benutzer :userName löschen', 'users_delete_warning' => 'Sie möchten den Benutzer \':userName\' gänzlich aus dem System löschen.', diff --git a/resources/lang/en/common.php b/resources/lang/en/common.php index e1d74c95e..c05cfa56c 100644 --- a/resources/lang/en/common.php +++ b/resources/lang/en/common.php @@ -17,6 +17,7 @@ return [ 'name' => 'Name', 'description' => 'Description', 'role' => 'Role', + 'cover_image' => 'Cover image', /** * Actions @@ -44,6 +45,7 @@ return [ 'no_items' => 'No items available', 'back_to_top' => 'Back to top', 'toggle_details' => 'Toggle Details', + 'toggle_thumbnails' => 'Toggle Thumbnails', /** * Header diff --git a/resources/lang/en/settings.php b/resources/lang/en/settings.php index 4529b1978..732b64c42 100644 --- a/resources/lang/en/settings.php +++ b/resources/lang/en/settings.php @@ -91,6 +91,7 @@ return [ 'users_external_auth_id' => 'External Authentication ID', 'users_password_warning' => 'Only fill the below if you would like to change your password:', 'users_system_public' => 'This user represents any guest users that visit your instance. It cannot be used to log in but is assigned automatically.', + 'users_books_display_type' => 'Select the type of view', 'users_delete' => 'Delete User', 'users_delete_named' => 'Delete user :userName', 'users_delete_warning' => 'This will fully delete this user with the name \':userName\' from the system.', diff --git a/resources/lang/es/common.php b/resources/lang/es/common.php index 3a62a2177..9a8fafc95 100644 --- a/resources/lang/es/common.php +++ b/resources/lang/es/common.php @@ -17,7 +17,7 @@ return [ 'name' => 'Nombre', 'description' => 'Descripción', 'role' => 'Rol', - + 'cover_image' => 'Imagen de portada', /** * Actions */ @@ -43,6 +43,7 @@ return [ 'no_items' => 'No hay items disponibles', 'back_to_top' => 'Volver arriba', 'toggle_details' => 'Alternar detalles', + 'toggle_thumbnails' => 'Alternar miniaturas', /** * Header diff --git a/resources/lang/es/settings.php b/resources/lang/es/settings.php index cd6a8b8d9..90bb0db2c 100644 --- a/resources/lang/es/settings.php +++ b/resources/lang/es/settings.php @@ -91,6 +91,7 @@ return [ 'users_external_auth_id' => 'ID externo de autenticación', 'users_password_warning' => 'Solo rellene a continuación si desea cambiar su password:', 'users_system_public' => 'Este usuario representa cualquier usuario invitado que visita la aplicación. No puede utilizarse para hacer login sio que es asignado automáticamente.', + 'users_books_display_type' => 'Seleccione el tipo de vista', 'users_delete' => 'Borrar usuario', 'users_delete_named' => 'Borrar usuario :userName', 'users_delete_warning' => 'Se borrará completamente el usuario con el nombre \':userName\' del sistema.', diff --git a/resources/lang/fr/common.php b/resources/lang/fr/common.php index 5eb4b8fa8..fe8bb761a 100644 --- a/resources/lang/fr/common.php +++ b/resources/lang/fr/common.php @@ -17,7 +17,7 @@ return [ 'name' => 'Nom', 'description' => 'Description', 'role' => 'Rôle', - + 'cover_image' => 'Image de couverture', /** * Actions */ @@ -43,6 +43,7 @@ return [ 'no_items' => 'Aucun élément', 'back_to_top' => 'Retour en haut', 'toggle_details' => 'Afficher les détails', + 'toggle_thumbnails' => 'Afficher les vignettes', /** * Header diff --git a/resources/lang/fr/settings.php b/resources/lang/fr/settings.php index 8a3756527..288c56d5a 100644 --- a/resources/lang/fr/settings.php +++ b/resources/lang/fr/settings.php @@ -91,6 +91,7 @@ return [ 'users_external_auth_id' => 'Identifiant d\'authentification externe', 'users_password_warning' => 'Remplissez ce fomulaire uniquement si vous souhaitez changer de mot de passe:', 'users_system_public' => 'Cet utilisateur représente les invités visitant votre instance. Il est assigné automatiquement aux invités.', + 'users_books_display_type' => 'Sélectionnez le type de vue', 'users_delete' => 'Supprimer un utilisateur', 'users_delete_named' => 'Supprimer l\'utilisateur :userName', 'users_delete_warning' => 'Ceci va supprimer \':userName\' du système.', diff --git a/resources/lang/nl/common.php b/resources/lang/nl/common.php index bdde9eb95..a096c1d22 100644 --- a/resources/lang/nl/common.php +++ b/resources/lang/nl/common.php @@ -17,7 +17,7 @@ return [ 'name' => 'Naam', 'description' => 'Beschrijving', 'role' => 'Rol', - + 'cover_image' => 'Omslagfoto', /** * Actions */ @@ -43,6 +43,7 @@ return [ 'no_items' => 'Geen items beschikbaar', 'back_to_top' => 'Terug naar boven', 'toggle_details' => 'Details Weergeven', + 'toggle_thumbnails' => 'Thumbnails Weergeven', /** * Header diff --git a/resources/lang/nl/settings.php b/resources/lang/nl/settings.php index 7408a2dc3..7b2f94530 100644 --- a/resources/lang/nl/settings.php +++ b/resources/lang/nl/settings.php @@ -91,6 +91,7 @@ return [ 'users_external_auth_id' => 'External Authentication ID', 'users_password_warning' => 'Vul onderstaande formulier alleen in als je het wachtwoord wilt aanpassen:', 'users_system_public' => 'De eigenschappen van deze gebruiker worden voor elke gastbezoeker gebruikt. Er kan niet mee ingelogd worden en wordt automatisch toegewezen.', + 'users_books_display_type' => 'Selecteer het type weergave', 'users_delete' => 'Verwijder gebruiker', 'users_delete_named' => 'Verwijder gebruiker :userName', 'users_delete_warning' => 'Dit zal de gebruiker \':userName\' volledig uit het systeem verwijderen.', diff --git a/resources/lang/pt_BR/common.php b/resources/lang/pt_BR/common.php index 820ba219c..eba301929 100644 --- a/resources/lang/pt_BR/common.php +++ b/resources/lang/pt_BR/common.php @@ -17,7 +17,7 @@ return [ 'name' => 'Nome', 'description' => 'Descrição', 'role' => 'Regra', - + 'cover_image' => 'Imagem de capa', /** * Actions */ @@ -43,6 +43,7 @@ return [ 'no_items' => 'Nenhum item disponível', 'back_to_top' => 'Voltar ao topo', 'toggle_details' => 'Alternar Detalhes', + 'toggle_thumbnails' => 'Alternar Miniaturas', /** * Header diff --git a/resources/lang/pt_BR/settings.php b/resources/lang/pt_BR/settings.php index b8d062b5f..b46eda8df 100644 --- a/resources/lang/pt_BR/settings.php +++ b/resources/lang/pt_BR/settings.php @@ -91,6 +91,7 @@ return [ 'users_external_auth_id' => 'ID de Autenticação Externa', 'users_password_warning' => 'Preencha os dados abaixo caso queira modificar a sua senha:', 'users_system_public' => 'Esse usuário representa quaisquer convidados que visitam o aplicativo. Ele não pode ser usado para login.', + 'users_books_display_type' => 'Selecione o tipo de exibição', 'users_delete' => 'Excluir Usuário', 'users_delete_named' => 'Excluir :userName', 'users_delete_warning' => 'A ação vai excluir completamente o usuário de nome \':userName\' do sistema.', diff --git a/resources/lang/sk/common.php b/resources/lang/sk/common.php index 100981597..19ba665b5 100644 --- a/resources/lang/sk/common.php +++ b/resources/lang/sk/common.php @@ -17,7 +17,7 @@ return [ 'name' => 'Meno', 'description' => 'Popis', 'role' => 'Rola', - + 'cover_image' => 'Obal knihy', /** * Actions */ @@ -43,6 +43,7 @@ return [ 'no_items' => 'Žiadne položky nie sú dostupné', 'back_to_top' => 'Späť nahor', 'toggle_details' => 'Prepnúť detaily', + 'toggle_thumbnails' => 'Prepnúť náhľady', /** * Header diff --git a/resources/lang/sk/settings.php b/resources/lang/sk/settings.php index 643b4b8ff..1c745fcf8 100644 --- a/resources/lang/sk/settings.php +++ b/resources/lang/sk/settings.php @@ -91,6 +91,7 @@ return [ 'users_external_auth_id' => 'Externé autentifikačné ID', 'users_password_warning' => 'Pole nižšie vyplňte iba ak chcete zmeniť heslo:', 'users_system_public' => 'Tento účet reprezentuje každého hosťovského používateľa, ktorý navštívi Vašu inštanciu. Nedá sa pomocou neho prihlásiť a je priradený automaticky.', + 'users_books_display_type' => 'Vyberte typ zobrazenia', 'users_delete' => 'Zmazať používateľa', 'users_delete_named' => 'Zmazať používateľa :userName', 'users_delete_warning' => ' Toto úplne odstráni používateľa menom \':userName\' zo systému.', diff --git a/resources/views/books/create.blade.php b/resources/views/books/create.blade.php index 2c629e699..4d1edf78b 100644 --- a/resources/views/books/create.blade.php +++ b/resources/views/books/create.blade.php @@ -4,9 +4,10 @@

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

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


+ @include('components.image-manager', ['imageType' => 'cover']) @stop \ No newline at end of file diff --git a/resources/views/books/edit.blade.php b/resources/views/books/edit.blade.php index 2419b68da..322f3d700 100644 --- a/resources/views/books/edit.blade.php +++ b/resources/views/books/edit.blade.php @@ -19,5 +19,5 @@ @include('books/form', ['model' => $book]) - +@include('components.image-manager', ['imageType' => 'cover']) @stop \ No newline at end of file diff --git a/resources/views/books/form.blade.php b/resources/views/books/form.blade.php index b1484d129..34f5fd842 100644 --- a/resources/views/books/form.blade.php +++ b/resources/views/books/form.blade.php @@ -9,7 +9,21 @@ @include('form/textarea', ['name' => 'description']) +
+ +

{{ trans('common.cover_image_description') }}

+ @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' => 'avatar cover' + ]) +
{{ trans('common.cancel') }} diff --git a/resources/views/books/grid-item.blade.php b/resources/views/books/grid-item.blade.php new file mode 100644 index 000000000..d11a66eac --- /dev/null +++ b/resources/views/books/grid-item.blade.php @@ -0,0 +1,15 @@ +
+
+

+ {{$book->name}} +
+ {{$book->name}} + +

+ @if(isset($book->searchSnippet)) +

{!! $book->searchSnippet !!}

+ @else +

{{ $book->getExcerpt() }}

+ @endif +
+
\ No newline at end of file diff --git a/resources/views/books/index.blade.php b/resources/views/books/index.blade.php index c090a127e..c5dd38a87 100644 --- a/resources/views/books/index.blade.php +++ b/resources/views/books/index.blade.php @@ -5,13 +5,13 @@
-
-
-
+
+
+ {{ trans('common.toggle_thumbnails') }} @if($currentUser->can('book-create-all')) {{ trans('entities.books_create') }} @endif -
+
@@ -20,14 +20,22 @@
-
+

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

@if(count($books) > 0) - @foreach($books as $book) - @include('books/list-item', ['book' => $book]) -
- @endforeach - {!! $books->render() !!} + @if($books_display=='grid') + @foreach($books as $book) + @include('books/grid-item', ['book' => $book]) + @endforeach +
+ {!! $books->render() !!} +
+ @else + @foreach($books as $book) + @include('books/list-item', ['book' => $book]) + @endforeach + {!! $books->render() !!} + @endif @else

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

@if(userCan('books-create-all')) @@ -35,7 +43,7 @@ @endif @endif
-
+
@if($recents)
 
diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php index ff3475194..c15e34974 100644 --- a/resources/views/users/edit.blade.php +++ b/resources/views/users/edit.blade.php @@ -49,6 +49,13 @@ @endforeach
+
+ + +