From 460723895b7a4d09c818b44ccc13f20d5d735e92 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Thu, 19 Apr 2018 12:55:27 +0000 Subject: [PATCH] Elastic: Files - verious improvements --- plugins/kolab_files/kolab_files.js | 18 +++--- .../kolab_files/lib/kolab_files_engine.php | 1 + plugins/kolab_files/localization/en_US.inc | 1 + .../elastic/templates/compose_plugin.html | 11 ++-- .../skins/elastic/templates/filepreview.html | 3 + .../skins/elastic/templates/files.html | 7 ++- .../elastic/templates/message_plugin.html | 3 +- plugins/kolab_files/skins/elastic/ui.js | 18 +++++- .../skins/elastic/include/kolab_files.less | 61 +++++++++++++++---- plugins/libkolab/skins/elastic/libkolab.less | 32 ++++++++++ 10 files changed, 121 insertions(+), 34 deletions(-) diff --git a/plugins/kolab_files/kolab_files.js b/plugins/kolab_files/kolab_files.js index 125d2697..48e4addb 100644 --- a/plugins/kolab_files/kolab_files.js +++ b/plugins/kolab_files/kolab_files.js @@ -87,8 +87,7 @@ window.rcmail && window.files_api && rcmail.addEventListener('init', function() .addEventListener('dragstart', function(e) { kolab_files_drag_start(e); }) .addEventListener('dragmove', function(e) { kolab_files_drag_move(e); }) .addEventListener('dragend', function(e) { kolab_files_drag_end(e); }) - .addEventListener('column_replace', function(e) { kolab_files_set_coltypes(e, 'files'); }) - .addEventListener('listupdate', function(e) { rcmail.triggerEvent('listupdate', e); }); + .addEventListener('column_replace', function(e) { kolab_files_set_coltypes(e, 'files'); }); rcmail.enable_command('menu-open', 'menu-save', 'files-sort', 'files-search', 'files-search-reset', 'folder-create', true); @@ -107,8 +106,7 @@ window.rcmail && window.files_api && rcmail.addEventListener('init', function() rcmail.sessionslist.addEventListener('dblclick', function(o) { kolab_files_sessions_list_dblclick(o); }) .addEventListener('select', function(o) { kolab_files_sessions_list_select(o); }) .addEventListener('keypress', function(o) { kolab_files_sessions_list_keypress(o); }) - .addEventListener('column_replace', function(e) { kolab_files_set_coltypes(e, 'sessions'); }) - .addEventListener('listupdate', function(e) { rcmail.triggerEvent('listupdate', e); }); + .addEventListener('column_replace', function(e) { kolab_files_set_coltypes(e, 'sessions'); }); rcmail.sessionslist.init(); kolab_files_list_coltypes('sessions'); @@ -251,8 +249,7 @@ function kolab_files_from_cloud_widget(elem) column_movable: false, dblclick_time: rcmail.dblclick_time }); - rcmail.fileslist.addEventListener('select', function(o) { kolab_files_list_select(o); }) - .addEventListener('listupdate', function(e) { rcmail.triggerEvent('listupdate', e); }); + rcmail.fileslist.addEventListener('select', function(o) { kolab_files_list_select(o); }); rcmail.enable_command('files-sort', 'files-search', 'files-search-reset', true); @@ -719,7 +716,7 @@ function kolab_files_file_rename_dialog(file) function kolab_files_file_create_dialog(file) { var buttons = {}, action = file ? 'copy' : 'create', - button_classes = ['mainaction save'], + button_classes = ['mainaction save edit'], dialog = $('#files-file-create-dialog'), type_select = $('select[name="type"]', dialog), select = $('select[name="parent"]', dialog).html(''), @@ -949,10 +946,8 @@ function kolab_files_upload_input(button) }) .attr('onclick', '') // remove default button action .click(function(e) { -console.log("*1") // forward click if mouse-enter event was missed if (rcmail.commands['files-upload'] && !this.__active) { -console.log("*2") this.__active = true; move_file_input(e); file.trigger(e); @@ -2728,6 +2723,7 @@ function kolab_files_ui() // empty the list this.env.file_list = []; rcmail.fileslist.clear(true); + rcmail.triggerEvent('listupdate', {list: rcmail.fileslist, rowcount: 0}); // request if (params.collection || params.all_folders) @@ -2759,6 +2755,7 @@ function kolab_files_ui() this.env.file_list = list; rcmail.fileslist.resize(); + rcmail.triggerEvent('listupdate', {list: rcmail.fileslist, rowcount: rcmail.fileslist.rowcount}); // update document sessions info of this folder if (list && list.length) @@ -3556,7 +3553,8 @@ function kolab_files_ui() _task: 'files', _action: params && params.action ? params.action : 'open', _file: file, - _viewer: viewer || 0 + _viewer: viewer || 0, + _frame: 1 }; if (params && params.session) diff --git a/plugins/kolab_files/lib/kolab_files_engine.php b/plugins/kolab_files/lib/kolab_files_engine.php index 8a5776a1..6a75566e 100644 --- a/plugins/kolab_files/lib/kolab_files_engine.php +++ b/plugins/kolab_files/lib/kolab_files_engine.php @@ -1453,6 +1453,7 @@ class kolab_files_engine $this->rc->output->set_env('file', $file); $this->rc->output->set_env('file_data', $this->file_data); $this->rc->output->set_env('mimetype', $this->file_data['type']); + $this->rc->output->set_env('filename', pathinfo($file, PATHINFO_BASENAME)); $this->rc->output->set_env('editor_type', $editor_type); $this->rc->output->set_env('photo_placeholder', $placeholder); $this->rc->output->set_pagetitle(rcube::Q($file)); diff --git a/plugins/kolab_files/localization/en_US.inc b/plugins/kolab_files/localization/en_US.inc index c3f78f88..56b90162 100644 --- a/plugins/kolab_files/localization/en_US.inc +++ b/plugins/kolab_files/localization/en_US.inc @@ -26,6 +26,7 @@ $labels['foldermount'] = 'Add storage'; $labels['folderdelete'] = 'Delete folder'; $labels['folderoptions'] = 'Folder options'; $labels['findfolders'] = 'Find folders'; +$labels['findfiles'] = 'Find files'; $labels['folderinside'] = 'Insert inside'; $labels['foldername'] = 'Folder name'; diff --git a/plugins/kolab_files/skins/elastic/templates/compose_plugin.html b/plugins/kolab_files/skins/elastic/templates/compose_plugin.html index 392842e8..24b91fc0 100644 --- a/plugins/kolab_files/skins/elastic/templates/compose_plugin.html +++ b/plugins/kolab_files/skins/elastic/templates/compose_plugin.html @@ -3,24 +3,25 @@ -
+
- - + +

- +
diff --git a/plugins/kolab_files/skins/elastic/templates/filepreview.html b/plugins/kolab_files/skins/elastic/templates/filepreview.html index d979911f..edd52d3b 100644 --- a/plugins/kolab_files/skins/elastic/templates/filepreview.html +++ b/plugins/kolab_files/skins/elastic/templates/filepreview.html @@ -15,6 +15,9 @@ diff --git a/plugins/kolab_files/skins/elastic/templates/message_plugin.html b/plugins/kolab_files/skins/elastic/templates/message_plugin.html index 9ab9fb67..fa9b0a31 100644 --- a/plugins/kolab_files/skins/elastic/templates/message_plugin.html +++ b/plugins/kolab_files/skins/elastic/templates/message_plugin.html @@ -1,7 +1,8 @@