From a05c370eb46480ce3a4b6516080d68715d298376 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Thu, 19 Mar 2009 02:42:35 +0000 Subject: [PATCH] See ChangeLog Monotone-Parent: bb83e15abbaa6a9134aefc67b7bb671c74735ea4 Monotone-Revision: 574f52308bd6e344b897fdc217aa41c480108da3 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2009-03-19T02:42:35 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 8 ++ Documentation/lori.png | Bin 13138 -> 0 bytes UI/MainUI/Dutch.lproj/Localizable.strings | 9 ++ UI/MainUI/English.lproj/Localizable.strings | 11 +- UI/MainUI/French.lproj/Localizable.strings | 9 ++ UI/MainUI/German.lproj/Localizable.strings | 9 ++ UI/MainUI/Italian.lproj/Localizable.strings | 9 ++ UI/MainUI/SOGoRootPage.m | 12 ++ UI/MainUI/Spanish.lproj/Localizable.strings | 9 ++ UI/Templates/MainUI/SOGoBrowsersPanel.wox | 32 +++-- UI/Templates/MainUI/SOGoRootPage.wox | 62 ++++++--- UI/WebServerResources/SOGoRootPage.css | 144 ++++++++++++++------ UI/WebServerResources/SOGoRootPage.js | 15 +- UI/WebServerResources/iefixes.css | 6 - 14 files changed, 256 insertions(+), 79 deletions(-) delete mode 100644 Documentation/lori.png diff --git a/ChangeLog b/ChangeLog index a1eaaa4f0..4db25ca89 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2009-03-18 Francis Lachapelle + + * UI/MainUI/SOGoRootPage.m ([SOGoRootPage -version]): new method + that returns the application version. + + * iCalDateTime.m ([iCalDateTime -dateTime]): when not defined, the + timezone is now guessed from the date of the current object. + 2009-03-18 Ludovic Marcotte * Updated the documentation for the SOGo diff --git a/Documentation/lori.png b/Documentation/lori.png deleted file mode 100644 index 4ac2d620a8954b9d2f0ca0e99530a25f182d9bfd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13138 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 GPL version 2.
+Parts of this software are distributed under the GNU LGPL version 2.

+This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law."; \ No newline at end of file diff --git a/UI/MainUI/English.lproj/Localizable.strings b/UI/MainUI/English.lproj/Localizable.strings index a6f573749..695749df6 100644 --- a/UI/MainUI/English.lproj/Localizable.strings +++ b/UI/MainUI/English.lproj/Localizable.strings @@ -22,4 +22,13 @@ "French" = "French"; "German" = "German"; "Italian" = "Italian"; -"Spanish" = "Spanish"; \ No newline at end of file +"Spanish" = "Spanish"; + +"About" = "About"; +"AboutBox" = "SOGo is a groupware server built around OpenGroupware.org (OGo) and the SOPE application server. It focuses on scalability.

+SOGo provides a rich AJAX-based Web interface and supports multiple native clients through the use of standard protocols such as CalDAV, CardDAV and GroupDAV.

+Copyright © 2006-2009 Inverse inc.
+Copyright © 2002-2005 SKYRIX Software AG

+This software are distributed under the GNU GPL version 2.
+Parts of this software are distributed under the GNU LGPL version 2.

+This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law."; \ No newline at end of file diff --git a/UI/MainUI/French.lproj/Localizable.strings b/UI/MainUI/French.lproj/Localizable.strings index c5b60d369..85b9c802d 100644 --- a/UI/MainUI/French.lproj/Localizable.strings +++ b/UI/MainUI/French.lproj/Localizable.strings @@ -23,3 +23,12 @@ "German" = "Allemand"; "Italian" = "Italien"; "Spanish" = "Espagnol"; + +"About" = "À propos"; +"AboutBox" = "SOGo is a groupware server built around OpenGroupware.org (OGo) and the SOPE application server. It focuses on scalability.

