amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-03-05 23:26:24 +00:00
Code Issues Projects Releases Wiki Activity

merge of '1480ab87cd945c5b85d9c1f7282d0ab1267f37d0'

Browse Source 
and '79cc22f9c2a49076ea278b33a8c3a3ac249d9b75'

Monotone-Parent: 1480ab87cd945c5b85d9c1f7282d0ab1267f37d0
Monotone-Parent: 79cc22f9c2a49076ea278b33a8c3a3ac249d9b75
Monotone-Revision: 4114bd0be7d5fc4d73b57879b042ffab8c6a8d7f

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2009-07-29T15:40:52
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2009-07-29 15:40:52 +00:00
parent 17ee6224fd 37a4b12fa6
commit d2d010d913
7 changed files with 40 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
UI/WebServerResources/MailerUI.js
View File

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

37
UI/WebServerResources/SchedulerUI.js
View File

@@ -2082,24 +2082,35 @@ 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)
var targets = $$("DIV#daysView DIV.days DIV.day DIV.events DIV.clickableHourCell");
else
if (currentView == "dayview") {
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 if (currentView == "weekview")
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.
}
}
}

3
UI/WebServerResources/UIxMailEditor.js
View File

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

2
debian/control vendored
View File

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

2
debian/rules vendored
View File

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

15
debian/sogo.postinst vendored
View File

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

4
debian/sogo.postrm vendored
View File

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