Drive/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Listing active collaborative editing sessions (T728)

Browse source
This commit is contained in:
Aleksander Machniak 2016-01-29 11:24:02 +01:00
parent 669feb6b02
commit 1f88231db9
8 changed files with 542 additions and 130 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
plugins/kolab_files/config.inc.php.dist
View file

@ -12,6 +12,15 @@ $config['kolab_files_sort_col'] = 'name';
// Order of the files list sort // Order of the files list sort
$config['kolab_files_sort_order'] = 'asc'; $config['kolab_files_sort_order'] = 'asc';
// List of editing sessions list columns. Available are: name, owner
$config['kolab_files_sessions_list_cols'] = array('name', 'owner');
// Name of the column to sort sessions list by
$config['kolab_files_sessions_sort_col'] = 'name';
// Order of the sessions list sort
$config['kolab_files_sessions_sort_order'] = 'asc';
// Number of concurent requests for searching and collections listing. Default: 1 // Number of concurent requests for searching and collections listing. Default: 1
$config['kolab_files_search_threads'] = 1; $config['kolab_files_search_threads'] = 1;

398
plugins/kolab_files/kolab_files.js
View file

@ -72,29 +72,46 @@ window.rcmail && window.files_api && rcmail.addEventListener('init', function()
kolab_files_from_cloud_widget($('#taskedit-attachment-form > div.buttons')); kolab_files_from_cloud_widget($('#taskedit-attachment-form > div.buttons'));
} }
else if (rcmail.task == 'files') { else if (rcmail.task == 'files') {
if (rcmail.gui_objects.filelist) { if (rcmail.gui_objects.fileslist) {
rcmail.file_list = new rcube_list_widget(rcmail.gui_objects.filelist, { rcmail.fileslist = new rcube_list_widget(rcmail.gui_objects.fileslist, {
multiselect: true, multiselect: true,
draggable: true, draggable: true,
keyboard: true, keyboard: true,
column_movable: rcmail.env.col_movable, column_movable: rcmail.env.files_col_movable,
dblclick_time: rcmail.dblclick_time dblclick_time: rcmail.dblclick_time
}); });
rcmail.file_list.addEventListener('dblclick', function(o) { kolab_files_list_dblclick(o); }) rcmail.fileslist.addEventListener('dblclick', function(o) { kolab_files_list_dblclick(o); })
.addEventListener('select', function(o) { kolab_files_list_select(o); }) .addEventListener('select', function(o) { kolab_files_list_select(o); })
.addEventListener('keypress', function(o) { kolab_files_list_keypress(o); }) .addEventListener('keypress', function(o) { kolab_files_list_keypress(o); })
.addEventListener('dragstart', function(e) { kolab_files_drag_start(e); }) .addEventListener('dragstart', function(e) { kolab_files_drag_start(e); })
.addEventListener('dragmove', function(e) { kolab_files_drag_move(e); }) .addEventListener('dragmove', function(e) { kolab_files_drag_move(e); })
.addEventListener('dragend', function(e) { kolab_files_drag_end(e); }) .addEventListener('dragend', function(e) { kolab_files_drag_end(e); })
.addEventListener('column_replace', function(e) { kolab_files_set_coltypes(e); }) .addEventListener('column_replace', function(e) { kolab_files_set_coltypes(e, 'files'); })
.addEventListener('listupdate', function(e) { rcmail.triggerEvent('listupdate', e); }); .addEventListener('listupdate', function(e) { rcmail.triggerEvent('listupdate', e); });
rcmail.enable_command('menu-open', 'menu-save', 'files-sort', 'files-search', 'files-search-reset', 'folder-create', true); rcmail.enable_command('menu-open', 'menu-save', 'files-sort', 'files-search', 'files-search-reset', 'folder-create', true);
rcmail.file_list.init(); rcmail.fileslist.init();
kolab_files_list_coltypes(); kolab_files_list_coltypes('files');
kolab_files_drag_drop_init($(rcmail.gui_objects.filelist).parents('.droptarget')); kolab_files_drag_drop_init($(rcmail.gui_objects.fileslist).parents('.droptarget'));
}
if (rcmail.gui_objects.sessionslist) {
rcmail.sessionslist = new rcube_list_widget(rcmail.gui_objects.sessionslist, {
keyboard: true,
column_movable: rcmail.env.sessions_col_movable,
dblclick_time: rcmail.dblclick_time
});
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); });
rcmail.sessionslist.init();
kolab_files_list_coltypes('sessions');
} }
// "one file only" commands // "one file only" commands
@ -215,19 +232,19 @@ function kolab_files_from_cloud_widget(elem)
.click(function() { kolab_files_selector_dialog(); }) .click(function() { kolab_files_selector_dialog(); })
.appendTo(elem); .appendTo(elem);
if (rcmail.gui_objects.filelist) { if (rcmail.gui_objects.fileslist) {
rcmail.file_list = new rcube_list_widget(rcmail.gui_objects.filelist, { rcmail.fileslist = new rcube_list_widget(rcmail.gui_objects.fileslist, {
multiselect: true, multiselect: true,
keyboard: true, keyboard: true,
column_movable: false, column_movable: false,
dblclick_time: rcmail.dblclick_time dblclick_time: rcmail.dblclick_time
}); });
rcmail.file_list.addEventListener('select', function(o) { kolab_files_list_select(o); }) rcmail.fileslist.addEventListener('select', function(o) { kolab_files_list_select(o); })
.addEventListener('listupdate', function(e) { rcmail.triggerEvent('listupdate', e); }); .addEventListener('listupdate', function(e) { rcmail.triggerEvent('listupdate', e); });
rcmail.enable_command('files-sort', 'files-search', 'files-search-reset', true); rcmail.enable_command('files-sort', 'files-search', 'files-search-reset', true);
rcmail.file_list.init(); rcmail.fileslist.init();
kolab_files_list_coltypes(); kolab_files_list_coltypes();
} }
} }
@ -333,7 +350,7 @@ function kolab_files_selector_dialog()
buttons[rcmail.gettext('kolab_files.attachsel')] = function () { buttons[rcmail.gettext('kolab_files.attachsel')] = function () {
var list = []; var list = [];
$('#filelist tr.selected').each(function() { $('#fileslist tr.selected').each(function() {
list.push($(this).data('file')); list.push($(this).data('file'));
}); });
@ -369,7 +386,7 @@ function kolab_files_selector_dialog()
minHeight: 300, minHeight: 300,
width: 700, width: 700,
height: 500 height: 500
}, function() { rcmail.file_list.resize(); }); }, function() { rcmail.fileslist.resize(); });
if (!rcmail.env.files_loaded) { if (!rcmail.env.files_loaded) {
rcmail.env.folder_list_selector = '#files-compose-dialog #files-folder-list'; rcmail.env.folder_list_selector = '#files-compose-dialog #files-folder-list';
@ -378,7 +395,7 @@ function kolab_files_selector_dialog()
rcmail.env.files_loaded = true; rcmail.env.files_loaded = true;
} }
else { else {
rcmail.file_list.clear_selection(); rcmail.fileslist.clear_selection();
} }
}; };
@ -695,7 +712,7 @@ function kolab_files_file_create_dialog(file)
if (rcmail.env.file_data) if (rcmail.env.file_data)
type = rcmail.env.file_data.type; type = rcmail.env.file_data.type;
else { else {
sel = rcmail.file_list.get_selection(); sel = rcmail.fileslist.get_selection();
type = $('#rcmrow' + sel[0]).data('type'); type = $('#rcmrow' + sel[0]).data('type');
} }
} }
@ -739,6 +756,67 @@ function kolab_files_file_create_dialog(file)
file_api.folder_select_element(select, {writable: true}); file_api.folder_select_element(select, {writable: true});
}; };
// file session dialog
function kolab_files_session_dialog(session)
{
var buttons = {},
dialog = $('#files-session-dialog'),
filename = file_api.file_name(session.file),
owner = session.owner_name || session.owner,
title = rcmail.gettext('kolab_files.sessiondialog'),
content = rcmail.gettext('kolab_files.sessiondialogcontent'),
button_classes = ['mainaction'],
join_session = function(id) {
var viewer = file_api.file_type_supported('application/vnd.oasis.opendocument.text', rcmail.env.files_caps);
params = {action: 'edit', session: id};
file_api.file_open('', viewer, params);
};
content = content.replace('$file', filename).replace('$owner', owner);
$('div', dialog).text(content);
if (session.is_owner) {
buttons[rcmail.gettext('kolab_files.open')] = function() {
kolab_dialog_close(this);
join_session(session.id);
};
buttons[rcmail.gettext('kolab_files.close')] = function() {
kolab_dialog_close(this);
file_api.document_delete(session.id);
};
button_classes.push('delete');
}
else if (session.is_invited) {
// @TODO: check if not-accepted and provide "Decline invitation" button
// @TODO: Add "Accept button", add comment field to the dialog
buttons[rcmail.gettext('kolab_files.join')] = function() {
kolab_dialog_close(this);
join_session(session.id);
};
}
else {
buttons[rcmail.gettext('kolab_files.request')] = function() {
kolab_dialog_close(this);
// @TODO: Add comment field to the dialog
manticore.invitation_request({session_id: session.id});
};
}
buttons[rcmail.gettext('kolab_files.cancel')] = function() {
kolab_dialog_close(this);
};
// show dialog window
kolab_dialog_show(dialog, {
title: title,
buttons: buttons,
button_classes: button_classes,
minHeight: 100,
height: 150
});
};
function kolab_dialog_show(content, params, onopen) function kolab_dialog_show(content, params, onopen)
{ {
params = $.extend({ params = $.extend({
@ -854,14 +932,16 @@ function kolab_files_upload_input(button)
/***********************************************************/ /***********************************************************/
// for reordering column array (Konqueror workaround) // for reordering column array (Konqueror workaround)
// and for setting some message list global variables // and for setting some files/sessions list global variables
function kolab_files_list_coltypes() function kolab_files_list_coltypes(type)
{ {
var n, list = rcmail.file_list; if (!type) type = 'files';
var n, list = rcmail[type + 'list'];
rcmail.env.subject_col = null; rcmail.env.subject_col = null;
if ((n = $.inArray('name', rcmail.env.file_coltypes)) >= 0) { if ((n = $.inArray('name', rcmail.env[type + '_coltypes'])) >= 0) {
rcmail.env.subject_col = n; rcmail.env.subject_col = n;
list.subject_col = n; list.subject_col = n;
} }
@ -869,18 +949,19 @@ function kolab_files_list_coltypes()
list.init_header(); list.init_header();
}; };
function kolab_files_set_list_options(cols, sort_col, sort_order) function kolab_files_set_list_options(cols, sort_col, sort_order, type)
{ {
var update = 0, i, idx, name, newcols = [], oldcols = rcmail.env.file_coltypes; var update = 0, i, idx, name, newcols = [], oldcols = rcmail.env[type + '_coltypes'];
if (sort_col === undefined) if (sort_col === undefined)
sort_col = rcmail.env.sort_col; sort_col = rcmail.env[type + '_sort_col'];
if (!sort_order) if (!sort_order)
sort_order = rcmail.env.sort_order; sort_order = rcmail.env[type + '_sort_order'];
if (rcmail.env.sort_col != sort_col || rcmail.env.sort_order != sort_order) { if (rcmail.env[type + '_sort_col'] != sort_col || rcmail.env[type + '_sort_order'] != sort_order) {
update = 1; update = 1;
rcmail.set_list_sorting(sort_col, sort_order); // set table header class
kolab_files_set_list_sorting(sort_col, sort_order, type);
} }
if (cols && cols.length) { if (cols && cols.length) {
@ -904,9 +985,10 @@ function kolab_files_set_list_options(cols, sort_col, sort_order)
} }
if (update == 1) if (update == 1)
rcmail.command('files-list', {sort: sort_col, reverse: sort_order == 'DESC'}); rcmail.command(type + '-list', {sort: sort_col, reverse: sort_order == 'DESC'});
else if (update) { else if (update) {
rcmail.http_post('files/prefs', { rcmail.http_post('files/prefs', {
type: type,
kolab_files_list_cols: oldcols, kolab_files_list_cols: oldcols,
kolab_files_sort_col: sort_col, kolab_files_sort_col: sort_col,
kolab_files_sort_order: sort_order kolab_files_sort_order: sort_order
@ -914,23 +996,61 @@ function kolab_files_set_list_options(cols, sort_col, sort_order)
} }
}; };
function kolab_files_set_coltypes(list) function kolab_files_set_list_sorting(sort_col, sort_order, type)
{
// set table header class
var old_col = rcmail.env[type + '_sort_col'],
old_sort = rcmail.env[type + '_sort_order'];
$('#rcm' + old_col).removeClass('sortedASC sortedDESC');
$('#rcm' + sort_col).addClass('sorted' + sort_order);
rcmail.env[type + '_sort_col'] = sort_col;
rcmail.env[type + '_sort_order'] = sort_order;
};
function kolab_files_set_coltypes(list, type)
{ {
var i, found, name, cols = list.list.tHead.rows[0].cells; var i, found, name, cols = list.list.tHead.rows[0].cells;
rcmail.env.file_coltypes = []; rcmail.env[type + '_coltypes'] = [];
for (i=0; i<cols.length; i++) for (i=0; i<cols.length; i++)
if (cols[i].id && cols[i].id.match(/^rcm/)) { if (cols[i].id && cols[i].id.match(/^rcm/)) {
name = cols[i].id.replace(/^rcm/, ''); name = cols[i].id.replace(/^rcm/, '');
rcmail.env.file_coltypes.push(name); rcmail.env[type + '_coltypes'].push(name);
} }
// if ((found = $.inArray('name', rcmail.env.file_coltypes)) >= 0) // if ((found = $.inArray('name', rcmail.env.files_coltypes)) >= 0)
// rcmail.env.subject_col = found; // rcmail.env.subject_col = found;
rcmail.env.subject_col = list.subject_col; rcmail.env.subject_col = list.subject_col;
rcmail.http_post('files/prefs', {kolab_files_list_cols: rcmail.env.file_coltypes}); rcmail.http_post('files/prefs', {kolab_files_list_cols: rcmail.env[type + '_coltypes'], type: type});
};
function kolab_files_sessions_list_dblclick(list)
{
rcmail.command('sessions-open');
};
function kolab_files_sessions_list_select(list)
{
var selected = list.selection.length;
rcmail.enable_command('sessions-open', selected == 1);
};
function kolab_files_sessions_list_keypress(list)
{
if (list.modkey == CONTROL_KEY)
return;
if (list.key_pressed == list.ENTER_KEY) {
// use setTimeout(), otherwise the opened dialog will be immediately closed
setTimeout(function() { rcmail.command('sessions-open'); }, 50);
}
// else if (list.key_pressed == list.DELETE_KEY || list.key_pressed == list.BACKSPACE_KEY)
// rcmail.command('sessions-delete');
}; };
function kolab_files_list_dblclick(list) function kolab_files_list_dblclick(list)
@ -995,7 +1115,7 @@ function kolab_files_drag_end(e)
var modkey = rcube_event.get_modifier(e), var modkey = rcube_event.get_modifier(e),
menu = rcmail.gui_objects.file_dragmenu; menu = rcmail.gui_objects.file_dragmenu;
rcmail.file_list.draglayer.hide(); rcmail.fileslist.draglayer.hide();
if (menu && modkey == SHIFT_KEY && rcmail.commands['files-copy']) { if (menu && modkey == SHIFT_KEY && rcmail.commands['files-copy']) {
var pos = rcube_event.get_mouse_pos(e); var pos = rcube_event.get_mouse_pos(e);
@ -1030,7 +1150,7 @@ function kolab_files_drag_menu_action(command)
function kolab_files_selected() function kolab_files_selected()
{ {
var files = []; var files = [];
$.each(rcmail.file_list.get_selection(), function(i, v) { $.each(rcmail.fileslist.get_selection(), function(i, v) {
var name, row = $('#rcmrow'+v); var name, row = $('#rcmrow'+v);
if (row.length == 1 && (name = row.data('file'))) if (row.length == 1 && (name = row.data('file')))
@ -1097,7 +1217,6 @@ function kolab_files_drag_drop_init(container)
}, false); }, false);
}; };
// handler for drag/drop on element // handler for drag/drop on element
function kolab_files_drag_hover(e) function kolab_files_drag_hover(e)
{ {
@ -1484,22 +1603,33 @@ function kolab_files_invitation_dialog(invitation)
rcube_webmail.prototype.files_sort = function(props) rcube_webmail.prototype.files_sort = function(props)
{ {
var params = {}, this.files_sort_handler(props, 'files');
sort_order = this.env.sort_order, };
sort_col = !this.env.disabled_sort_col ? props : this.env.sort_col;
if (!this.env.disabled_sort_order) rcube_webmail.prototype.sessions_sort = function(props)
sort_order = this.env.sort_col == sort_col && sort_order == 'ASC' ? 'DESC' : 'ASC'; {
this.files_sort_handler(props, 'sessions');
};
rcube_webmail.prototype.files_sort_handler = function(col, type)
{
var params = {},
c = type == 'files' ? '' : ('_' + type),
sort_order = this.env[type + '_sort_order'],
sort_col = !this.env['kolab_files' + c + '_disabled_sort_col'] ? col : this.env[type + '_sort_col'];
if (!this.env['kolab_files' + c + '_disabled_sort_order'])
sort_order = this.env[type + '_sort_col'] == sort_col && sort_order == 'ASC' ? 'DESC' : 'ASC';
// set table header and update env // set table header and update env
this.set_list_sorting(sort_col, sort_order); kolab_files_set_list_sorting(sort_col, sort_order, type);
this.http_post('files/prefs', {kolab_files_sort_col: sort_col, kolab_files_sort_order: sort_order}); this.http_post('files/prefs', {kolab_files_sort_col: sort_col, kolab_files_sort_order: sort_order, type: type});
params.sort = sort_col; params.sort = sort_col;
params.reverse = sort_order == 'DESC'; params.reverse = sort_order == 'DESC';
this.command('files-list', params); this.command(type + '-list', params);
}; };
rcube_webmail.prototype.files_search = function() rcube_webmail.prototype.files_search = function()
@ -1560,13 +1690,28 @@ rcube_webmail.prototype.files_list = function(param)
rcube_webmail.prototype.files_list_update = function(head) rcube_webmail.prototype.files_list_update = function(head)
{ {
var list = this.file_list; var list = this.fileslist;
$('thead', list.fixed_header ? list.fixed_header : list.list).html(head); $('thead', list.fixed_header ? list.fixed_header : list.list).html(head);
kolab_files_list_coltypes(); kolab_files_list_coltypes();
file_api.file_list(); file_api.file_list();
}; };
rcube_webmail.prototype.sessions_list = function(param)
{
// just rcmail wrapper, to handle command busy states
file_api.session_list(param);
}
rcube_webmail.prototype.sessions_list_update = function(head)
{
var list = this.sessionslist;
$('thead', list.fixed_header ? list.fixed_header : list.list).html(head);
kolab_files_list_coltypes();
file_api.sessions_list();
};
rcube_webmail.prototype.files_get = function() rcube_webmail.prototype.files_get = function()
{ {
var files = this.env.file ? [this.env.file] : kolab_files_selected(); var files = this.env.file ? [this.env.file] : kolab_files_selected();
@ -1718,6 +1863,16 @@ rcube_webmail.prototype.folder_mount = function()
kolab_files_folder_mount_dialog(); kolab_files_folder_mount_dialog();
}; };
// open a session dialog
rcube_webmail.prototype.sessions_open = function()
{
var id = this.sessionslist.get_selection(),
session = id ? file_api.env.sessions_list[id] : null;
if (session)
kolab_files_session_dialog(session);
};
/**********************************************************/ /**********************************************************/
/********* Files API handler **********/ /********* Files API handler **********/
@ -1839,6 +1994,14 @@ function kolab_files_ui()
rows.push(row); rows.push(row);
}); });
// add Sessions entry
if (rcmail.task == 'files' && !rcmail.env.action && rcmail.env.files_caps && rcmail.env.files_caps.MANTICORE) {
rows.push($('<li class="mailbox collection sessions"></li>')
.attr('id', 'rcmli' + rcmail.html_identifier_encode('folder-collection-sessions'))
.append($('<a class="name"></a>').text(rcmail.gettext('kolab_files.sessions')))
);
}
list.append(rows).appendTo(elem) list.append(rows).appendTo(elem)
.on('click', 'a.subscription', function(e) { .on('click', 'a.subscription', function(e) {
return file_api.folder_list_subscription_button_click(this); return file_api.folder_list_subscription_button_click(this);
@ -1903,6 +2066,12 @@ function kolab_files_ui()
var is_collection = folder.match(/^folder-collection-(.*)$/), var is_collection = folder.match(/^folder-collection-(.*)$/),
collection = RegExp.$1 || null; collection = RegExp.$1 || null;
if (collection == 'sessions') {
rcmail.enable_command('files-list', 'files-folder-delete', 'folder-rename', 'files-upload', false);
this.sessions_list();
return;
}
if (is_collection) if (is_collection)
folder = null; folder = null;
@ -1948,7 +2117,7 @@ function kolab_files_ui()
rcmail.env[prefname] = rcmail.env[prefname].replace(entry, ''); rcmail.env[prefname] = rcmail.env[prefname].replace(entry, '');
} }
if (old !== rcmail.env[prefname] && (!rcmail.file_list || !rcmail.file_list.drag_active)) if (old !== rcmail.env[prefname] && (!rcmail.fileslist || !rcmail.fileslist.drag_active))
rcmail.command('save-pref', {name: prefname, value: rcmail.env[prefname]}); rcmail.command('save-pref', {name: prefname, value: rcmail.env[prefname]});
}; };
@ -2390,9 +2559,58 @@ function kolab_files_ui()
rcmail.files_set_quota(response.result); rcmail.files_set_quota(response.result);
}; };
// List of sessions
this.sessions_list = function(params)
{
if (!rcmail.gui_objects.sessionslist)
return;
if (!params)
params = {};
if (rcmail.gui_objects.fileslist) {
$(rcmail.gui_objects.fileslist).parent().hide();
$(rcmail.gui_objects.sessionslist).parent().show();
rcmail.fileslist.clear();
}
this.env.folder = null;
this.env.collection = null;
// empty the list
this.env.sessions_list = {};
rcmail.sessionslist.clear(true);
rcmail.enable_command(rcmail.env.file_commands, false);
rcmail.enable_command(rcmail.env.file_commands_all, false);
params.req_id = this.set_busy(true, 'loading');
this.requests[params.req_id] = this.request('sessions', params, 'sessions_list_response');
};
// file list response handler
this.sessions_list_response = function(response)
{
if (response.req_id)
rcmail.hide_message(response.req_id);
if (!this.response(response))
return;
$.each(response.result, function(sess_id, data) {
var row = file_api.session_list_row(sess_id, data);
rcmail.sessionslist.insert_row(row);
response.result[sess_id].row = row;
});
this.env.sessions_list = response.result;
rcmail.sessionslist.resize();
};
// Files list
this.file_list = function(params) this.file_list = function(params)
{ {
if (!rcmail.gui_objects.filelist) if (!rcmail.gui_objects.fileslist)
return; return;
if (!params) if (!params)
@ -2423,23 +2641,29 @@ function kolab_files_ui()
if (params.folder == undefined) if (params.folder == undefined)
params.folder = this.env.folder; params.folder = this.env.folder;
if (params.sort == undefined) if (params.sort == undefined)
params.sort = this.env.sort_col; params.sort = this.env.files_sort_col;
if (params.reverse == undefined) if (params.reverse == undefined)
params.reverse = this.env.sort_reverse; params.reverse = this.env.files_sort_reverse;
if (params.search == undefined) if (params.search == undefined)
params.search = this.env.search; params.search = this.env.search;
this.env.folder = params.folder; this.env.folder = params.folder;
this.env.collection = params.collection; this.env.collection = params.collection;
this.env.sort_col = params.sort; this.env.files_sort_col = params.sort;
this.env.sort_reverse = params.reverse; this.env.files_sort_reverse = params.reverse;
rcmail.enable_command(rcmail.env.file_commands, false); rcmail.enable_command(rcmail.env.file_commands, false);
rcmail.enable_command(rcmail.env.file_commands_all, false); rcmail.enable_command(rcmail.env.file_commands_all, false);
if (rcmail.gui_objects.sessionslist) {
$(rcmail.gui_objects.sessionslist).parent().hide();
$(rcmail.gui_objects.fileslist).parent().show();
rcmail.sessionslist.clear(true)
}
// empty the list // empty the list
this.env.file_list = []; this.env.file_list = [];
rcmail.file_list.clear(true); rcmail.fileslist.clear(true);
// request // request
if (params.collection || params.all_folders) if (params.collection || params.all_folders)
@ -2459,18 +2683,18 @@ function kolab_files_ui()
if (!this.response(response)) if (!this.response(response))
return; return;
var i = 0, list = [], table = $('#filelist'); var i = 0, list = [];
$.each(response.result, function(key, data) { $.each(response.result, function(key, data) {
var row = file_api.file_list_row(key, data, ++i); var row = file_api.file_list_row(key, data, ++i);
rcmail.file_list.insert_row(row); rcmail.fileslist.insert_row(row);
data.row = row; data.row = row;
data.filename = key; data.filename = key;
list.push(data); list.push(data);
}); });
this.env.file_list = list; this.env.file_list = list;
rcmail.file_list.resize(); rcmail.fileslist.resize();
// update document sessions info of this folder // update document sessions info of this folder
if (list && list.length) if (list && list.length)
@ -2524,7 +2748,7 @@ function kolab_files_ui()
this.requests[params.req_id] = this.request('file_list', params, 'file_list_loop_response'); this.requests[params.req_id] = this.request('file_list', params, 'file_list_loop_response');
} }
rcmail.file_list.resize(); rcmail.fileslist.resize();
if (!valid) if (!valid)
return; return;
@ -2549,7 +2773,7 @@ function kolab_files_ui()
var n, i, len, elem, row, folder, list = [], var n, i, len, elem, row, folder, list = [],
index = this.env.file_list.length, index = this.env.file_list.length,
table = rcmail.file_list; table = rcmail.fileslist;
for (n=0, len=index; n<len; n++) { for (n=0, len=index; n<len; n++) {
elem = this.env.file_list[n]; elem = this.env.file_list[n];
@ -2596,7 +2820,7 @@ function kolab_files_ui()
this.file_list_sort = function(col, reverse) this.file_list_sort = function(col, reverse)
{ {
var n, len, list = this.env.file_list, var n, len, list = this.env.file_list,
table = $('#filelist'), tbody = $('<tbody>'); table = $('#fileslist'), tbody = $('<tbody>', table);
this.env.sort_col = col; this.env.sort_col = col;
this.env.sort_reverse = reverse; this.env.sort_reverse = reverse;
@ -2618,12 +2842,13 @@ function kolab_files_ui()
$('tbody', table).replaceWith(tbody); $('tbody', table).replaceWith(tbody);
}; };
// Files list record
this.file_list_row = function(file, data, index) this.file_list_row = function(file, data, index)
{ {
var c, col, row = ''; var c, col, row = '';
for (c in rcmail.env.file_coltypes) { for (c in rcmail.env.files_coltypes) {
c = rcmail.env.file_coltypes[c]; c = rcmail.env.files_coltypes[c];
if (c == 'name') if (c == 'name')
col = '<td class="name filename ' + this.file_type_class(data.type) + '">' col = '<td class="name filename ' + this.file_type_class(data.type) + '">'
+ '<span>' + escapeHTML(data.name) + '</span></td>'; + '<span>' + escapeHTML(data.name) + '</span></td>';
@ -2651,6 +2876,42 @@ function kolab_files_ui()
return row.get(0); return row.get(0);
}; };
// Sessions list record
this.session_list_row = function(id, data)
{
var c, col, row = '', classes = ['session'];
for (c in rcmail.env.sessions_coltypes) {
c = rcmail.env.sessions_coltypes[c];
if (c == 'name')
col = '<td class="name filename ' + this.file_type_class(data.type) + '">'
+ '<span>' + escapeHTML(file_api.file_name(data.file)) + '</span></td>';
/*
else if (c == 'mtime')
col = '<td class="mtime">' + data.mtime + '</td>';
else if (c == 'size')
col = '<td class="size">' + this.file_size(data.size) + '</td>';
*/
else if (c == 'owner')
col = '<td class="owner">' + escapeHTML(data.owner_name || data.owner) + '</td>';
else if (c == 'options')
col = '<td class="options"><span></span></td>';
row += col;
}
if (data.is_owner)
classes.push('owner');
else if (data.is_invited)
classes.push('invited');
row = $('<tr>')
.html(row)
.attr({id: 'rcmrow' + id, 'class': classes.join(' ')});
return row.get(0);
};
this.file_search = function(value, all_folders) this.file_search = function(value, all_folders)
{ {
if (value) { if (value) {
@ -2708,7 +2969,7 @@ function kolab_files_ui()
}); });
// refresh sessions info in time intervals // refresh sessions info in time intervals
if (rcmail.env.files_caps && rcmail.env.files_caps.MANTICORE && (rcmail.file_list || rcmail.env.file)) if (rcmail.env.files_caps && rcmail.env.files_caps.MANTICORE && (rcmail.fileslist || rcmail.env.file))
this.workers[folder] = setTimeout(function() { this.workers[folder] = setTimeout(function() {
file_api.request('folder_info', {folder: folder, sessions: 1}, 'folder_info_response'); file_api.request('folder_info', {folder: folder, sessions: 1}, 'folder_info_response');
}, (rcmail.env.files_interval || 60) * 1000); }, (rcmail.env.files_interval || 60) * 1000);
@ -2747,7 +3008,7 @@ function kolab_files_ui()
dir = this.file_path(rcmail.env.file); dir = this.file_path(rcmail.env.file);
// check if opener window contains files list, if not we can just close current window // check if opener window contains files list, if not we can just close current window
if (rco && rco.file_list && (opener.file_api.env.folder == dir || !opener.file_api.env.folder)) if (rco && rco.fileslist && (opener.file_api.env.folder == dir || !opener.file_api.env.folder))
self = opener.file_api; self = opener.file_api;
else else
window.close(); window.close();
@ -3280,6 +3541,7 @@ function kolab_files_ui()
this.document_delete = function(id) this.document_delete = function(id)
{ {
this.req = this.set_busy(true, 'kolab_files.sessionterminating'); this.req = this.set_busy(true, 'kolab_files.sessionterminating');
this.deleted_session = id;
this.request('document_delete', {id: id}, 'document_delete_response'); this.request('document_delete', {id: id}, 'document_delete_response');
}; };
@ -3293,6 +3555,20 @@ function kolab_files_ui()
window.close(); window.close();
// @todo: force sessions info update // @todo: force sessions info update
var win = window, list = rcmail.sessionslist;
if (!list) {
win = window.opener;
if (win && win.rcmail && win.file_api)
list = win.rcmail.sessionslist;
}
// remove session from the list (if sessions list exist)
if (list) {
list.remove(this.deleted_session);
delete win.file_api.env.sessions_list[this.deleted_session];
}
}; };
// Invite document session participants // Invite document session participants

148
plugins/kolab_files/lib/kolab_files_engine.php
View file

@ -27,7 +27,8 @@ class kolab_files_engine
private $plugin; private $plugin;
private $rc; private $rc;
private $timeout = 600; private $timeout = 600;
private $sort_cols = array('name', 'mtime', 'size'); private $files_sort_cols = array('name', 'mtime', 'size');
private $sessions_sort_cols = array('name');
const API_VERSION = 2; const API_VERSION = 2;
@ -138,7 +139,7 @@ class kolab_files_engine
'more', 'accept', 'decline', 'join', 'status', 'when', 'file', 'comment', 'more', 'accept', 'decline', 'join', 'status', 'when', 'file', 'comment',
'statusaccepted', 'statusinvited', 'statusdeclined', 'statusrequested', 'statusaccepted', 'statusinvited', 'statusdeclined', 'statusrequested',
'invitationaccepting', 'invitationdeclining', 'invitationrequesting', 'invitationaccepting', 'invitationdeclining', 'invitationrequesting',
'close', 'invitationtitle'); 'close', 'invitationtitle', 'sessions');
} }
if (!empty($templates)) { if (!empty($templates)) {
@ -157,7 +158,9 @@ class kolab_files_engine
'file-rename-form' => array($this, 'file_rename_form'), 'file-rename-form' => array($this, 'file_rename_form'),
'file-create-form' => array($this, 'file_create_form'), 'file-create-form' => array($this, 'file_create_form'),
'file-edit-dialog' => array($this, 'file_edit_dialog'), 'file-edit-dialog' => array($this, 'file_edit_dialog'),
'file-session-dialog' => array($this, 'file_session_dialog'),
'filelist' => array($this, 'file_list'), 'filelist' => array($this, 'file_list'),
'sessionslist' => array($this, 'sessions_list'),
'filequotadisplay' => array($this, 'quota_display'), 'filequotadisplay' => array($this, 'quota_display'),
'document-editors-dialog' => array($this, 'document_editors_dialog'), 'document-editors-dialog' => array($this, 'document_editors_dialog'),
)); ));
@ -355,6 +358,17 @@ class kolab_files_engine
return '<div></div>'; return '<div></div>';
} }
/**
* Template object for file session dialog
*/
public function file_session_dialog($attrib)
{
$this->plugin->add_label('join', 'open', 'close', 'request', 'cancel',
'sessiondialog', 'sessiondialogcontent');
return '<div></div>';
}
/** /**
* Template object for dcument editors dialog * Template object for dcument editors dialog
*/ */
@ -500,12 +514,31 @@ class kolab_files_engine
*/ */
public function file_list($attrib) public function file_list($attrib)
{ {
return $this->list_handler($attrib, 'files');
}
/**
* Template object for sessions list
*/
public function sessions_list($attrib)
{
return $this->list_handler($attrib, 'sessions');
}
/**
* Creates unified template object for files|sessions list
*/
protected function list_handler($attrib, $type = 'files')
{
$prefix = 'kolab_' . $type . '_';
$c_prefix = 'kolab_files' . ($type != 'files' ? '_' . $type : '') . '_';
// define list of cols to be displayed based on parameter or config // define list of cols to be displayed based on parameter or config
if (empty($attrib['columns'])) { if (empty($attrib['columns'])) {
$list_cols = $this->rc->config->get('kolab_files_list_cols'); $list_cols = $this->rc->config->get($c_prefix . 'list_cols');
$dont_override = $this->rc->config->get('dont_override'); $dont_override = $this->rc->config->get('dont_override');
$a_show_cols = is_array($list_cols) ? $list_cols : array('name'); $a_show_cols = is_array($list_cols) ? $list_cols : array('name');
$this->rc->output->set_env('col_movable', !in_array('kolab_files_list_cols', (array)$dont_override)); $this->rc->output->set_env($type . '_col_movable', !in_array($c_prefix . 'list_cols', (array)$dont_override));
} }
else { else {
$columns = str_replace(array("'", '"'), '', $attrib['columns']); $columns = str_replace(array("'", '"'), '', $attrib['columns']);
@ -523,33 +556,35 @@ class kolab_files_engine
$attrib['columns'] = $a_show_cols; $attrib['columns'] = $a_show_cols;
// save some variables for use in ajax list // save some variables for use in ajax list
$_SESSION['kolab_files_list_attrib'] = $attrib; $_SESSION[$prefix . 'list_attrib'] = $attrib;
// For list in dialog(s) remove all option-like columns // For list in dialog(s) remove all option-like columns
if ($this->rc->task != 'files') { if ($this->rc->task != 'files') {
$a_show_cols = array_intersect($a_show_cols, $this->sort_cols); $a_show_cols = array_intersect($a_show_cols, $this->{$type . '_sort_cols'});
} }
// set default sort col/order to session // set default sort col/order to session
if (!isset($_SESSION['kolab_files_sort_col'])) if (!isset($_SESSION[$prefix . 'sort_col']))
$_SESSION['kolab_files_sort_col'] = $this->rc->config->get('kolab_files_sort_col') ?: 'name'; $_SESSION[$prefix . 'sort_col'] = $this->rc->config->get($c_prefix . 'sort_col') ?: 'name';
if (!isset($_SESSION['kolab_files_sort_order'])) if (!isset($_SESSION[$prefix . 'sort_order']))
$_SESSION['kolab_files_sort_order'] = strtoupper($this->rc->config->get('kolab_files_sort_order') ?: 'asc'); $_SESSION[$prefix . 'sort_order'] = strtoupper($this->rc->config->get($c_prefix . 'sort_order') ?: 'asc');
// set client env // set client env
$this->rc->output->add_gui_object('filelist', $attrib['id']); $this->rc->output->add_gui_object($type . 'list', $attrib['id']);
$this->rc->output->set_env('sort_col', $_SESSION['kolab_files_sort_col']); $this->rc->output->set_env($type . '_sort_col', $_SESSION[$prefix . 'sort_col']);
$this->rc->output->set_env('sort_order', $_SESSION['kolab_files_sort_order']); $this->rc->output->set_env($type . '_sort_order', $_SESSION[$prefix . 'sort_order']);
$this->rc->output->set_env('file_coltypes', $a_show_cols); $this->rc->output->set_env($type . '_coltypes', $a_show_cols);
$this->rc->output->set_env('search_threads', $this->rc->config->get('kolab_files_search_threads'));
$this->rc->output->include_script('list.js'); $this->rc->output->include_script('list.js');
// attach css rules for mimetype icons // attach css rules for mimetype icons
$this->plugin->include_stylesheet($this->url . '/skins/default/images/mimetypes/style.css'); if (!$this->filetypes_style) {
$this->plugin->include_stylesheet($this->url . '/skins/default/images/mimetypes/style.css');
$this->filetypes_style = true;
}
$thead = ''; $thead = '';
foreach ($this->file_list_head($attrib, $a_show_cols) as $cell) { foreach ($this->list_head($attrib, $a_show_cols, $type) as $cell) {
$thead .= html::tag('th', array('class' => $cell['className'], 'id' => $cell['id']), $cell['html']); $thead .= html::tag('th', array('class' => $cell['className'], 'id' => $cell['id']), $cell['html']);
} }
@ -561,30 +596,31 @@ class kolab_files_engine
/** /**
* Creates <THEAD> for message list table * Creates <THEAD> for message list table
*/ */
protected function file_list_head($attrib, $a_show_cols) protected function list_head($attrib, $a_show_cols, $type = 'files')
{ {
$prefix = 'kolab_' . $type . '_';
$c_prefix = 'kolab_files_' . ($type != 'files' ? $type : '') . '_';
$skin_path = $_SESSION['skin_path']; $skin_path = $_SESSION['skin_path'];
// $image_tag = html::img(array('src' => "%s%s", 'alt' => "%s"));
// check to see if we have some settings for sorting // check to see if we have some settings for sorting
$sort_col = $_SESSION['kolab_files_sort_col']; $sort_col = $_SESSION[$prefix . 'sort_col'];
$sort_order = $_SESSION['kolab_files_sort_order']; $sort_order = $_SESSION[$prefix . 'sort_order'];
$dont_override = (array)$this->rc->config->get('dont_override'); $dont_override = (array)$this->rc->config->get('dont_override');
$disabled_sort = in_array('message_sort_col', $dont_override); $disabled_sort = in_array($c_prefix . 'sort_col', $dont_override);
$disabled_order = in_array('message_sort_order', $dont_override); $disabled_order = in_array($c_prefix . 'sort_order', $dont_override);
$this->rc->output->set_env('disabled_sort_col', $disabled_sort); $this->rc->output->set_env($prefix . 'disabled_sort_col', $disabled_sort);
$this->rc->output->set_env('disabled_sort_order', $disabled_order); $this->rc->output->set_env($prefix . 'disabled_sort_order', $disabled_order);
// define sortable columns // define sortable columns
if ($disabled_sort) if ($disabled_sort)
$a_sort_cols = $sort_col && !$disabled_order ? array($sort_col) : array(); $a_sort_cols = $sort_col && !$disabled_order ? array($sort_col) : array();
else else
$a_sort_cols = $this->sort_cols; $a_sort_cols = $this->{$type . '_sort_cols'};
if (!empty($attrib['optionsmenuicon'])) { if (!empty($attrib['optionsmenuicon'])) {
$onclick = 'return ' . rcmail_output::JS_OBJECT_NAME . ".command('menu-open', 'filelistmenu', this, event)"; $onclick = 'return ' . rcmail_output::JS_OBJECT_NAME . ".command('menu-open', '{$type}listmenu', this, event)";
$inner = $this->rc->gettext('listoptions'); $inner = $this->rc->gettext('listoptions');
if (is_string($attrib['optionsmenuicon']) && $attrib['optionsmenuicon'] != 'true') { if (is_string($attrib['optionsmenuicon']) && $attrib['optionsmenuicon'] != 'true') {
@ -595,7 +631,7 @@ class kolab_files_engine
'href' => '#list-options', 'href' => '#list-options',
'onclick' => $onclick, 'onclick' => $onclick,
'class' => 'listmenu', 'class' => 'listmenu',
'id' => 'listmenulink', 'id' => $type . 'listmenulink',
'title' => $this->rc->gettext('listoptions'), 'title' => $this->rc->gettext('listoptions'),
'tabindex' => '0', 'tabindex' => '0',
), $inner); ), $inner);
@ -609,11 +645,6 @@ class kolab_files_engine
foreach ($a_show_cols as $col) { foreach ($a_show_cols as $col) {
// get column name // get column name
switch ($col) { switch ($col) {
/*
case 'status':
$col_name = '<span class="' . $col .'">&nbsp;</span>';
break;
*/
case 'options': case 'options':
$col_name = $list_menu; $col_name = $list_menu;
break; break;
@ -625,12 +656,13 @@ class kolab_files_engine
if (in_array($col, $a_sort_cols)) { if (in_array($col, $a_sort_cols)) {
$col_name = html::a(array( $col_name = html::a(array(
'href' => "#sort", 'href' => "#sort",
'onclick' => 'return ' . rcmail_output::JS_OBJECT_NAME . ".command('files-sort','$col',this)", 'onclick' => 'return ' . rcmail_output::JS_OBJECT_NAME . ".command('$type-sort','$col',this)",
'title' => $this->plugin->gettext('sortby') 'title' => $this->plugin->gettext('sortby')
), $col_name); ), $col_name);
} }
else if ($col_name[0] != '<') else if ($col_name[0] != '<') {
$col_name = '<span class="' . $col .'">' . $col_name . '</span>'; $col_name = '<span class="' . $col .'">' . $col_name . '</span>';
}
$sort_class = $col == $sort_col && !$disabled_order ? " sorted$sort_order" : ''; $sort_class = $col == $sort_col && !$disabled_order ? " sorted$sort_order" : '';
$class_name = $col.$sort_class; $class_name = $col.$sort_class;
@ -643,28 +675,29 @@ class kolab_files_engine
} }
/** /**
* Update files list object * Update files|sessions list object
*/ */
protected function file_list_update($prefs) protected function list_update($prefs, $type = 'files')
{ {
$attrib = $_SESSION['kolab_files_list_attrib']; $prefix = 'kolab_' . $type . '_list_';
$attrib = $_SESSION[$prefix . 'attrib'];
if (!empty($prefs['kolab_files_list_cols'])) { if (!empty($prefs[$prefix . 'cols'])) {
$attrib['columns'] = $prefs['kolab_files_list_cols']; $attrib['columns'] = $prefs[$prefix . 'cols'];
$_SESSION['kolab_files_list_attrib'] = $attrib; $_SESSION[$prefix . 'attrib'] = $attrib;
} }
$a_show_cols = $attrib['columns']; $a_show_cols = $attrib['columns'];
$head = ''; $head = '';
foreach ($this->file_list_head($attrib, $a_show_cols) as $cell) { foreach ($this->list_head($attrib, $a_show_cols, $type) as $cell) {
$head .= html::tag('th', array('class' => $cell['className'], 'id' => $cell['id']), $cell['html']); $head .= html::tag('th', array('class' => $cell['className'], 'id' => $cell['id']), $cell['html']);
} }
$head = html::tag('tr', null, $head); $head = html::tag('tr', null, $head);
$this->rc->output->set_env('file_coltypes', $a_show_cols); $this->rc->output->set_env($type . '_coltypes', $a_show_cols);
$this->rc->output->command('files_list_update', $head); $this->rc->output->command($type . '_list_update', $head);
} }
/** /**
@ -913,22 +946,35 @@ class kolab_files_engine
{ {
$dont_override = (array)$this->rc->config->get('dont_override'); $dont_override = (array)$this->rc->config->get('dont_override');
$prefs = array(); $prefs = array();
$type = rcube_utils::get_input_value('type', rcube_utils::INPUT_POST);
$opts = array( $opts = array(
'kolab_files_sort_col' => true, 'kolab_files_sort_col' => true,
'kolab_files_sort_order' => true, 'kolab_files_sort_order' => true,
'kolab_files_list_cols' => false, 'kolab_files_list_cols' => false,
); );
foreach ($opts as $o => $sess) { foreach ($opts as $o => $sess) {
if (isset($_POST[$o]) && !in_array($o, $dont_override)) { if (isset($_POST[$o])) {
$prefs[$o] = rcube_utils::get_input_value($o, rcube_utils::INPUT_POST); $value = rcube_utils::get_input_value($o, rcube_utils::INPUT_POST);
if ($sess) { $session_key = $o;
$_SESSION[$o] = $prefs[$o]; $config_key = $o;
if ($type != 'files') {
$config_key = str_replace('files', 'files_' . $type, $config_key);
}
if (in_array($config_key, $dont_override)) {
continue;
} }
if ($o == 'kolab_files_list_cols') { if ($o == 'kolab_files_list_cols') {
$update_list = true; $update_list = true;
} }
$prefs[$config_key] = $value;
if ($sess) {
$_SESSION[$session_key] = $prefs[$config_key];
}
} }
} }
@ -938,7 +984,7 @@ class kolab_files_engine
} }
if (!empty($update_list)) { if (!empty($update_list)) {
$this->file_list_update($prefs); $this->list_update($prefs, $type);
} }
$this->rc->output->send(); $this->rc->output->send();

6
plugins/kolab_files/localization/en_US.inc
View file

@ -55,6 +55,7 @@ $labels['collection_audio'] = 'Audio';
$labels['collection_video'] = 'Video'; $labels['collection_video'] = 'Video';
$labels['collection_image'] = 'Images'; $labels['collection_image'] = 'Images';
$labels['collection_document'] = 'Documents'; $labels['collection_document'] = 'Documents';
$labels['sessions'] = 'Sessions';
$labels['uploading'] = 'Uploading file(s)...'; $labels['uploading'] = 'Uploading file(s)...';
$labels['attaching'] = 'Attaching file(s)...'; $labels['attaching'] = 'Attaching file(s)...';
@ -129,13 +130,18 @@ $labels['declinedownernotice'] = '$owner declined your request to join the editi
$labels['acceptednotice'] = '$user accepted your invitation to the editing session.'; $labels['acceptednotice'] = '$user accepted your invitation to the editing session.';
$labels['declinednotice'] = '$user declined your invitation to the editing session.'; $labels['declinednotice'] = '$user declined your invitation to the editing session.';
$labels['requestednotice'] = '$user requested to join the editing session.'; $labels['requestednotice'] = '$user requested to join the editing session.';
$labels['sessiondialog'] = 'Document editing session';
$labels['sessiondialogcontent'] = 'There is ongoing editing session on $file created by $owner.';
$labels['more'] = 'More.'; $labels['more'] = 'More.';
$labels['accept'] = 'Accept'; $labels['accept'] = 'Accept';
$labels['join'] = 'Join the session'; $labels['join'] = 'Join the session';
$labels['decline'] = 'Decline'; $labels['decline'] = 'Decline';
$labels['owner'] = 'Owner';
$labels['when'] = 'When'; $labels['when'] = 'When';
$labels['file'] = 'File'; $labels['file'] = 'File';
$labels['comment'] = 'Comment'; $labels['comment'] = 'Comment';
$labels['open'] = 'Open';
$labels['request'] = 'Request an invitation';
$labels['invitationtitle'] = 'Invitation for $file'; $labels['invitationtitle'] = 'Invitation for $file';
$labels['ivitationaccepting'] = 'Accepting an invitation...'; $labels['ivitationaccepting'] = 'Accepting an invitation...';
$labels['ivitationdeclining'] = 'Declining an invitation...'; $labels['ivitationdeclining'] = 'Declining an invitation...';

BIN
plugins/kolab_files/skins/larry/images/folders.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

6
plugins/kolab_files/skins/larry/style.css
View file

@ -195,6 +195,9 @@ ul.toolbarmenu li span.saveas {
.folderlist li.mailbox.collection.image a.name { .folderlist li.mailbox.collection.image a.name {
background-position: 5px -48px; background-position: 5px -48px;
} }
.folderlist li.mailbox.collection.sessions a.name {
background-position: 5px -192px;
}
.folderlist li.mailbox.collection.audio.selected a.name { .folderlist li.mailbox.collection.audio.selected a.name {
background-position: 5px -119px; background-position: 5px -119px;
} }
@ -207,6 +210,9 @@ ul.toolbarmenu li span.saveas {
.folderlist li.mailbox.collection.image.selected a.name { .folderlist li.mailbox.collection.image.selected a.name {
background-position: 5px -72px; background-position: 5px -72px;
} }
.folderlist li.mailbox.collection.sessions.selected a.name {
background-position: 5px -216px;
}
#files-folder-list li a.subscription { #files-folder-list li a.subscription {
display: inline-block; display: inline-block;

60
plugins/kolab_files/skins/larry/templates/files.html
View file

@ -64,6 +64,10 @@
<div id="filelistbox" class="boxlistcontent"> <div id="filelistbox" class="boxlistcontent">
<roundcube:object name="filelist" id="filelist" class="records-table filelist sortheader fixedheader" optionsmenuIcon="true" aria-labelledby="aria-label-filelist" /> <roundcube:object name="filelist" id="filelist" class="records-table filelist sortheader fixedheader" optionsmenuIcon="true" aria-labelledby="aria-label-filelist" />
</div> </div>
<h2 id="aria-label-sessionslist" class="voice"><roundcube:label name="kolab_files.arialabelsessionslist" /></h2>
<div id="sessionslistbox" class="boxlistcontent" style="display:none">
<roundcube:object name="sessionslist" id="sessionslist" class="records-table filelist sortheader fixedheader" optionsmenuIcon="true" aria-labelledby="aria-label-sessionslist" />
</div>
</div> </div>
</div> </div>
@ -109,9 +113,13 @@
<h3 id="aria-label-fileeditdialog" class="voice"><roundcube:label name="kolab_files.arialabelfileeditdialog" /></h3> <h3 id="aria-label-fileeditdialog" class="voice"><roundcube:label name="kolab_files.arialabelfileeditdialog" /></h3>
<roundcube:object name="file-edit-dialog"> <roundcube:object name="file-edit-dialog">
</div> </div>
<div id="files-session-dialog" role="dialog" aria-labelledby="aria-label-filesessiondialog" aria-hidden="true">
<h3 id="aria-label-filesessiondialog" class="voice"><roundcube:label name="kolab_files.arialabelfilesessiondialog" /></h3>
<roundcube:object name="file-session-dialog">
</div>
<div id="listoptions" class="propform popupdialog" data-editable="true" role="dialog" aria-labelledby="aria-label-listoptions" aria-hidden="true"> <div id="fileslistoptions" class="propform popupdialog" data-editable="true" role="dialog" aria-labelledby="aria-label-fileslistoptions" aria-hidden="true">
<h3 id="aria-label-listoptions" class="voice"><roundcube:label name="kolab_files.arialabellistoptions" /></h3> <h3 id="aria-label-fileslistoptions" class="voice"><roundcube:label name="kolab_files.arialabellistoptions" /></h3>
<roundcube:if condition="!in_array('kolab_files_list_cols', (array)config:dont_override)" /> <roundcube:if condition="!in_array('kolab_files_list_cols', (array)config:dont_override)" />
<fieldset class="floating"> <fieldset class="floating">
<legend><roundcube:label name="listcolumns" /></legend> <legend><roundcube:label name="listcolumns" /></legend>
@ -144,8 +152,52 @@
<roundcube:endif /> <roundcube:endif />
<br style="clear:both" /> <br style="clear:both" />
<div class="formbuttons"> <div class="formbuttons">
<roundcube:button command="menu-save" id="listmenusave" type="input" class="button mainaction" label="save" /> <roundcube:button command="menu-save" id="fileslistmenusave" type="input" class="button mainaction" label="save" />
<roundcube:button command="menu-close" prop="filelistmenu" id="listmenucancel" type="input" class="button" label="cancel" /> <roundcube:button command="menu-close" prop="fileslistmenu" id="fileslistmenucancel" type="input" class="button" label="cancel" />
</div>
</div>
<div id="sessionslistoptions" class="propform popupdialog" data-editable="true" role="dialog" aria-labelledby="aria-label-sessionslistoptions" aria-hidden="true">
<h3 id="aria-label-sessionslistoptions" class="voice"><roundcube:label name="kolab_files.arialabellistoptions" /></h3>
<roundcube:if condition="!in_array('kolab_files_sessions_list_cols', (array)config:dont_override)" />
<fieldset class="floating">
<legend><roundcube:label name="listcolumns" /></legend>
<ul class="proplist">
<li><label class="disabled"><input type="checkbox" name="list_col[]" value="options" checked="checked" disabled="disabled" /> <span><roundcube:label name="options" /></span></label></li>
<li><label class="disabled"><input type="checkbox" name="list_col[]" value="name" checked="checked" disabled="disabled" /> <span><roundcube:label name="kolab_files.name" /></span></label></li>
<li><label><input type="checkbox" name="list_col[]" value="owner" /> <span><roundcube:label name="kolab_files.owner" /></span></label></li>
<!--
<li><label><input type="checkbox" name="list_col[]" value="mtime" /> <span><roundcube:label name="kolab_files.mtime" /></span></label></li>
<li><label><input type="checkbox" name="list_col[]" value="size" /> <span><roundcube:label name="size" /></span></label></li>
-->
</ul>
</fieldset>
<roundcube:endif />
<roundcube:if condition="!in_array('kolab_files_sessions_sort_col', (array)config:dont_override)" />
<fieldset class="floating">
<legend><roundcube:label name="listsorting" /></legend>
<ul class="proplist">
<li><label><input type="radio" name="sort_col" value="name" /> <span><roundcube:label name="kolab_files.name" /></span></label></li>
<!--
<li><label><input type="radio" name="sort_col" value="mtime" /> <span><roundcube:label name="kolab_files.mtime" /></span></label></li>
<li><label><input type="radio" name="sort_col" value="size" /> <span><roundcube:label name="size" /></span></label></li>
-->
</ul>
</fieldset>
<roundcube:endif />
<roundcube:if condition="!in_array('kolab_files_sessions_sort_order', (array)config:dont_override)" />
<fieldset class="floating">
<legend><roundcube:label name="listorder" /></legend>
<ul class="proplist">
<li><label><input type="radio" name="sort_ord" value="ASC" /> <span><roundcube:label name="asc" /></span></label></li>
<li><label><input type="radio" name="sort_ord" value="DESC" /> <span><roundcube:label name="desc" /></span></label></li>
</ul>
</fieldset>
<roundcube:endif />
<br style="clear:both" />
<div class="formbuttons">
<roundcube:button command="menu-save" id="sessionslistmenusave" type="input" class="button mainaction" label="save" />
<roundcube:button command="menu-close" prop="sessionslistmenu" id="sessionslistmenucancel" type="input" class="button" label="cancel" />
</div> </div>
</div> </div>

45
plugins/kolab_files/skins/larry/ui.js
View file

@ -52,11 +52,18 @@ function kolab_files_update_quota(p)
function kolab_files_show_listoptions(p) function kolab_files_show_listoptions(p)
{ {
if (!p || p.name != 'filelistmenu') { if (!p || !p.name) {
return; return;
} }
var $dialog = $('#listoptions'); if (p.name.match(/^(files|sessions)listmenu$/)) {
var type = RegExp.$1;
}
else {
return;
}
var $dialog = $('#' + type + 'listoptions');
// close the dialog // close the dialog
if ($dialog.is(':visible')) { if ($dialog.is(':visible')) {
@ -65,34 +72,44 @@ function kolab_files_show_listoptions(p)
} }
// set form values // set form values
$('input[name="sort_col"][value="'+rcmail.env.sort_col+'"]').prop('checked', true); $('input[name="sort_col"][value="'+rcmail.env[type + '_sort_col']+'"]', $dialog).prop('checked', true);
$('input[name="sort_ord"][value="DESC"]').prop('checked', rcmail.env.sort_order == 'DESC'); $('input[name="sort_ord"][value="DESC"]', $dialog).prop('checked', rcmail.env[type + '_sort_order'] == 'DESC');
$('input[name="sort_ord"][value="ASC"]').prop('checked', rcmail.env.sort_order != 'DESC'); $('input[name="sort_ord"][value="ASC"]', $dialog).prop('checked', rcmail.env[type + '_sort_order'] != 'DESC');
// set checkboxes // set checkboxes
$('input[name="list_col[]"]').each(function() { $('input[name="list_col[]"]').each(function() {
$(this).prop('checked', $.inArray(this.value, rcmail.env.file_coltypes) != -1); $(this).prop('checked', $.inArray(this.value, rcmail.env[type + '_coltypes']) != -1);
}); });
$dialog.dialog({ $dialog.dialog({
modal: true, modal: true,
resizable: false, resizable: false,
closeOnEscape: true, closeOnEscape: true,
close: function() { rcmail.file_list.focus(); }, close: function() { rcmail[type + 'list'].focus(); },
title: null, title: null,
minWidth: 400, minWidth: 400,
width: $dialog.width()+20 width: $dialog.width()+20
}).show(); }).show();
}; };
function kolab_files_save_listoptions() function kolab_files_save_listoptions(p)
{ {
$('#listoptions').dialog('close'); if (!p || !p.originalEvent) {
return;
}
var sort = $('input[name="sort_col"]:checked').val(), if (p.originalEvent.target.id.match(/^(files|sessions)listmenusave$/)) {
ord = $('input[name="sort_ord"]:checked').val(), var type = RegExp.$1;
cols = $('input[name="list_col[]"]:checked') }
.map(function(){ return this.value; }).get(); else {
return;
}
kolab_files_set_list_options(cols, sort, ord); var dialog = $('#' + type + 'listoptions').dialog('close');
var sort = $('input[name="sort_col"]:checked', dialog).val(),
ord = $('input[name="sort_ord"]:checked', dialog).val(),
cols = $('input[name="list_col[]"]:checked', dialog)
.map(function() { return this.value; }).get();
kolab_files_set_list_options(cols, sort, ord, type);
}; };