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

merge of 'a84224f7e18c7678f6ed4be61800899d8fb9286d'

Browse Source 
and 'bc6a066b0ed99cc7226c2f6c089a4ed6987ee423'

Monotone-Parent: a84224f7e18c7678f6ed4be61800899d8fb9286d
Monotone-Parent: bc6a066b0ed99cc7226c2f6c089a4ed6987ee423
Monotone-Revision: d830b49b93b3b05bd3b392063b915cc6954ee1a1

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-09-23T19:59:37
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2011-09-23 19:59:37 +00:00
parent fcad5d186b 0c2d6ddc3e
commit e5b0d6813c
14 changed files with 102 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@@ -1,3 +1,15 @@
2011-09-23 Francis Lachapelle <flachapelle@inverse.ca>
* UI/PreferencesUI/UIxPreferences.m (-defaultCalendarList, -itemCalendarText,
-userDefaultCalendar, -setUserDefaultCalendar:): new methods to
show a popup menu for the new defaults SOGoDefaultCalendar. This
option sets which calendar is used when creating an event or a
task (selected, personal, first enabled).
* UI/WebServerResources/SchedulerUI.js (eventsListCallback):
events are always editable and erasable for superusers.
(newEvent): added supported for the new defaults SOGoDefaultCalendar.
2011-09-23 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* OpenChange/MAPIStoreGCSMessage.m (-getPrChangeKey:inMemCtx:):

5
NEWS
View File

