steffen: server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView day.php, 1.4, 1.4.2.1 month.php, 1.3, 1.3.2.1 week.php, 1.5, 1.5.2.1 workweek.php, 1.5, 1.5.2.1
cvs at intevation.de
cvs at intevation.de
Tue Aug 30 01:53:21 CEST 2005
Author: steffen
Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView
In directory doto:/tmp/cvs-serv11685/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView
Modified Files:
Tag: kolab_2_0_branch
day.php month.php week.php workweek.php
Log Message:
Backport from HAED of fix for Issue666 (fbview wrong) and Issue869 (insane freebusy...)
Index: day.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView/day.php,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- day.php 11 Nov 2004 15:08:48 -0000 1.4
+++ day.php 29 Aug 2005 23:53:19 -0000 1.4.2.1
@@ -11,6 +11,7 @@
* @author Mike Cochrane <mike at graftonhall.co.nz>
* @package Kronolith
*/
+
class Kronolith_FreeBusy_View_day extends Kronolith_FreeBusy_View {
var $_startStamp;
@@ -28,8 +29,8 @@
$right = max(0, 100 * (($end - $this->_startStamp) / ($this->_endStamp - $this->_startStamp)));
$width = $right - $left;
- $template->set('left', $left);
- $template->set('width', min($width, 100 - $left) );
+ $template->set('left', sprintf("%F", $left));
+ $template->set('width', sprintf("%F", min($width, 100 - $left)) );
$template->set('top', $count++ * 15);
$template->set('evclick', '');
$template->set('label', '');
Index: month.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView/month.php,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- month.php 21 Dec 2004 23:59:57 -0000 1.3
+++ month.php 29 Aug 2005 23:53:19 -0000 1.3.2.1
@@ -210,8 +210,8 @@
}
}
if (($right - $left) != 0) {
- $template->set('left', $left);
- $template->set('width', $right - $left);
+ $template->set('left', sprintf("%F",$left));
+ $template->set('width', sprintf("%F",$right - $left));
$template->set('top', $count++ * 15);
$template->set('label', $label);
$template->set('evclick', '');
@@ -256,7 +256,7 @@
$left = 0;
$template->set('left', $left);
- $template->set('width', min($right - $left, 100));
+ $template->set('width', sprintf("%F",min($right - $left, 100)));
$template->set('top', $count++ * 15);
$blocks .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/unknownblock.tpl');
@@ -279,8 +279,8 @@
}
$right = 100;
- $template->set('left', $left);
- $template->set('width', min($right - $left, 100));
+ $template->set('left', sprintf("%F",$left));
+ $template->set('width', sprintf("%F",min($right - $left, 100)));
$template->set('top', $count++ * 15);
$blocks .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/unknownblock.tpl');
Index: week.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView/week.php,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- week.php 21 Dec 2004 23:59:57 -0000 1.5
+++ week.php 29 Aug 2005 23:53:19 -0000 1.5.2.1
@@ -224,8 +224,8 @@
}
}
if ( ($right - $left) != 0.) {
- $template->set('left', $left);
- $template->set('width', $right - $left);
+ $template->set('left', sprintf("%F",$left));
+ $template->set('width', sprintf("%F",$right - $left));
$template->set('top', $count++ * 15);
$template->set('label', $label);
$template->set('evclick', '');
@@ -270,7 +270,7 @@
$left = 0;
$template->set('left', $left);
- $template->set('width', min($right - $left, 100));
+ $template->set('width', sprintf("%F",min($right - $left, 100)));
$template->set('top', $count++ * 15);
$blocks .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/unknownblock.tpl');
@@ -293,8 +293,8 @@
}
$right = 100;
- $template->set('left', $left);
- $template->set('width', min($right - $left, 100));
+ $template->set('left', sprintf("%F",$left));
+ $template->set('width', sprintf("%F",min($right - $left, 100)));
$template->set('top', $count++ * 15);
$blocks .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/unknownblock.tpl');
Index: workweek.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView/workweek.php,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- workweek.php 21 Dec 2004 23:59:57 -0000 1.5
+++ workweek.php 29 Aug 2005 23:53:19 -0000 1.5.2.1
@@ -220,8 +220,8 @@
$right += 1;
}
}
- $template->set('left', $left);
- $template->set('width', $right - $left);
+ $template->set('left', sprintf("%F",$left));
+ $template->set('width', sprintf("%F",$right - $left));
$template->set('top', $count++ * 15);
$template->set('label', $label);
$template->set('evclick', '');
@@ -265,7 +265,7 @@
$left = 0;
$template->set('left', $left);
- $template->set('width', min($right - $left, 100));
+ $template->set('width', sprintf("%F",min($right - $left, 100)));
$template->set('top', $count++ * 15);
$blocks .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/unknownblock.tpl');
@@ -288,8 +288,8 @@
}
$right = 100;
- $template->set('left', $left);
- $template->set('width', min($right - $left, 100));
+ $template->set('left', sprintf("%F",$left));
+ $template->set('width', sprintf("%F",min($right - $left, 100)));
$template->set('top', $count++ * 15);
$blocks .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/unknownblock.tpl');
More information about the commits
mailing list