summaryrefslogtreecommitdiff
path: root/plugins/libcalendaring
diff options
context:
space:
mode:
authorThomas Bruederli <bruederli@kolabsys.com>2014-09-11 15:55:01 (GMT)
committerThomas Bruederli <bruederli@kolabsys.com>2014-09-11 15:55:01 (GMT)
commit086e2b2e1fa86cdd37a298fdaadd3472518d53b7 (patch)
tree0738bd6d2e6bcae5d737846bebe76fb861330cc0 /plugins/libcalendaring
parent6b7fc6729d23e273f4e5a9cbbd2f6cd7ec8b9ba8 (diff)
downloadroundcubemail-plugins-kolab-086e2b2e1fa86cdd37a298fdaadd3472518d53b7.tar.gz
Render preview agenda for iTip requests below RSVP buttons (#3161)
Diffstat (limited to 'plugins/libcalendaring')
-rw-r--r--plugins/libcalendaring/lib/libcalendaring_itip.php3
-rw-r--r--plugins/libcalendaring/libcalendaring.js14
2 files changed, 17 insertions, 0 deletions
diff --git a/plugins/libcalendaring/lib/libcalendaring_itip.php b/plugins/libcalendaring/lib/libcalendaring_itip.php
index a5b056f..6740bfa 100644
--- a/plugins/libcalendaring/lib/libcalendaring_itip.php
+++ b/plugins/libcalendaring/lib/libcalendaring_itip.php
@@ -434,6 +434,9 @@ class libcalendaring_itip
$emails = $this->lib->get_user_emails();
$title = $event['sequence'] > 0 ? $this->gettext('itipupdate') : $this->gettext('itipinvitation');
$metadata['rsvp'] = true;
+ if (is_object($event['start'])) {
+ $metadata['date'] = $event['start']->format('U');
+ }
// check for X-KOLAB-INVITATIONTYPE property and only show accept/decline buttons
if (self::get_custom_property($event, 'X-KOLAB-INVITATIONTYPE') == 'CONFIRMATION') {
diff --git a/plugins/libcalendaring/libcalendaring.js b/plugins/libcalendaring/libcalendaring.js
index b23a3fe..5b8ad5c 100644
--- a/plugins/libcalendaring/libcalendaring.js
+++ b/plugins/libcalendaring/libcalendaring.js
@@ -912,6 +912,20 @@ rcube_libcalendaring.update_itip_object_status = function(p)
// show rsvp/import buttons (with calendar selector)
$('#'+p.action+'-'+p.id).show().find('input.button').last().after(p.select);
+
+ // show itip box appendix after replacing the given placeholders
+ if (p.append && p.append.selector) {
+ var elem = $(p.append.selector);
+ if (p.append.replacements) {
+ $.each(p.append.replacements, function(k, html) {
+ elem.html(elem.html().replace(k, html));
+ });
+ }
+ else if (p.append.html) {
+ elem.html(p.append.html)
+ }
+ elem.show();
+ }
};
/**