fix for bug [ 1000255 ] Todo with progress screw formating in calender:

- partialy caused by a <div ... /> with no closing </div>
- a table around the icons and title, puts them in one line now
This commit is contained in:
Ralf Becker 2004-08-07 18:32:03 +00:00
parent c22cba8574
commit 9a58928b81
2 changed files with 5 additions and 4 deletions

View File

@ -482,15 +482,16 @@
$title = ($do_events?$GLOBALS['phpgw']->common->formattime(date('H',$info['info_startdate']+$this->tz_offset_sec),date('i',$info['info_startdate']+$this->tz_offset_sec)).' ':'').
$info['info_subject'];
$view = $this->link->view('infolog',$info['info_id']);
$content = '';
$content=array();
foreach($icons = array(
$info['info_type'] => 'infolog',
$info['info_status'] => 'infolog'
) as $name => $app)
{
$content .= $GLOBALS['phpgw']->html->image($app,$name,lang($name),'border="0" width="15" height="15"').' ';
$content[] = $GLOBALS['phpgw']->html->image($app,$name,lang($name),'border="0" width="15" height="15"').' ';
}
$content = $GLOBALS['phpgw']->html->a_href($content.'&nbsp;'.$title,$view).'<br>';
$content[] = $GLOBALS['phpgw']->html->a_href($title,$view);
$content = $GLOBALS['phpgw']->html->table(array(1 => $content));
$to_include[] = array(
'starttime' => $info['info_startdate']+$this->tz_offset_sec,

View File

@ -516,7 +516,7 @@ htmlareaConfig.editorURL = '."'$this->phpgwapi_js_url/htmlarea/';";
return '<div title="'.$title.'" '.$options.
' style="height: '.$height.'; width: '.$width.'; border: 1px solid black; padding: 1px;'.
(stristr($options,'onclick="') ? ' cursor: pointer; cursor: hand;' : '').'">'."\n\t".
'<div style="height: '.$height.'; width: '.$percent.'%; background: '.$color.';" />'."\n</div>\n";
'<div style="height: '.$height.'; width: '.$percent.'%; background: '.$color.';"></div>'."\n</div>\n";
}
function image( $app,$name,$title='',$options='' )