From d3b35a6d47f4c6fb40bd05d17f0a2d3b732574cc Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Wed, 19 Mar 2014 18:42:21 +0100 Subject: [PATCH] Display delegated-from/to information in attendees list (hover title) --- plugins/calendar/calendar_ui.js | 23 ++++++++++++++++++----- plugins/calendar/localization/en_US.inc | 2 ++ 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js index f74880e0..b94b24ce 100644 --- a/plugins/calendar/calendar_ui.js +++ b/plugins/calendar/calendar_ui.js @@ -350,19 +350,26 @@ function rcube_calendar_ui(settings) return (j - k); }); - var data, dispname, organizer = false, rsvp = false, line, morelink, html = '',overflow = ''; + var data, dispname, tooltip, organizer = false, rsvp = false, line, morelink, html = '',overflow = ''; for (var j=0; j < event.attendees.length; j++) { data = event.attendees[j]; dispname = Q(data.name || data.email); + tooltip = ''; if (data.email) { - dispname = '' + dispname + ''; + tooltip = data.email; + dispname = '' + dispname + ''; if (data.role == 'ORGANIZER') organizer = true; else if ((data.status == 'NEEDS-ACTION' || data.status == 'TENTATIVE' || data.rsvp) && settings.identity.emails.indexOf(';'+data.email) >= 0) rsvp = data.status.toLowerCase(); } - line = '' + dispname + ' '; + if (data['delegated-to']) + tooltip = rcmail.gettext('delegatedto', 'calendar') + data['delegated-to']; + else if (data['delegated-from']) + tooltip = rcmail.gettext('delegatedfrom', 'calendar') + data['delegated-from']; + + line = '' + dispname + ' '; if (morelink) overflow += line; else @@ -1524,11 +1531,17 @@ function rcube_calendar_ui(settings) // delete icon var icon = rcmail.env.deleteicon ? '' : rcmail.gettext('delete'); var dellink = '' + icon + ''; - + var tooltip = data.status || ''; + + if (data['delegated-to']) + tooltip = rcmail.gettext('delegatedto', 'calendar') + data['delegated-to']; + else if (data['delegated-from']) + tooltip = rcmail.gettext('delegatedfrom', 'calendar') + data['delegated-from']; + var html = '' + select + '' + '' + dispname + '' + '' + - '' + Q(data.status || '') + '' + + '' + Q(data.status || '') + '' + '' + (organizer || readonly ? '' : dellink) + ''; var table = rcmail.env.calendar_resources && data.cutype == 'RESOURCE' ? resources_list : attendees_list; diff --git a/plugins/calendar/localization/en_US.inc b/plugins/calendar/localization/en_US.inc index 8d68d725..055092a9 100644 --- a/plugins/calendar/localization/en_US.inc +++ b/plugins/calendar/localization/en_US.inc @@ -122,6 +122,8 @@ $labels['availbusy'] = 'Busy'; $labels['availunknown'] = 'Unknown'; $labels['availtentative'] = 'Tentative'; $labels['availoutofoffice'] = 'Out of Office'; +$labels['delegatedto'] = 'Delegated to: '; +$labels['delegatedfrom'] = 'Delegated from: '; $labels['scheduletime'] = 'Find availability'; $labels['sendinvitations'] = 'Send invitations'; $labels['sendnotifications'] = 'Notify participants about modifications';