Merge pull request #8 from OsmosysSoftware/feature-181

Issue 181

app/Book.php

@@ -18,7 +18,7 @@ class Book extends Entity
         return baseUrl('/books/' . urlencode($this->slug));
     }
 
-    public function getBookCover($size = 120)
+    public function getBookCover()
     {
         $default = baseUrl('/default.png');
         $image = $this->image;

resources/assets/js/global.js

@@ -154,10 +154,10 @@ $('[data-action="expand-entity-list-details"]').click(function() {
     $('.entity-list.compact').find('p').not('.empty-text').slideToggle(240);
 });
 
-// Toggle thumbnails
+// Toggle thumbnail::hide image and reduce grid size
 $(document).ready(function(){
    $('[data-action="expand-thumbnail"]').click(function(){
-     $('.galleryItem').toggleClass("collapse").find('img').slideToggle(50);
+     $('.gallery-item').toggleClass("collapse").find('img').slideToggle(50);
    });
 });
 

resources/assets/sass/styles.scss

@@ -63,11 +63,6 @@ body.dragging, body.dragging * {
   &.square {
     border-radius: 3px;
   }
-  &.cover {
-    height: 192px;
-    width: 120px;
-    border-radius: 3px;
-  }
 }
 
 // System wide notifications
@@ -279,25 +274,31 @@ $btt-size: 40px;
   }
 }
 
-.galleryItem {
+
+
+.gallery-item {
   margin-bottom: 32px;
   height: 330px;
   overflow: hidden;
   border: 1px solid #9e9e9e;
-  h3 {
+  h4 {
     font-size: 1.2em;
     text-align: center;
   }
   p {
     font-size: 0.8em;
     text-align: center;
-  }
-  img {
-    height: 192px;
-    width: 120px;
-    margin-top: 5%;
+    padding: 0px 12px;
   }
   &.collapse {
     height: 130px;
   }
 }
+
+.gallery-image {
+  margin-top: 5%;
+  text-align: center;
+  img {
+    border-radius: 3px;
+  }
+}

resources/lang/de/common.php

@@ -18,6 +18,7 @@ return [
     'description' => 'Beschreibung',
     'role' => 'Rolle',
     'cover_image' => 'Titelbild',
+    'cover_image_description' => 'Das Bild sollte in einem Verhältnis von Höhe zu Breite von 1.6: 1 sein.',
 
     /**
      * Actions

resources/lang/de/settings.php

@@ -91,7 +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_books_display_type' => 'Bevorzugtes Display-Layout für Bücher',
     '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.',

resources/lang/en/common.php

@@ -18,7 +18,7 @@ return [
     'description' => 'Description',
     'role' => 'Role',
     'cover_image' => 'Cover image',
-
+    'cover_image_description' => 'The image should be in a height/width ratio of 1.6:1.',
     /**
      * Actions
      */

resources/lang/en/settings.php

@@ -91,7 +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_books_display_type' => 'Preferred layout for books viewing',
     '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.',

resources/lang/es/common.php

@@ -18,6 +18,7 @@ return [
     'description' => 'Descripción',
     'role' => 'Rol',
     'cover_image' => 'Imagen de portada',
+    'cover_image_description' => 'La imagen debe estar en una relación altura / anchura de 1.6: 1.',
     /**
      * Actions
      */

resources/lang/es/settings.php

@@ -91,7 +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_books_display_type' => 'Diseño de pantalla preferido para libros',
     'users_delete' => 'Borrar usuario',
     'users_delete_named' => 'Borrar usuario :userName',
     'users_delete_warning' => 'Se borrará completamente el usuario con el nombre \':userName\' del sistema.',

resources/lang/fr/common.php

@@ -18,6 +18,7 @@ return [
     'description' => 'Description',
     'role' => 'Rôle',
     'cover_image' => 'Image de couverture',
+    'cover_image_description' => 'L\'image devrait avoir un rapport d\'aspect 1.6: 1',
     /**
      * Actions
      */

resources/lang/fr/settings.php

@@ -91,7 +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_books_display_type' => 'Disposition d\'affichage préférée pour les livres',
     'users_delete' => 'Supprimer un utilisateur',
     'users_delete_named' => 'Supprimer l\'utilisateur :userName',
     'users_delete_warning' => 'Ceci va supprimer \':userName\' du système.',

resources/lang/nl/common.php

@@ -18,6 +18,7 @@ return [
     'description' => 'Beschrijving',
     'role' => 'Rol',
     'cover_image' => 'Omslagfoto',
+    'cover_image_description' => 'De afbeelding moet in een hoogte / breedte verhouding van 1.6: 1 zijn.',
     /**
      * Actions
      */

resources/lang/nl/settings.php

@@ -91,7 +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_books_display_type' => 'Voorkeursuitleg voor het weergeven van boeken',
     'users_delete' => 'Verwijder gebruiker',
     'users_delete_named' => 'Verwijder gebruiker :userName',
     'users_delete_warning' => 'Dit zal de gebruiker \':userName\' volledig uit het systeem verwijderen.',

resources/lang/pt_BR/common.php

@@ -18,6 +18,7 @@ return [
     'description' => 'Descrição',
     'role' => 'Regra',
     'cover_image' => 'Imagem de capa',
+    'cover_image_description' => 'A imagem deve estar em uma relação de aspecto 1.6: 1.',
     /**
      * Actions
      */

resources/lang/pt_BR/settings.php

@@ -91,7 +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_books_display_type' => 'Layout preferido para mostrar livros',
     '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.',

resources/lang/sk/common.php

@@ -18,6 +18,7 @@ return [
     'description' => 'Popis',
     'role' => 'Rola',
     'cover_image' => 'Obal knihy',
+    'cover_image_description' => 'Obraz by mal mať pomer strán 1.6: 1.',
     /**
      * Actions
      */

resources/lang/sk/settings.php

@@ -91,7 +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_books_display_type' => 'Preferované rozloženie pre prezeranie kníh',
     '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.',

resources/views/books/grid-item.blade.php

@@ -1,15 +1,19 @@
 <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>
+    <div class="gallery-item">
+    <h4>
         <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>
+    </h4>
+    <div class="gallery-image">
+        <a class="text-book entity-list-item-link" href="{{$book->getUrl()}}">
+        <img src="{{$book->getBookCover()}}" alt="{{$book->name}}">
+        </a>
+    </div>
     @if(isset($book->searchSnippet))
         <p class="text-muted">{!! $book->searchSnippet !!}</p>
     @else
-        <p class="text-muted">{{ $book->getExcerpt() }}</p>
+        <p class="text-muted">{{ $book->getExcerpt(80) }}</p>
     @endif
 </div>
 </div>

resources/views/components/image-picker.blade.php

@@ -13,7 +13,7 @@
         <button class="text-button neg" data-action="remove-image" type="button">{{ trans('common.remove') }}</button>
     @endif
 
-    <input type="hidden" name="{{$name}}" id="{{$name}}" value="{{ isset($currentId) && ($currentId !== '' && $currentId !== false) ? $currentId : $currentImage}}">
+    <input type="hidden" name="{{$name}}" id="{{$name}}" value="{{ isset($currentId) && ($currentId !== 0 && $currentId !== false) ? $currentId : $currentImage}}">
 </div>
 
 <script>