").addClass("input-group").append(input).append(color).append($("
").append(button))
+ .appendTo("#calendarcategories");
+ color.minicolors(rcmail.env.minicolors_config || {});
$("#rcmfd_new_category").val("");
}
- }');
+ }', 'foot');
- $this->rc->output->add_script('$("#rcmfd_new_category").keypress(function(event){
+ $this->rc->output->add_script('$("#rcmfd_new_category").keypress(function(event) {
if (event.which == 13) {
rcube_calendar_add_category();
event.preventDefault();
@@ -656,12 +684,12 @@ class calendar extends rcube_plugin
$checkbox = new html_checkbox(array('name' => '_birthday_adressbooks[]') + $input_attrib);
foreach ($this->rc->get_address_sources(false, true) as $source) {
$active = in_array($source['id'], (array)$this->rc->config->get('calendar_birthday_adressbooks', array())) ? $source['id'] : '';
- $sources[] = html::label(null, $checkbox->show($active, array('value' => $source['id'])) . ' ' . rcube::Q($source['realname'] ?: $source['name']));
+ $sources[] = html::tag('li', null, html::label(null, $checkbox->show($active, array('value' => $source['id'])) . rcube::Q($source['realname'] ?: $source['name'])));
}
$p['blocks']['birthdays']['options']['birthday_adressbooks'] = array(
'title' => rcube::Q($this->gettext('birthdayscalendarsources')),
- 'content' => join(html::br(), $sources),
+ 'content' => html::tag('ul', 'proplist', implode("\n", $sources)),
);
$field_id = 'rcmfd_birthdays_alarm';
@@ -676,10 +704,12 @@ class calendar extends rcube_plugin
foreach (array('-M','-H','-D') as $trigger)
$select_offset->add($this->rc->gettext('trigger' . $trigger, 'libcalendaring'), $trigger);
- $preset = libcalendaring::parse_alarm_value($this->rc->config->get('calendar_birthdays_alarm_offset', '-1D'));
+ $preset = libcalendaring::parse_alarm_value($this->rc->config->get('calendar_birthdays_alarm_offset', '-1D'));
+ $preset_type = $this->rc->config->get('calendar_birthdays_alarm_type', '');
+
$p['blocks']['birthdays']['options']['birthdays_alarmoffset'] = array(
- 'title' => html::label($field_id . 'value', rcube::Q($this->gettext('showalarms'))),
- 'content' => $select_type->show($this->rc->config->get('calendar_birthdays_alarm_type', '')) . ' ' . $input_value->show($preset[0]) . ' ' . $select_offset->show($preset[1]),
+ 'title' => html::label($field_id, rcube::Q($this->gettext('showalarms'))),
+ 'content' => html::div('input-group', $select_type->show($preset_type) . $input_value->show($preset[0]) . ' ' . $select_offset->show($preset[1])),
);
}
@@ -839,12 +869,12 @@ class calendar extends rcube_plugin
}
// report more results available
if ($this->driver->search_more_results)
- $this->rc->output->show_message('autocompletemore', 'info');
+ $this->rc->output->show_message('autocompletemore', 'notice');
$this->rc->output->command('multi_thread_http_response', $results, rcube_utils::get_input_value('_reqid', rcube_utils::INPUT_GPC));
return;
}
-
+
if ($success)
$this->rc->output->show_message('successfullysaved', 'confirmation');
else {
@@ -1190,10 +1220,10 @@ class calendar extends rcube_plugin
}
// unlock client
- $this->rc->output->command('plugin.unlock_saving');
+ $this->rc->output->command('plugin.unlock_saving', $success);
// update event object on the client or trigger a complete refresh if too complicated
- if ($reload) {
+ if ($reload && empty($_REQUEST['_framed'])) {
$args = array('source' => $event['calendar']);
if ($reload > 1)
$args['refetch'] = true;
@@ -1926,7 +1956,8 @@ class calendar extends rcube_plugin
*/
public function attachment_upload()
{
- $this->lib->attachment_upload(self::SESSION_KEY, 'cal-');
+ $handler = new kolab_attachments_handler();
+ $handler->attachment_upload(self::SESSION_KEY, 'cal-');
}
/**
@@ -1934,9 +1965,11 @@ class calendar extends rcube_plugin
*/
public function attachment_get()
{
+ $handler = new kolab_attachments_handler();
+
// show loading page
if (!empty($_GET['_preload'])) {
- return $this->lib->attachment_loading_page();
+ return $handler->attachment_loading_page();
}
$event_id = rcube_utils::get_input_value('_event', rcube_utils::INPUT_GPC);
@@ -1961,10 +1994,7 @@ class calendar extends rcube_plugin
// show part page
if (!empty($_GET['_frame'])) {
- $this->lib->attachment = $attachment;
- $this->register_handler('plugin.attachmentframe', array($this->lib, 'attachment_frame'));
- $this->register_handler('plugin.attachmentcontrols', array($this->lib, 'attachment_header'));
- $this->rc->output->send('calendar.attachment');
+ $handler->attachment_page($attachment);
}
// deliver attachment content
else if ($attachment) {
@@ -1972,7 +2002,7 @@ class calendar extends rcube_plugin
$attachment['body'] = $this->driver->get_attachment_body($id, $event);
}
- $this->lib->attachment_get($attachment);
+ $handler->attachment_get($attachment);
}
// if we arrive here, the requested part was not found
@@ -2390,30 +2420,6 @@ class calendar extends rcube_plugin
$this->rc->output->send("calendar.print");
}
- /**
- *
- */
- public function get_inline_ui()
- {
- foreach (array('save','cancel','savingdata') as $label)
- $texts['calendar.'.$label] = $this->gettext($label);
-
- $texts['calendar.new_event'] = $this->gettext('createfrommail');
-
- $this->ui->init_templates();
- $this->ui->calendar_list(); # set env['calendars']
- echo $this->api->output->parse('calendar.eventedit', false, false);
- echo html::tag('script', array('type' => 'text/javascript'),
- "rcmail.set_env('calendars', " . rcube_output::json_serialize($this->api->output->env['calendars']) . ");\n".
- "rcmail.set_env('deleteicon', '" . $this->api->output->env['deleteicon'] . "');\n".
- "rcmail.set_env('cancelicon', '" . $this->api->output->env['cancelicon'] . "');\n".
- "rcmail.set_env('loadingicon', '" . $this->api->output->env['loadingicon'] . "');\n".
- "rcmail.gui_object('attachmentlist', '" . $this->ui->attachmentlist_id . "');\n".
- "rcmail.add_label(" . rcube_output::json_serialize($texts) . ");\n"
- );
- exit;
- }
-
/**
* Compare two event objects and return differing properties
*
@@ -2615,7 +2621,7 @@ class calendar extends rcube_plugin
&& ($response['action'] == 'rsvp' || $response['action'] == 'import')
) {
$calendars = $this->driver->list_calendars($mode);
- $calendar_select = new html_select(array('name' => 'calendar', 'id' => 'itip-saveto', 'is_escaped' => true));
+ $calendar_select = new html_select(array('name' => 'calendar', 'id' => 'itip-saveto', 'is_escaped' => true, 'class' => 'form-control'));
$calendar_select->add('--', '');
$numcals = 0;
foreach ($calendars as $calendar) {
@@ -2640,8 +2646,8 @@ class calendar extends rcube_plugin
// render small agenda view for the respective day
if ($data['method'] == 'REQUEST' && !empty($data['date']) && $response['action'] == 'rsvp') {
$event_start = rcube_utils::anytodatetime($data['date']);
- $day_start = new Datetime(gmdate('Y-m-d 00:00', $data['date']), $this->lib->timezone);
- $day_end = new Datetime(gmdate('Y-m-d 23:59', $data['date']), $this->lib->timezone);
+ $day_start = new Datetime(gmdate('Y-m-d 00:00', $data['date']), $this->lib->timezone);
+ $day_end = new Datetime(gmdate('Y-m-d 23:59', $data['date']), $this->lib->timezone);
// get events on that day from the user's personal calendars
$calendars = $this->driver->list_calendars(calendar_driver::FILTER_PERSONAL);
@@ -2650,6 +2656,7 @@ class calendar extends rcube_plugin
$before = $after = array();
foreach ($events as $event) {
+
// TODO: skip events with free_busy == 'free' ?
if ($event['uid'] == $data['uid'] || $event['end'] < $day_start || $event['start'] > $day_end)
continue;
@@ -2841,7 +2848,6 @@ class calendar extends rcube_plugin
}
else if (in_array($header->ctype, array('multipart/alternative', 'multipart/mixed'))) {
// TODO: fetch bodystructure and search for ical parts. Maybe too expensive?
-
if (!empty($header->structure) && is_array($header->structure->parts)) {
foreach ($header->structure->parts as $part) {
if (libcalendaring::part_is_vcalendar($part) && !empty($part->ctype_parameters['method'])) {
@@ -2889,7 +2895,7 @@ class calendar extends rcube_plugin
) . '%before%' . $this->mail_agenda_event_row($event, 'current') . '%after%');
}
- $html .= html::div('calendar-invitebox',
+ $html .= html::div('calendar-invitebox invitebox boxinformation',
$this->itip->mail_itip_inline_ui(
$event,
$ical_objects->method,
@@ -3368,17 +3374,21 @@ class calendar extends rcube_plugin
*/
public function mail_message2event()
{
- $uid = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_POST);
- $mbox = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_POST);
+ $this->ui->init();
+ $this->ui->addJS();
+ $this->ui->init_templates();
+ $this->ui->calendar_list(array(), true); // set env['calendars']
+
+ $uid = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_GET);
+ $mbox = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_GET);
$event = array();
// establish imap connection
- $imap = $this->rc->get_storage();
- $imap->set_folder($mbox);
- $message = new rcube_message($uid);
+ $imap = $this->rc->get_storage();
+ $message = new rcube_message($uid, $mbox);
if ($message->headers) {
- $event['title'] = trim($message->subject);
+ $event['title'] = trim($message->subject);
$event['description'] = trim($message->first_text_part());
$this->load_driver();
@@ -3420,14 +3430,14 @@ class calendar extends rcube_plugin
}
}
}
-
- $this->rc->output->command('plugin.mail2event_dialog', $event);
+
+ $this->rc->output->set_env('event_prop', $event);
}
else {
$this->rc->output->command('display_message', $this->gettext('messageopenerror'), 'error');
}
-
- $this->rc->output->send();
+
+ $this->rc->output->send('calendar.dialog');
}
/**
diff --git a/plugins/calendar/calendar_base.js b/plugins/calendar/calendar_base.js
index 3f00925b..c089bbd4 100644
--- a/plugins/calendar/calendar_base.js
+++ b/plugins/calendar/calendar_base.js
@@ -33,53 +33,40 @@ function rcube_calendar(settings)
// extend base class
rcube_libcalendaring.call(this, settings);
- // member vars
- this.ui_loaded = false;
- this.selected_attachment = null;
-
- // private vars
- var me = this;
-
// create new event from current mail message
this.create_from_mail = function(uid)
{
- if (uid || (uid = rcmail.get_single_uid())) {
- // load calendar UI (scripts and edit dialog template)
- if (!this.ui_loaded) {
- $.when(
- $.getScript(rcmail.assets_path('plugins/calendar/calendar_ui.js')),
- $.getScript(rcmail.assets_path('plugins/calendar/lib/js/fullcalendar.js')),
- $.get(rcmail.url('calendar/inlineui'), function(html) { $(document.body).append(html); }, 'html')
- ).then(function() {
- // disable attendees feature (autocompletion and stuff is not initialized)
- for (var c in rcmail.env.calendars)
- rcmail.env.calendars[c].attendees = rcmail.env.calendars[c].resources = false;
+ if (!uid && !(uid = rcmail.get_single_uid())) {
+ return;
+ }
- me.ui_loaded = true;
- me.ui = new rcube_calendar_ui(me.settings);
- me.create_from_mail(uid); // start over
+ var url = {_mbox: rcmail.env.mailbox, _uid: uid, _framed: 1},
+ buttons = {},
+ button_classes = ['mainaction save', 'cancel'],
+ title = rcmail.gettext('calendar.createfrommail'),
+ dialog = $('