From 3aa6b46bb05cab5656d624ac37806797d548298f Mon Sep 17 00:00:00 2001 From: C Robert Date: Tue, 28 Jul 2009 19:43:54 +0000 Subject: [PATCH 1/6] Monotone-Parent: 7d3304b769784beb1122a7a8507098f0d966fc4d Monotone-Revision: 4d3de62dbabf59955a6167e8ddf38e5dbfb00656 Monotone-Author: crobert@inverse.ca Monotone-Date: 2009-07-28T19:43:54 Monotone-Branch: ca.inverse.sogo --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index facde4ce1..14fa1a7eb 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Standards-Version: 3.7.3 Package: sogo Section: web Architecture: i386 -Depends: gnustep-base-common, gnustep-base-runtime, libsope-core, libsope-appserver, libsope-ldap, libsope-cards +Depends: gnustep-base-common, gnustep-base-runtime, libsope-core4.9, libsope-appserver4.9, libsope-ldap4.9 Description: SOGo SOGo is a groupware server built around OpenGroupware.org (OGo) and the SOPE application server. It focuses on scalability. From ced2268aa511e4127f5b8761fd1949fe4b0677a4 Mon Sep 17 00:00:00 2001 From: C Robert Date: Wed, 29 Jul 2009 13:11:46 +0000 Subject: [PATCH 2/6] Fixed deb issues Monotone-Parent: 4d3de62dbabf59955a6167e8ddf38e5dbfb00656 Monotone-Revision: dea46a9c0a007139fa87fd98c606f1185523a535 Monotone-Author: crobert@inverse.ca Monotone-Date: 2009-07-29T13:11:46 Monotone-Branch: ca.inverse.sogo --- debian/rules | 2 +- debian/sogo.postinst | 15 +++++++-------- debian/sogo.postrm | 4 ++-- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/debian/rules b/debian/rules index f072fa78a..8e2c65928 100755 --- a/debian/rules +++ b/debian/rules @@ -46,7 +46,7 @@ install-arch: dh_installdirs -s $(MAKE) DESTDIR=$(CURDIR)/debian/tmp GNUSTEP_INSTALLATION_DOMAIN=SYSTEM install - mkdir -p debian/tmp/etc/init.d/sogod + mkdir -p debian/tmp/etc/init.d mkdir -p debian/tmp/etc/cron.daily mkdir -p debian/tmp/var/run/sogo mkdir -p debian/tmp/var/log/sogo diff --git a/debian/sogo.postinst b/debian/sogo.postinst index eac9b086d..35cac7bd0 100755 --- a/debian/sogo.postinst +++ b/debian/sogo.postinst @@ -2,17 +2,16 @@ set -e /usr/sbin/groupadd -f -K GID_MIN=100 -K GID_MAX=500 sogo -USERS=\`getent passwd|grep sogo|sed -e 's/\([a-zA-Z]*:\)\(.*\)/\1/g'\` +USERS=`getent passwd | grep sogo | sed -e 's/\([a-zA-Z]*\):.*/\1/g'` -if [ \"\$USERS\" != \"sogo:\" ] ; then -echo \"Adding user sogo\" -useradd -d /tmp -g sogo -K UID_MIN=100 -K UID_MAX=500 -K PASS_MAX_DAYS=-1 -s -/bin/false sogo +if [ "$USERS" != "sogo" ] ; then + echo "Adding user sogo" + useradd -d /tmp -g sogo -K UID_MIN=100 -K UID_MAX=500 -K PASS_MAX_DAYS=-1 -s /bin/false sogo fi -chown sogo /var/run/sogo -chown sogo /var/spool/sogo -chown sogo /var/log/sogo +chown -R sogo /var/run/sogo +chown -R sogo /var/spool/sogo +chown -R sogo /var/log/sogo update-rc.d sogod defaults /sbin/ldconfig diff --git a/debian/sogo.postrm b/debian/sogo.postrm index c0074bd72..28f349900 100755 --- a/debian/sogo.postrm +++ b/debian/sogo.postrm @@ -1,4 +1,4 @@ #!/bin/sh set -e -userdel sogo||true -update-rc.d SOGo remove ||true +userdel sogo || true +update-rc.d SOGo remove || true From 90305db0be2c5e505e929359281b217b942cf415 Mon Sep 17 00:00:00 2001 From: C Robert Date: Wed, 29 Jul 2009 13:43:47 +0000 Subject: [PATCH 3/6] Mantis 73 Monotone-Parent: 510caacd94dac9fc1a3fdf4240cc641a70be63d8 Monotone-Revision: 0225c4a89ef891800df91c4029034783afc00cf7 Monotone-Author: crobert@inverse.ca Monotone-Date: 2009-07-29T13:43:47 Monotone-Branch: ca.inverse.sogo --- UI/WebServerResources/SchedulerUI.js | 32 +++++++++++++++++++--------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js index 550344dc5..54eac42ea 100644 --- a/UI/WebServerResources/SchedulerUI.js +++ b/UI/WebServerResources/SchedulerUI.js @@ -2084,22 +2084,34 @@ function drawNowLine () { var minutes = d.getMinutes(); var test = $$("DIV#daysView DIV.days DIV.day"); // day view - if (test.length == 1) - var targets = $$("DIV#daysView DIV.days DIV.day DIV.events DIV.clickableHourCell"); + if (test.length == 1) { + var today = new Date (); + var m = parseInt(today.getMonth ()) + 1; + var d = today.getDate (); + if (m < 10) + m = "0" + m; + if (d < 10) + d = "0" + d; + var day = today.getFullYear () + "" + m + "" + d; + var targets = $$("DIV#daysView DIV.days DIV.day[day=" + day + + "] DIV.events DIV.clickableHourCell"); + } else var targets = $$("DIV#daysView DIV.days DIV.dayOfToday DIV.events DIV.clickableHourCell"); - var target = targets[hours]; + if (targets) { + var target = targets[hours]; - if (target) { - var div = $("nowLineDisplay"); - if (!div) - div = new Element ("div", {'id': 'nowLineDisplay'}); + if (target) { + var div = $("nowLineDisplay"); + if (!div) + div = new Element ("div", {'id': 'nowLineDisplay'}); - div.style.top = parseInt (((minutes * target.offsetHeight) / 60) - 1) + "px"; - target.appendChild (div); + div.style.top = parseInt (((minutes * target.offsetHeight) / 60) - 1) + "px"; + target.appendChild (div); - setTimeout ("drawNowLine ();", 60000); // 1 min. + setTimeout ("drawNowLine ();", 60000); // 1 min. + } } } From 67bfa03ef5700f2790768d2b0d5a60f146948135 Mon Sep 17 00:00:00 2001 From: C Robert Date: Wed, 29 Jul 2009 13:54:14 +0000 Subject: [PATCH 4/6] Mantis 83 Monotone-Parent: 0225c4a89ef891800df91c4029034783afc00cf7 Monotone-Revision: 4009db4e2bd5b1c933ea9b2c942a6a98e39e245f Monotone-Author: crobert@inverse.ca Monotone-Date: 2009-07-29T13:54:14 Monotone-Branch: ca.inverse.sogo --- UI/WebServerResources/UIxMailEditor.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/UI/WebServerResources/UIxMailEditor.js b/UI/WebServerResources/UIxMailEditor.js index 5b0c84e44..d0a78a9fd 100644 --- a/UI/WebServerResources/UIxMailEditor.js +++ b/UI/WebServerResources/UIxMailEditor.js @@ -749,7 +749,8 @@ function onWindowResize(event) { var height = Math.floor(window.height() - editor.offsetTop); if (Prototype.Browser.IE) { - editor.style.top = 0; + editor.style.width = ''; + editor.style.height = ''; height += 3; } From 6127c7f2e72e52eebdd53424eb89b04f1d68818f Mon Sep 17 00:00:00 2001 From: C Robert Date: Wed, 29 Jul 2009 14:39:13 +0000 Subject: [PATCH 5/6] Mantis 82 Monotone-Parent: 4009db4e2bd5b1c933ea9b2c942a6a98e39e245f Monotone-Revision: 6c6de2f0d403cfa411f80a8674bbd04da598e17e Monotone-Author: crobert@inverse.ca Monotone-Date: 2009-07-29T14:39:13 Monotone-Branch: ca.inverse.sogo --- UI/WebServerResources/MailerUI.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js index eef774594..00ed21338 100644 --- a/UI/WebServerResources/MailerUI.js +++ b/UI/WebServerResources/MailerUI.js @@ -640,8 +640,9 @@ function messageListCallback(http) { row.selectElement(); lastClickedRow = row.rowIndex - $(row).up('table').down('thead').getElementsByTagName('tr').length; var rowPosition = row.rowIndex * row.getHeight(); - if (rowPosition > div.getHeight()) - div.scrollTop = rowPosition; // scroll to selected message + if (rowPosition < div.scrollTop + || rowPosition > div.scrollTop + div.getHeight ()) + div.scrollTop = rowPosition; // scroll to selected message } else $("messageContent").update(); From 37a4b12fa6968d8fd064b7e157fa211e28941528 Mon Sep 17 00:00:00 2001 From: C Robert Date: Wed, 29 Jul 2009 14:47:14 +0000 Subject: [PATCH 6/6] Monotone-Parent: 6c6de2f0d403cfa411f80a8674bbd04da598e17e Monotone-Revision: 79cc22f9c2a49076ea278b33a8c3a3ac249d9b75 Monotone-Author: crobert@inverse.ca Monotone-Date: 2009-07-29T14:47:14 Monotone-Branch: ca.inverse.sogo --- UI/WebServerResources/SchedulerUI.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js index 54eac42ea..a6c68041a 100644 --- a/UI/WebServerResources/SchedulerUI.js +++ b/UI/WebServerResources/SchedulerUI.js @@ -2082,9 +2082,8 @@ function drawNowLine () { var d = new Date(); var hours = d.getHours(); var minutes = d.getMinutes(); - var test = $$("DIV#daysView DIV.days DIV.day"); - // day view - if (test.length == 1) { + + if (currentView == "dayview") { var today = new Date (); var m = parseInt(today.getMonth ()) + 1; var d = today.getDate (); @@ -2096,7 +2095,7 @@ function drawNowLine () { var targets = $$("DIV#daysView DIV.days DIV.day[day=" + day + "] DIV.events DIV.clickableHourCell"); } - else + else if (currentView == "weekview") var targets = $$("DIV#daysView DIV.days DIV.dayOfToday DIV.events DIV.clickableHourCell"); if (targets) {