From: Abijeet <redacted>
Date: Wed, 12 Jul 2017 13:11:35 +0000 (+0530)
Subject: Merge pull request #8 from OsmosysSoftware/feature-181
X-Git-Tag: v0.19.0~1^2~15^2~28
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/f37509062e7519ef82821b08ab56d76c289bfcda?ds=inline;hp=-c

Merge pull request #8 from OsmosysSoftware/feature-181

Issue 181
---

f37509062e7519ef82821b08ab56d76c289bfcda
diff --combined resources/assets/js/global.js
index bd55777e8,f358b99ec..1ee5bf0d3
--- a/resources/assets/js/global.js
+++ b/resources/assets/js/global.js
@@@ -17,7 -17,6 +17,7 @@@ let axiosInstance = axios.create(
          'baseURL': window.baseUrl('')
      }
  });
 +window.$http = axiosInstance;
  
  Vue.prototype.$http = axiosInstance;
  
@@@ -154,10 -153,10 +154,10 @@@ $('[data-action="expand-entity-list-det
      $('.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 --combined resources/lang/en/settings.php
index 732b64c42,becaa5859..d35857903
--- a/resources/lang/en/settings.php
+++ b/resources/lang/en/settings.php
@@@ -91,7 -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.',
@@@ -122,7 -122,6 +122,7 @@@
          'nl' => 'Nederlands',
          'pt_BR' => 'Português do Brasil',
          'sk' => 'Slovensky',
 +        'ja' => '日本語',
      ]
      ///////////////////////////////////
  ];