From fcddeb4224308f80184000ad34add7ffc3dcf3c2 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Mon, 3 Feb 2014 15:15:14 -0500 Subject: [PATCH] Visually identify users with no freebusy Fixes #2565 --- NEWS | 1 + .../SchedulerUI/UIxAttendeesEditor.wox | 8 +++---- UI/WebServerResources/UIxAttendeesEditor.css | 22 ++++++------------- UI/WebServerResources/UIxAttendeesEditor.js | 7 ++++-- 4 files changed, 17 insertions(+), 21 deletions(-) diff --git a/NEWS b/NEWS index 8a827024f..dbc4c6e26 100644 --- a/NEWS +++ b/NEWS @@ -23,6 +23,7 @@ Enhancements - we now use binary encoding in memcached (#2587) - warn user when overbooking a resource by creating an event in its calendar (#2541) - converted JavaScript alerts to inline CSS dialogs in appointment editor + - visually identify users with no freebusy information in autocompletion widget of attendees editor (#2565) Bug fixes - don't load 'background' attribute (#2437) diff --git a/UI/Templates/SchedulerUI/UIxAttendeesEditor.wox b/UI/Templates/SchedulerUI/UIxAttendeesEditor.wox index 7d90f9ad6..0c7754ca9 100644 --- a/UI/Templates/SchedulerUI/UIxAttendeesEditor.wox +++ b/UI/Templates/SchedulerUI/UIxAttendeesEditor.wox @@ -104,13 +104,13 @@ diff --git a/UI/WebServerResources/UIxAttendeesEditor.css b/UI/WebServerResources/UIxAttendeesEditor.css index acd957609..f3ba190db 100644 --- a/UI/WebServerResources/UIxAttendeesEditor.css +++ b/UI/WebServerResources/UIxAttendeesEditor.css @@ -183,7 +183,7 @@ TABLE#freeBusyHeader TR.freeBusyHeader3 SPAN.freeBusyZoneElement.busy TABLE#freeBusyData TD SPAN.freeBusyZoneElement { height: 24px; } -SPAN.colorBox.free, +.colorBox.free, TABLE#freeBusyData TD SPAN.freeBusyZoneElement { background-color: #ebebe4; } @@ -215,27 +215,19 @@ DIV#legend LI margin: 0px; padding: 0px; } -UL.freebusy-legend SPAN.colorBox -{ float: left; - margin-top: 5px; - margin-right: 2px; - display: block; - border: 1px solid #999; - border-left: 1px solid #ccc; - border-right: 1px solid #ccc; - border-bottom: 1px solid #eee; - width: 32px; - height: 10px; } +#legend .colorBox +{ border: 1px solid #fff; + cursor: default; } -SPAN.colorBox.busy, +.colorBox.busy, SPAN.freeBusyZoneElement.busy { background-color: #35556b !important; } -SPAN.colorBox.maybe-busy, +.colorBox.maybe-busy, SPAN.freeBusyZoneElement.maybe-busy { background-color: #adc0d0 !important; } -SPAN.colorBox.noFreeBusy, +.colorBox.noFreeBusy, TABLE#freeBusyData TD.noFreeBusy { background-color: #e09ebd; } diff --git a/UI/WebServerResources/UIxAttendeesEditor.js b/UI/WebServerResources/UIxAttendeesEditor.js index a10f8174c..af2fc0d5c 100644 --- a/UI/WebServerResources/UIxAttendeesEditor.js +++ b/UI/WebServerResources/UIxAttendeesEditor.js @@ -220,10 +220,13 @@ function performSearchCallback(http) { list.appendChild(node); node.address = completeEmail; // log("node.address: " + node.address); - if (contact["c_uid"]) + if (contact["c_uid"]) { node.uid = (contact["isMSExchange"]? UserLogin + ":" : "") + contact["c_uid"]; - else + } + else { node.uid = null; + node.appendChild(new Element('div').addClassName('colorBox').addClassName('noFreeBusy')); + } node.isList = isList; if (isList) { node.cname = contact["c_name"];