FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-21 07:56:03 +00:00
Code Issues Releases Wiki Activity

55_GDS,55_InfoPanel: updated

Browse Source 
minor improvements

git-svn-id: https://svn.fhem.de/fhem/trunk@8008 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
betateilchen 2015-02-16 12:28:29 +00:00
parent c273596045
commit 7d838a928c
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fhem/FHEM/55_GDS.pm
View File

@ -1246,7 +1246,7 @@ sub initDropdownLists($){
sub gdsHeadlines($;$) { sub gdsHeadlines($;$) {
my ($d,$sep) = @_; my ($d,$sep) = @_;
my $text; my $text = "";
$sep = (defined($sep)) ? $sep : '|'; $sep = (defined($sep)) ? $sep : '|';
my $count = ReadingsVal($d,'a_count',0); my $count = ReadingsVal($d,'a_count',0);
for (my $i = 0; $i < $count; $i++) { for (my $i = 0; $i < $count; $i++) {

9
fhem/FHEM/55_InfoPanel.pm
View File

@ -42,7 +42,7 @@
# 7995 - added: xcondition (can be overridden by set) # 7995 - added: xcondition (can be overridden by set)
# set ovClear,ovDisable,ovEnable # set ovClear,ovDisable,ovEnable
# get counter, layout, overrides # get counter, layout, overrides
# 7997 - removed: trashcan due to performance issues # - removed: trashcan due to performance issues
# - added: break condition for includes # - added: break condition for includes
# #
############################################## ##############################################
@ -670,7 +670,7 @@ 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; ". "width:${width}px; text-align:$params{tbalign}; ".
"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";
@ -1300,7 +1300,6 @@ sub btIP_splitRequest {
sub btIP_returnHTML { sub btIP_returnHTML {
my ($name) = @_; my ($name) = @_;
# my $url = btIP_getURL();
my $refresh = AttrVal($name, 'refresh', 60); my $refresh = AttrVal($name, 'refresh', 60);
my $title = AttrVal($name, 'title', $name); my $title = AttrVal($name, 'title', $name);
@ -1311,10 +1310,11 @@ sub btIP_returnHTML {
btIP_returnSVG($name)."\n</div>\n"; btIP_returnSVG($name)."\n</div>\n";
$code .= $defs{$name}{fhem}{div} if($defs{$name}{fhem}{div}); $code .= $defs{$name}{fhem}{div} if($defs{$name}{fhem}{div});
$code .= "</body>\n".btIP_HTMLTail(); $code .= "</body>\n".btIP_HTMLTail();
return ("text/html; charset=utf-8", $code); return ("text/html; charset=utf-8", $code);
} }
#style="display: none;" onload="document.getElementsByTagName('BODY')[0].style.display='block';"
sub btIP_HTMLHead { sub btIP_HTMLHead {
my ($name,$title,$refresh) = @_; my ($name,$title,$refresh) = @_;
my $doctype = '<?xml version="1.0" encoding="utf-8" standalone="no"?> '."\n". my $doctype = '<?xml version="1.0" encoding="utf-8" standalone="no"?> '."\n".
@ -1408,7 +1408,6 @@ Please read <a href="http://forum.fhem.de/index.php/topic,32828.0.html" target="
<br/> <br/>
<ul> <ul>
<li>layout tag img can not be used</li> <li>layout tag img can not be used</li>
<li>layout tag trash can not be used</li>
<li>layout tag plot can only handle scale = 1 and inline = 0</li> <li>layout tag plot can only handle scale = 1 and inline = 0</li>
</ul> </ul>
</li> </li>