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

merge of '0891f9bac2704aa4c0ef0224c54360af14c5618a'

Browse source 
and '7bb42646015cb99b0c6dfe942e088aba59cc5991'

Monotone-Parent: 0891f9bac2704aa4c0ef0224c54360af14c5618a
Monotone-Parent: 7bb42646015cb99b0c6dfe942e088aba59cc5991
Monotone-Revision: c7bedf71e117aebb3c471ca7dafef74ece6a678a

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2010-05-16T19:24:36
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle 2010-05-16 19:24:36 +00:00
parent 661d3f2809 d2ca80f4b4
commit b036d4baac
5 changed files with 39 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2010-05-21 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Appointments/SOGoAptMailUpdate.m (-valueForProperty:):
set the timezone of date objects to the active user's timezone.
* UI/WebServerResources/SchedulerUI.js: (resetCategoriesStyles):
fixed an exception occurring when
UserDefaults['SOGoCalendarCategoriesColors'] is undefined.
2010-05-21 Francis Lachapelle <flachapelle@inverse.ca>
* UI/WebServerResources/SchedulerUI.js (onMenuCurrentView):

14
SoObjects/Appointments/SOGoAptMailUpdate.m
View file

@ -19,6 +19,8 @@
02111-1307, USA.
*/
#import <Foundation/NSCalendarDate.h>
#import <NGObjWeb/WOContext+SoObjects.h>
#import <NGCards/iCalEvent.h>
#import <NGCards/iCalEventChanges.h>
@ -27,6 +29,7 @@
#import <SOGo/NSObject+Utilities.h>
#import <SOGo/SOGoDateFormatter.h>
#import <SOGo/SOGoUser.h>
#import <SOGo/SOGoUserDefaults.h>
#import "SOGoAptMailNotification.h"
@ -38,9 +41,10 @@
- (NSString *) valueForProperty: (NSString *) property
{
static NSDictionary *valueTypes = nil;
SOGoDateFormatter *dateFormatter;
NSString *valueType;
id value;
SOGoUser *user;
NSTimeZone *userTZ;
if (!valueTypes)
{
@ -61,9 +65,11 @@
value = [(iCalEvent *) apt propertyValue: property];
if ([valueType isEqualToString: @"date"])
{
dateFormatter = [[context activeUser]
dateFormatterInContext: context];
value = [dateFormatter formattedDateAndTime: value];
user = [context activeUser];
userTZ = [[user userDefaults] timeZone];
[value setTimeZone: userTZ];
value = [[user dateFormatterInContext: context]
formattedDateAndTime: value];
}
}
else

2
SoObjects/SOGo/SOGoDefaults.plist
View file

@ -61,7 +61,7 @@
SOGoDraftsFolderName = "Drafts";
SOGoTrashFolderName = "Trash";
SOGoCalendarDefaultCategoryColor = "#F0F0F0";
SOGoCalendarDefaultCategoryColor = "#aaa";
SOGoCalendarShouldDisplayWeekend = YES;
SOGoFreeBusyDefaultInterval = ( 7, 7 );

34
UI/WebServerResources/SchedulerUI.js
View file

@ -1252,10 +1252,11 @@ function resetCategoriesStyles() {
categoriesStyleSheet.removeChild(categoriesStyleSheet.firstChild);
}
// Update stylesheet with new categories colors
var selectors = [];
var rules = [];
categoriesStyles.keys().each(function(category) {
if (UserDefaults['SOGoCalendarCategoriesColors']) {
// Update stylesheet with new categories colors
var selectors = [];
var rules = [];
categoriesStyles.keys().each(function(category) {
var color = UserDefaults['SOGoCalendarCategoriesColors'][category];
if (color) {
rules[rules.length] = '{ border-right: 8px solid ' + color + '; }';
@ -1263,18 +1264,19 @@ function resetCategoriesStyles() {
}
});
if (selectors.length > 0) {
if (categoriesStyleSheet.styleSheet && categoriesStyleSheet.styleSheet.addRule) {
// IE
for (var i = 0; i < selectors.length; i++)
categoriesStyleSheet.styleSheet.addRule(selectors[i],
rules[i]);
}
else {
// Mozilla + Safari
for (var i = 0; i < selectors.length; i++)
categoriesStyleSheet.appendChild(document.createTextNode(selectors[i] +
' ' + rules[i]));
if (selectors.length > 0) {
if (categoriesStyleSheet.styleSheet && categoriesStyleSheet.styleSheet.addRule) {
// IE
for (var i = 0; i < selectors.length; i++)
categoriesStyleSheet.styleSheet.addRule(selectors[i],
rules[i]);
}
else {
// Mozilla + Safari
for (var i = 0; i < selectors.length; i++)
categoriesStyleSheet.appendChild(document.createTextNode(selectors[i] +
' ' + rules[i]));
}
}
}
}

2
UI/WebServerResources/UIxComponentEditor.js
View file

@ -18,7 +18,7 @@ function onPopupAttendeesWindow(event) {
else
ComponentEditor.attendeesWindow = window.open(ApplicationBaseURL + "/editAttendees",
sanitizeWindowName(activeCalendar + activeComponent + "Attendees"),
"width=803,height=573");
"width=900,height=573");
return false;
}