mirror/php-ifm
1
0
Fork 0
mirror of https://github.com/misterunknown/ifm.git synced 2025-08-14 12:04:05 +02:00
Code Issues Releases Wiki Activity

fixed some minor issues:

Browse Source 
- fixed archive_extract_success key in language files
- filetable: permission column is now smaller
This commit is contained in:
Marco Dickert
2017-09-01 15:33:06 +02:00
parent 1901e28064
commit 2fcdc843d9
9 changed files with 45 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
build/libifm.php
View File

@@ -278,8 +278,8 @@ f00bar;
<td>{{size}}</td> <td>{{size}}</td>
{{/config.showfilesize}} {{/config.showfilesize}}
{{#config.showpermissions}} {{#config.showpermissions}}
<td class="hidden-xs"> <td class="hidden-xs td-permissions">
<input type="text" name="newpermissions" class="form-control {{filepermmode}}" value="{{fileperms}}" data-filename="{{name}}" {{readonly}}> <input type="text" size="11" name="newpermissions" class="form-control {{filepermmode}}" value="{{fileperms}}" data-filename="{{name}}" {{readonly}}>
</td> </td>
{{/config.showpermissions}} {{/config.showpermissions}}
{{#config.showowner}} {{#config.showowner}}
@@ -507,7 +507,7 @@ f00bar;
<div class="modal-body"> <div class="modal-body">
<fieldset> <fieldset>
<label>{{i18n.search_pattern}}:</label> <label>{{i18n.search_pattern}}:</label>
<input type="text" class="form-control" id="searchPattern" name="pattern" value="{{lastSearch}}"><br> <input type="text" class="form-control" id="searchPattern" name="pattern" autocomplete="off" value="{{lastSearch}}"><br>
<table id="searchResults" class="table"> <table id="searchResults" class="table">
</table> </table>
</fieldset> </fieldset>
@@ -558,7 +558,7 @@ f00bar;
{ {
"ajax_request": "AJAX request", "ajax_request": "AJAX request",
"archivename": "Name of the archive", "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_create_error": "Could not create archive.",
"archive_invalid_format": "Invalid archive format given.", "archive_invalid_format": "Invalid archive format given.",
"cancel": "Cancel", "cancel": "Cancel",
@@ -596,7 +596,7 @@ f00bar;
"file_save_success": "File was saved successfully.", "file_save_success": "File was saved successfully.",
"file_save_confirm": "Do you want to save the following file -", "file_save_confirm": "Do you want to save the following file -",
"file_save_error": "File could not be edited or created: ", "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.", "file_upload_success": "File successfully uploaded.",
"filename": "Filename", "filename": "Filename",
"filename_new": "New Filename", "filename_new": "New Filename",
@@ -669,7 +669,7 @@ $i18n["de"] = <<<'f00bar'
{ {
"ajax_request": "AJAX Request", "ajax_request": "AJAX Request",
"archivename": "Name des Archivs", "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_create_error": "Das Archiv konnte nicht erstellt werden.",
"archive_invalid_format": "Ungültiges Archivformat angegeben.", "archive_invalid_format": "Ungültiges Archivformat angegeben.",
"cancel": "Abbrechen", "cancel": "Abbrechen",
@@ -706,8 +706,8 @@ $i18n["de"] = <<<'f00bar'
"file_save_error": "Datei konnte nicht gespeichert werden.", "file_save_error": "Datei konnte nicht gespeichert werden.",
"file_save_success": "Datei erfolgreich gespeichert.", "file_save_success": "Datei erfolgreich gespeichert.",
"file_save_confirm": "Soll diese Datei wirklich gespeichert werden -", "file_save_confirm": "Soll diese Datei wirklich gespeichert werden -",
"file_save_error": "Datei konnte nicht geändert oder angelegt werden: ", "file_save_error": "Datei konnte nicht geändert oder angelegt werden: ",
"file_upload_error": "Datei konnte nicht hochgeladen werden: ", "file_upload_error": "Datei konnte nicht hochgeladen werden.",
"file_upload_success": "Datei erfolgreich hochgeladen", "file_upload_success": "Datei erfolgreich hochgeladen",
"filename": "Dateiname", "filename": "Dateiname",
"filename_new": "Neuer Dateiname", "filename_new": "Neuer Dateiname",
@@ -1050,7 +1050,7 @@ img.imgpreview { max-width: 100%; }
div#content { width: 100%; height: 350px; } 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 tr th.buttons { min-width: 95px; }
#filetable tbody tr.highlightedItem { box-shadow: 0px 0px 10px 2px #337ab7; } #filetable tbody tr.highlightedItem { box-shadow: 0px 0px 10px 2px #337ab7; }
@@ -1113,6 +1113,8 @@ footer {
top:50%; top:50%;
font-size: 6em; font-size: 6em;
} }
.td-permissions { width: 1px; }
<?php print '</style> <?php print '</style>
'; ';
} }
@@ -2037,7 +2039,7 @@ function IFM( params ) {
if(data.status == "OK") { if(data.status == "OK") {
self.showMessage( self.i18n.file_upload_success, "s"); self.showMessage( self.i18n.file_upload_success, "s");
if(data.cd == self.currentDir) self.refreshFileTable(); 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"); }, error: function() { self.showMessage( self.i18n.general_error, "e"); },
complete: function() { self.task_done(id); } complete: function() { self.task_done(id); }
@@ -2282,8 +2284,9 @@ function IFM( params ) {
}, },
dataType: "json", dataType: "json",
success: function( data ) { success: function( data ) {
console.log( data );
if( data.status == "OK" ) { if( data.status == "OK" ) {
self.showMessage( self.i18n.archive_create_success, "s" ); self.showMessage( data.message, "s" );
self.refreshFileTable(); self.refreshFileTable();
} else } else
self.showMessage( data.message, "e" ); self.showMessage( data.message, "e" );
@@ -3289,7 +3292,7 @@ function IFM( params ) {
} else } else
$this->jsonResponse( array( "status" => "ERROR", "message" => $this->l['file_save_error'] ) ); $this->jsonResponse( array( "status" => "ERROR", "message" => $this->l['file_save_error'] ) );
} else } 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 // gets the content of a file

27
ifm.php
View File

@@ -278,8 +278,8 @@ f00bar;
<td>{{size}}</td> <td>{{size}}</td>
{{/config.showfilesize}} {{/config.showfilesize}}
{{#config.showpermissions}} {{#config.showpermissions}}
<td class="hidden-xs"> <td class="hidden-xs td-permissions">
<input type="text" name="newpermissions" class="form-control {{filepermmode}}" value="{{fileperms}}" data-filename="{{name}}" {{readonly}}> <input type="text" size="11" name="newpermissions" class="form-control {{filepermmode}}" value="{{fileperms}}" data-filename="{{name}}" {{readonly}}>
</td> </td>
{{/config.showpermissions}} {{/config.showpermissions}}
{{#config.showowner}} {{#config.showowner}}
@@ -507,7 +507,7 @@ f00bar;
<div class="modal-body"> <div class="modal-body">
<fieldset> <fieldset>
<label>{{i18n.search_pattern}}:</label> <label>{{i18n.search_pattern}}:</label>
<input type="text" class="form-control" id="searchPattern" name="pattern" value="{{lastSearch}}"><br> <input type="text" class="form-control" id="searchPattern" name="pattern" autocomplete="off" value="{{lastSearch}}"><br>
<table id="searchResults" class="table"> <table id="searchResults" class="table">
</table> </table>
</fieldset> </fieldset>
@@ -558,7 +558,7 @@ f00bar;
{ {
"ajax_request": "AJAX request", "ajax_request": "AJAX request",
"archivename": "Name of the archive", "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_create_error": "Could not create archive.",
"archive_invalid_format": "Invalid archive format given.", "archive_invalid_format": "Invalid archive format given.",
"cancel": "Cancel", "cancel": "Cancel",
@@ -596,7 +596,7 @@ f00bar;
"file_save_success": "File was saved successfully.", "file_save_success": "File was saved successfully.",
"file_save_confirm": "Do you want to save the following file -", "file_save_confirm": "Do you want to save the following file -",
"file_save_error": "File could not be edited or created: ", "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.", "file_upload_success": "File successfully uploaded.",
"filename": "Filename", "filename": "Filename",
"filename_new": "New Filename", "filename_new": "New Filename",
@@ -669,7 +669,7 @@ $i18n["de"] = <<<'f00bar'
{ {
"ajax_request": "AJAX Request", "ajax_request": "AJAX Request",
"archivename": "Name des Archivs", "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_create_error": "Das Archiv konnte nicht erstellt werden.",
"archive_invalid_format": "Ungültiges Archivformat angegeben.", "archive_invalid_format": "Ungültiges Archivformat angegeben.",
"cancel": "Abbrechen", "cancel": "Abbrechen",
@@ -706,8 +706,8 @@ $i18n["de"] = <<<'f00bar'
"file_save_error": "Datei konnte nicht gespeichert werden.", "file_save_error": "Datei konnte nicht gespeichert werden.",
"file_save_success": "Datei erfolgreich gespeichert.", "file_save_success": "Datei erfolgreich gespeichert.",
"file_save_confirm": "Soll diese Datei wirklich gespeichert werden -", "file_save_confirm": "Soll diese Datei wirklich gespeichert werden -",
"file_save_error": "Datei konnte nicht geändert oder angelegt werden: ", "file_save_error": "Datei konnte nicht geändert oder angelegt werden: ",
"file_upload_error": "Datei konnte nicht hochgeladen werden: ", "file_upload_error": "Datei konnte nicht hochgeladen werden.",
"file_upload_success": "Datei erfolgreich hochgeladen", "file_upload_success": "Datei erfolgreich hochgeladen",
"filename": "Dateiname", "filename": "Dateiname",
"filename_new": "Neuer Dateiname", "filename_new": "Neuer Dateiname",
@@ -1050,7 +1050,7 @@ img.imgpreview { max-width: 100%; }
div#content { width: 100%; height: 350px; } 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 tr th.buttons { min-width: 95px; }
#filetable tbody tr.highlightedItem { box-shadow: 0px 0px 10px 2px #337ab7; } #filetable tbody tr.highlightedItem { box-shadow: 0px 0px 10px 2px #337ab7; }
@@ -1113,6 +1113,8 @@ footer {
top:50%; top:50%;
font-size: 6em; font-size: 6em;
} }
.td-permissions { width: 1px; }
<?php print '</style> <?php print '</style>
'; ';
} }
@@ -2037,7 +2039,7 @@ function IFM( params ) {
if(data.status == "OK") { if(data.status == "OK") {
self.showMessage( self.i18n.file_upload_success, "s"); self.showMessage( self.i18n.file_upload_success, "s");
if(data.cd == self.currentDir) self.refreshFileTable(); 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"); }, error: function() { self.showMessage( self.i18n.general_error, "e"); },
complete: function() { self.task_done(id); } complete: function() { self.task_done(id); }
@@ -2282,8 +2284,9 @@ function IFM( params ) {
}, },
dataType: "json", dataType: "json",
success: function( data ) { success: function( data ) {
console.log( data );
if( data.status == "OK" ) { if( data.status == "OK" ) {
self.showMessage( self.i18n.archive_create_success, "s" ); self.showMessage( data.message, "s" );
self.refreshFileTable(); self.refreshFileTable();
} else } else
self.showMessage( data.message, "e" ); self.showMessage( data.message, "e" );
@@ -3289,7 +3292,7 @@ function IFM( params ) {
} else } else
$this->jsonResponse( array( "status" => "ERROR", "message" => $this->l['file_save_error'] ) ); $this->jsonResponse( array( "status" => "ERROR", "message" => $this->l['file_save_error'] ) );
} else } 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 // gets the content of a file

6
src/i18n/de.json
View File

@@ -1,7 +1,7 @@
{ {
"ajax_request": "AJAX Request", "ajax_request": "AJAX Request",
"archivename": "Name des Archivs", "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_create_error": "Das Archiv konnte nicht erstellt werden.",
"archive_invalid_format": "Ungültiges Archivformat angegeben.", "archive_invalid_format": "Ungültiges Archivformat angegeben.",
"cancel": "Abbrechen", "cancel": "Abbrechen",
@@ -38,8 +38,8 @@
"file_save_error": "Datei konnte nicht gespeichert werden.", "file_save_error": "Datei konnte nicht gespeichert werden.",
"file_save_success": "Datei erfolgreich gespeichert.", "file_save_success": "Datei erfolgreich gespeichert.",
"file_save_confirm": "Soll diese Datei wirklich gespeichert werden -", "file_save_confirm": "Soll diese Datei wirklich gespeichert werden -",
"file_save_error": "Datei konnte nicht geändert oder angelegt werden: ", "file_save_error": "Datei konnte nicht geändert oder angelegt werden: ",
"file_upload_error": "Datei konnte nicht hochgeladen werden: ", "file_upload_error": "Datei konnte nicht hochgeladen werden.",
"file_upload_success": "Datei erfolgreich hochgeladen", "file_upload_success": "Datei erfolgreich hochgeladen",
"filename": "Dateiname", "filename": "Dateiname",
"filename_new": "Neuer Dateiname", "filename_new": "Neuer Dateiname",

4
src/i18n/en.json
View File

@@ -1,7 +1,7 @@
{ {
"ajax_request": "AJAX request", "ajax_request": "AJAX request",
"archivename": "Name of the archive", "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_create_error": "Could not create archive.",
"archive_invalid_format": "Invalid archive format given.", "archive_invalid_format": "Invalid archive format given.",
"cancel": "Cancel", "cancel": "Cancel",
@@ -39,7 +39,7 @@
"file_save_success": "File was saved successfully.", "file_save_success": "File was saved successfully.",
"file_save_confirm": "Do you want to save the following file -", "file_save_confirm": "Do you want to save the following file -",
"file_save_error": "File could not be edited or created: ", "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.", "file_upload_success": "File successfully uploaded.",
"filename": "Filename", "filename": "Filename",
"filename_new": "New Filename", "filename_new": "New Filename",

5
src/ifm.js
View File

@@ -870,7 +870,7 @@ function IFM( params ) {
if(data.status == "OK") { if(data.status == "OK") {
self.showMessage( self.i18n.file_upload_success, "s"); self.showMessage( self.i18n.file_upload_success, "s");
if(data.cd == self.currentDir) self.refreshFileTable(); 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"); }, error: function() { self.showMessage( self.i18n.general_error, "e"); },
complete: function() { self.task_done(id); } complete: function() { self.task_done(id); }
@@ -1115,8 +1115,9 @@ function IFM( params ) {
}, },
dataType: "json", dataType: "json",
success: function( data ) { success: function( data ) {
console.log( data );
if( data.status == "OK" ) { if( data.status == "OK" ) {
self.showMessage( self.i18n.archive_create_success, "s" ); self.showMessage( data.message, "s" );
self.refreshFileTable(); self.refreshFileTable();
} else } else
self.showMessage( data.message, "e" ); self.showMessage( data.message, "e" );

2
src/main.php
View File

@@ -566,7 +566,7 @@ f00bar;
} else } else
$this->jsonResponse( array( "status" => "ERROR", "message" => $this->l['file_save_error'] ) ); $this->jsonResponse( array( "status" => "ERROR", "message" => $this->l['file_save_error'] ) );
} else } 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 // gets the content of a file

4
src/style.css
View File

@@ -34,7 +34,7 @@ img.imgpreview { max-width: 100%; }
div#content { width: 100%; height: 350px; } 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 tr th.buttons { min-width: 95px; }
#filetable tbody tr.highlightedItem { box-shadow: 0px 0px 10px 2px #337ab7; } #filetable tbody tr.highlightedItem { box-shadow: 0px 0px 10px 2px #337ab7; }
@@ -97,3 +97,5 @@ footer {
top:50%; top:50%;
font-size: 6em; font-size: 6em;
} }
.td-permissions { width: 1px; }

4
src/templates/filetable.html
View File

@@ -25,8 +25,8 @@
<td>{{size}}</td> <td>{{size}}</td>
{{/config.showfilesize}} {{/config.showfilesize}}
{{#config.showpermissions}} {{#config.showpermissions}}
<td class="hidden-xs"> <td class="hidden-xs td-permissions">
<input type="text" name="newpermissions" class="form-control {{filepermmode}}" value="{{fileperms}}" data-filename="{{name}}" {{readonly}}> <input type="text" size="11" name="newpermissions" class="form-control {{filepermmode}}" value="{{fileperms}}" data-filename="{{name}}" {{readonly}}>
</td> </td>
{{/config.showpermissions}} {{/config.showpermissions}}
{{#config.showowner}} {{#config.showowner}}

2
src/templates/modal.search.html
View File

@@ -2,7 +2,7 @@
<div class="modal-body"> <div class="modal-body">
<fieldset> <fieldset>
<label>{{i18n.search_pattern}}:</label> <label>{{i18n.search_pattern}}:</label>
<input type="text" class="form-control" id="searchPattern" name="pattern" value="{{lastSearch}}"><br> <input type="text" class="form-control" id="searchPattern" name="pattern" autocomplete="off" value="{{lastSearch}}"><br>
<table id="searchResults" class="table"> <table id="searchResults" class="table">
</table> </table>
</fieldset> </fieldset>