+SOGo provides a rich AJAX-based Web interface and supports multiple native clients through the use of standard protocols such as CalDAV, CardDAV and GroupDAV.

+Copyright © 2006-2009 Inverse inc.
+Copyright © 2002-2005 SKYRIX Software AG

+This software are distributed under the GNU GPL version 2.
+Parts of this software are distributed under the GNU LGPL version 2.

+This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law."; \ No newline at end of file diff --git a/UI/MainUI/German.lproj/Localizable.strings b/UI/MainUI/German.lproj/Localizable.strings index f1561a552..4c6100b24 100644 --- a/UI/MainUI/German.lproj/Localizable.strings +++ b/UI/MainUI/German.lproj/Localizable.strings @@ -22,3 +22,12 @@ "German" = "Deutsch"; "Italian" = "Italienisch"; "Spanish" = "Spanisch"; + +"About" = "About"; +"AboutBox" = "SOGo is a groupware server built around OpenGroupware.org (OGo) and the SOPE application server. It focuses on scalability.

+SOGo provides a rich AJAX-based Web interface and supports multiple native clients through the use of standard protocols such as CalDAV, CardDAV and GroupDAV.

+Copyright © 2006-2009 Inverse inc.
+Copyright © 2002-2005 SKYRIX Software AG

+This software are distributed under the GNU GPL version 2.
+Parts of this software are distributed under the GNU LGPL version 2.

+This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law."; \ No newline at end of file diff --git a/UI/MainUI/Italian.lproj/Localizable.strings b/UI/MainUI/Italian.lproj/Localizable.strings index d9c3e8d3b..e19e8c420 100644 --- a/UI/MainUI/Italian.lproj/Localizable.strings +++ b/UI/MainUI/Italian.lproj/Localizable.strings @@ -22,3 +22,12 @@ "German" = "German"; "Italian" = "Italiano"; "Spanish" = "Spanish"; + +"About" = "About"; +"AboutBox" = "SOGo is a groupware server built around OpenGroupware.org (OGo) and the SOPE application server. It focuses on scalability.

+SOGo provides a rich AJAX-based Web interface and supports multiple native clients through the use of standard protocols such as CalDAV, CardDAV and GroupDAV.

+Copyright © 2006-2009 Inverse inc.
+Copyright © 2002-2005 SKYRIX Software AG

+This software are distributed under the GNU GPL version 2.
+Parts of this software are distributed under the GNU LGPL version 2.

+This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law."; \ No newline at end of file diff --git a/UI/MainUI/SOGoRootPage.m b/UI/MainUI/SOGoRootPage.m index 8e090c94b..6ba80cf68 100644 --- a/UI/MainUI/SOGoRootPage.m +++ b/UI/MainUI/SOGoRootPage.m @@ -197,5 +197,17 @@ static NSArray *supportedLanguages = nil; return text; } +- (NSString *) version +{ + NSString *aString; + + aString = [NSString stringWithFormat: @"%d.%d.%d", + SOGO_MAJOR_VERSION, + SOGO_MINOR_VERSION, + SOGO_SUBMINOR_VERSION]; + + return aString; +} + @end /* SOGoRootPage */ diff --git a/UI/MainUI/Spanish.lproj/Localizable.strings b/UI/MainUI/Spanish.lproj/Localizable.strings index 73240eb15..58dfa7f1e 100644 --- a/UI/MainUI/Spanish.lproj/Localizable.strings +++ b/UI/MainUI/Spanish.lproj/Localizable.strings @@ -25,3 +25,12 @@ "German" = "German"; "Italian" = "Italian"; "Spanish" = "Spanish"; + +"About" = "About"; +"AboutBox" = "SOGo is a groupware server built around OpenGroupware.org (OGo) and the SOPE application server. It focuses on scalability.

+SOGo provides a rich AJAX-based Web interface and supports multiple native clients through the use of standard protocols such as CalDAV, CardDAV and GroupDAV.

+Copyright © 2006-2009 Inverse inc.
+Copyright © 2002-2005 SKYRIX Software AG

