Branch 'dev/calendar-resources' - 2 commits - plugins/calendar

[Thomas Brüderli]

 plugins/calendar/calendar_ui.js             |   23 ++++++++++++++++++-----
 plugins/calendar/localization/en_US.inc     |    2 ++
 plugins/calendar/skins/classic/calendar.css |    4 ++--
 3 files changed, 22 insertions(+), 7 deletions(-)

New commits:
commit d3b35a6d47f4c6fb40bd05d17f0a2d3b732574cc
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Wed Mar 19 18:42:21 2014 +0100

    Display delegated-from/to information in attendees list (hover title)

diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js
index f74880e..b94b24c 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 = '<a href="mailto:' + data.email + '" title="' + Q(data.email) + '" class="mailtolink" data-cutype="' + data.cutype + '">' + dispname + '</a>';
+            tooltip = data.email;
+            dispname = '<a href="mailto:' + data.email + '" class="mailtolink" data-cutype="' + data.cutype + '">' + dispname + '</a>';
             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 = '<span class="attendee ' + String(data.role == 'ORGANIZER' ? 'organizer' : data.status).toLowerCase() + '">' + dispname + '</span> ';
+          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 = '<span class="attendee ' + String(data.role == 'ORGANIZER' ? 'organizer' : data.status).toLowerCase() + '" title="' + Q(tooltip) + '">' + dispname + '</span> ';
           if (morelink)
             overflow += line;
           else
@@ -1524,11 +1531,17 @@ function rcube_calendar_ui(settings)
       // delete icon
       var icon = rcmail.env.deleteicon ? '<img src="' + rcmail.env.deleteicon + '" alt="" />' : rcmail.gettext('delete');
       var dellink = '<a href="#delete" class="iconlink delete deletelink" title="' + Q(rcmail.gettext('delete')) + '">' + icon + '</a>';
-      
+      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 = '<td class="role">' + select + '</td>' +
         '<td class="name">' + dispname + '</td>' +
         '<td class="availability"><img src="./program/resources/blank.gif" class="availabilityicon ' + avail + '" data-email="' + data.email + '" /></td>' +
-        '<td class="confirmstate"><span class="' + String(data.status).toLowerCase() + '" title="' + Q(data.status || '') + '">' + Q(data.status || '') + '</span></td>' +
+        '<td class="confirmstate"><span class="' + String(data.status).toLowerCase() + '" title="' + Q(tooltip) + '">' + Q(data.status || '') + '</span></td>' +
         '<td class="options">' + (organizer || readonly ? '' : dellink) + '</td>';
 
       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 8d68d72..055092a 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';


commit a4770d4d5d3cd214493d2f528e159315e55ebffc
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Mon Mar 17 21:24:21 2014 +0100

    Fix treelist toggle icons in classic skin

diff --git a/plugins/calendar/skins/classic/calendar.css b/plugins/calendar/skins/classic/calendar.css
index f8361d8..49776b3 100644
--- a/plugins/calendar/skins/classic/calendar.css
+++ b/plugins/calendar/skins/classic/calendar.css
@@ -1143,8 +1143,8 @@ span.spacer {
 	top: -2px;
 }
 
-#resources-list li ul li a {
-	padding-left: 35px;
+#resources-list li ul div.treetoggle {
+	left: 23px !important;
 }
 
 #resource-selection {