add nav back button langs

streamtw · streamtw · commit 5c0775d4d440 · 2016-03-10T14:17:59.000+08:00
diff --git a/src/lang/en/lfm.php b/src/lang/en/lfm.php
@@ -1,11 +1,12 @@
 <?php
 
 return [
+    'nav-back'          => 'Back',
+    'nav-new'           => 'New Folder',
     'nav-upload'        => 'Upload',
     'nav-thumbnails'    => 'Thumbnails',
     'nav-list'          => 'List',
 
-    'menu-new'          => 'New Folder',
     'menu-rename'       => 'Rename',
     'menu-delete'       => 'Delete',
     'menu-view'         => 'View',
@@ -41,8 +42,8 @@
     'error-folder-exist'=> 'A folder with this name already exists!',
 
     'btn-upload'        => 'Upload File',
-    'btn-close'         => 'Close',
     'btn-uploading'     => 'Uploading...',
+    'btn-close'         => 'Close',
     'btn-crop'          => 'Crop',
     'btn-cancel'        => 'Cancel',
     'btn-resize'        => 'Resize',
@@ -56,5 +57,4 @@
     'resize-new-width'  => 'Width:',
 
     'locale-bootbox'    => 'en',
-
 ];
diff --git a/src/lang/fr/lfm.php b/src/lang/fr/lfm.php
@@ -1,11 +1,12 @@
 <?php
 
 return [
+    'nav-back'          => 'Back',
+    'nav-new'           => 'Nouveau dossier',
     'nav-upload'        => 'Charger',
     'nav-thumbnails'    => 'Vignettes',
     'nav-list'          => 'Liste',
     
-    'menu-new'          => 'Nouveau dossier',
     'menu-rename'       => 'Renommez',
     'menu-delete'       => 'Effacer',
     'menu-view'         => 'Voir le',
@@ -41,8 +42,8 @@
     'error-folder-exist'=> 'Un dossier avec ce nom existe déjà !',
 
     'btn-upload'        => 'Envoyer le fichier',
-    'btn-close'         => 'Fermer',
     'btn-uploading'     => 'Envoi...',
+    'btn-close'         => 'Fermer',
     'btn-crop'          => 'Rogner',
     'btn-cancel'        => 'Annuler',
     'btn-resize'        => 'Redimensionner',
@@ -56,5 +57,4 @@
     'resize-new-width'  => 'Largeur',
 
     'locale-bootbox'    => 'fr',
-
 ];
