Revert "Bookstack grid view."

diff --git a/app/Book.php b/app/Book.php
index b4cafd65b39860916afcdd7fb7ffc06eb76d03d9..06c00945d43c4dbdea946c21769ffef7a626888f 100644 (file)
--- a/app/Book.php
+++ b/app/Book.php
@@ -3,7 +3,7 @@
 class Book extends Entity
 {
 
 class Book extends Entity
 {
 

-    protected $fillable = ['name', 'description', 'image'];
+    protected $fillable = ['name', 'description'];

 
     /**
      * Get the url for this book.
 
     /**
      * Get the url for this book.


@@ -18,24 +18,6 @@ class Book extends Entity
         return baseUrl('/books/' . urlencode($this->slug));
     }
 
         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
     /*
      * Get the edit url for this book.
      * @return string

diff --git a/app/Http/Controllers/BookController.php b/app/Http/Controllers/BookController.php
index eecb7839f378439519a57a2c526f845fab22d958..4313a4e2082a246bcf908db46a9f0814c8fcdec2 100644 (file)
--- 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);
         $books = $this->entityRepo->getAllPaginated('book', 16);
         $recents = $this->signedIn ? $this->entityRepo->getRecentlyViewed('book', 4, 0) : false;
         $popular = $this->entityRepo->getPopular('book', 3, 0);

-        $books_display = $this->currentUser->books_display;
+        $display = $this->currentUser->display;

         $this->setPageTitle('Books');
         $this->setPageTitle('Books');

-        return view('books/index', ['books' => $books, 'recents' => $recents, 'popular' => $popular, 'books_display' => $books_display] );
+        return view('books/index', ['books' => $books, 'recents' => $recents, 'popular' => $popular, 'display' => $display]); //added displaly to access user display

     }
 
     /**
     }
 
     /**


@@ -115,9 +115,9 @@ class BookController extends Controller
             'name' => 'required|string|max:255',
             'description' => 'string|max:1000'
         ]);
             '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 703322cbd269c5dfb80fcf164e5900f10be60d6d..8033557e4cb9a0a048c1d7112c90f84dc4e4bf70 100644 (file)
--- 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
      */
      * The attributes that are mass assignable.
      * @var array
      */

-    protected $fillable = ['name', 'email', 'image_id', 'books_display' ];
+    protected $fillable = ['name', 'email', 'image_id'];

 
     /**
      * The attributes excluded from the model's JSON form.
 
     /**
      * 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
deleted file mode 100644 (file)
index 3961127..0000000
--- a/database/migrations/2017_07_05_102650_add_cover_image_display.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class AddCoverImageDisplay extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::table('users', function (Blueprint $table) {
-            $table->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
deleted file mode 100644 (file)
index 1d7b737..0000000
Binary files a/public/default.png and /dev/null differ

diff --git a/resources/assets/js/global.js b/resources/assets/js/global.js
index 3a288f791d8320763cddc48503de72fedcc265c4..dc6802e12ba6646be4099f759773f2368e2c5ffe 100644 (file)
--- a/resources/assets/js/global.js
+++ b/resources/assets/js/global.js
@@ -153,13 +153,6 @@ $('[data-action="expand-entity-list-details"]').click(function() {
     $('.entity-list.compact').find('p').not('.empty-text').slideToggle(240);
 });
 
     $('.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);
 // 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 aa3ac10691f032267b93b0bdd867846f88d7dd8b..afb9d531bd4a82ae8b17410083f97e1f6b0ab875 100644 (file)
--- a/resources/assets/sass/styles.scss
+++ b/resources/assets/sass/styles.scss
@@ -63,11 +63,6 @@ body.dragging, body.dragging * {
   &.square {
     border-radius: 3px;
   }
   &.square {
     border-radius: 3px;
   }

-  &.cover {
-    height: 192px;
-    width: 120px;
-    border-radius: 3px;
-  }

 }
 
 // System wide notifications
 }
 
 // System wide notifications


@@ -279,25 +274,5 @@ $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 c3ee51abb94ca702e0b68d5646967b400a4f621d..7ad1743a0119b114a07c0de538b90e99a8ba0bbe 100644 (file)
--- a/resources/lang/de/common.php
+++ b/resources/lang/de/common.php
@@ -17,7 +17,6 @@ return [
     'name' => 'Name',
     'description' => 'Beschreibung',
     'role' => 'Rolle',
     'name' => 'Name',
     'description' => 'Beschreibung',
     'role' => 'Rolle',

-    'cover_image' => 'Titelbild',

 
     /**
      * Actions
 
     /**
      * Actions


@@ -44,7 +43,7 @@ return [
     'no_items' => 'Keine Einträge gefunden.',
     'back_to_top' => 'nach oben',
     'toggle_details' => 'Details zeigen/verstecken',
     'no_items' => 'Keine Einträge gefunden.',
     'back_to_top' => 'nach oben',
     'toggle_details' => 'Details zeigen/verstecken',

-    'toggle_thumbnails' => 'Thumbnails zeigen/verstecken',
+

     /**
      * Header
      */
     /**
      * Header
      */

diff --git a/resources/lang/de/settings.php b/resources/lang/de/settings.php
index 21d65321f34564481b68fab3c4d6fc1e1931d0b8..668eecf337a54a6cc60ac6c793b3ef8568dd39f6 100644 (file)
--- a/resources/lang/de/settings.php
+++ b/resources/lang/de/settings.php
@@ -91,7 +91,6 @@ 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_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.',
     '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 c05cfa56c067ab3f7f758cebd0b32fb7978ddaa1..e1d74c95e0e0718f0be435c5f40fdbb3da9f8e40 100644 (file)
--- a/resources/lang/en/common.php
+++ b/resources/lang/en/common.php
@@ -17,7 +17,6 @@ return [
     'name' => 'Name',
     'description' => 'Description',
     'role' => 'Role',
     'name' => 'Name',
     'description' => 'Description',
     'role' => 'Role',

-    'cover_image' => 'Cover image',

 
     /**
      * Actions
 
     /**
      * Actions


@@ -45,7 +44,6 @@ return [
     'no_items' => 'No items available',
     'back_to_top' => 'Back to top',
     'toggle_details' => 'Toggle Details',
     'no_items' => 'No items available',
     'back_to_top' => 'Back to top',
     'toggle_details' => 'Toggle Details',

-    'toggle_thumbnails' => 'Toggle Thumbnails',

 
     /**
      * Header
 
     /**
      * Header

diff --git a/resources/lang/en/settings.php b/resources/lang/en/settings.php
index e95bf35a3d3a2307c901049796f4b5add6c62f73..31163e87e75bc7393f3425b0e417e8ab1e4e1e31 100644 (file)
--- a/resources/lang/en/settings.php
+++ b/resources/lang/en/settings.php
@@ -91,7 +91,6 @@ 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_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.',
     '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 9a8fafc951d43cc906c0e6b779d7072492be6a00..3a62a21776fcc09817ad3d3990c7c68951bdc720 100644 (file)
--- a/resources/lang/es/common.php
+++ b/resources/lang/es/common.php
@@ -17,7 +17,7 @@ return [
     'name' => 'Nombre',
     'description' => 'Descripción',
     'role' => 'Rol',
     'name' => 'Nombre',
     'description' => 'Descripción',
     'role' => 'Rol',

-    'cover_image' => 'Imagen de portada',
+

     /**
      * Actions
      */
     /**
      * Actions
      */


@@ -43,7 +43,6 @@ return [
     'no_items' => 'No hay items disponibles',
     'back_to_top' => 'Volver arriba',
     'toggle_details' => 'Alternar detalles',
     'no_items' => 'No hay items disponibles',
     'back_to_top' => 'Volver arriba',
     'toggle_details' => 'Alternar detalles',

-    'toggle_thumbnails' => 'Alternar miniaturas',

 
     /**
      * Header
 
     /**
      * Header

diff --git a/resources/lang/es/settings.php b/resources/lang/es/settings.php
index 90bb0db2c4d4652ca2570391b5e248e8188cc8ff..cd6a8b8d9b56eac1852dafbf88dcf620f4291445 100644 (file)
--- a/resources/lang/es/settings.php
+++ b/resources/lang/es/settings.php
@@ -91,7 +91,6 @@ 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_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.',
     '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 fe8bb761a41abf8b2f491399deb2cd62e047daaf..5eb4b8fa8509a1f844b4141980f099fd421d4139 100644 (file)
--- a/resources/lang/fr/common.php
+++ b/resources/lang/fr/common.php
@@ -17,7 +17,7 @@ return [
     'name' => 'Nom',
     'description' => 'Description',
     'role' => 'Rôle',
     'name' => 'Nom',
     'description' => 'Description',
     'role' => 'Rôle',

-    'cover_image' => 'Image de couverture',
+

     /**
      * Actions
      */
     /**
      * Actions
      */


@@ -43,7 +43,6 @@ return [
     'no_items' => 'Aucun élément',
     'back_to_top' => 'Retour en haut',
     'toggle_details' => 'Afficher les détails',
     'no_items' => 'Aucun élément',
     'back_to_top' => 'Retour en haut',
     'toggle_details' => 'Afficher les détails',

-    'toggle_thumbnails' => 'Afficher les vignettes',

 
     /**
      * Header
 
     /**
      * Header

diff --git a/resources/lang/fr/settings.php b/resources/lang/fr/settings.php
index 288c56d5a53ea1f386598e757f1cded887a14902..8a375652781f55fbc6c89e50c5225da1872afcf8 100644 (file)
--- a/resources/lang/fr/settings.php
+++ b/resources/lang/fr/settings.php
@@ -91,7 +91,6 @@ 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_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.',
     '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 a096c1d2241d09dabf7250d98b76f50c660f0d84..bdde9eb957705753979e9b250d82f0662b99b55c 100644 (file)
--- a/resources/lang/nl/common.php
+++ b/resources/lang/nl/common.php
@@ -17,7 +17,7 @@ return [
     'name' => 'Naam',
     'description' => 'Beschrijving',
     'role' => 'Rol',
     'name' => 'Naam',
     'description' => 'Beschrijving',
     'role' => 'Rol',

-    'cover_image' => 'Omslagfoto',
+

     /**
      * Actions
      */
     /**
      * Actions
      */


@@ -43,7 +43,6 @@ return [
     'no_items' => 'Geen items beschikbaar',
     'back_to_top' => 'Terug naar boven',
     'toggle_details' => 'Details Weergeven',
     'no_items' => 'Geen items beschikbaar',
     'back_to_top' => 'Terug naar boven',
     'toggle_details' => 'Details Weergeven',

-    'toggle_thumbnails' => 'Thumbnails Weergeven',

 
     /**
      * Header
 
     /**
      * Header

diff --git a/resources/lang/nl/settings.php b/resources/lang/nl/settings.php
index 7b2f945307004a640cd0f75941ae62fcdd238ec7..7408a2dc32c53ca5a6f62018bf1acf49d2576dd9 100644 (file)
--- a/resources/lang/nl/settings.php
+++ b/resources/lang/nl/settings.php
@@ -91,7 +91,6 @@ 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_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.',
     '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 eba301929770ead5842fc168cba3814ab6416186..820ba219c4be6d3678005a5c9552a1e7805851b9 100644 (file)
--- 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',
     'name' => 'Nome',
     'description' => 'Descrição',
     'role' => 'Regra',

-    'cover_image' => 'Imagem de capa',
+

     /**
      * Actions
      */
     /**
      * Actions
      */


@@ -43,7 +43,6 @@ return [
     'no_items' => 'Nenhum item disponível',
     'back_to_top' => 'Voltar ao topo',
     'toggle_details' => 'Alternar Detalhes',
     'no_items' => 'Nenhum item disponível',
     'back_to_top' => 'Voltar ao topo',
     'toggle_details' => 'Alternar Detalhes',

-    'toggle_thumbnails' => 'Alternar Miniaturas',

 
     /**
      * Header
 
     /**
      * Header

diff --git a/resources/lang/pt_BR/settings.php b/resources/lang/pt_BR/settings.php
index b46eda8dfa22163ded53d760da60e3a2bab0785e..b8d062b5fdaa49b3223749c715de402a7d42e6b5 100644 (file)
--- a/resources/lang/pt_BR/settings.php
+++ b/resources/lang/pt_BR/settings.php
@@ -91,7 +91,6 @@ 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_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.',
     '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 19ba665b5ed10bce5fdc523b7bc69ac485d6302b..100981597374d714f49c4b284677772e7f16a7f1 100644 (file)
--- a/resources/lang/sk/common.php
+++ b/resources/lang/sk/common.php
@@ -17,7 +17,7 @@ return [
     'name' => 'Meno',
     'description' => 'Popis',
     'role' => 'Rola',
     'name' => 'Meno',
     'description' => 'Popis',
     'role' => 'Rola',

-    'cover_image' => 'Obal knihy',
+

     /**
      * Actions
      */
     /**
      * Actions
      */


@@ -43,7 +43,6 @@ return [
     'no_items' => 'Žiadne položky nie sú dostupné',
     'back_to_top' => 'Späť nahor',
     'toggle_details' => 'Prepnúť detaily',
     'no_items' => 'Žiadne položky nie sú dostupné',
     'back_to_top' => 'Späť nahor',
     'toggle_details' => 'Prepnúť detaily',

-    'toggle_thumbnails' => 'Prepnúť náhľady',

 
     /**
      * Header
 
     /**
      * Header

diff --git a/resources/lang/sk/settings.php b/resources/lang/sk/settings.php
index 1c745fcf8569e37d9b3ffdd43d88afddb7c04055..643b4b8ffbde1d2d9e122080544a0711dcb7a6ee 100644 (file)
--- a/resources/lang/sk/settings.php
+++ b/resources/lang/sk/settings.php
@@ -91,7 +91,6 @@ 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_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.',
     '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 4d1edf78bf4cfa204bc19d73e92b2fa55011fbb5..2c629e699622053940849dc207121cb4a201b21d 100644 (file)
--- a/resources/views/books/create.blade.php
+++ b/resources/views/books/create.blade.php
@@ -4,10 +4,9 @@
 
 <div class="container small" ng-non-bindable>
     <h1>{{ trans('entities.books_create') }}</h1>
 
 <div class="container small" ng-non-bindable>
     <h1>{{ trans('entities.books_create') }}</h1>

-    <form action="{{ baseUrl("/books") }}" method="POST" enctype="multipart/form-data">
+    <form action="{{ baseUrl("/books") }}" method="POST">

         @include('books/form')
     </form>
 </div>
         @include('books/form')
     </form>
 </div>

-<p class="margin-top large"><br></p>
-    @include('components.image-manager', ['imageType' => 'cover'])
+

 @stop
\ No newline at end of file
 @stop
\ No newline at end of file

diff --git a/resources/views/books/edit.blade.php b/resources/views/books/edit.blade.php
index 322f3d7001d54bf55e83ed1cf37ad9d817802f3a..2419b68da807ab1a346293ee38ec694e67c1c25a 100644 (file)
--- a/resources/views/books/edit.blade.php
+++ b/resources/views/books/edit.blade.php
@@ -19,5 +19,5 @@
             @include('books/form', ['model' => $book])
         </form>
     </div>
             @include('books/form', ['model' => $book])
         </form>
     </div>

-@include('components.image-manager', ['imageType' => 'cover'])
+

 @stop
\ No newline at end of file
 @stop
\ No newline at end of file

diff --git a/resources/views/books/form.blade.php b/resources/views/books/form.blade.php
index 34f5fd842979d57f076f2e725c1030bd3546bcf4..b1484d1296f3cf84ef6f2e59bf11d6af8a5c3c2d 100644 (file)
--- a/resources/views/books/form.blade.php
+++ b/resources/views/books/form.blade.php
@@ -9,21 +9,7 @@
     <label for="description">{{ trans('common.description') }}</label>
     @include('form/textarea', ['name' => 'description'])
 </div>
     <label for="description">{{ trans('common.description') }}</label>
     @include('form/textarea', ['name' => 'description'])
 </div>

-<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' => 'avatar cover'
-        ])
-</div>

 <div class="form-group">
     <a href="{{ isset($book) ? $book->getUrl() : baseUrl('/books') }}" class="button muted">{{ trans('common.cancel') }}</a>
     <button type="submit" class="button pos">{{ trans('entities.books_save') }}</button>
 <div class="form-group">
     <a href="{{ isset($book) ? $book->getUrl() : baseUrl('/books') }}" class="button muted">{{ trans('common.cancel') }}</a>
     <button type="submit" class="button pos">{{ trans('entities.books_save') }}</button>

diff --git a/resources/views/books/grid-item.blade.php b/resources/views/books/grid-item.blade.php
deleted file mode 100644 (file)
index d11a66e..0000000
--- a/resources/views/books/grid-item.blade.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<div class="col-xs-12 col-sm-6 col-md-4 col-lg-3"  data-entity-type="book" data-entity-id="{{$book->id}}">
-    <div class="galleryItem">
-    <h3>
-        <a class="text-book entity-list-item-link" href="{{$book->getUrl()}}"><i class="zmdi zmdi-book"></i><span class="entity-list-item-name">{{$book->name}}</span>
-        <br>
-        <img src="{{$book->getBookCover(192)}}" alt="{{$book->name}}">
-        </a>
-    </h3>
-    @if(isset($book->searchSnippet))
-        <p class="text-muted">{!! $book->searchSnippet !!}</p>
-    @else
-        <p class="text-muted">{{ $book->getExcerpt() }}</p>
-    @endif
-</div>
-</div>
\ No newline at end of file

diff --git a/resources/views/books/index.blade.php b/resources/views/books/index.blade.php
index c5dd38a8722c0fa5be64c7683d87bc1ffe105fd2..c090a127e1dee9076020d9397ce46f7eaaf39804 100644 (file)
--- a/resources/views/books/index.blade.php
+++ b/resources/views/books/index.blade.php
@@ -5,13 +5,13 @@
     <div class="faded-small toolbar">
         <div class="container">
             <div class="row">
     <div class="faded-small toolbar">
         <div class="container">
             <div class="row">

-                <div class="col-xs-12 faded">
-                    <div class="action-buttons text-left">
-                    <a data-action="expand-thumbnail" class="text-primary text-button"><i class="zmdi zmdi-wrap-text"></i>{{ trans('common.toggle_thumbnails') }}</a>
+                <div class="col-xs-1"></div>
+                <div class="col-xs-11 faded">
+                    <div class="action-buttons">

                         @if($currentUser->can('book-create-all'))
                             <a href="{{ baseUrl("/books/create") }}" class="text-pos text-button"><i class="zmdi zmdi-plus"></i>{{ trans('entities.books_create') }}</a>
                         @endif
                         @if($currentUser->can('book-create-all'))
                             <a href="{{ baseUrl("/books/create") }}" class="text-pos text-button"><i class="zmdi zmdi-plus"></i>{{ trans('entities.books_create') }}</a>
                         @endif

-                        </div>
+                    </div>

                 </div>
             </div>
         </div>
                 </div>
             </div>
         </div>


@@ -20,22 +20,14 @@
 
     <div class="container" ng-non-bindable>
         <div class="row">
 
     <div class="container" ng-non-bindable>
         <div class="row">

-            <div class="col-xs-12 col-sm-12 col-md-9">
+            <div class="col-sm-7">

                 <h1>{{ trans('entities.books') }}</h1>
                 @if(count($books) > 0)
                 <h1>{{ trans('entities.books') }}</h1>
                 @if(count($books) > 0)

-                    @if($books_display=='grid')
-                        @foreach($books as $book)
-                            @include('books/grid-item', ['book' => $book])
-                        @endforeach
-                        <div class="col-xs-12">
-                            {!! $books->render() !!}
-                        </div>
-                    @else
-                        @foreach($books as $book)
-                            @include('books/list-item', ['book' => $book])
-                        @endforeach
-                        {!! $books->render() !!}
-                    @endif
+                    @foreach($books as $book)
+                        @include('books/list-item', ['book' => $book])
+                        <hr>
+                    @endforeach
+                    {!! $books->render() !!}

                 @else
                     <p class="text-muted">{{ trans('entities.books_empty') }}</p>
                     @if(userCan('books-create-all'))
                 @else
                     <p class="text-muted">{{ trans('entities.books_empty') }}</p>
                     @if(userCan('books-create-all'))


@@ -43,7 +35,7 @@
                     @endif
                 @endif
             </div>
                     @endif
                 @endif
             </div>

-            <div class="col-xs-12 col-sm-12 col-md-3">
+            <div class="col-sm-4 col-sm-offset-1">

                 <div id="recents">
                     @if($recents)
                         <div class="margin-top">&nbsp;</div>
                 <div id="recents">
                     @if($recents)
                         <div class="margin-top">&nbsp;</div>

diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index c15e34974666346447ee533e5bfa60dc349ddffc..ff3475194bdfacd7705d74cf17e8d81061a8048b 100644 (file)
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -49,13 +49,6 @@
                             @endforeach
                         </select>
                     </div>
                             @endforeach
                         </select>
                     </div>

-                    <div class="form-group">
-                        <label for="books_display">{{ trans('settings.users_books_display_type') }}</label>
-                        <select name="books_display" id="books_display">
-                            <option @if($user->books_display === 'grid') selected @endif value="grid">Grid</option>
-                            <option @if($user->books_display === 'list') selected @endif value="list">List</option>
-                        </select>
-                    </div>

                 </div>
             </div>
             <div class="form-group">
                 </div>
             </div>
             <div class="form-group">