+This software are distributed under the GNU GPL version 2.
+Parts of this software are distributed under the GNU LGPL version 2.

+This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law."; \ No newline at end of file diff --git a/UI/Templates/MainUI/SOGoBrowsersPanel.wox b/UI/Templates/MainUI/SOGoBrowsersPanel.wox index 49d7a3f67..87665dc46 100644 --- a/UI/Templates/MainUI/SOGoBrowsersPanel.wox +++ b/UI/Templates/MainUI/SOGoBrowsersPanel.wox @@ -8,17 +8,25 @@ xmlns:rsrc="OGo:url" xmlns:label="OGo:label">
-

-

-

Firefox

- -

-

Internet Explorer 7

-

Safari 3

- - -

-

Safari 3

- + + + + + +
+ + +

+

Firefox

+ +

+

Internet Explorer 7

+

Safari 3

+ + +

+

Safari 3

+ +
diff --git a/UI/Templates/MainUI/SOGoRootPage.wox b/UI/Templates/MainUI/SOGoRootPage.wox index e67108fcd..4c7ae120f 100644 --- a/UI/Templates/MainUI/SOGoRootPage.wox +++ b/UI/Templates/MainUI/SOGoRootPage.wox @@ -9,32 +9,56 @@ xmlns:label="OGo:label" const:popup="YES" > + +
+ +
-

