'),
editform = $('#taskedit'),
+ readonly = rec && rec.readonly,
list = rec.list && me.tasklists[rec.list] ? me.tasklists[rec.list] :
(me.selected_list ? me.tasklists[me.selected_list] : { editable: action == 'new', rights: action == 'new' ? 'rwitd' : 'r' });
@@ -2444,6 +2349,7 @@ function rcube_tasklist_ui(settings)
var notify = $('#edit-attendees-donotify').get(0);
var invite = $('#edit-attendees-invite').get(0);
var comment = $('#edit-attendees-comment');
+ var taglist;
invite.checked = settings.itip_notify & 1 > 0;
notify.checked = me.has_attendees(rec) && invite.checked;
@@ -2461,23 +2367,10 @@ function rcube_tasklist_ui(settings)
tasklist.val(rec.list || me.selected_list || selected_list);
// tag-edit line
- var tagline = $(rcmail.gui_objects.edittagline).empty();
- $.each(typeof rec.tags == 'object' && rec.tags.length ? rec.tags : [''], function(i,val){
- $('
')
- .attr('name', 'tags[]')
- .attr('tabindex', '0')
- .addClass('tag')
- .val(val)
- .appendTo(tagline);
- });
-
- $('input.tag', rcmail.gui_objects.edittagline).tagedit({
- animSpeed: 100,
- allowEdit: false,
- checkNewEntriesCaseSensitive: false,
- autocompleteOptions: { source: tags, minLength: 0, noCheck: true, appendTo:'#taskedit' },
- texts: { removeLinkTitle: rcmail.gettext('removetag', 'tasklist') }
- });
+ if (window.kolab_tags_input) {
+ $('#taskedit-tagline').parent('.form-group').show();
+ taglist = kolab_tags_input($('#taskedit-tagline'), rec.tags, readonly);
+ }
// set alarm(s)
me.set_alarms_edit('#taskedit-alarms', action != 'new' && rec.valarms ? rec.valarms : []);
@@ -2538,7 +2431,7 @@ function rcube_tasklist_ui(settings)
}
// attachments
- rcmail.enable_command('remove-attachment', list.editable);
+ rcmail.enable_command('remove-attachment', 'upload-file', list.editable);
me.selected_task.deleted_attachments = [];
// we're sharing some code for uploads handling with app.js
rcmail.env.attachments = [];
@@ -2555,14 +2448,12 @@ function rcube_tasklist_ui(settings)
$('#taskedit-tab-attachments')[(list.attachments||rec.attachments?'show':'hide')]();
// activate the first tab
- $('#taskedit').tabs('option', 'active', 0);
+ $('#taskedit:not([data-notabs])').tabs('option', 'active', 0); // Larry
+ if (elastic)
+ $('#taskedit li.nav-item:first-child a').tab('show'); // Elastic
// define dialog buttons
- var buttons = [];
- buttons.push({
- text: rcmail.gettext('save', 'tasklist'),
- 'class': 'mainaction',
- click: function() {
+ var buttons = [], save_func = function() {
var data = me.selected_task;
data._status_before = me.selected_task.status + '';
@@ -2570,8 +2461,9 @@ function rcube_tasklist_ui(settings)
$.each({ title:title, description:description, date:recdate, time:rectime, startdate:recstartdate, starttime:recstarttime, status:taskstatus }, function(key,input){
data[key] = input.val();
});
+
data.list = tasklist.find('option:selected').val();
- data.tags = [];
+ data.tags = taglist ? kolab_tags_input_value(taglist) : [];
data.attachments = [];
data.attendees = task_attendees;
data.valarms = me.serialize_alarms('#taskedit-alarms');
@@ -2599,17 +2491,6 @@ function rcube_tasklist_ui(settings)
return false;
}
- // collect tags
- $('input[type="hidden"]', rcmail.gui_objects.edittagline).each(function(i,elem) {
- if (elem.value)
- data.tags.push(elem.value);
- });
- // including the "pending" one in the text box
- var newtag = $('#tagedit-input').val();
- if (newtag != '') {
- data.tags.push(newtag);
- }
-
// uploaded attachments list
for (var i in rcmail.env.attachments) {
if (i.match(/^rcmfile(.+)/))
@@ -2665,10 +2546,19 @@ function rcube_tasklist_ui(settings)
if (save_task(data, action))
$dialog.dialog('close');
- } // end click:
+ };
+
+ rcmail.enable_command('save-task', true);
+ rcmail.env.task_save_func = save_func;
+
+ buttons.push({
+ text: rcmail.gettext('save', 'tasklist'),
+ 'class': 'mainaction',
+ click: save_func
});
if (action != 'new') {
+ rcmail.enable_command('delete-task', true);
buttons.push({
text: rcmail.gettext('delete', 'tasklist'),
'class': 'delete',
@@ -2687,26 +2577,32 @@ function rcube_tasklist_ui(settings)
});
// open jquery UI dialog
- $dialog.dialog({
- modal: true,
- resizable: (!bw.ie6 && !bw.ie7), // disable for performance reasons
- closeOnEscape: false,
- title: rcmail.gettext((action == 'edit' ? 'edittask' : 'newtask'), 'tasklist'),
- close: function() {
- rcmail.ksearch_blur();
- editform.hide().appendTo(document.body);
- $dialog.dialog('destroy').remove();
- },
- buttons: buttons,
- minHeight: 460,
- minWidth: 500,
- width: 580
- }).append(editform.show()); // adding form content AFTERWARDS massively speeds up opening on IE
+ if (!elastic) {
+ $dialog.dialog({
+ modal: true,
+ resizable: (!bw.ie6 && !bw.ie7), // disable for performance reasons
+ closeOnEscape: false,
+ title: rcmail.gettext((action == 'edit' ? 'edittask' : 'newtask'), 'tasklist'),
+ close: function() {
+ rcmail.ksearch_blur();
+ editform.hide().appendTo(document.body);
+ $dialog.dialog('destroy').remove();
+ },
+ buttons: buttons,
+ minHeight: 460,
+ minWidth: 500,
+ width: 580
+ }).append(editform.show()); // adding form content AFTERWARDS massively speeds up opening on IE
+
+ // set dialog size according to content
+ me.dialog_resize($dialog.get(0), $dialog.height(), 580);
+ }
title.select();
- // set dialog size according to content
- me.dialog_resize($dialog.get(0), $dialog.height(), 580);
+ // Elastic
+ editform.removeClass('hidden').parents('.watermark').addClass('formcontainer');
+ //$('#notedetailsbox').parent().trigger('loaded');
}
/**
@@ -2719,10 +2615,10 @@ function rcube_tasklist_ui(settings)
return false;
var query = { _id: att.id, _t: rec.recurrence_id||rec.id, _list:rec.list, _frame: 1 };
+
if (rec.rev)
query._rev = rec.rev;
-
// open attachment in frame if it's of a supported mimetype
// similar as in app.js and calendar_ui.js
if (att.id && att.mimetype && $.inArray(att.mimetype, settings.mimetypes)>=0) {
@@ -2751,17 +2647,14 @@ function rcube_tasklist_ui(settings)
if (edit) {
rcmail.env.attachments[elem.id] = elem;
// delete icon
- content = $('
')
- .attr('href', '#delete')
- .attr('title', rcmail.gettext('delete'))
- .addClass('delete')
+ content = $('').attr({href: '#delete', title: rcmail.gettext('delete'), 'class': 'delete'})
.click({ id:elem.id }, function(e) {
remove_attachment(this, e.data.id);
return false;
});
if (!rcmail.env.deleteicon) {
- content.html(rcmail.gettext('delete'));
+ // content.html(rcmail.gettext('delete'));
}
else {
$('![]()
').attr('src', rcmail.env.deleteicon).attr('alt', rcmail.gettext('delete')).appendTo(content);
@@ -2771,13 +2664,13 @@ function rcube_tasklist_ui(settings)
}
// name/link
- $('')
- .attr('href', '#load')
- .addClass('file')
- .html(elem.name).click({ task:rec, att:elem }, function(e) {
+ $('').attr({href: '#load', 'class': 'filename'})
+ .append($('').text(elem.name))
+ .click({ task:rec, att:elem }, function(e) {
load_attachment(e.data.task, e.data.att);
return false;
- }).appendTo(li);
+ })
+ .appendTo(li);
ul.append(li);
}
@@ -2868,6 +2761,7 @@ function rcube_tasklist_ui(settings)
html = rcmail.gettext('deleteparenttasktconfirm','tasklist');
buttons.push({
text: rcmail.gettext('deletethisonly','tasklist'),
+ 'class': 'delete',
click: function() {
_delete_task(id, 0);
$(this).dialog('close');
@@ -2875,6 +2769,7 @@ function rcube_tasklist_ui(settings)
});
buttons.push({
text: rcmail.gettext('deletewithchilds','tasklist'),
+ 'class': 'delete',
click: function() {
_delete_task(id, 1);
$(this).dialog('close');
@@ -2908,6 +2803,7 @@ function rcube_tasklist_ui(settings)
buttons.push({
text: rcmail.gettext('cancel', 'tasklist'),
+ 'class': 'cancel',
click: function() {
$(this).dialog('close');
}
@@ -3001,20 +2897,7 @@ function rcube_tasklist_ui(settings)
*/
function list_set_sort(col)
{
- if (settings.sort_col != col) {
- settings.sort_col = col;
- $('#taskviewsortmenu .sortcol').attr('aria-checked', 'false').removeClass('selected')
- .filter('.by-' + col).attr('aria-checked', 'true').addClass('selected');
-
- // re-sort list index and re-render list
- listindex.sort(function(a, b) { return task_cmp(listdata[a], listdata[b]); });
- render_tasklist();
-
- rcmail.enable_command('list-order', settings.sort_col != 'auto');
- $('#taskviewsortmenu .sortorder').removeClass('selected').filter('[aria-checked=true]').addClass('selected');
-
- rcmail.save_pref({ name: 'tasklist_sort_col', value: (col == 'auto' ? '' : col) });
- }
+ list_set_sort_and_order(col, settings.sort_order);
}
/**
@@ -3022,108 +2905,95 @@ function rcube_tasklist_ui(settings)
*/
function list_set_order(order)
{
- if (settings.sort_order != order) {
- settings.sort_order = order;
- $('#taskviewsortmenu .sortorder').attr('aria-checked', 'false').removeClass('selected')
- .filter('.' + order).attr('aria-checked', 'true').addClass('selected');
-
- // re-sort list index and re-render list
- listindex.sort(function(a, b) { return task_cmp(listdata[a], listdata[b]); });
- render_tasklist();
-
- rcmail.save_pref({ name: 'tasklist_sort_order', value: order });
- }
+ list_set_sort_and_order(settings.sort_col, order);
}
/**
- *
+ * Change tasks list sorting and/or order
+ */
+ function list_set_sort_and_order(col, order)
+ {
+ var col_change = settings.sort_col != col,
+ ord_change = settings.sort_order != order;
+
+ if (col_change || ord_change) {
+ settings.sort_col = col;
+ settings.sort_order = order;
+
+ // re-sort list index and re-render list
+ listindex.sort(function(a, b) { return task_cmp(listdata[a], listdata[b]); });
+ render_tasklist();
+
+ rcmail.enable_command('list-order', settings.sort_col != 'auto');
+
+ if (col_change)
+ rcmail.save_pref({ name: 'tasklist_sort_col', value: (col == 'auto' ? '' : col) });
+
+ if (ord_change)
+ rcmail.save_pref({ name: 'tasklist_sort_order', value: order });
+
+ $('#taskviewsortmenu .sortcol').attr('aria-checked', 'false').removeClass('selected')
+ .filter('.by-' + col).attr('aria-checked', 'true').addClass('selected');
+ $('#taskviewsortmenu .sortorder').removeClass('selected')
+ .filter('[aria-checked=true]').addClass('selected');
+ }
+ }
+
+ function get_setting(name)
+ {
+ return settings[name];
+ }
+
+ /**
+ * Dialog for tasks list creation/update
*/
function list_edit_dialog(id)
{
- var list = me.tasklists[id],
- $dialog = $(rcmail.gui_containers.tasklistform);
+ var list = me.tasklists[id] || {name: '', editable: true, rights: 'riwta', showalarms: true},
+ title = rcmail.gettext((list.id ? 'editlist' : 'createlist'), 'tasklist'),
+ params = {action: (list.id ? 'form-edit' : 'form-new'), l: { id:list.id }, _framed: 1},
+ $dialog = $('