diff --git a/src/lang/pt-BR/lfm.php b/src/lang/pt-BR/lfm.php
@@ -1,11 +1,12 @@
 <?php
 
 return [
+    'nav-back'          => 'Back',
+    'nav-new'           => 'Nova Pasta',
     'nav-upload'        => 'Enviar',
     'nav-thumbnails'    => 'Miniatura',
     'nav-list'          => 'Lista',
 
-    'menu-new'          => 'Nova Pasta',
     'menu-rename'       => 'Renomear',
     'menu-delete'       => 'Deletar',
     'menu-view'         => 'Ver',
@@ -41,8 +42,8 @@
     'error-folder-exist'=> 'Uma pasta com este nome já existe!',
 
     'btn-upload'        => 'Enviar Arquivo',
-    'btn-close'         => 'Fechar',
     'btn-uploading'     => 'Enviando...',
+    'btn-close'         => 'Fechar',
     'btn-crop'          => 'Cortar',
     'btn-cancel'        => 'Cancelar',
     'btn-resize'        => 'Redimensionar',
diff --git a/src/lang/tr/lfm.php b/src/lang/tr/lfm.php
@@ -1,11 +1,12 @@
 <?php
 
 return [
+    'nav-back'          => 'Back',
+    'nav-new'           => 'Yeni Klasör',
     'nav-upload'        => 'Yükle',
     'nav-thumbnails'    => 'Küçük Resim',
     'nav-list'          => 'Liste',
 
-    'menu-new'          => 'Yeni Klasör',
     'menu-rename'       => 'Ad değiştir',
     'menu-delete'       => 'Sil',
     'menu-view'         => 'Görüntüle',
@@ -41,8 +42,8 @@
     'error-folder-exist'=> 'Bu adda bir klasör zaten var!',
 
     'btn-upload'        => 'Yükle',
-    'btn-close'         => 'Kapat',
     'btn-uploading'     => 'Yükleniyor...',
+    'btn-close'         => 'Kapat',
     'btn-crop'          => 'Kırp',
     'btn-cancel'        => 'İptal',
     'btn-resize'        => 'Boyutlandır',
@@ -56,5 +57,4 @@
     'resize-new-width'  => 'Genişlik:',
 
     'locale-bootbox'    => 'tr',
-
 ];
diff --git a/src/lang/zh-CN/lfm.php b/src/lang/zh-CN/lfm.php
@@ -1,11 +1,12 @@
 <?php
 
 return [
+    'nav-back'          => '回上一页',
+    'nav-new'           => '添加文件夹',
     'nav-upload'        => '上传档案',
     'nav-thumbnails'    => '缩略图显示',
     'nav-list'          => '列表显示',
 
-    'menu-new'          => '添加文件夹',
     'menu-rename'       => '重命名',
     'menu-delete'       => '删除',
     'menu-view'         => '预览',
@@ -41,8 +42,8 @@
     'error-folder-exist'=> '相同名稱的資料夾已存在！',
 
     'btn-upload'        => '上传',
-    'btn-close'         => '关闭',
     'btn-uploading'     => '上传中...',
+    'btn-close'         => '关闭',
     'btn-crop'          => '裁剪',
     'btn-cancel'        => '取消',
     'btn-resize'        => '缩放',
@@ -56,5 +57,4 @@
     'resize-new-width'  => '目前宽度:',
 
     'locale-bootbox'    => 'zh_CN',
-
 ];
diff --git a/src/lang/zh-TW/lfm.php b/src/lang/zh-TW/lfm.php
@@ -1,11 +1,12 @@
 <?php
 
 return [
+    'nav-back'          => '回上一頁',
+    'nav-new'           => '新增資料夾',
     'nav-upload'        => '上傳檔案',
     'nav-thumbnails'    => '縮圖顯示',
     'nav-list'          => '列表顯示',
 
-    'menu-new'          => '新增資料夾',
     'menu-rename'       => '重新命名',
     'menu-delete'       => '刪除',
     'menu-view'         => '預覽',
@@ -41,8 +42,8 @@
     'error-folder-exist'=> '相同名稱的資料夾已存在！',
 
     'btn-upload'        => '上傳',
-    'btn-close'         => '關閉',
     'btn-uploading'     => '上傳中...',
+    'btn-close'         => '關閉',
     'btn-crop'          => '裁剪',
     'btn-cancel'        => '取消',
     'btn-resize'        => '縮放',
@@ -56,5 +57,4 @@
     'resize-new-width'  => '目前寬度:',
 
     'locale-bootbox'    => 'zh_TW',
-
 ];
diff --git a/src/views/images.blade.php b/src/views/images.blade.php
@@ -4,25 +4,26 @@
     @if((sizeof($files) > 0) || (sizeof($directories) > 0))
 
     @foreach($directories as $key => $dir_name)
+    <?php $long_name = $dir_name['long'];?>
     <div class="col-sm-6 col-md-2">
       <div class="thumbnail text-center" data-id="{{ $dir_name['long'] }}">
-        <a id="folder_{{ $key }}" data-id="{{ $dir_name['long'] }}" onclick="clickFolder('folder_{{ $key }}',0)" class="folder-icon pointer">
+        <a data-id="{{ $dir_name['long'] }}" onclick="clickFolder('{{ $long_name }}')" class="folder-icon pointer">
           {{--<i class="fa fa-folder-o fa-5x"></i>--}}
           <img src="/vendor/laravel-filemanager/img/folder.jpg">
         </a>
       </div>
       <div class="caption text-center">
         <div class="btn-group">
-          <button type="button" onclick="clickFolder('folder_{{ $key }}',0)" class="btn btn-default btn-xs">
+          <button type="button" onclick="clickFolder('{{ $long_name }}')" class="btn btn-default btn-xs">
             {{ str_limit($dir_name['short'], $limit = 10, $end = '...') }}
           </button>
           <button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown" aria-expanded="false">
             <span class="caret"></span>
             <span class="sr-only">Toggle Dropdown</span>
           </button>
           <ul class="dropdown-menu" role="menu">
-            <li><a href="javascript:rename('{{ $dir_name['long'] }}')">{{ Lang::get('laravel-filemanager::lfm.menu-rename') }}</a></li>
-            <li><a href="javascript:trash('{{ $dir_name['long'] }}')">{{ Lang::get('laravel-filemanager::lfm.menu-delete') }}</a></li>
+            <li><a href="javascript:rename('{{ $dir_name['short'] }}')">{{ Lang::get('laravel-filemanager::lfm.menu-rename') }}</a></li>
+            <li><a href="javascript:trash('{{ $dir_name['short'] }}')">{{ Lang::get('laravel-filemanager::lfm.menu-delete') }}</a></li>
           </ul>
         </div>
 
@@ -38,7 +39,7 @@
     <div class="col-sm-6 col-md-2 img-row">
 
       <div class="thumbnail thumbnail-img" data-id="{{ $file_name }}" id="img_thumbnail_{{ $key }}">
-        <img id="{{ $file }}" src="{{ $thumb_src }}" alt="" style="cursor:pointer;" onclick="useFile('{{ $file_name }}')">
+        <img id="{{ $file }}" src="{{ $thumb_src }}" alt="" class="pointer" onclick="useFile('{{ $file_name }}')">
       </div>
 
       <div class="caption text-center">
diff --git a/src/views/index.blade.php b/src/views/index.blade.php
@@ -38,13 +38,13 @@
                       <ul class="nav navbar-nav" id="nav-buttons">
                         <li>
                           <a href="#!" id="to-previous">
-                            <i class="fa fa-arrow-left"></i> 回上一頁
+                            <i class="fa fa-arrow-left"></i> {{ Lang::get('laravel-filemanager::lfm.nav-back') }}
                           </a>
                         </li>
                         <li><a style='cursor:default;'>|</a></li>
                         <li>
                           <a href="#!" id="add-folder">
-                            <i class="fa fa-plus"></i> {{ Lang::get('laravel-filemanager::lfm.menu-new') }}
+                            <i class="fa fa-plus"></i> {{ Lang::get('laravel-filemanager::lfm.nav-new') }}
                           </a>
                         </li>
                         <li>
