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

merge of '2c52bc9062d09379395dae99d6c685de6c8157c9'

Browse Source 
and '8dcf465d8b7d8d1213dcce13303ce7aba65a10ff'

Monotone-Parent: 2c52bc9062d09379395dae99d6c685de6c8157c9
Monotone-Parent: 8dcf465d8b7d8d1213dcce13303ce7aba65a10ff
Monotone-Revision: 548d3cca58e3fec9bc3c888112b856a577978bec

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-03-19T19:07:54
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2009-03-19 19:07:54 +00:00
parent 4cfb2b0ccd ed59785862
commit a4394cb489
3 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+6
View File
@@ -1,3 +1,9 @@
2009-03-19 Francis Lachapelle <flachapelle@inverse.ca>
* UI/Scheduler/UIxCalListingActions.m ([UIxCalListingActions
-_fetchFields:forComponentOfType:]): the _fixDates method doesn't
have to be called for the month view.
2009-03-19 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/SOGoUserFolder.m ([SOGoUserFolder
UI/Scheduler/UIxCalListingActions.m
+5 -5
View File
@@ -327,9 +327,10 @@ static NSArray *tasksFields = nil;
forKey: @"c_owner"];
if (![[newInfo objectForKey: @"c_title"] length])
[self _fixComponentTitle: newInfo withType: component];
// Possible improvement: only call _fixDates if event is recurrent
// or the view range span a daylight saving time change
[self _fixDates: newInfo];
if (dayBasedView)
// Possible improvement: only call _fixDates if event is recurrent
// or the view range span a daylight saving time change
[self _fixDates: newInfo];
[infos addObject: [newInfo objectsForKeys: fields
notFoundMarker: marker]];
}
@@ -800,8 +801,7 @@ _computeBlocksPosition (NSArray *blocks)
event = [events objectAtIndex: count];
eventNbr = [NSNumber numberWithUnsignedInt: count];
if (dayBasedView && [[event objectAtIndex: 7] boolValue])
[self _fillBlocks: allDayBlocks
withEvent: event withNumber: eventNbr];
[self _fillBlocks: allDayBlocks withEvent: event withNumber: eventNbr];
else
[self _fillBlocks: blocks withEvent: event withNumber: eventNbr];
}
UI/WebServerResources/SOGoRootPage.js
+11 -8
View File
@@ -7,10 +7,12 @@ function initLogin() {
+ "; expires=" + date.toGMTString());
var about = $("about");
about.observe("click", function(event) { $("aboutBox").show(); });
if (about) {
about.observe("click", function(event) { $("aboutBox").show(); });
var aboutClose = $("aboutClose");
aboutClose.observe("click", function(event) { $("aboutBox").hide(); });
var aboutClose = $("aboutClose");
aboutClose.observe("click", function(event) { $("aboutBox").hide(); });
}
var submit = $("submit");
submit.observe("click", onLoginClick);
@@ -26,7 +28,7 @@ function onLoginClick(event) {
var userNameField = $("userName");
var userName = userNameField.value;
var password = $("password").value;
var language = $("language").value;
var language = $("language");
if (userName.length > 0) {
this.hide();
@@ -37,11 +39,12 @@ function onLoginClick(event) {
&& !userName.endsWith(loginSuffix))
userName += loginSuffix;
var url = $("connectForm").getAttribute("action");
var parameters = ("userName=" + encodeURIComponent(userName) +
"&password=" + encodeURIComponent(password) +
((language == "WONoSelectionString")?"":("&language=" + language)));
var parameters = "userName=" + encodeURIComponent(userName) +
"&password=" + encodeURIComponent(password);
if (language)
parameters += (language.value == "WONoSelectionString")?"":("&language=" + language.value);
document.cookie = "";
triggerAjaxRequest(url, onLoginCallback, null, parameters,
triggerAjaxRequest(url, onLoginCallback, null, (parameters),
{ "Content-type": "application/x-www-form-urlencoded",
"Content-length": parameters.length,
"Connection": "close" });