LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge of '213bbc308bab313d8aeeda0c97702d2718560a33' 

and '3d423e4f0281b17bb64e43dcc170a072949b70cb'

Monotone-Parent: 213bbc308bab313d8aeeda0c97702d2718560a33
Monotone-Parent: 3d423e4f0281b17bb64e43dcc170a072949b70cb
Monotone-Revision: 479a80bcb5b10e43ecadc5b5db6efa34926e52a0

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-10-27T21:38:38
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2011-10-27 21:38:38 +00:00
parent 530a339d72 6c4ed0de46
commit 89e76a2bb2
5 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2011-10-27 Francis Lachapelle <flachapelle@inverse.ca>
* 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 <wsourdeau@inverse.ca>
* OpenChange/MAPIStoreObject.m (-canGetProperty:): new method that

4
UI/WebServerResources/SOGoRootPage.css
View File

@ -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;

10
UI/WebServerResources/SOGoRootPage.js
View File

@ -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");

10
UI/WebServerResources/UIxAttendeesEditor.js
View File

@ -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

1
debian/rules vendored
View File

@ -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