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

Copy iTip inivitation comment to event objects and display it in calendar with the RSPV buttons (#419)

Browse source
This commit is contained in:
Thomas Bruederli 2014-08-01 10:00:59 +02:00
parent 79ebe9e227
commit 4ea51417ba
6 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
plugins/calendar/calendar_ui.js
View file

@ -534,9 +534,13 @@ function rcube_calendar_ui(settings)
.html(Q(rcmail.gettext('itip' + mystatus, 'libcalendaring')));
}
$('#event-rsvp')[(rsvp && !is_organizer(event) && event.status != 'CANCELLED' ? 'show' : 'hide')]();
var show_rsvp = rsvp && !is_organizer(event) && event.status != 'CANCELLED';
$('#event-rsvp')[(show_rsvp ? 'show' : 'hide')]();
$('#event-rsvp .rsvp-buttons input').prop('disabled', false).filter('input[rel='+mystatus+']').prop('disabled', true);
if (show_rsvp && event.comment)
$('#event-rsvp-comment').show().children('.event-text').html(Q(event.comment));
$('#event-rsvp a.reply-comment-toggle').show();
$('#event-rsvp .itip-reply-comment textarea').hide().val('');
}

1
plugins/calendar/localization/en_US.inc
View file

@ -111,6 +111,7 @@ $labels['quickview'] = 'View only this calendar';
$labels['invitationspending'] = 'Pending invitations';
$labels['invitationsdeclined'] = 'Declined invitations';
$labels['changepartstat'] = 'Change participant status';
$labels['rsvpcomment'] = 'Invitation text';
// agenda view
$labels['listrange'] = 'Range to display:';

1
plugins/calendar/skins/larry/calendar.css
View file

@ -717,6 +717,7 @@ a.miniColors-trigger {
margin-left: 2em;
}
.calendarmain .eventdialog #event-rsvp-comment,
.calendarmain .eventdialog #event-created-changed {
margin-top: 0.6em;
}

4
plugins/calendar/skins/larry/templates/calendar.html
View file

@ -142,6 +142,10 @@
<label><roundcube:label name="calendar.changed" /></label>
<span class="event-text event-changed"></span>
</div>
<div class="event-line" id="event-rsvp-comment">
<label><roundcube:label name="calendar.rsvpcomment" /></label>
<span class="event-text"></span>
</div>
<roundcube:object name="plugin.event_rsvp_buttons" id="event-rsvp" class="event-dialog-message" style="display:none" />
</div>

5
plugins/libcalendaring/libvcalendar.php
View file

@ -465,6 +465,7 @@ class libvcalendar implements Iterator
case 'LOCATION':
case 'DESCRIPTION':
case 'URL':
case 'COMMENT':
$event[strtolower($prop->name)] = self::convert_string($prop);
break;
@ -520,10 +521,6 @@ class libvcalendar implements Iterator
}
break;
case 'COMMENT':
$event['comment'] = $prop->value;
break;
default:
if (substr($prop->name, 0, 2) == 'X-')
$event['x-custom'][] = array($prop->name, strval($prop->value));

8
plugins/libkolab/lib/kolab_format_xcal.php
View file

@ -127,6 +127,10 @@ abstract class kolab_format_xcal extends kolab_format
'start' => self::php_datetime($this->obj->start()),
);
if (method_exists($this->obj, 'comment')) {
$object['comment'] = $this->obj->comment();
}
// read organizer and attendees
if (($organizer = $this->obj->organizer()) && ($organizer->email() || $organizer->name())) {
$object['organizer'] = array(
@ -340,6 +344,10 @@ abstract class kolab_format_xcal extends kolab_format
$this->obj->setCategories(self::array2vector($object['categories']));
$this->obj->setUrl(strval($object['url']));
if (method_exists($this->obj, 'setComment')) {
$this->obj->setComment($object['comment']);
}
// process event attendees
$attendees = new vectorattendee;
foreach ((array)$object['attendees'] as $attendee) {