amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-12 06:55:26 +00:00
Code Issues Projects Releases Wiki Activity

merge of '3556596e54bd1f81160e5c10120b46259ec240f8'

Browse Source 
and 'ab7deac10b2e0f0a2db216131747b63c5f374160'

Monotone-Parent: 3556596e54bd1f81160e5c10120b46259ec240f8
Monotone-Parent: ab7deac10b2e0f0a2db216131747b63c5f374160
Monotone-Revision: 1847862dc21a428caed6adc657748916dc782418

Monotone-Author: crobert@inverse.ca
Monotone-Date: 2009-06-02T19:44:28
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
C Robert
2009-06-02 19:44:28 +00:00
parent 7c3da75fa5 5a178e6392
commit 5dde98e2e6
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+3
View File
@@ -10,6 +10,9 @@
* SoObjects/Appointments/SOGoAppointmentFolder.m (_enforceTimeLimitOnFilter):
Rewrote algorithm, fixed cyclic events issue.
* UI/WebServerResources/UIxAttendeesEditor.js: Fixed update bug on "enter"
* UI/Templates/SchedulerUI/UIxAttendeesEditor.wox: Removed next/prev hour
and zoom buttons
2009-06-02 Ludovic Marcotte <lmarcotte@inverse.ca>
UI/Templates/SchedulerUI/UIxAttendeesEditor.wox
+4 -2
View File
@@ -26,6 +26,7 @@
<a href="#" class="button _disabled"
><var:string label:value="Next slot" /></a>
</div>
<!--
<div id="freeBusyZoomButtons">
<var:string label:value="Zoom:"/>
<a href="#" class="button _disabled"><var:string label:value="-" /></a>
@@ -33,6 +34,7 @@
string="itemZoomText" selection="zoom"/>
<a href="#" class="button _disabled"><var:string label:value="+" /></a>
</div>
-->
<div id="freeBusyView">
<table id="freeBusy" cellspacing="0" cellpadding="0"
xmlns="http://www.w3.org/1999/xhtml"
@@ -93,12 +95,12 @@
><var:string label:value="No free-busy information" /></li>
</ul>
</div>
<div id="freeBusyButtons">
<!--<div id="freeBusyButtons">
<a href="#" class="button _disabled"
><var:string label:value="Previous hour" /></a>
<a href="#" class="button _disabled"
><var:string label:value="Next hour" /></a>
</div>
</div>-->
<div id="freeBusyReplicas">
<div><var:string label:value="Start:"
/><var:component className="UIxTimeDateControl"
UI/WebServerResources/UIxAttendeesEditor.js
+8 -3
View File
@@ -60,12 +60,16 @@ function onContactKeydown(event) {
preventDefault(event);
if (this.confirmedValue)
this.value = this.confirmedValue;
if (this.uid)
this.blur(); // triggers checkAttendee function call
$(this).selectText(0, this.value.length);
if (document.currentPopupMenu)
hideMenu(document.currentPopupMenu);
attendeesEditor.selectedIndex = -1;
if (this.uid) {
this.hasfreebusy = false;
this.setAttribute ("modified", "1");
this.blur(); // triggers checkAttendee function call
}
}
else if ($('attendeesMenu').getStyle('visibility') == 'visible') {
attendeesEditor.currentField = this;
@@ -446,12 +450,13 @@ function initializeWindowButtons() {
var buttons = $("freeBusyViewButtons").childNodesWithTag("a");
for (var i = 0; i < buttons.length; i++)
buttons[i].observe("click", listRowMouseDownHandler, false);
buttons = $("freeBusyZoomButtons").childNodesWithTag("a");
/* buttons = $("freeBusyZoomButtons").childNodesWithTag("a");
for (var i = 0; i < buttons.length; i++)
buttons[i].observe("click", listRowMouseDownHandler, false);
buttons = $("freeBusyButtons").childNodesWithTag("a");
for (var i = 0; i < buttons.length; i++)
buttons[i].observe("click", listRowMouseDownHandler, false);
*/
}
function onEditorOkClick(event) {