FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-17 17:36:01 +00:00
Code Issues Releases Wiki Activity

55_InfoPanel.pm: updated

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@7966 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
betateilchen 2015-02-13 23:52:14 +00:00
parent 627c44e06f
commit 81e44f3703
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fhem/FHEM/55_InfoPanel.pm
View File

@ -578,7 +578,7 @@ sub btIP_itemTextBox {
} }
sub btIP_itemTicker { sub btIP_itemTicker {
my ($id,$x,$y,$items,$speed,$arg,%params) = @_; my ($id,$x,$y,$width,$items,$speed,$arg,%params) = @_;
$id = ($id eq '-') ? createUniqueId() : $id; $id = ($id eq '-') ? createUniqueId() : $id;
my $pause = 2 * $speed; my $pause = 2 * $speed;
my $color = substr($params{rgb},0,6); my $color = substr($params{rgb},0,6);
@ -589,9 +589,11 @@ sub btIP_itemTicker {
"<script>\$(function() {\$('#${id}_ticker').vTicker('init', ". "<script>\$(function() {\$('#${id}_ticker').vTicker('init', ".
"{speed: $speed, pause: $pause, mousePause:true, showItems: $items, padding:$params{padding}});});</script>\n". "{speed: $speed, pause: $pause, mousePause:true, showItems: $items, padding:$params{padding}});});</script>\n".
"<div id=\"${id}_ticker\" style=\"position:relative; top:${y}px; left:${x}px; z-index:1; ". "<div id=\"${id}_ticker\" style=\"position:relative; top:${y}px; left:${x}px; z-index:1; ".
"width:${width}px; ".
"font-family:$params{font}; font-size:$params{pt}; color:#$color; \" >\n<ul>\n"; "font-family:$params{font}; font-size:$params{pt}; color:#$color; \" >\n<ul>\n";
foreach (@a) {$ticker .= sprintf($liTemplate,$_)}; foreach (@a) {$ticker .= sprintf($liTemplate,$_)};
$ticker .= "</ul>\n</div>\n</div>\n"; $ticker .= "</ul>\n</div>\n</div>\n";
return $ticker; return $ticker;
} }
@ -1116,12 +1118,12 @@ sub btIP_evalLayout {
} }
when("ticker") { when("ticker") {
($id,$x,$y,$format,$speed,$arg)= split("[ \t]+", $def, 6); ($id,$x,$y,$width,$format,$speed,$arg)= split("[ \t]+", $def, 7);
($x,$y)= btIP_xy($x,$y,%params); ($x,$y)= btIP_xy($x,$y,%params);
$params{xx} = $x; $params{xx} = $x;
$params{yy} = $y; $params{yy} = $y;
$arg = AnalyzePerlCommand(undef,$arg); $arg = AnalyzePerlCommand(undef,$arg);
$defs{$name}{fhem}{div} .= btIP_itemTicker($id,$x,$y,$format,$speed,$arg,%params); $defs{$name}{fhem}{div} .= btIP_itemTicker($id,$x,$y,$width,$format,$speed,$arg,%params);
} }
when("time") { when("time") {
@ -1137,8 +1139,8 @@ sub btIP_evalLayout {
($x,$y)= btIP_xy($x,$y,%params); ($x,$y)= btIP_xy($x,$y,%params);
$fgcolor = AnalyzePerlCommand(undef,$fgcolor); $fgcolor = AnalyzePerlCommand(undef,$fgcolor);
$bgcolor = AnalyzePerlCommand(undef,$bgcolor); $bgcolor = AnalyzePerlCommand(undef,$bgcolor);
$link = AnalyzePerlCommand(undef,$link); $link = AnalyzePerlCommand(undef,$link);
$svg .= btIP_itemTrash($id,$x,$y,$scale,$fgcolor,$bgcolor,$link,%params); $svg .= btIP_itemTrash($id,$x,$y,$scale,$fgcolor,$bgcolor,$link,%params);
$params{xx} = $x; $params{xx} = $x;
$params{yy} = $y; $params{yy} = $y;
} }