From 4359f406cb4dab5483759d6ce228cbfd1a888aa5 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Tue, 27 Sep 2011 20:15:06 +0000 Subject: [PATCH] See ChangeLog Monotone-Parent: 517b0b095f30f6f2f92a4da5dfe0155872190daa Monotone-Revision: b28dce204bf84148d4bd3df3df8b289cdd7a4168 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2011-09-27T20:15:06 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 7 +++-- NEWS | 7 +++-- UI/Common/UIxPageFrame.m | 9 +++++++ UI/Templates/UIxPageFrame.wox | 13 ++++----- UI/WebServerResources/ContactsUI.css | 4 +-- UI/WebServerResources/MailerUI.css | 4 +-- UI/WebServerResources/SOGoRootPage.css | 5 ++++ UI/WebServerResources/SchedulerUI.css | 10 +++---- UI/WebServerResources/UIxPreferences.js | 3 ++- UI/WebServerResources/generic.css | 35 +++++++++++++++++++------ 10 files changed, 69 insertions(+), 28 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0555f3144..bd7e26e27 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2011-09-27 Francis Lachapelle + * UI/Common/UIxPageFrame.m (-userHasVacationEnabled): new method + that returns whether the user has an automatic vacation message enabled. + * SoObjects/SOGo/SOGoUserDefaults.m (-setBusyOffHours): new setter for the new defaults SOGoBusyOffHours, which defines if periods outside business hours should be opaque (busy). @@ -241,7 +244,7 @@ * OpenChange/MAPIStoreMailFolder.m: (moveCopy...) Cleaned up some code and we now also correctly send notification updates for the destination folder - + 2011-09-04 Ludovic Marcotte * OpenChange/MAPIStoreMapping.m: (MAPIStoreMappingTDBTraverse()) @@ -251,7 +254,7 @@ indexing.tdb database (per user). * OpenChange/MAPIStoreSOGo.m: Some cleanups to ease current and - future debugging + future debugging 2011-08-18 Francis Lachapelle diff --git a/NEWS b/NEWS index 10d75d456..7d09ee3a6 100644 --- a/NEWS +++ b/NEWS @@ -2,10 +2,13 @@ --------------------- New Features - new user defaults SOGoDefaultCalendar to specify which calendar is used when - creating an event or a task (selected, personal, first enabled). + creating an event or a task (selected, personal, first enabled) + - new user defaults SOGoBusyOffHours to specify if off-hours should be + automatically added to the free-busy information Enhancements - - phone numbers in the contacts web module are now links (tel:). + - phone numbers in the contacts web module are now links (tel:) + - revamp of the modules link banner (15-pixel taller) Bug Fixes - diff --git a/UI/Common/UIxPageFrame.m b/UI/Common/UIxPageFrame.m index d7a278d31..68ddb1ee5 100644 --- a/UI/Common/UIxPageFrame.m +++ b/UI/Common/UIxPageFrame.m @@ -506,6 +506,15 @@ return [ud language]; } +- (BOOL) userHasVacationEnabled +{ + NSDictionary *vacationOptions; + + vacationOptions = [[[context activeUser] userDefaults] vacationOptions]; + + return (vacationOptions && [[vacationOptions objectForKey: @"enabled"] boolValue]); +} + /* UserDefaults, UserSettings */ - (NSString *) _dictionaryWithKeys: (NSArray *) keys fromSource: (SOGoDefaultsSource *) source diff --git a/UI/Templates/UIxPageFrame.wox b/UI/Templates/UIxPageFrame.wox index f8404b3e0..b1389ccb1 100644 --- a/UI/Templates/UIxPageFrame.wox +++ b/UI/Templates/UIxPageFrame.wox @@ -61,7 +61,8 @@ > - | + @@ -73,7 +74,7 @@ var:href="relativeCalendarPath" > - | + - | + - | + - | + @@ -111,7 +112,7 @@ | diff --git a/UI/WebServerResources/ContactsUI.css b/UI/WebServerResources/ContactsUI.css index 9141963a6..52fc0e720 100644 --- a/UI/WebServerResources/ContactsUI.css +++ b/UI/WebServerResources/ContactsUI.css @@ -21,7 +21,7 @@ DIV#rightPanel { position: absolute; - top: 65px; + top: 80px; left: 15em; margin-left: 5px; right: 0px; @@ -106,7 +106,7 @@ TABLE.titletable TD.titlecell SELECT DIV#contactFoldersList { position: absolute; - top: 69px; + top: 84px; left: 0px; width: 15em; bottom: 0px; diff --git a/UI/WebServerResources/MailerUI.css b/UI/WebServerResources/MailerUI.css index 650d08aca..986f77b74 100644 --- a/UI/WebServerResources/MailerUI.css +++ b/UI/WebServerResources/MailerUI.css @@ -22,7 +22,7 @@ DIV#leftPanel { position: absolute; - top: 70px; + top: 85px; left: 0px; width: 15em; bottom: 0px; @@ -33,7 +33,7 @@ DIV#leftPanel DIV#rightPanel { position: absolute; - top: 65px; + top: 80px; left: 15em; right: 0px; bottom: 0px; diff --git a/UI/WebServerResources/SOGoRootPage.css b/UI/WebServerResources/SOGoRootPage.css index 93aa084f6..9d0af4184 100644 --- a/UI/WebServerResources/SOGoRootPage.css +++ b/UI/WebServerResources/SOGoRootPage.css @@ -6,6 +6,11 @@ IMG#preparedAnimation { width: 0px; height: 0px; } +DIV.linkbanner A#about +{ float: right; + margin: 0px; + padding: 0px .5em; } + DIV#aboutBox { position: absolute; z-index: 1000; diff --git a/UI/WebServerResources/SchedulerUI.css b/UI/WebServerResources/SchedulerUI.css index 81506103a..89cad9629 100644 --- a/UI/WebServerResources/SchedulerUI.css +++ b/UI/WebServerResources/SchedulerUI.css @@ -1,6 +1,6 @@ DIV#leftPanel { position: absolute; - top: 65px; + top: 80px; left: 0px; width: 19.25em; bottom: 0px; @@ -83,17 +83,17 @@ UL#tasksList LI white-space: nowrap; } UL#tasksList LI.overdue -{ color: #f00; } +{ color: #f00 !important; } UL#tasksList LI.duetoday -{ color: #00f; } +{ color: #00f !important; } UL#tasksList LI.completed { text-decoration: line-through; color: #000; } UL#tasksList LI.duelater -{ color: #999; } +{ color: #999 !important; } UL#tasksList LI.important SPAN { color: #f00 !important; @@ -120,7 +120,7 @@ UL#tasksList LI[class~="_selected"].completed DIV#rightPanel { position: absolute; - top: 65px; + top: 80px; left: 19.25em; right: 0px; bottom: 0px; diff --git a/UI/WebServerResources/UIxPreferences.js b/UI/WebServerResources/UIxPreferences.js index a07939e55..05148a12a 100644 --- a/UI/WebServerResources/UIxPreferences.js +++ b/UI/WebServerResources/UIxPreferences.js @@ -88,7 +88,8 @@ function _setupEvents() { var widgets = [ "timezone", "shortDateFormat", "longDateFormat", "timeFormat", "weekStartDay", "dayStartTime", "dayEndTime", "firstWeek", "messageCheck", "sortByThreads", - "subscribedFoldersOnly", "language", "defaultCalendar" ]; + "subscribedFoldersOnly", "language", "defaultCalendar", + "enableVacation" ]; for (var i = 0; i < widgets.length; i++) { var widget = $(widgets[i]); if (widget) { diff --git a/UI/WebServerResources/generic.css b/UI/WebServerResources/generic.css index 62e0f4722..6ef29e1a5 100644 --- a/UI/WebServerResources/generic.css +++ b/UI/WebServerResources/generic.css @@ -121,32 +121,49 @@ DIV.linkbanner width: 100%; top: 0px; left: 0px; + height: 30px; z-index: 100; + font-size: 12px; + line-height: 26px; color: #aaa; } DIV.linkbanner A, DIV.linkbanner SPAN -{ cursor: default; +{ float: left; + border-top: 2px solid #000; + border-bottom: 2px solid #000; color: #ddd; text-decoration: none; top: 0px; left: 0px; - padding: 2px 5px; } + padding: 0px 0.5em; } + +DIV.linkbanner A +{ cursor: pointer; } DIV.linkbanner SPAN -{ color: #afafff; } +{ border-top: 2px solid #afafff; + border-bottom: 2px solid #000; + color: #afafff; + color: #fff; + font-weight: bold; } DIV.linkbanner A:hover -{ color: #dd5; } +{ background-color: #666; + border-top: 2px solid #666; + border-bottom: 2px solid #666; } DIV.linkbanner A#logoff, DIV.linkbanner SPAN#userIdentificationDisplay { float: right; margin: 0px; - padding: 0px; - padding-right: .5em; } + padding: 0px .5em; } DIV.linkbanner SPAN#userIdentificationDisplay -{ color: #DDDDDD; } +{ border-top: 2px solid #000; + color: #DDDDDD; } + +DIV.linkbanner IMG +{ padding: 0px 4px; } .linkbannerlinks { vertical-align: bottom; @@ -297,7 +314,7 @@ DIV#logConsole background-color: #fff; overflow-y: scroll; color: #222; - top: 1em; + top: 30px; left: 0px; right: 0px; height: 15em; } @@ -839,6 +856,8 @@ DIV.tabsContainer > UL LI.active { background: transparent url('tab_a_active_bg.png') no-repeat scroll top right !important; } DIV.tabsContainer > UL LI.active SPAN { background: transparent url('tab_span_active_bg.png') no-repeat !important; } +DIV.tabsContainer > UL LI SPAN:hover +{ cursor: pointer; } DIV.tabsContainer > UL LI.first { margin-left: -1px; padding-left: -1px; } /* Firefox will complain */