@@ -1,10 +1,11 @@
1.3-2011MMDD (1.3.9)
---------------------
New Features
-
- new user defaults SOGoDefaultCalendar to specify which calendar is used when
creating an event or a task (selected, personal, first enabled).
Enhancements
- phone numbers in the contacts web module are now links (tel://).
- phone numbers in the contacts web module are now links (tel:).
Bug Fixes
-

6
UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings
View File

@@ -92,6 +92,12 @@
"firstWeekOfYear_First4DayWeek" = "Primeira semana com 4 dias";
"firstWeekOfYear_FirstFullWeek" = "Primeira semana com 5 dias";
/* Default Calendar */
"Default calendar :" = "Default calendar";
"selectedCalendar" = "Selected calendar";
"personalCalendar" = "Personal calendar";
"firstCalendar" = "First enabled calendar";
"reminderTime_0000" = "0 minutos";
"reminderTime_0005" = "5 minutos";
"reminderTime_0010" = "10 minutos";

6
UI/PreferencesUI/English.lproj/Localizable.strings
View File

@@ -92,6 +92,12 @@
"firstWeekOfYear_First4DayWeek" = "First 4-day week";
"firstWeekOfYear_FirstFullWeek" = "First full week";
/* Default Calendar */
"Default calendar :" = "Default calendar";
"selectedCalendar" = "Selected calendar";
"personalCalendar" = "Personal calendar";
"firstCalendar" = "First enabled calendar";
"reminderTime_0000" = "0 minutes";
"reminderTime_0005" = "5 minutes";
"reminderTime_0010" = "10 minutes";

6
UI/PreferencesUI/Hungarian.lproj/Localizable.strings
View File

@@ -92,6 +92,12 @@
"firstWeekOfYear_First4DayWeek" = "Első 4 napos héttől";
"firstWeekOfYear_FirstFullWeek" = "Első teljes héttől";
/* Default Calendar */
"Default calendar :" = "Default calendar";
"selectedCalendar" = "Selected calendar";
"personalCalendar" = "Personal calendar";
"firstCalendar" = "First enabled calendar";
"reminderTime_0000" = "0 perc";
"reminderTime_0005" = "5 perc";
"reminderTime_0010" = "10 perc";

6
UI/PreferencesUI/Norwegian.lproj/Localizable.strings
View File

@@ -92,6 +92,12 @@
"firstWeekOfYear_First4DayWeek" = "Første 4-dagersuken i året";
"firstWeekOfYear_FirstFullWeek" = "Første hele uken i året";
/* Default Calendar */
"Default calendar :" = "Default calendar";
"selectedCalendar" = "Selected calendar";
"personalCalendar" = "Personal calendar";
"firstCalendar" = "First enabled calendar";
"reminderTime_0000" = "0 minutter";
"reminderTime_0005" = "5 minutter";
"reminderTime_0010" = "10 minutter";

6
UI/PreferencesUI/Swedish.lproj/Localizable.strings
View File

@@ -92,6 +92,12 @@
"firstWeekOfYear_First4DayWeek" = "Första 4-dagarsveckan på året";
"firstWeekOfYear_FirstFullWeek" = "Första hela veckan på året";
/* Default Calendar */
"Default calendar :" = "Default calendar";
"selectedCalendar" = "Selected calendar";
"personalCalendar" = "Personal calendar";
"firstCalendar" = "First enabled calendar";
"reminderTime_0000" = "0 minuter";
"reminderTime_0005" = "5 minuter";
"reminderTime_0010" = "10 minuter";

24
UI/PreferencesUI/UIxPreferences.m
View File

@@ -421,6 +421,30 @@
[userDefaults setFirstDayOfWeek: [newDay intValue]];
}
- (NSArray *) defaultCalendarList
{
NSMutableArray *options;
options = [NSArray arrayWithObjects: @"selected", @"personal", @"first", nil];
return options;
}
- (NSString *) itemCalendarText
{
return [self labelForKey: [NSString stringWithFormat: @"%@Calendar", item]];
}
- (NSString *) userDefaultCalendar
{
return [userDefaults defaultCalendar];
}
- (void) setUserDefaultCalendar: (NSString *) newValue
{
[userDefaults setDefaultCalendar: newValue];
}
- (NSArray *) hoursList
{
static NSMutableArray *hours = nil;

6
UI/PreferencesUI/Welsh.lproj/Localizable.strings
View File

@@ -92,6 +92,12 @@
"firstWeekOfYear_First4DayWeek" = "First 4-day week";
"firstWeekOfYear_FirstFullWeek" = "Wythnos cyntaf llawn";
/* Default Calendar */
"Default calendar :" = "Default calendar";
"selectedCalendar" = "Selected calendar";
"personalCalendar" = "Personal calendar";
"firstCalendar" = "First enabled calendar";
"reminderTime_0000" = "0 munud";
"reminderTime_0005" = "5 munud";
"reminderTime_0010" = "10 munud";

5
UI/Templates/PreferencesUI/UIxPreferences.wox
View File

@@ -102,6 +102,11 @@
const:id="firstWeek"
string="itemFirstWeekText" selection="userFirstWeek"
/></label><br/>
<label><var:string label:value="Default calendar :"/>
<var:popup list="defaultCalendarList" item="item"
const:id="defaultCalendar"
string="itemCalendarText" selection="userDefaultCalendar"
/></label><br/>
<label><var:string label:value="Categories"/></label>
<div id="calendarCategoriesListWrapper" class="listWrapper"
><table class="categoriesList" cellspacing="0">

2
UI/Templates/SchedulerUI/UIxCalMainView.wox
View File

@@ -7,7 +7,7 @@
xmlns:rsrc="OGo:url"
xmlns:label="OGo:label"
className="UIxPageFrame"
const:userDefaultsKeys="SOGoCalendarCategoriesColors"
const:userDefaultsKeys="SOGoCalendarCategoriesColors,SOGoDefaultCalendar"
const:userSettingsKeys="Calendar,ShowCompletedTasks"
const:jsFiles="SchedulerUIDnD.js"
title="title">

21
UI/WebServerResources/SchedulerUI.js
View File

@@ -36,7 +36,24 @@ var clipboard = null;
var eventsToCopy = [];
function newEvent(type, day, hour, duration) {
var folder = getSelectedFolder();
var folder = null;
if (UserDefaults['SOGoDefaultCalendar'] == 'personal')
folder = $("calendarList").down("li");
else if (UserDefaults['SOGoDefaultCalendar'] == 'first') {
var list = $("calendarList");
var inputs = list.select("input");
for (var i = 0; i < inputs.length; i++) {
var input = inputs[i];
if (input.checked) {
folder = input.up();
break;
}
}
if (!folder)
folder = list.down("li");
}
else
folder = getSelectedFolder();
var folderID = folder.readAttribute("id");
var urlstr = ApplicationBaseURL + folderID + "/new" + type;
var params = [];
@@ -908,7 +925,7 @@ function eventsListCallback(http) {
if (rTime)
row.recurrenceTime = escape(rTime);
row.isException = data[i][17];
row.editable = data[i][18];
row.editable = data[i][18] || IsSuperUser;
row.erasable = data[i][19] || IsSuperUser;
var startDate = new Date();
startDate.setTime(data[i][5] * 1000);

2
UI/WebServerResources/UIxPreferences.css
View File

@@ -51,7 +51,7 @@ DIV.listWrapper
#calendarCategoriesListWrapper
{ bottom: 30px;
right: 2em;
top: 88px;
top: 108px;
left: 2em; }
#contactsCategoriesListWrapper

2
UI/WebServerResources/UIxPreferences.js
View File

@@ -88,7 +88,7 @@ function _setupEvents() {
var widgets = [ "timezone", "shortDateFormat", "longDateFormat",
"timeFormat", "weekStartDay", "dayStartTime", "dayEndTime",
"firstWeek", "messageCheck", "sortByThreads",
"subscribedFoldersOnly", "language" ];
"subscribedFoldersOnly", "language", "defaultCalendar" ];
for (var i = 0; i < widgets.length; i++) {
var widget = $(widgets[i]);
if (widget) {