extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-06 02:02:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix for bug #416454

Browse Source
This commit is contained in:
skeeter 2001-04-18 17:04:40 +00:00
parent c4040201e8
commit 6972306f8f
3 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
calendar/inc/class.calendar.inc.php
View File

@ -1263,18 +1263,41 @@ class calendar extends calendar_
$phpgw->preferences->save_repository();
}
if($phpgw_info['user']['preferences']['common']['time_format'] == '12')
$t_format = $phpgw_info['user']['preferences']['common']['time_format'];
$browser = CreateObject('phpgwapi.browser');
$browser->browser();
$browser_agent = $browser->get_agent();
if($browser_agent == 'MOZILLA')
{
$time_width=15;
if($t_format == '12')
{
$time_width=48;
}
else
{
$time_width=26;
}
}
else
{
$time_width=9;
if($t_format == '12')
{
$time_width=20;
}
else
{
$time_width=14;
}
}
$var = Array(
'event_width' => (100 - $time_width),
'time_width' => $time_width
'event_width' => (100 - $time_width),
'time_width' => $time_width,
'time_bgcolor' => $phpgw_info['theme']['cal_dayview'],
'bg_time_image' => $this->phpgwapi_template_dir.'/navbar_filler.jpg',
'font_color' => $phpgw_info['theme']['bg_text'],
'font' => $phpgw_info['theme']['font']
);
$p->set_var($var);
$first_hour = (int)$phpgw_info['user']['preferences']['calendar']['workdaystarts'] + 1;
@ -1341,15 +1364,7 @@ class calendar extends calendar_
$this->last_row = $i;
}
}
$var = Array(
'time_bgcolor' => $phpgw_info['theme']['cal_dayview'],
'bg_time_image' => $this->phpgwapi_template_dir.'/navbar_filler.jpg',
'font_color' => $phpgw_info['theme']['bg_text'],
'font' => $phpgw_info['theme']['font']
);
$p->set_var($var);
if (isset($time[99]) && strlen($time[99]) > 0)
{
$var = Array(

4
calendar/templates/default/day_cal.tpl
View File

@ -17,10 +17,12 @@
{
width: {time_width}%;
background-image: url('{bg_time_image}');
background-repeat: repeat;
border-width: 1;
color: #{font_color};
font-family: {font};
font-size: 65%;
line-height: 110%;
line-height: 100%;
vertical-align: middle;
}

4
calendar/templates/idsociety/day_cal.tpl
View File

@ -17,10 +17,12 @@
{
width: {time_width}%;
background-image: url('{bg_time_image}');
background-repeat: repeat;
border-width: 1;
color: #{font_color};
font-family: {font};
font-size: 65%;
line-height: 110%;
line-height: 100%;
vertical-align: middle;
}