From 67ef2ddf4beb10d1c8e4819e673d406be046bfcb Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Mon, 17 Sep 2007 20:11:32 +0000 Subject: [PATCH 01/10] Monotone-Parent: 7001bd5342e68b3d0c659bc90a70a249a337d23c Monotone-Revision: fe3f54b152f30a04758f292beef7c98e2349e958 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2007-09-17T20:11:32 Monotone-Branch: ca.inverse.sogo --- UI/WebServerResources/UIxAttendeesEditor.css | 16 ++++++++++++---- UI/WebServerResources/UIxAttendeesEditor.js | 10 +++++----- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/UI/WebServerResources/UIxAttendeesEditor.css b/UI/WebServerResources/UIxAttendeesEditor.css index db0d0499f..054a95150 100644 --- a/UI/WebServerResources/UIxAttendeesEditor.css +++ b/UI/WebServerResources/UIxAttendeesEditor.css @@ -20,6 +20,13 @@ DIV#freeBusyView -moz-border-top-colors: #9c9a94 #000; -moz-border-left-colors: #9c9a94 #000; } +TABLE#freeBusy +{ border-collapse: collapse; + table-layout: auto; } + +TABLE#freeBusy THEAD TH +{ white-space: nowrap; } + TABLE#freeBusy TD, TABLE#freeBusy TH { padding: 0px; @@ -56,14 +63,14 @@ TABLE#freeBusy TR.freeBusyHeader2 TH, TABLE#freeBusy TR.freeBusyHeader3 TH { text-align: left; color: #777; - background: #fff; - border-collapse: collapse; } + background: #fff; } TABLE#freeBusy TR.freeBusyHeader2 TH -{ width: 6em; } +{ padding-right: 2em; } TABLE#freeBusy TR.freeBusyHeader3 TH -{ border-bottom: 1px solid #cecbff; } +{ border-left: 1px solid #fff; + border-bottom: 1px solid #cecbff; } TABLE#freeBusy TR.attendeeModel { display: none; } @@ -84,6 +91,7 @@ TABLE#freeBusy TD.noFreeBusy SPAN.freeBusyZoneElement { display: block; float: left; + clear: right; width: 25%; margin: 0px; padding: 0px; diff --git a/UI/WebServerResources/UIxAttendeesEditor.js b/UI/WebServerResources/UIxAttendeesEditor.js index f7f17be00..0f0547d66 100644 --- a/UI/WebServerResources/UIxAttendeesEditor.js +++ b/UI/WebServerResources/UIxAttendeesEditor.js @@ -268,9 +268,9 @@ function setSlot(tds, nbr, status) { var td = tds[i]; var spans = $(td).childNodesWithTag("span"); if (status == '2') - spans[spannbr].addClassName("maybe-busy"); + $(spans[spannbr]).addClassName("maybe-busy"); else - spans[spannbr].addClassName("busy"); + $(spans[spannbr]).addClassName("busy"); } } @@ -282,7 +282,7 @@ function updateFreeBusyData(http) { var tds = node.parentNode.parentNode.cells; for (var i = 0; i < slots.length; i++) { if (slots[i] != '0') - setSlot(tds, i, slots[i]); + setSlot(tds, i, slots[i]); } } document.contactFreeBusyAjaxRequest = null; @@ -502,14 +502,14 @@ function prepareAttendees() { for (var i = 0; i < attendeesNames.length; i++) { var tr = body.insertRow(i); var td = document.createElement("td"); - td.addClassName("attendees"); + $(td).addClassName("attendees"); var input = document.createElement("input"); var value = ""; if (attendeesNames[i].length > 0) value += attendeesNames[i] + " "; value += "<" + attendeesEmails[i] + ">"; input.value = value; - input.addClassName("textField"); + $(input).addClassName("textField"); input.setAttribute("modified", "0"); tr.appendChild(td); td.appendChild(input); From fc5f287edde8761efb78faef6b1f8300a553089c Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Mon, 17 Sep 2007 20:12:16 +0000 Subject: [PATCH 02/10] Monotone-Parent: fe3f54b152f30a04758f292beef7c98e2349e958 Monotone-Revision: 8ea0d17601b1217bc79e633f55d75e875b542c26 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2007-09-17T20:12:16 Monotone-Branch: ca.inverse.sogo --- NEWS | 1 + 1 file changed, 1 insertion(+) diff --git a/NEWS b/NEWS index e6fe36e0f..628a91987 100644 --- a/NEWS +++ b/NEWS @@ -10,6 +10,7 @@ - added tooltips for toolbar buttons (English and French); - added checkmarks in live search options popup menus; - initial support for resizable columns in tables; +- improved IE7 and Safari support: attendees selector; - countless bugfixes; 0.9.0-20070824 From e2d501a9b76f182a89a61f3832ec7215e7dfd354 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Mon, 17 Sep 2007 20:53:16 +0000 Subject: [PATCH 03/10] Monotone-Parent: 8ea0d17601b1217bc79e633f55d75e875b542c26 Monotone-Revision: 6db79539af388f03f06a0b0e18a722cbeac0292e Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2007-09-17T20:53:16 Monotone-Branch: ca.inverse.sogo --- UI/WebServerResources/MailerUI.css | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/UI/WebServerResources/MailerUI.css b/UI/WebServerResources/MailerUI.css index 6b2e4773a..c1ac5c7dd 100644 --- a/UI/WebServerResources/MailerUI.css +++ b/UI/WebServerResources/MailerUI.css @@ -33,8 +33,7 @@ DIV#leftPanel } DIV#rightPanel -{ - position: absolute; +{ position: absolute; top: 5.5em; left: 15em; right: 0px; @@ -42,8 +41,7 @@ DIV#rightPanel margin: 0px; margin-left: 5px; padding: 0px; - overflow: hidden; -} + overflow: hidden; } /* top list */ DIV#mailboxContent @@ -54,8 +52,8 @@ DIV#mailboxContent left: 0px; right: 0px; height: 15.5em; - overflow: hidden; - overflow-y: auto; } + overflow: scroll; + overflow-x: hidden; } DIV#messageContent { position: absolute; From 1d5c49a7cb1123a08a24acbdf164d58a08650939 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Mon, 17 Sep 2007 21:29:08 +0000 Subject: [PATCH 04/10] Monotone-Parent: 6db79539af388f03f06a0b0e18a722cbeac0292e Monotone-Revision: 84e757681cdfa7773cbbc9bd4d77e9536cae62fc Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2007-09-17T21:29:08 Monotone-Branch: ca.inverse.sogo --- UI/Templates/ContactsUI/UIxContactView.wox | 1 - UI/WebServerResources/ContactsUI.css | 3 ++- UI/WebServerResources/ContactsUI.js | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/UI/Templates/ContactsUI/UIxContactView.wox b/UI/Templates/ContactsUI/UIxContactView.wox index adfdbeaca..888752b0d 100644 --- a/UI/Templates/ContactsUI/UIxContactView.wox +++ b/UI/Templates/ContactsUI/UIxContactView.wox @@ -20,7 +20,6 @@ /> Date: Mon, 17 Sep 2007 22:42:55 +0000 Subject: [PATCH 05/10] Monotone-Parent: 84e757681cdfa7773cbbc9bd4d77e9536cae62fc Monotone-Revision: e480078fda9240a929b3ea04d2ddecdf26c20630 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2007-09-17T22:42:55 Monotone-Branch: ca.inverse.sogo --- UI/MainUI/SOGoUserHomePage.m | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/UI/MainUI/SOGoUserHomePage.m b/UI/MainUI/SOGoUserHomePage.m index 910155833..032a615fa 100644 --- a/UI/MainUI/SOGoUserHomePage.m +++ b/UI/MainUI/SOGoUserHomePage.m @@ -221,6 +221,11 @@ static NSString *defaultModule = nil; date = [NSCalendarDate calendarDate]; [cookie setExpires: [date yesterday]]; [response addCookie: cookie]; + + [response setHeader: date forKey: @"Last-Modified"]; + [response setHeader: @"no-store, no-cache, must-revalidate, max-age=0" forKey: @"Cache-Control"]; + [response setHeader: @"post-check=0, pre-check=0" forKey: @"Cache-Control"]; + [response setHeader: @"no-cache" forKey: @"Pragma"]; return response; } From 0c538f0fbc3202c9f9a0b1853d1d9e39d8ad725e Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Tue, 18 Sep 2007 20:52:32 +0000 Subject: [PATCH 06/10] Monotone-Parent: ebea63a163ebf08fba3b02873febbe9dcaaaeb2c Monotone-Revision: a486856eb1c20d59b444f05d1ce45177d7ccc66e Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2007-09-18T20:52:32 Monotone-Branch: ca.inverse.sogo --- UI/Common/UIxPageFrame.h | 5 ++++ UI/Common/UIxPageFrame.m | 40 ++++++++++++++++++++++++++ UI/Templates/MainUI/SOGoRootPage.wox | 8 +++--- UI/Templates/UIxPageFrame.wox | 22 ++++++++++++-- UI/WebServerResources/SOGoRootPage.css | 14 ++++++++- 5 files changed, 82 insertions(+), 7 deletions(-) diff --git a/UI/Common/UIxPageFrame.h b/UI/Common/UIxPageFrame.h index 94fe9816f..7fe7837ae 100644 --- a/UI/Common/UIxPageFrame.h +++ b/UI/Common/UIxPageFrame.h @@ -23,6 +23,7 @@ #define UIXPAGEFRAME_H #import +#import @interface WOComponent (PopupExtension) @@ -56,6 +57,10 @@ - (void) setToolbar: (NSString *) newToolbar; - (NSString *) toolbar; +- (BOOL) isBrowserCompatible; +- (BOOL) isIE7Compatible; +- (BOOL) isMac; + @end #endif /* UIXPAGEFRAME_H */ diff --git a/UI/Common/UIxPageFrame.m b/UI/Common/UIxPageFrame.m index 267a653d8..4f631eeeb 100644 --- a/UI/Common/UIxPageFrame.m +++ b/UI/Common/UIxPageFrame.m @@ -258,4 +258,44 @@ return toolbar; } +/* browser/os identification */ + +- (BOOL) isCompatibleBrowser +{ + WEClientCapabilities *cc; + + cc = [[context request] clientCapabilities]; + + //NSLog(@"Browser = %@", [cc description]); + //NSLog(@"User agent = %@", [cc userAgent]); + //NSLog(@"Browser major version = %i", [cc majorVersion]); + + return ( + ([[cc userAgentType] isEqualToString: @"IE"] && [cc majorVersion] >= 7) || + ([[cc userAgentType] isEqualToString: @"Mozilla"] && [cc majorVersion] >= 5) || + ([[cc userAgentType] isEqualToString: @"Safari"] && [cc majorVersion] >= 4) + ); +} + +- (BOOL) isIE7Compatible +{ + WEClientCapabilities *cc; + + cc = [[context request] clientCapabilities]; + + return ([cc isWindowsBrowser] && + ([[cc userAgent] rangeOfString: @"NT 5.1"].location != NSNotFound || + [[cc userAgent] rangeOfString: @"NT 6"].location != NSNotFound)); +} + +- (BOOL) isMac +{ + WEClientCapabilities *cc; + + cc = [[context request] clientCapabilities]; + + return [cc isMacBrowser]; +} + + @end /* UIxPageFrame */ diff --git a/UI/Templates/MainUI/SOGoRootPage.wox b/UI/Templates/MainUI/SOGoRootPage.wox index 0fa3da10e..af0bc6bc4 100644 --- a/UI/Templates/MainUI/SOGoRootPage.wox +++ b/UI/Templates/MainUI/SOGoRootPage.wox @@ -7,10 +7,10 @@ xmlns:const="http://www.skyrix.com/od/constant" xmlns:rsrc="OGo:url" xmlns:label="OGo:label" - > + >
-

+


@@ -21,6 +21,6 @@
-
- + diff --git a/UI/Templates/UIxPageFrame.wox b/UI/Templates/UIxPageFrame.wox index ff1588e05..8cc188326 100644 --- a/UI/Templates/UIxPageFrame.wox +++ b/UI/Templates/UIxPageFrame.wox @@ -33,8 +33,9 @@ /> - -