Visually identify users with no freebusy

Fixes #2565
pull/17/head
Francis Lachapelle 2014-02-03 15:15:14 -05:00
parent f1cb87aa02
commit fcddeb4224
4 changed files with 17 additions and 21 deletions

1
NEWS
View File

@ -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)

View File

@ -104,13 +104,13 @@
</ul>
<ul class="freebusy-legend">
<li><span class="colorBox free"><!-- spacer --></span
<li><div class="colorBox free"><!-- spacer --></div
><var:string label:value="Free" /></li>
<li><span class="colorBox busy"><!-- spacer --></span
<li><div class="colorBox busy"><!-- spacer --></div
><var:string label:value="Busy" /></li>
<!-- li><span class="colorBox maybe-busy">\- spacer -\->/span -->
<!-- li><div class="colorBox maybe-busy">\- spacer -\->/div -->
<!-- >var:string label:value="Maybe busy" />/li> -->
<li><span class="colorBox noFreeBusy"><!-- spacer --></span
<li><div class="colorBox noFreeBusy"><!-- spacer --></div
><var:string label:value="No free-busy information" /></li>
</ul>
</div>

View File

@ -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; }

View File

@ -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"];