From 2fcdc843d99f3ec87833c7e6e8513d93b5770cd2 Mon Sep 17 00:00:00 2001 From: Marco Dickert Date: Fri, 1 Sep 2017 15:33:06 +0200 Subject: [PATCH] fixed some minor issues: - fixed archive_extract_success key in language files - filetable: permission column is now smaller --- build/libifm.php | 27 +++++++++++++++------------ ifm.php | 27 +++++++++++++++------------ src/i18n/de.json | 6 +++--- src/i18n/en.json | 4 ++-- src/ifm.js | 5 +++-- src/main.php | 2 +- src/style.css | 4 +++- src/templates/filetable.html | 4 ++-- src/templates/modal.search.html | 2 +- 9 files changed, 45 insertions(+), 36 deletions(-) diff --git a/build/libifm.php b/build/libifm.php index 9eb43e6..21bc2e7 100644 --- a/build/libifm.php +++ b/build/libifm.php @@ -278,8 +278,8 @@ f00bar; {{size}} {{/config.showfilesize}} {{#config.showpermissions}} - - + + {{/config.showpermissions}} {{#config.showowner}} @@ -507,7 +507,7 @@ f00bar;
-
+
@@ -558,7 +558,7 @@ f00bar; { "ajax_request": "AJAX request", "archivename": "Name of the archive", - "archive_create_sucess": "Archive successfully created.", + "archive_create_success": "Archive successfully created.", "archive_create_error": "Could not create archive.", "archive_invalid_format": "Invalid archive format given.", "cancel": "Cancel", @@ -596,7 +596,7 @@ f00bar; "file_save_success": "File was saved successfully.", "file_save_confirm": "Do you want to save the following file -", "file_save_error": "File could not be edited or created: ", - "file_upload_error": "File could not be uploaded: ", + "file_upload_error": "File could not be uploaded.", "file_upload_success": "File successfully uploaded.", "filename": "Filename", "filename_new": "New Filename", @@ -669,7 +669,7 @@ $i18n["de"] = <<<'f00bar' { "ajax_request": "AJAX Request", "archivename": "Name des Archivs", - "archive_create_sucess": "Das Archiv wurde erfolgreich erstellt.", + "archive_create_success": "Das Archiv wurde erfolgreich erstellt.", "archive_create_error": "Das Archiv konnte nicht erstellt werden.", "archive_invalid_format": "Ungültiges Archivformat angegeben.", "cancel": "Abbrechen", @@ -706,8 +706,8 @@ $i18n["de"] = <<<'f00bar' "file_save_error": "Datei konnte nicht gespeichert werden.", "file_save_success": "Datei erfolgreich gespeichert.", "file_save_confirm": "Soll diese Datei wirklich gespeichert werden -", - "file_save_error": "Datei konnte nicht geändert oder angelegt werden: ", - "file_upload_error": "Datei konnte nicht hochgeladen werden: ", + "file_save_error": "Datei konnte nicht geändert oder angelegt werden: ", + "file_upload_error": "Datei konnte nicht hochgeladen werden.", "file_upload_success": "Datei erfolgreich hochgeladen", "filename": "Dateiname", "filename_new": "Neuer Dateiname", @@ -1050,7 +1050,7 @@ img.imgpreview { max-width: 100%; } div#content { width: 100%; height: 350px; } -input[name=newperms] { width: 7em; } +input[name=newpermissions] { padding: 6px 8px; } #filetable tr th.buttons { min-width: 95px; } #filetable tbody tr.highlightedItem { box-shadow: 0px 0px 10px 2px #337ab7; } @@ -1113,6 +1113,8 @@ footer { top:50%; font-size: 6em; } + +.td-permissions { width: 1px; } '; } @@ -2037,7 +2039,7 @@ function IFM( params ) { if(data.status == "OK") { self.showMessage( self.i18n.file_upload_success, "s"); if(data.cd == self.currentDir) self.refreshFileTable(); - } else self.showMessage( self.i18n.file_upload_error +data.message, "e"); + } else self.showMessage( data.message, "e"); }, error: function() { self.showMessage( self.i18n.general_error, "e"); }, complete: function() { self.task_done(id); } @@ -2282,8 +2284,9 @@ function IFM( params ) { }, dataType: "json", success: function( data ) { + console.log( data ); if( data.status == "OK" ) { - self.showMessage( self.i18n.archive_create_success, "s" ); + self.showMessage( data.message, "s" ); self.refreshFileTable(); } else self.showMessage( data.message, "e" ); @@ -3289,7 +3292,7 @@ function IFM( params ) { } else $this->jsonResponse( array( "status" => "ERROR", "message" => $this->l['file_save_error'] ) ); } else - $this->jsonResponse( array( "status" => "ERROR", "message" => $this-l['invalid_filename'] ) ); + $this->jsonResponse( array( "status" => "ERROR", "message" => $this->l['invalid_filename'] ) ); } // gets the content of a file diff --git a/ifm.php b/ifm.php index c9f9fa0..de61f38 100644 --- a/ifm.php +++ b/ifm.php @@ -278,8 +278,8 @@ f00bar; {{size}} {{/config.showfilesize}} {{#config.showpermissions}} - - + + {{/config.showpermissions}} {{#config.showowner}} @@ -507,7 +507,7 @@ f00bar;
-
+
@@ -558,7 +558,7 @@ f00bar; { "ajax_request": "AJAX request", "archivename": "Name of the archive", - "archive_create_sucess": "Archive successfully created.", + "archive_create_success": "Archive successfully created.", "archive_create_error": "Could not create archive.", "archive_invalid_format": "Invalid archive format given.", "cancel": "Cancel", @@ -596,7 +596,7 @@ f00bar; "file_save_success": "File was saved successfully.", "file_save_confirm": "Do you want to save the following file -", "file_save_error": "File could not be edited or created: ", - "file_upload_error": "File could not be uploaded: ", + "file_upload_error": "File could not be uploaded.", "file_upload_success": "File successfully uploaded.", "filename": "Filename", "filename_new": "New Filename", @@ -669,7 +669,7 @@ $i18n["de"] = <<<'f00bar' { "ajax_request": "AJAX Request", "archivename": "Name des Archivs", - "archive_create_sucess": "Das Archiv wurde erfolgreich erstellt.", + "archive_create_success": "Das Archiv wurde erfolgreich erstellt.", "archive_create_error": "Das Archiv konnte nicht erstellt werden.", "archive_invalid_format": "Ungültiges Archivformat angegeben.", "cancel": "Abbrechen", @@ -706,8 +706,8 @@ $i18n["de"] = <<<'f00bar' "file_save_error": "Datei konnte nicht gespeichert werden.", "file_save_success": "Datei erfolgreich gespeichert.", "file_save_confirm": "Soll diese Datei wirklich gespeichert werden -", - "file_save_error": "Datei konnte nicht geändert oder angelegt werden: ", - "file_upload_error": "Datei konnte nicht hochgeladen werden: ", + "file_save_error": "Datei konnte nicht geändert oder angelegt werden: ", + "file_upload_error": "Datei konnte nicht hochgeladen werden.", "file_upload_success": "Datei erfolgreich hochgeladen", "filename": "Dateiname", "filename_new": "Neuer Dateiname", @@ -1050,7 +1050,7 @@ img.imgpreview { max-width: 100%; } div#content { width: 100%; height: 350px; } -input[name=newperms] { width: 7em; } +input[name=newpermissions] { padding: 6px 8px; } #filetable tr th.buttons { min-width: 95px; } #filetable tbody tr.highlightedItem { box-shadow: 0px 0px 10px 2px #337ab7; } @@ -1113,6 +1113,8 @@ footer { top:50%; font-size: 6em; } + +.td-permissions { width: 1px; } '; } @@ -2037,7 +2039,7 @@ function IFM( params ) { if(data.status == "OK") { self.showMessage( self.i18n.file_upload_success, "s"); if(data.cd == self.currentDir) self.refreshFileTable(); - } else self.showMessage( self.i18n.file_upload_error +data.message, "e"); + } else self.showMessage( data.message, "e"); }, error: function() { self.showMessage( self.i18n.general_error, "e"); }, complete: function() { self.task_done(id); } @@ -2282,8 +2284,9 @@ function IFM( params ) { }, dataType: "json", success: function( data ) { + console.log( data ); if( data.status == "OK" ) { - self.showMessage( self.i18n.archive_create_success, "s" ); + self.showMessage( data.message, "s" ); self.refreshFileTable(); } else self.showMessage( data.message, "e" ); @@ -3289,7 +3292,7 @@ function IFM( params ) { } else $this->jsonResponse( array( "status" => "ERROR", "message" => $this->l['file_save_error'] ) ); } else - $this->jsonResponse( array( "status" => "ERROR", "message" => $this-l['invalid_filename'] ) ); + $this->jsonResponse( array( "status" => "ERROR", "message" => $this->l['invalid_filename'] ) ); } // gets the content of a file diff --git a/src/i18n/de.json b/src/i18n/de.json index 84bfb9d..68323af 100644 --- a/src/i18n/de.json +++ b/src/i18n/de.json @@ -1,7 +1,7 @@ { "ajax_request": "AJAX Request", "archivename": "Name des Archivs", - "archive_create_sucess": "Das Archiv wurde erfolgreich erstellt.", + "archive_create_success": "Das Archiv wurde erfolgreich erstellt.", "archive_create_error": "Das Archiv konnte nicht erstellt werden.", "archive_invalid_format": "Ungültiges Archivformat angegeben.", "cancel": "Abbrechen", @@ -38,8 +38,8 @@ "file_save_error": "Datei konnte nicht gespeichert werden.", "file_save_success": "Datei erfolgreich gespeichert.", "file_save_confirm": "Soll diese Datei wirklich gespeichert werden -", - "file_save_error": "Datei konnte nicht geändert oder angelegt werden: ", - "file_upload_error": "Datei konnte nicht hochgeladen werden: ", + "file_save_error": "Datei konnte nicht geändert oder angelegt werden: ", + "file_upload_error": "Datei konnte nicht hochgeladen werden.", "file_upload_success": "Datei erfolgreich hochgeladen", "filename": "Dateiname", "filename_new": "Neuer Dateiname", diff --git a/src/i18n/en.json b/src/i18n/en.json index d5a78b0..05c70ca 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -1,7 +1,7 @@ { "ajax_request": "AJAX request", "archivename": "Name of the archive", - "archive_create_sucess": "Archive successfully created.", + "archive_create_success": "Archive successfully created.", "archive_create_error": "Could not create archive.", "archive_invalid_format": "Invalid archive format given.", "cancel": "Cancel", @@ -39,7 +39,7 @@ "file_save_success": "File was saved successfully.", "file_save_confirm": "Do you want to save the following file -", "file_save_error": "File could not be edited or created: ", - "file_upload_error": "File could not be uploaded: ", + "file_upload_error": "File could not be uploaded.", "file_upload_success": "File successfully uploaded.", "filename": "Filename", "filename_new": "New Filename", diff --git a/src/ifm.js b/src/ifm.js index 2c5486c..fccb972 100644 --- a/src/ifm.js +++ b/src/ifm.js @@ -870,7 +870,7 @@ function IFM( params ) { if(data.status == "OK") { self.showMessage( self.i18n.file_upload_success, "s"); if(data.cd == self.currentDir) self.refreshFileTable(); - } else self.showMessage( self.i18n.file_upload_error +data.message, "e"); + } else self.showMessage( data.message, "e"); }, error: function() { self.showMessage( self.i18n.general_error, "e"); }, complete: function() { self.task_done(id); } @@ -1115,8 +1115,9 @@ function IFM( params ) { }, dataType: "json", success: function( data ) { + console.log( data ); if( data.status == "OK" ) { - self.showMessage( self.i18n.archive_create_success, "s" ); + self.showMessage( data.message, "s" ); self.refreshFileTable(); } else self.showMessage( data.message, "e" ); diff --git a/src/main.php b/src/main.php index c121d5d..60b60b4 100644 --- a/src/main.php +++ b/src/main.php @@ -566,7 +566,7 @@ f00bar; } else $this->jsonResponse( array( "status" => "ERROR", "message" => $this->l['file_save_error'] ) ); } else - $this->jsonResponse( array( "status" => "ERROR", "message" => $this-l['invalid_filename'] ) ); + $this->jsonResponse( array( "status" => "ERROR", "message" => $this->l['invalid_filename'] ) ); } // gets the content of a file diff --git a/src/style.css b/src/style.css index b75f152..b9d598c 100644 --- a/src/style.css +++ b/src/style.css @@ -34,7 +34,7 @@ img.imgpreview { max-width: 100%; } div#content { width: 100%; height: 350px; } -input[name=newperms] { width: 7em; } +input[name=newpermissions] { padding: 6px 8px; } #filetable tr th.buttons { min-width: 95px; } #filetable tbody tr.highlightedItem { box-shadow: 0px 0px 10px 2px #337ab7; } @@ -97,3 +97,5 @@ footer { top:50%; font-size: 6em; } + +.td-permissions { width: 1px; } diff --git a/src/templates/filetable.html b/src/templates/filetable.html index 5dd0a08..6f53919 100644 --- a/src/templates/filetable.html +++ b/src/templates/filetable.html @@ -25,8 +25,8 @@ {{size}} {{/config.showfilesize}} {{#config.showpermissions}} - - + + {{/config.showpermissions}} {{#config.showowner}} diff --git a/src/templates/modal.search.html b/src/templates/modal.search.html index 9a2ae5f..5fe4643 100644 --- a/src/templates/modal.search.html +++ b/src/templates/modal.search.html @@ -2,7 +2,7 @@
-
+