extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-01 20:34:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix for the wider 12h timeformat in the day-, week- and month-view

Browse Source
This commit is contained in:
Ralf Becker 2006-03-07 08:42:06 +00:00
parent 795cdcdc0e
commit a560c8d9c4
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
calendar/inc/class.uiviews.inc.php
View File

@ -608,7 +608,7 @@ class uiviews extends uical
} }
$html = $indent.'<div class="calTimeGrid" style="height: '.$height.'px;">'."\n"; $html = $indent.'<div class="calTimeGrid" style="height: '.$height.'px;">'."\n";
$html .= $indent."\t".'<div class="calGridHeader row_on" style="width: 47px; height: '. $html .= $indent."\t".'<div class="calGridHeader" style="height: '.
$this->rowHeight.'%;">'.$title."</div>\n"; $this->rowHeight.'%;">'.$title."</div>\n";
$off = false; // Off-row means a different bgcolor $off = false; // Off-row means a different bgcolor
@ -641,7 +641,8 @@ class uiviews extends uical
// why do we use a div in a div which has the same height and width??? // why do we use a div in a div which has the same height and width???
// To make IE6 happy!!! Whithout the second div you can't use // To make IE6 happy!!! Whithout the second div you can't use
// style="left: 50px; right: 0px;" // style="left: 50px; right: 0px;"
$html .= $indent."\t".'<div id="calDayCols" class="calDayCols"><div style="width=100%; height: 100%;">'."\n"; $html .= $indent."\t".'<div id="calDayCols" class="calDayCols'.($this->bo->common_prefs['timeformat'] == 12 ? '12h' : '').
'"><div style="width=100%; height: 100%;">'."\n";
$dayCol_width = $dayCols_width / count($daysEvents); $dayCol_width = $dayCols_width / count($daysEvents);
$n = 0; $n = 0;
foreach($daysEvents as $day => $events) foreach($daysEvents as $day => $events)

11
calendar/templates/default/app.css
View File

@ -64,16 +64,17 @@
/* contains (multiple) dayCol's /* contains (multiple) dayCol's
*/ */
.calDayCols{ .calDayCols,.calDayCols12h{
position: absolute; position: absolute;
top: 0px; top: 0px;
height: 100%; height: 100%;
left: 50px; left: 45px;
right: 0px; right: 0px;
/* set via inline style on runtime: }
* left: width(calTimeRowTime) /* 12h timeformat with am/pm
* width: 100% - width(calTimeRowTime)
*/ */
.calDayCols12h{
left: 65px;
} }
/* contains (multiple) eventCol's /* contains (multiple) eventCol's