holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed not working category color of rows (calendar, addressbook)

Browse Source
This commit is contained in:
Ralf Becker 2011-05-30 11:08:37 +00:00
parent 2e84fb63e2
commit a147a9a4a8
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
etemplate/inc/class.etemplate.inc.php
View File

@ -729,7 +729,7 @@ class etemplate extends boetemplate
if (($color = $data['color'])) if (($color = $data['color']))
{ {
//echo "<p>cats2color($cats)=$color</p>\n"; //echo "<p>cats2color('$cats')=$color</p>\n";
return $cat2color[$cats] = $cat2color[$cat] = $color; return $cat2color[$cats] = $cat2color[$cat] = $color;
} }
} }
@ -821,14 +821,13 @@ class etemplate extends boetemplate
if ($cl == '@' || $cl && strpos($cl,'$') !== false) if ($cl == '@' || $cl && strpos($cl,'$') !== false)
{ {
$cl = $this->expand_name($cl,0,$r,$content['.c'],$content['.row'],$content); $cl = $this->expand_name($cl,0,$r,$content['.c'],$content['.row'],$content);
if (!$cl || preg_match('/(^| )([0-9,]+)( |$)/',$cl,$matches))
if (!$cl || preg_match('/^[0-9,]*$/',$cl))
{ {
if (($color = $this->cats2color($cl))) if (($color = $this->cats2color($matches[2])))
{ {
$rows[".$row"] .= ' style="background-color: '.$color.';"'; $rows[".$row"] .= ' style="background-color: '.$color.';"';
} }
$cl = 'row'; $cl = str_replace($matches[2],'row',$cl);
} }
} }
if ($cl == 'nmr' || substr($cl,0,3) == 'row') // allow to have further classes behind row if ($cl == 'nmr' || substr($cl,0,3) == 'row') // allow to have further classes behind row