LupusNobilis/sogo
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

merge of '09b7f3172646059661ecae8b9b613cb052cfff9a'

Browse source 
and '12a3d305a1e50a57c4bdbc1b4a3610a6f9627ccf'

Monotone-Parent: 09b7f3172646059661ecae8b9b613cb052cfff9a
Monotone-Parent: 12a3d305a1e50a57c4bdbc1b4a3610a6f9627ccf
Monotone-Revision: abf0593bed546a2a9f1b2e7b96945af8f2dd4bee

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-04-28T16:22:18
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau 2010-04-28 16:22:18 +00:00
parent 1e424949c4 76e8d13897
commit 1a62535756
6 changed files with 26 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
Documentation/SOGo Installation Guide.odt
View file

Binary file not shown.

2
UI/Templates/PreferencesUI/UIxPreferences.wox
View file

@ -289,7 +289,7 @@
/><input const:id="newPasswordConfirmationField" class="textField"
type="password" const:value=""/></label><br/>
<a href="#" class="button" id="changePasswordBtn"
><span><var:string label:value="Change"/></span></a>
><span><var:string label:value="Change"/></span></a><br/>
</p>
<p id="passwordError"><!-- space --></p>
</div>

2
UI/WebServerResources/SOGoRootPage.css
View file

@ -36,7 +36,7 @@ A:link,
A:visited
{ color: #54b948; }
DIV#aboutBox DIV A.button
DIV A.button
{ color: #000; }
DIV#aboutBox P.logo

6
UI/WebServerResources/SOGoRootPage.js
View file

@ -192,10 +192,10 @@ function showPasswordDialog(dialogType, constructor, parameters) {
dialogs[dialogType] = dialog;
}
var password = $("password");
var offsets = password.cumulativeOffset();
var offsets = password.positionedOffset();
dialog.show();
var top = offsets[1] + 5;
var left = offsets[0] + password.clientWidth - dialog.clientWidth;
var top = offsets[1] - 2;
var left = offsets[0] + 10 - dialog.clientWidth;
dialog.setStyle({ "top": top + "px", "left": left + "px"});
}

36
UI/WebServerResources/SchedulerUI.js
View file

@ -936,26 +936,24 @@ function changeDateSelectorDisplay(day, keepCurrentDay) {
url += "?day=" + day;
}
if (day != currentDay) {
if (!keepCurrentDay)
currentDay = day;
var month = day.substr(0, 6);
if (cachedDateSelectors[month]) {
// log ("restoring cached selector for month: " + month);
setDateSelectorContent(cachedDateSelectors[month]);
}
else {
// log ("loading selector for month: " + month);
if (document.dateSelectorAjaxRequest) {
document.dateSelectorAjaxRequest.aborted = true;
document.dateSelectorAjaxRequest.abort();
}
document.dateSelectorAjaxRequest
= triggerAjaxRequest(url,
dateSelectorCallback,
month);
if (!keepCurrentDay)
currentDay = day;
var month = day.substr(0, 6);
if (cachedDateSelectors[month]) {
// log ("restoring cached selector for month: " + month);
setDateSelectorContent(cachedDateSelectors[month]);
}
else {
// log ("loading selector for month: " + month);
if (document.dateSelectorAjaxRequest) {
document.dateSelectorAjaxRequest.aborted = true;
document.dateSelectorAjaxRequest.abort();
}
document.dateSelectorAjaxRequest
= triggerAjaxRequest(url,
dateSelectorCallback,
month);
}
}

18
UI/WebServerResources/UIxPreferences.css
View file

@ -63,7 +63,8 @@ DIV#windowButtons
{ height: 50px; }
#vacation SPAN
{ float: right; }
#vacation BR
#vacation BR,
#passwordView BR
{ clear: both; }
DIV.bottomToolbar
@ -106,22 +107,11 @@ TD.activeColumn
P#passwordFields,
P#passwordError
{ position: absolute;
left: 0px; }
#passwordFields
{ top: 40px;
width: 410px;
{ width: 410px;
text-align: right; }
P#passwordError
{ top: 92px;
width: 307px;
text-align: right;
margin-left: 40px; }
P.errorMessage#passwordError
{ color: #f00; }
P.infoMessage#passwordError
{ color: #00f; }
{ color: #00f; }