From c931c0ea91250df726f1c4ba80305a5812e3f11d Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Thu, 27 Oct 2011 18:35:56 +0000 Subject: [PATCH 1/3] Removed reference to sogod-wrapper in debian rules. Monotone-Parent: a8c1ef20873db2c870d93bd5f81876e3cb41c719 Monotone-Revision: 7687ea3a86932c857758b36d555fd71f5ad1ecb5 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2011-10-27T18:35:56 --- debian/rules | 1 - 1 file changed, 1 deletion(-) 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 From 8b66f12225a046c768e18991eb33beb6df7a5d43 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Thu, 27 Oct 2011 18:47:59 +0000 Subject: [PATCH 2/3] See ChangeLog. Monotone-Parent: 7687ea3a86932c857758b36d555fd71f5ad1ecb5 Monotone-Revision: 826c26c2f6f34d0cea46bfa5fc4827ec833f3b9d Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2011-10-27T18:47:59 --- ChangeLog | 5 +++++ UI/WebServerResources/SOGoRootPage.css | 4 +--- UI/WebServerResources/SOGoRootPage.js | 10 +++++----- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 12181dbeb..973be8575 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-10-27 Francis Lachapelle + + * UI/WebServerResources/SOGoRootPage.js (initLogin): added sliding + effect to about box. + 2011-10-26 Francis Lachapelle * SoObjects/SOGo/SQLSource.m 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"); From 94efd85764db009d7d2f066aac5e08a0a0e72c82 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Thu, 27 Oct 2011 18:50:42 +0000 Subject: [PATCH 3/3] See ChangeLog. Monotone-Parent: 826c26c2f6f34d0cea46bfa5fc4827ec833f3b9d Monotone-Revision: f094ea8727e7110bffdeac78126137ceea63eda5 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2011-10-27T18:50:42 --- ChangeLog | 5 +++++ UI/WebServerResources/UIxAttendeesEditor.js | 10 +++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 973be8575..7cf71dc23 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 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. 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