From fb6029edbe07a221c5de716f6b8ef2b7c6cf4bba Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Thu, 5 Apr 2018 11:14:37 +0000
Subject: [PATCH] Elastic: Save-as-event dialog using iframe

---
 plugins/calendar/calendar.php                 |  57 ++--
 plugins/calendar/calendar_base.js             |  74 ++---
 plugins/calendar/calendar_ui.js               | 278 ++++++++++--------
 plugins/calendar/localization/en_US.inc       |   1 +
 .../skins/elastic/templates/calendar.html     |  16 +-
 .../skins/elastic/templates/eventedit.html    |   4 +-
 plugins/calendar/skins/larry/calendar.css     |  17 ++
 .../skins/larry/templates/eventedit.html      |   2 +-
 plugins/libcalendaring/skins/larry/libcal.css |   5 +-
 .../skins/elastic/include/calendar.less       |  11 +-
 plugins/tasklist/localization/en_US.inc       |   1 +
 plugins/tasklist/skins/larry/tasklist.css     |   1 +
 .../skins/larry/templates/dialog.html         |  14 -
 13 files changed, 249 insertions(+), 232 deletions(-)

diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index b6176ba6..72bd2d34 100644
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -153,8 +153,7 @@ class calendar extends rcube_plugin
       $this->register_action('print', array($this,'print_view'));
       $this->register_action('mailimportitip', array($this, 'mail_import_itip'));
       $this->register_action('mailimportattach', array($this, 'mail_import_attachment'));
-      $this->register_action('mailtoevent', array($this, 'mail_message2event'));
-      $this->register_action('inlineui', array($this, 'get_inline_ui'));
+      $this->register_action('dialog-ui', array($this, 'mail_message2event'));
       $this->register_action('check-recent', array($this, 'check_recent'));
       $this->register_action('itip-status', array($this, 'event_itip_status'));
       $this->register_action('itip-remove', array($this, 'event_itip_remove'));
@@ -875,7 +874,7 @@ class calendar extends rcube_plugin
         $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 {
@@ -1221,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;
@@ -2421,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
    *
@@ -3375,17 +3350,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(); // 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();
@@ -3427,14 +3406,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..3bf7b8b4 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;
-
-            me.ui_loaded = true;
-            me.ui = new rcube_calendar_ui(me.settings);
-            me.create_from_mail(uid);  // start over
-          });
-
-          return;
-        }
-
-        // get message contents for event dialog
-        var lock = rcmail.set_busy(true, 'loading');
-        rcmail.http_post('calendar/mailtoevent', {
-            '_mbox': rcmail.env.mailbox,
-            '_uid': uid
-          }, lock);
+      if (!uid && !(uid = rcmail.get_single_uid())) {
+        return;
       }
-    };
 
-    // callback function triggered from server with contents for the new event
-    this.mail2event_dialog = function(event)
-    {
-      if (event.title) {
-        this.ui.add_event(event);
-        if (rcmail.message_list)
-          rcmail.message_list.blur();
-      }
+      var url = {_mbox: rcmail.env.mailbox, _uid: uid, _framed: 1},
+        buttons = {},
+        button_classes = ['mainaction save', 'cancel'],
+        title = rcmail.gettext('calendar.createfrommail'),
+            dialog = $('<iframe>').attr({
+                id: 'kolabcalendarinlinegui',
+                name: 'kolabcalendardialog',
+                src: rcmail.url('calendar/dialog-ui', url)
+            });
+
+        // dialog buttons
+        buttons[rcmail.gettext('save')] = function() {
+            var frame = rcmail.get_frame_window('kolabcalendarinlinegui');
+            frame.rcmail.command('event-save');
+        };
+
+        buttons[rcmail.gettext('cancel')] = function() {
+            dialog.dialog('destroy');
+        };
+
+        // open jquery UI dialog
+        window.kolab_event_dialog_element = dialog = rcmail.show_popup_dialog(dialog, title, buttons, {
+            button_classes: button_classes,
+            minWidth: 500,
+            width: 600,
+            height: 600
+        });
     };
 
     // handler for attachment-save-calendar commands
