From 7a724f913431cc8d200ce7b1d054f523ea148650 Mon Sep 17 00:00:00 2001 From: Nilesh Deepak Date: Wed, 12 Jul 2017 13:44:37 +0530 Subject: [PATCH 1/3] Updated modifications. --- public/default.png | Bin 3338 -> 1116 bytes resources/assets/js/global.js | 4 ++-- resources/assets/sass/styles.scss | 17 +++++++++-------- resources/lang/de/common.php | 1 + resources/lang/de/settings.php | 2 +- resources/lang/en/common.php | 2 +- resources/lang/en/settings.php | 2 +- resources/lang/es/common.php | 1 + resources/lang/es/settings.php | 2 +- resources/lang/fr/common.php | 1 + resources/lang/fr/settings.php | 2 +- resources/lang/nl/common.php | 1 + resources/lang/nl/settings.php | 2 +- resources/lang/pt_BR/common.php | 1 + resources/lang/pt_BR/settings.php | 2 +- resources/lang/sk/common.php | 1 + resources/lang/sk/settings.php | 2 +- resources/views/books/grid-item.blade.php | 12 ++++++++---- .../views/components/image-picker.blade.php | 2 +- 19 files changed, 34 insertions(+), 23 deletions(-) diff --git a/public/default.png b/public/default.png index 1d7b737e7da36a919d9d389cbd980938cfae2435..3b04154027b359a3f9521c1ad01f56a442d5319b 100644 GIT binary patch literal 1116 zcmeAS@N?(olHy`uVBq!ia0vp^6+nD|14uBun)X8sNU@|l`Z_W&Z0zU$lgJ9>DVb-_yl0q~g}wE1AKMJS5mZ z{QNin(5+2b{OJudxDzc{3N6Z>NVvMhP7E$)+&Q`JOIcHxuchkeyt4Q|zg^WUf4%&( z>+;-x4*wT_Vl+rN(7?#d#v?(9@n8Sp3Awxa+utvXe!ZhC?BeVl*7cXwub7{FT{8b_ zquk#Q%eH@b@AN`SFun3Y9s%L=UUM7Hq)2? zW_%B_VmEcl-2aKIefP= z8XIlrc5cxvZkBzsfn`^Ydf+Oqt(Vj`aq#9W%9eihb5#!eDJ`W-0i{AWLiX4eDD2~j zIbVC`&dkc%;GOZQ{Y9^r*C?BIJv=76{K$q$e=BU1t~$r{UcN2bd)?!y{H>qW3PsZc zcdtLSdf9>VW=zMQuh}W1_hWJJ_u3nekDV-yUL9Fm7rDd4Vr}KNb=%VGZEa?A?payS zw@%w}XJV=A>e@vuIdi^pU!ZiJhyK@Pcogdd`tYi6W;Ik%-(%t_c6l_TU*n;HZ2ZSyQ*H~9=fK}Coa+I@u&2* z6~XcI_8#c{Q@Ve8T#Ne3&lxd!A31aCR)?N*+O~6@zk1~3A8w&`g$HR6OMQO>+bLFo^ zB*$Nj-8jLrj?20D`{7+DH$I4*vhMgBi>{uP;`YaSQ}(LrJn{d!^XZNwcV@jgw|#l= z^iB6JehR$%rnx?nk#IW3NbB{5KgAhJ-LE_6cw_-{n`((`L`h0wNvc(HQ7VvPFfuSS z*EKNLH8cz{w6robvNE;QHZZa>Ft~Eyx+jW;-29Zxv`X9>md?%p3e>>h>FVdQ&MBb@ E0CAn~>;M1& literal 3338 zcmd^BZCH|5AHS`o+j_B7&kS+FV!s8$aTJwEKV8HQ<(&?c) z7i3cQ!&kbY*6qhOrP-!c`Rv$r5JL$)W@B^w8K2qM=mOfV4~mKo*&M4V?zkllT*ZCa zdt$p^_#8nxJx@s1hKVpA3H$p|p`qdCxluv6lf~kdC4oCY{T{R)`g|Gw-!l07cKQ?1 z|LB(L*JP^Hav*zaRaMoD$*7}H-Yn$yX>|22#VKUZ>%ye_>Gs@s&2x=65fyVi;`(?+ zE@Dm(IkPZ$G%Rz9x@ZMz--^oNm zBn)gWIqcx**qIMEZ%ZCBd2t}y6x<H$TG0I=<~(&93C;n0)>0PLa#O zJ$Aj5bJ1>_XJ*HRu8~Ss`skZCE>^dVL{K0GqkH8=&n+Fjy}d^-gJR#faU-z9>|uD8 zy%l7v&#UJ_%Rxj1i^*VAhtp@K27d7qFwl57Q9z|-`T_rx)^gjYSZC}u~om$ zlhj$Wbji_Q%$T74wLMMKIt9*7&Lav1sV3*loSe-YHss~yMc5n$3nnKg^&>oq@-aBO za`3T2fjJo;->KDVQ6BEK+CJJShm@C-lf$~#&BxfEKe4@4m!T4;7T{fQ8nzg=vMUrl+l9Z!Mxu0H}asU)! zowfCx?p8n^x}s|bR%lQTC!5bpwc}YIixpnr8Cr|>)l1}|c4PP-m#iDP@(cpWTG1Ew6lAwnmC_Ex#XGJajXT9*j(vb)NF1v|!~EkEzFB=<^)`cP$G8 z;HQw{4!vIAJ>ar-=+2!xu#A-E7`G}R5E@7kpiHogML0pi;cT4X`7eAL!Q^SrErD^8 zy;PCrfbdfgrqj(m^nt^93!{&`j6l>gT9vF#6&1CdYPe!oMF>!~OeWLsK*}#rWo)kk zaR~J^P{=Gvqb^aYRQW4%B#!;Re{HCtP&9JB0Kmj+M#hO5;8386S0cP=$AH!fzE;=Yyk5*UB|TA9FmH}r_z}^z!}H4nB>gil%4G6 z9~J_xlb&CMm35uDDo;4^sRo{fH2azG5*Ztp9go1U6U0AS+#(LdsGj1wCz0a|6=Qc1^HbdXmrM>S0t*()Vwn+DC^U(y5cxVcK+hK8L6w<5c%EAMF)`4 zOTW1ZE5GeflcLQr*8VZi$rD7um{P*5XE1<#CGZD?Cjgwq5x-xXlxJnyc=VI|`vDe0 z`Wdzr%Wat&EEa2)NHAQ$GX_nA8#W~HNyG1&fh7VzO=~-cU;)Wibe$QGH?iNxA->Fx zEWomZdBU`5_XOG6hlV>be7OicuimTZ%>d@0>`K60{fNh&pN5im<2Bnja`G@YLwA#9lwzi;c*&+Q&C-f~;#Y6Yv7MutBhT+U z^W0TcYF~ljCzM>b#i=)B8xU(yeP6dBK*tAlD{nWP_&gVtE}MugT1dBps>{TPN;dJr4c}1k7!?3Y^ zKBReJlfrAyFb>7yo&OhR>o)(oFsf5DAAO@InU8x!Hh@{gt6dj{-=Y{*L8L;^o1$ zTAFbI*<7Knm#Xi`fxkT1fA9YD3b^1(nZiKdEIuKMQxDhDy2?vxX)!Tfs2SyVs}#EQK$TV-ROJ?t@3GMjkO})8)+Lh32*mGG>Ze}Wp{|X$JN^9pmUCZ< zZa9C3Y5yBW)<3XqnBxw7PB`0=pOs3KHQ8qrK01|DGeitRIIJ6OzhsSOaV5$)g2Mny zg|cnv|G>v#9hUgIq54;O9qv$@qWYF~&;jH|Dx6rnT(3nF_)GM5ZyKJ6&%Ybp0d7X$ zzV*Z&ij&Of=O!yr$_ByRl#~>`xB%n-n&p&2KAJd%K#&&SZ9s+LKg3m$-_-eKb9=72 zN9o)XYS+EyEASsZPYLu!iaDAEwAs-}laKN-(wif4qWM+nJc%PXP}+dh@Hq&lS?jy7 zZ}%?jSP3m|Yk>+NXa)2>^vQo6{I#gRveTb2|DRhHKrdGPXS!kbW^ZUyU(rbxt~V6| OE#z=`VAB_;zWFz_;LFee diff --git a/resources/assets/js/global.js b/resources/assets/js/global.js index 3a288f791..f358b99ec 100644 --- a/resources/assets/js/global.js +++ b/resources/assets/js/global.js @@ -153,10 +153,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); }); }); diff --git a/resources/assets/sass/styles.scss b/resources/assets/sass/styles.scss index aa3ac1069..67ff3fa0a 100644 --- a/resources/assets/sass/styles.scss +++ b/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,9 +274,14 @@ $btt-size: 40px; } } -.galleryItem { - margin-bottom: 32px; + + +.gallery-item { + width: 22%; + padding: 5px; + float: left; height: 330px; + margin: 2% 1% 2% 1%; overflow: hidden; border: 1px solid #9e9e9e; h3 { @@ -291,6 +291,7 @@ $btt-size: 40px; p { font-size: 0.8em; text-align: center; + padding: 0px 12px; } img { height: 192px; @@ -300,4 +301,4 @@ $btt-size: 40px; &.collapse { height: 130px; } -} +} \ No newline at end of file diff --git a/resources/lang/de/common.php b/resources/lang/de/common.php index c3ee51abb..8c1bb4569 100644 --- a/resources/lang/de/common.php +++ b/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 diff --git a/resources/lang/de/settings.php b/resources/lang/de/settings.php index 21d65321f..9d72b7942 100644 --- a/resources/lang/de/settings.php +++ b/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.', diff --git a/resources/lang/en/common.php b/resources/lang/en/common.php index c05cfa56c..9f35ddac7 100644 --- a/resources/lang/en/common.php +++ b/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 */ diff --git a/resources/lang/en/settings.php b/resources/lang/en/settings.php index e95bf35a3..becaa5859 100644 --- a/resources/lang/en/settings.php +++ b/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.', diff --git a/resources/lang/es/common.php b/resources/lang/es/common.php index 9a8fafc95..9514918ed 100644 --- a/resources/lang/es/common.php +++ b/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 */ diff --git a/resources/lang/es/settings.php b/resources/lang/es/settings.php index 90bb0db2c..4651247b9 100644 --- a/resources/lang/es/settings.php +++ b/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.', diff --git a/resources/lang/fr/common.php b/resources/lang/fr/common.php index fe8bb761a..129cf082e 100644 --- a/resources/lang/fr/common.php +++ b/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 */ diff --git a/resources/lang/fr/settings.php b/resources/lang/fr/settings.php index 288c56d5a..5d9c966e7 100644 --- a/resources/lang/fr/settings.php +++ b/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.', diff --git a/resources/lang/nl/common.php b/resources/lang/nl/common.php index a096c1d22..e26a4651a 100644 --- a/resources/lang/nl/common.php +++ b/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 */ diff --git a/resources/lang/nl/settings.php b/resources/lang/nl/settings.php index 7b2f94530..0323d87d4 100644 --- a/resources/lang/nl/settings.php +++ b/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.', diff --git a/resources/lang/pt_BR/common.php b/resources/lang/pt_BR/common.php index eba301929..510271166 100644 --- a/resources/lang/pt_BR/common.php +++ b/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 */ diff --git a/resources/lang/pt_BR/settings.php b/resources/lang/pt_BR/settings.php index b46eda8df..6c8ff3039 100644 --- a/resources/lang/pt_BR/settings.php +++ b/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.', diff --git a/resources/lang/sk/common.php b/resources/lang/sk/common.php index 19ba665b5..28fdad0f1 100644 --- a/resources/lang/sk/common.php +++ b/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 */ diff --git a/resources/lang/sk/settings.php b/resources/lang/sk/settings.php index 1c745fcf8..8a8d93e59 100644 --- a/resources/lang/sk/settings.php +++ b/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.', diff --git a/resources/views/books/grid-item.blade.php b/resources/views/books/grid-item.blade.php index d11a66eac..839e9f3a3 100644 --- a/resources/views/books/grid-item.blade.php +++ b/resources/views/books/grid-item.blade.php @@ -1,15 +1,19 @@
-
-

+
+

{{$book->name}}
+ +

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

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

{!! $book->searchSnippet !!}

@else -

{{ $book->getExcerpt() }}

+

{{ $book->getExcerpt(80) }}

@endif
\ No newline at end of file diff --git a/resources/views/components/image-picker.blade.php b/resources/views/components/image-picker.blade.php index 47fb2b8b7..6fd81dabd 100644 --- a/resources/views/components/image-picker.blade.php +++ b/resources/views/components/image-picker.blade.php @@ -13,7 +13,7 @@ @endif - +