+ + + + + +
+ + + + + + +
-
- - -
- -
+
diff --git a/UI/WebServerResources/SOGoRootPage.css b/UI/WebServerResources/SOGoRootPage.css index 6d40b6e75..78f53b96a 100644 --- a/UI/WebServerResources/SOGoRootPage.css +++ b/UI/WebServerResources/SOGoRootPage.css @@ -1,51 +1,114 @@ BODY -{ background-color: #999; +{ background-color: #dad3cc; text-align: center; } IMG#preparedAnimation -{ - width: 0px; - height: 0px; -} +{ width: 0px; + height: 0px; } -DIV#loginScreen -{ - background-color: #d4d0c8; - margin: 0px auto; - margin-top: 5em; +DIV#aboutBox +{ position: absolute; + z-index: 1000; + left: 0px; + width: 100%; + text-align: center; } + +DIV#aboutBox IMG +{ margin-top: 20px; } + +DIV#aboutBox DIV +{ background-color: #fff; + border: 1px solid #222; + margin: auto; + padding-bottom: 20px; + width: 550px; } + +A, +A:link, +A:visited +{ color: #54b948; } + +DIV#aboutBox DIV A.button +{ color: #000; } + +DIV#aboutBox P.logo +{ background-color: #222; + margin-top: 0; + margin-bottom: 10px; } + +DIV#aboutBox P.scroll +{ border: 1px solid #222; + height: 120px; + margin: auto; padding: 5px; - border: 2px solid transparent; + width: 350px; text-align: left; - width: 200px; - -moz-border-top-colors: #efebe7 #fff; - -moz-border-left-colors: #efebe7 #fff; - -moz-border-right-colors: #000 #9c9a94 transparent; - -moz-border-bottom-colors: #000 #9c9a94 transparent; -} + overflow-y: auto; } -IMG#splash -{ border: 0px; - margin: 0px; - padding: 0px; - height: 200px; - width: 200px; } +DIV#aboutBox P.links +{ margin: 0 0 20px 0; } -DIV#loginScreen INPUT.textField -{ width: 187px; } - -DIV#loginButton +DIV.linkbanner { text-align: right; } -DIV#loginButton INPUT -{ width: auto; - margin-top: 5px; } +DIV.linkbanner A +{ padding-right: .5em; } -DIV#loginButton IMG#progressIndicator -{ float: left; - width: 16px; +DIV#loginScreen +{ clear: both; + margin: 0px auto; + padding-top: 5em; + border: 2px solid transparent; + text-align: center; +} + +DIV#loginScreen TABLE +{ margin: auto; } + +DIV#loginScreen TABLE TD +{ text-align: right; } + +DIV#loginScreen TABLE TD#loginCell +{ border-left: 1px solid #fff; + padding-left: 10px; } + +LABEL +{ display: inline-block; + padding: 10px; } + +DIV#loginScreen LABEL +{ display: block; + padding: 5px; } + +#animation +{ margin: 0px auto; + padding: 0px; } + +IMG#splash +{ border: 0; + margin: 0px; + padding: 0px 0px 0px 0px; } + +DIV#loginScreen INPUT.textField +{ border: 1px solid #333; + width: 187px; } + +DIV#loginScreen INPUT.textField, +DIV#loginScreen SELECT +{ border: 1px solid #333; + -moz-border-top-colors: #333; + -moz-border-left-colors: #333; + -moz-border-right-colors: #333; + -moz-border-bottom-colors: #333; +} + +DIV#loginScreen INPUT#submit +{ margin-top: 10px; } + +IMG#progressIndicator +{ width: 16px; height: 16px; - border: 0px none; - margin-top: 5px; + margin-top: 20px; margin-left: 5px; } #noCookiesErrorMessage, @@ -58,8 +121,11 @@ P.browser border-top: 1px solid #888; border-left: 1px solid #888; border-right: 1px solid #eee; - border-bottom: 1px solid #eee; - line-height: 32px; } + border-bottom: 1px solid #eee; + line-height: 32px; + padding-right: 5px; } -P.browser img -{ padding: 2px; } +P.browser IMG +{ padding: 0 2px; + margin: 0; + vertical-align: middle; } diff --git a/UI/WebServerResources/SOGoRootPage.js b/UI/WebServerResources/SOGoRootPage.js index 4a5a162aa..7c60d2cae 100644 --- a/UI/WebServerResources/SOGoRootPage.js +++ b/UI/WebServerResources/SOGoRootPage.js @@ -5,6 +5,13 @@ function initLogin() { date.setTime(date.getTime() - 86400000); document.cookie = ("0xHIGHFLYxSOGo=discard; path=/" + "; expires=" + date.toGMTString()); + + var about = $("about"); + about.observe("click", function(event) { $("aboutBox").show(); }); + + var aboutClose = $("aboutClose"); + aboutClose.observe("click", function(event) { $("aboutBox").hide(); }); + var submit = $("submit"); submit.observe("click", onLoginClick); @@ -22,8 +29,9 @@ function onLoginClick(event) { var language = $("language").value; if (userName.length > 0) { - startAnimation($("loginButton"), $("submit")); - + this.hide(); + startAnimation($("animation")); + if (typeof(loginSuffix) != "undefined" && loginSuffix.length > 0 && !userName.endsWith(loginSuffix)) @@ -48,6 +56,7 @@ function onLoginCallback(http) { if (http.readyState == 4) { var noCookiesErrorMessage = $("noCookiesErrorMessage"); var loginErrorMessage = $("loginErrorMessage"); + var submitBtn = $("submit"); if (isHttpStatus204(http.status)) { // Make sure browser's cookies are enabled @@ -64,6 +73,7 @@ function onLoginCallback(http) { if (cookieExists === 0) { loginErrorMessage.hide(); noCookiesErrorMessage.show(); + submitBtn.show(); return false; } @@ -99,6 +109,7 @@ function onLoginCallback(http) { else { loginErrorMessage.show(); noCookiesErrorMessage.hide(); + submitBtn.show(); } } } diff --git a/UI/WebServerResources/iefixes.css b/UI/WebServerResources/iefixes.css index 7196fa518..4504d2511 100644 --- a/UI/WebServerResources/iefixes.css +++ b/UI/WebServerResources/iefixes.css @@ -6,12 +6,6 @@ FORM { padding: 0px; margin: 0px; } -DIV#loginScreen -{ border: 2px solid #fff; - border-right: 2px solid #666; - border-bottom: 2px solid #666; -} - /* generic */ SPAN.disabledToolbarButton { filter: alpha(opacity=40); }