@@ -107,12 +94,9 @@ window.rcmail && rcmail.addEventListener('init', function(evt) {
     if (rcmail.env.task == 'mail') {
       rcmail.register_command('calendar-create-from-mail', function() { cal.create_from_mail(); });
       rcmail.register_command('attachment-save-calendar', function() { cal.save_to_calendar(); });
-      rcmail.addEventListener('plugin.mail2event_dialog', function(p) { cal.mail2event_dialog(p); });
-      rcmail.addEventListener('plugin.unlock_saving', function(p) { cal.ui && cal.ui.unlock_saving(); });
 
       if (rcmail.env.action != 'show') {
         rcmail.env.message_commands.push('calendar-create-from-mail');
-        rcmail.add_element($('<a>'));
       }
       else {
         rcmail.enable_command('calendar-create-from-mail', true);
diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js
index 40197aed..1244f687 100644
--- a/plugins/calendar/calendar_ui.js
+++ b/plugins/calendar/calendar_ui.js
@@ -32,7 +32,7 @@ function rcube_calendar_ui(settings)
 {
     // extend base class
     rcube_calendar.call(this, settings);
-    
+
     /***  member vars  ***/
     this.is_loading = false;
     this.selected_event = null;
@@ -606,6 +606,9 @@ function rcube_calendar_ui(settings)
       event = me.selected_event; // change reference to clone
       freebusy_ui.needsupdate = false;
 
+      if (rcmail.env.action == 'dialog-ui')
+        calendar.attendees = false; // TODO: allow Attendees tab in Save-as-event dialog
+
       // reset dialog first
       $('#eventedit form').trigger('reset');
       $('#event-panel-recurrence input, #event-panel-recurrence select, #event-panel-attachments input').prop('disabled', false);
@@ -760,97 +763,102 @@ function rcube_calendar_ui(settings)
       };
       
       // init dialog buttons
-      var buttons = [];
-      
+      var buttons = [],
+        save_func = function() {
+          var start = parse_datetime(allday.checked ? '12:00' : starttime.val(), startdate.val());
+          var end   = parse_datetime(allday.checked ? '13:00' : endtime.val(), enddate.val());
+
+          // basic input validatetion
+          if (start.getTime() > end.getTime()) {
+            alert(rcmail.gettext('invalideventdates', 'calendar'));
+            return false;
+          }
+
+          // post data to server
+          var data = {
+            calendar: event.calendar,
+            start: date2servertime(start),
+            end: date2servertime(end),
+            allday: allday.checked?1:0,
+            title: title.val(),
+            description: description.val(),
+            location: location.val(),
+            categories: categories.val(),
+            vurl: vurl.val(),
+            free_busy: freebusy.val(),
+            priority: priority.val(),
+            sensitivity: sensitivity.val(),
+            status: eventstatus.val(),
+            recurrence: me.serialize_recurrence(endtime.val()),
+            valarms: me.serialize_alarms('#edit-alarms'),
+            attendees: event_attendees,
+            links: me.selected_event.links,
+            deleted_attachments: rcmail.env.deleted_attachments,
+            attachments: []
+          };
+
+          // uploaded attachments list
+          for (var i in rcmail.env.attachments)
+            if (i.match(/^rcmfile(.+)/))
+              data.attachments.push(RegExp.$1);
+
+          // read attendee roles
+          $('select.edit-attendee-role').each(function(i, elem){
+            if (data.attendees[i])
+              data.attendees[i].role = $(elem).val();
+          });
+
+          if (organizer)
+            data._identity = $('#edit-identities-list option:selected').val();
+
+          // per-attendee notification suppression
+          var need_invitation = false;
+          if (allow_invitations) {
+            $.each(data.attendees, function (i, v) {
+              if (v.role != 'ORGANIZER') {
+                if ($('input.edit-attendee-reply[value="' + v.email + '"]').prop('checked') || v.cutype == 'RESOURCE') {
+                  need_invitation = true;
+                  delete data.attendees[i]['noreply'];
+                }
+                else if (settings.itip_notify > 0) {
+                  data.attendees[i].noreply = 1;
+                }
+              }
+            });
+          }
+
+          // tell server to send notifications
+          if ((data.attendees.length || (event.id && event.attendees.length)) && allow_invitations && (notify.checked || invite.checked || need_invitation)) {
+            data._notify = settings.itip_notify;
+            data._comment = comment.val();
+          }
+
+          data.calendar = calendars.val();
+
+          if (event.id) {
+            data.id = event.id;
+            if (event.recurrence)
+              data._savemode = $('input.edit-recurring-savemode:checked').val();
+            if (data.calendar && data.calendar != event.calendar)
+              data._fromcalendar = event.calendar;
+          }
+
+          if (data.recurrence && syncstart.is(':checked'))
+            data.syncstart = 1;
+
+          update_event(action, data);
+
+          if (rcmail.env.action != 'dialog-ui')
+            $dialog.dialog("close");
+        };
+
+      rcmail.env.event_save_func = save_func;
+
       // save action
       buttons.push({
         text: rcmail.gettext('save', 'calendar'),
         'class': 'save mainaction',
-        click: function() {
-        var start = parse_datetime(allday.checked ? '12:00' : starttime.val(), startdate.val());
-        var end   = parse_datetime(allday.checked ? '13:00' : endtime.val(), enddate.val());
-        
-        // basic input validatetion
-        if (start.getTime() > end.getTime()) {
-          alert(rcmail.gettext('invalideventdates', 'calendar'));
-          return false;
-        }
-        
-        // post data to server
-        var data = {
-          calendar: event.calendar,
-          start: date2servertime(start),
-          end: date2servertime(end),
-          allday: allday.checked?1:0,
-          title: title.val(),
-          description: description.val(),
-          location: location.val(),
-          categories: categories.val(),
-          vurl: vurl.val(),
-          free_busy: freebusy.val(),
-          priority: priority.val(),
-          sensitivity: sensitivity.val(),
-          status: eventstatus.val(),
-          recurrence: me.serialize_recurrence(endtime.val()),
-          valarms: me.serialize_alarms('#edit-alarms'),
-          attendees: event_attendees,
-          links: me.selected_event.links,
-          deleted_attachments: rcmail.env.deleted_attachments,
-          attachments: []
-        };
-
-        // uploaded attachments list
-        for (var i in rcmail.env.attachments)
-          if (i.match(/^rcmfile(.+)/))
-            data.attachments.push(RegExp.$1);
-
-        // read attendee roles
-        $('select.edit-attendee-role').each(function(i, elem){
-          if (data.attendees[i])
-            data.attendees[i].role = $(elem).val();
-        });
-
-        if (organizer)
-          data._identity = $('#edit-identities-list option:selected').val();
-
-        // per-attendee notification suppression
-        var need_invitation = false;
-        if (allow_invitations) {
-          $.each(data.attendees, function (i, v) {
-            if (v.role != 'ORGANIZER') {
-              if ($('input.edit-attendee-reply[value="' + v.email + '"]').prop('checked') || v.cutype == 'RESOURCE') {
-                need_invitation = true;
-                delete data.attendees[i]['noreply'];
-              }
-              else if (settings.itip_notify > 0) {
-                data.attendees[i].noreply = 1;
-              }
-            }
-          });
-        }
-
-        // tell server to send notifications
-        if ((data.attendees.length || (event.id && event.attendees.length)) && allow_invitations && (notify.checked || invite.checked || need_invitation)) {
-          data._notify = settings.itip_notify;
-          data._comment = comment.val();
-        }
-
-        data.calendar = calendars.val();
-
-        if (event.id) {
-          data.id = event.id;
-          if (event.recurrence)
-            data._savemode = $('input.edit-recurring-savemode:checked').val();
-          if (data.calendar && data.calendar != event.calendar)
-            data._fromcalendar = event.calendar;
-        }
-
-        if (data.recurrence && syncstart.is(':checked'))
-          data.syncstart = 1;
-
-        update_event(action, data);
-        $dialog.dialog("close");
-      }  // end click:
+        click: save_func
       });
 
       if (event.id) {
@@ -876,7 +884,7 @@ function rcube_calendar_ui(settings)
       $('#edit-tab-attendees')[(calendar.attendees?'show':'hide')]();
       $('#edit-tab-resources')[(rcmail.env.calendar_resources?'show':'hide')]();
       $('#edit-tab-attachments')[(calendar.attachments?'show':'hide')]();
-      $('#eventedit:not([data-notabs]) > form').tabs('option', 'active', 0); // Larry
+      $('#eventedit:not([data-notabs])').tabs('option', 'active', 0); // Larry
 
       // show/hide tabs according to calendar's feature support and activate first tab (Ellastic)
       $('li > a[href="#event-panel-attendees"]').parent()[(calendar.attendees?'show':'hide')]();
@@ -891,33 +899,35 @@ function rcube_calendar_ui(settings)
 
       var editform = $("#eventedit");
 
-      // open jquery UI dialog
-      $dialog.dialog({
-        modal: true,
-        resizable: true,
-        closeOnEscape: false,
-        title: rcmail.gettext((action == 'edit' ? 'edit_event' : 'new_event'), 'calendar'),
-        open: function() {
-          editform.attr('aria-hidden', 'false');
-        },
-        close: function() {
-          editform.hide().attr('aria-hidden', 'true').appendTo(document.body);
-          $dialog.dialog("destroy").remove();
-          rcmail.ksearch_blur();
-          freebusy_data = {};
-          rcmail.env.comm_path = comm_path_before;  // restore comm_path
-          if (op_elem)
-            $(op_elem).focus();
-        },
-        buttons: buttons,
-        minWidth: 500,
-        width: 600
-      }).append(editform.show());  // adding form content AFTERWARDS massively speeds up opening on IE6
+      if (rcmail.env.action != 'dialog-ui') {
+        // open jquery UI dialog
+        $dialog.dialog({
+          modal: true,
+          resizable: true,
+          closeOnEscape: false,
+          title: rcmail.gettext((action == 'edit' ? 'edit_event' : 'new_event'), 'calendar'),
+          open: function() {
+            editform.attr('aria-hidden', 'false');
+          },
+          close: function() {
+            editform.hide().attr('aria-hidden', 'true').appendTo(document.body);
+            $dialog.dialog("destroy").remove();
+            rcmail.ksearch_blur();
+            freebusy_data = {};
+            rcmail.env.comm_path = comm_path_before;  // restore comm_path
+            if (op_elem)
+              $(op_elem).focus();
+          },
+          buttons: buttons,
+          minWidth: 500,
+          width: 600
+        }).append(editform.show());  // adding form content AFTERWARDS massively speeds up opening on IE6
 
-      // set dialog size according to form content
-      me.dialog_resize($dialog.get(0), editform.height() + (bw.ie ? 20 : 0), 550);
+        // set dialog size according to form content
+        me.dialog_resize($dialog.get(0), editform.height() + (bw.ie ? 20 : 0), 550);
 
-      title.select();
+        rcmail.triggerEvent('calendar-event-dialog', {dialog: $dialog});
+      }
 
       // init other tabs asynchronously
       window.setTimeout(function(){ me.set_recurrence_edit(event); }, exec_deferred);
@@ -926,7 +936,7 @@ function rcube_calendar_ui(settings)
       if (calendar.attachments)
         window.setTimeout(load_attachments_tab, exec_deferred);
 
-      rcmail.triggerEvent('calendar-event-dialog', {dialog: $dialog});
+      title.select();
     };
 
     // show event changelog in a dialog
@@ -3963,7 +3973,7 @@ function rcube_calendar_ui(settings)
             $('#edit-recurrence-syncstart').hide();
       };
 
-      $('#eventtabs').tabs({activate: tab_change});             // Larry
+      $('#eventedit:not([data-notabs])').tabs({activate: tab_change});             // Larry
       $('#eventedit a.nav-link').on('show.bs.tab', tab_change); // Elastic
 
       $('#edit-enddate').datepicker(datepicker_settings);
@@ -4145,6 +4155,32 @@ function rcube_calendar_ui(settings)
     // add proprietary css styles if not IE
     if (!bw.ie)
       $('div.fc-content').addClass('rcube-fc-content');
+
+    // Save-as-event dialog content
+    if (rcmail.env.action == 'dialog-ui') {
+      var date = new Date(), event = {allDay: false, calendar: me.selected_calendar};
+
+      date.setHours(date.getHours()+1);
+      date.setMinutes(0);
+
+      var end = new Date(date.getTime());
+      end.setHours(date.getHours()+1);
+
+      event.start = date;
+      event.end = end;
+
+      // exec deferred because it must be after init_calendar_ui
+      window.setTimeout(function() {
+        event_edit_dialog('new', $.extend(event, rcmail.env.event_prop));
+      }, exec_deferred);
+
+      rcmail.register_command('event-save', function() { rcmail.env.event_save_func(); }, true);
+      rcmail.addEventListener('plugin.unlock_saving', function(status) {
+        me.unlock_saving();
+        if (status)
+          window.parent.kolab_event_dialog_element.dialog('destroy');
+      });
+    }
 } // end rcube_calendar class
 
 
@@ -4156,6 +4192,13 @@ if (rcmail.env.devel_mode && window.less) {
 
 /* calendar plugin initialization */
 window.rcmail && rcmail.addEventListener('init', function(evt) {
+  // let's go
+  var cal = new rcube_calendar_ui($.extend(rcmail.env.calendar_settings, rcmail.env.libcal_settings));
+
+  if (rcmail.env.action == 'dialog-ui') {
+    return;
+  }
+
   // configure toolbar buttons
   rcmail.register_command('addevent', function(){ cal.add_event(); }, true);
   rcmail.register_command('print', function(){ cal.print_calendars(); }, true);
@@ -4201,9 +4244,6 @@ window.rcmail && rcmail.addEventListener('init', function(evt) {
   rcmail.addEventListener('plugin.itip_message_processed', function(data){ cal.itip_message_processed(data); });
   rcmail.addEventListener('requestrefresh', function(q){ return cal.before_refresh(q); });
 
-  // let's go
-  var cal = new rcube_calendar_ui($.extend(rcmail.env.calendar_settings, rcmail.env.libcal_settings));
-
   $(window).resize(function(e) {
     // check target due to bugs in jquery
     // http://bugs.jqueryui.com/ticket/7514
diff --git a/plugins/calendar/localization/en_US.inc b/plugins/calendar/localization/en_US.inc
index 25ef90da..5d9bc093 100644
--- a/plugins/calendar/localization/en_US.inc
+++ b/plugins/calendar/localization/en_US.inc
@@ -306,5 +306,6 @@ $labels['arialabeleventattendees'] = 'Event participants list';
 $labels['arialabeleventresources'] = 'Event resources list';
 $labels['arialabelresourcesearchform'] = 'Resources search form';
 $labels['arialabelresourceselection'] = 'Available resources';
+$labels['arialabeleventform'] = 'Event editing form';
 
 ?>
diff --git a/plugins/calendar/skins/elastic/templates/calendar.html b/plugins/calendar/skins/elastic/templates/calendar.html
index 29b70e1f..f84d8ae0 100644
--- a/plugins/calendar/skins/elastic/templates/calendar.html
+++ b/plugins/calendar/skins/elastic/templates/calendar.html
@@ -127,14 +127,6 @@
 		<label class="col-sm-4 col-form-label"><roundcube:label name="calendar.priority" /></label>
 		<span class="event-text col-sm-8 form-control-plaintext"></span>
 	</div>
-	<div id="event-created" class="form-group row faded">
-		<label class="col-sm-4 col-form-label"><roundcube:label name="calendar.created" /></label>
-		<span class="event-text event-created col-sm-8 form-control-plaintext"></span>
-	</div>
-	<div id="event-changed" class="form-group row faded">
-		<label class="col-sm-4 col-form-label"><roundcube:label name="calendar.changed" /></label>
-		<span class="event-text event-changed col-sm-8 form-control-plaintext"></span>
-	</div>
 	<div id="event-rsvp-comment" class="form-group row">
 		<label class="col-sm-4 col-form-label"><roundcube:label name="calendar.rsvpcomment" /></label>
 		<span class="event-text col-sm-8 form-control-plaintext"></span>
@@ -143,6 +135,14 @@
 		<label class="col-sm-4 col-form-label"><roundcube:label name="calendar.links" /></label>
 		<span class="event-text col-sm-8"></span>
 	</div>
+	<div id="event-created" class="form-group row faded">
+		<label class="col-sm-4 col-form-label"><roundcube:label name="calendar.created" /></label>
+		<span class="event-text event-created col-sm-8 form-control-plaintext"></span>
+	</div>
+	<div id="event-changed" class="form-group row faded">
+		<label class="col-sm-4 col-form-label"><roundcube:label name="calendar.changed" /></label>
+		<span class="event-text event-changed col-sm-8 form-control-plaintext"></span>
+	</div>
 	<div id="event-attachments" class="form-group row">
 		<div class="event-text"></div>
 	</div>
diff --git a/plugins/calendar/skins/elastic/templates/eventedit.html b/plugins/calendar/skins/elastic/templates/eventedit.html
index 7cbe0a26..d3373cb6 100644
--- a/plugins/calendar/skins/elastic/templates/eventedit.html
+++ b/plugins/calendar/skins/elastic/templates/eventedit.html
@@ -1,4 +1,4 @@
-<div id="eventedit" class="popupmenu formcontent" aria-hidden="true" data-notabs="true">
+<div id="eventedit" class="<roundcube:exp expression="env:framed ? '' : 'popupmenu '">formcontent" aria-hidden="true" data-notabs="true">
 	<form class="tabbed" action="#" method="post" enctype="multipart/form-data">
 		<!-- basic info -->
 		<fieldset id="event-panel-summary">
@@ -20,7 +20,7 @@
 				<div class="col-sm-10 datetime">
 					<input type="text" name="startdate" size="11" id="edit-startdate" class="form-control" required="true" /> &nbsp;
 					<input type="text" name="starttime" size="6" id="edit-starttime" class="form-control" aria-label="<roundcube:label name='calendar.starttime' />" />
-					<label><input type="checkbox" name="allday" id="edit-allday" value="1" /><roundcube:label name="calendar.all-day" /></label>
+					<label><input type="checkbox" name="allday" id="edit-allday" value="1" class="pretty-checkbox" /><roundcube:label name="calendar.all-day" /></label>
 				</div>
 			</div>
 			<div class="form-group row">
diff --git a/plugins/calendar/skins/larry/calendar.css b/plugins/calendar/skins/larry/calendar.css
index 41cdda87..9ad25cbc 100644
--- a/plugins/calendar/skins/larry/calendar.css
+++ b/plugins/calendar/skins/larry/calendar.css
@@ -887,6 +887,18 @@ a.miniColors-trigger {
 	visibility: visible;
 }
 
+body.eventdialog {
+	margin: 0;
+	overflow-y: auto;
+}
+
+body.eventdialog #eventedit {
+	display: block;
+	top: 0;
+	padding: 1em;
+	border-bottom: 0;
+}
+
 #eventedit {
 	position: relative;
 	top: -1.5em;
@@ -919,6 +931,10 @@ div.form-section,
 	border-bottom: 2px solid #fafafa;
 }
 
+div.event-section > .col-form-label {
+	float: left;
+}
+
 .calendarmain .eventdialog label,
 #eventedit label,
 .form-section label {
@@ -1375,6 +1391,7 @@ td.topalign {
 
 #schedule-freebusy-times tr.times td {
 	cursor: pointer;
+	white-space: nowrap;
 }
 
 #schedule-freebusy-times #fbrowall td {
diff --git a/plugins/calendar/skins/larry/templates/eventedit.html b/plugins/calendar/skins/larry/templates/eventedit.html
index 70fd53a8..6f96b18f 100644
--- a/plugins/calendar/skins/larry/templates/eventedit.html
+++ b/plugins/calendar/skins/larry/templates/eventedit.html
@@ -1,4 +1,4 @@
-<div id="eventedit" class="uidialog uidialog-tabbed" aria-hidden="true">
+<div id="eventedit" class="<roundcube:exp expression="env:framed ? '' : 'uidialog '">uidialog-tabbed" aria-hidden="true">
 	<form id="eventtabs" action="#" method="post" enctype="multipart/form-data">
 		<ul>
 			<li><a href="#event-panel-summary"><roundcube:label name="calendar.tabsummary" /></a></li><li id="edit-tab-recurrence"><a href="#event-panel-recurrence"><roundcube:label name="calendar.tabrecurrence" /></a></li><li id="edit-tab-attendees"><a href="#event-panel-attendees"><roundcube:label name="calendar.tabattendees" /></a></li><li id="edit-tab-resources"><a href="#event-panel-resources"><roundcube:label name="calendar.tabresources" /></a></li><li id="edit-tab-attachments"><a href="#event-panel-attachments"><roundcube:label name="calendar.tabattachments" /></a></li>
diff --git a/plugins/libcalendaring/skins/larry/libcal.css b/plugins/libcalendaring/skins/larry/libcal.css
index 39062475..80e0ccb1 100644
--- a/plugins/libcalendaring/skins/larry/libcal.css
+++ b/plugins/libcalendaring/skins/larry/libcal.css
@@ -118,8 +118,9 @@ label.noreply-toggle + a.reply-comment-toggle {
 	min-width: 5em;
 }
 
-#edit-recurrence-yearly-bymonthblock {
-	margin-left: 7.5em;
+.recurrence-form .event-section label + div,
+.recurrence-form .form-section label + div {
+	display: inline-block;
 }
 
 #edit-recurrence-rdates {
diff --git a/plugins/libkolab/skins/elastic/include/calendar.less b/plugins/libkolab/skins/elastic/include/calendar.less
index acdb79dc..aa85a6fd 100644
--- a/plugins/libkolab/skins/elastic/include/calendar.less
+++ b/plugins/libkolab/skins/elastic/include/calendar.less
@@ -1300,9 +1300,16 @@ body.task-calendar {
 .datetime {
     label {
         margin-left: 1em;
-        line-height: 2.2;
-        text-align: right;
         flex: 1;
+
+        label {
+            line-height: 1.8;
+
+            &:before {
+                margin-right: .25rem;
+                line-height: 1.5;
+            }
+        }
     }
 
     input {
diff --git a/plugins/tasklist/localization/en_US.inc b/plugins/tasklist/localization/en_US.inc
index 9ec5395b..5223f377 100644
--- a/plugins/tasklist/localization/en_US.inc
+++ b/plugins/tasklist/localization/en_US.inc
@@ -137,6 +137,7 @@ $labels['arialabeltaskselector'] = 'List mode';
 $labels['arialabeltasklisting'] = 'Tasks listing';
 $labels['arialabelsortmenu'] = 'Tasks sorting options';
 $labels['arialabeltasklistform'] = 'Tasks list properties';
+$labels['arialabeltaskform'] = 'Task editing form';
 
 // attendees
 $labels['attendee'] = 'Assignee';
diff --git a/plugins/tasklist/skins/larry/tasklist.css b/plugins/tasklist/skins/larry/tasklist.css
index b7c45228..ad56ec89 100644
--- a/plugins/tasklist/skins/larry/tasklist.css
+++ b/plugins/tasklist/skins/larry/tasklist.css
@@ -777,6 +777,7 @@ body.taskdialog #taskedit {
 	display: block;
 	top: 0;
 	padding: 1em;
+	border: 0;
 }
 
 #taskedit {
diff --git a/plugins/tasklist/skins/larry/templates/dialog.html b/plugins/tasklist/skins/larry/templates/dialog.html
index ebb7d243..306febf0 100644
--- a/plugins/tasklist/skins/larry/templates/dialog.html
+++ b/plugins/tasklist/skins/larry/templates/dialog.html
@@ -8,19 +8,5 @@
 
 <roundcube:include file="/templates/taskedit.html" />
 
-<script type="text/javascript">
-
-// UI startup
-var UI = new rcube_mail_ui();
-
-$(document).ready(function(e) {
-	rcmail.addEventListener('tasklist_editform_load', function(e){
-		if (rcmail.env.tasklist_driver == 'kolab')
-			UI.init_tabs($('#tasklistform > form').addClass('propform tabbed'));
-	});
-});
-
-</script>
-
 </body>
 </html>