diff --git a/ChangeLog b/ChangeLog index 0ee14466d..61883ba79 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2011-10-27 Francis Lachapelle + + * UI/WebServerResources/UIxAttendeesEditor.js + (performSearchCallback): show a list email address (usually an + LDAP group) unless the list has no email address (usually a + personal contacts list). + + * UI/WebServerResources/SOGoRootPage.js (initLogin): added sliding + effect to about box. + 2011-10-27 Wolfgang Sourdeau * OpenChange/MAPIStoreObject.m (-canGetProperty:): new method that diff --git a/UI/WebServerResources/SOGoRootPage.css b/UI/WebServerResources/SOGoRootPage.css index 9d0af4184..a8aa75659 100644 --- a/UI/WebServerResources/SOGoRootPage.css +++ b/UI/WebServerResources/SOGoRootPage.css @@ -15,12 +15,10 @@ DIV#aboutBox { position: absolute; z-index: 1000; left: 0px; + top: 30px; width: 100%; text-align: center; } -DIV#aboutBox IMG -{ margin-top: 20px; } - DIV#aboutBox DIV { background-color: #fff; border: 1px solid #222; diff --git a/UI/WebServerResources/SOGoRootPage.js b/UI/WebServerResources/SOGoRootPage.js index 6d214d2a5..2ac4436a0 100644 --- a/UI/WebServerResources/SOGoRootPage.js +++ b/UI/WebServerResources/SOGoRootPage.js @@ -16,13 +16,13 @@ function initLogin() { var about = $("about"); if (about) { about.observe("click", function(event) { - $("aboutBox").show(); - event.stop() }); - + if (!$("aboutBox").visible()) + Effect.SlideDown("aboutBox", { queue: { position: 'end', scope: 'aboutscope', limit: 2 } }); + event.stop(); }); var aboutClose = $("aboutClose"); aboutClose.observe("click", function(event) { - $("aboutBox").hide(); - event.stop() }); + Effect.SlideUp("aboutBox", { duration: 2.0, queue: { position: 'end', scope: 'aboutscope', limit: 2 } }); + event.stop() }); } var submit = $("submit"); diff --git a/UI/WebServerResources/UIxAttendeesEditor.js b/UI/WebServerResources/UIxAttendeesEditor.js index e5806ed3b..af7faf682 100644 --- a/UI/WebServerResources/UIxAttendeesEditor.js +++ b/UI/WebServerResources/UIxAttendeesEditor.js @@ -41,8 +41,8 @@ function resolveListAttendees(input, append) { } function resolveListAttendeesCallback(http) { + var input = http.callbackData["input"]; if (http.readyState == 4 && http.status == 200) { - var input = http.callbackData["input"]; var append = http.callbackData["append"]; var contacts = http.responseText.evalJSON(true); for (var i = 0; i < contacts.length; i++) { @@ -85,6 +85,10 @@ function resolveListAttendeesCallback(http) { } } } + else { + // List not found (probably an LDAP group) + performSearch(input); + } } function onContactKeydown(event) { @@ -205,7 +209,7 @@ function performSearchCallback(http) { var isList = (contact["c_component"] && contact["c_component"] == "vlist"); var completeEmail = contact["c_cn"].trim(); - if (!isList) { + if (contact["c_mail"]) { if (completeEmail) completeEmail += " <" + contact["c_mail"] + ">"; else @@ -276,7 +280,7 @@ function performSearchCallback(http) { input.container = contact["container"]; } var completeEmail = contact["c_cn"].trim(); - if (!isList) { + if (contact["c_mail"]) { if (completeEmail) completeEmail += " <" + contact["c_mail"] + ">"; else diff --git a/debian/rules b/debian/rules index 7552135cf..9810d4b3c 100755 --- a/debian/rules +++ b/debian/rules @@ -39,7 +39,6 @@ install-arch: build-arch $(MAKE) DESTDIR=$(CURDIR)/debian/tmp GNUSTEP_INSTALLATION_DOMAIN=SYSTEM install mkdir -p debian/tmp/etc/default cp Scripts/sogo-default debian/tmp/etc/default/sogo - cp Scripts/sogod-wrapper debian/tmp/usr/sbin/sogod-wrapper mkdir -p debian/tmp/usr/share/lintian/overrides cp debian/sogo.overrides debian/tmp/usr/share/lintian/overrides/sogo mkdir -p debian/tmp/etc/apache2/conf.d