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 4ac2d620a..000000000 Binary files a/Documentation/lori.png and /dev/null differ diff --git a/UI/MainUI/Dutch.lproj/Localizable.strings b/UI/MainUI/Dutch.lproj/Localizable.strings index 0b0263523..80bcba4a5 100644 --- a/UI/MainUI/Dutch.lproj/Localizable.strings +++ b/UI/MainUI/Dutch.lproj/Localizable.strings @@ -23,3 +23,12 @@ "German" = "Duits"; "Italian" = "Italiaans"; "Spanish" = "Spaans"; + +"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/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); }