FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-08 19:32:42 +00:00
Code Issues Releases Wiki Activity

55_InfoPanel.pm: updated

Browse Source 
added Dashboard compatibility

git-svn-id: https://svn.fhem.de/fhem/trunk@7974 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
betateilchen 2015-02-14 13:29:02 +00:00
parent 14a2745121
commit 0b704ea4a4
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
fhem/FHEM/55_InfoPanel.pm
View File

@ -1200,10 +1200,14 @@ sub btIP_addExtension {
$data{FWEXT}{$url}{LINK} = "+$link";
$data{FWEXT}{$url}{NAME} = $friendlyname;
$data{FWEXT}{$url}{FORKABLE} = 0;
$data{FWEXT}{$url}{SCRIPT} = '/pgm2/jquery.min.js"></script>' .
'<script type="text/javascript" src="http://richhollis.github.com/vticker/downloads/jquery.vticker.min.js?v=1.15"></script>' .
# '<script type="text/javascript" src="/fhem/pgm2/jquery.vticker.min.js"></script>' .
'<script type="text/javascript" charset="UTF-8';
# $data{FWEXT}{$url}{SCRIPT} = '/pgm2/jquery.min.js"></script>' .
$data{FWEXT}{jquery}{SCRIPT} = "/pgm2/jquery.min.js" unless $data{FWEXT}{jquery}{SCRIPT};
$data{FWEXT}{jqueryvticker}{SCRIPT} = "/pgm2/jquery.vticker.min.js" unless $data{FWEXT}{jqueryvticker}{SCRIPT};
## '<script type="text/javascript" src="http://richhollis.github.com/vticker/downloads/jquery.vticker.min.js?v=1.15"></script>' .
## '<script type="text/javascript" src="/fhem/pgm2/jquery.vticker.min.js"></script>' .
## '<script type="text/javascript" charset="UTF-8';
}
sub btIP_CGI{
@ -1289,19 +1293,19 @@ sub btIP_HTMLHead {
sub btIP_getScript {
my $scripts= "";
my $jsTemplate = '<script type="text/javascript" src="%s"></script>'."\n";
# if(defined($data{FWEXT})) {
# foreach my $k (sort keys %{$data{FWEXT}}) {
# my $h = $data{FWEXT}{$k};
# next if($h !~ m/HASH/ || !$h->{SCRIPT});
# my $script = $h->{SCRIPT};
# $script = ($script =~ m,^/,) ? "$FW_ME$script" : "$FW_ME/pgm2/$script";
# $scripts .= sprintf($jsTemplate, $script);
# }
# }
$scripts .= sprintf($jsTemplate,"$FW_ME/pgm2/jquery.min.js");
$scripts .= sprintf($jsTemplate,"http://richhollis.github.com/vticker/downloads/jquery.vticker.min.js?v=1.15");
# $scripts =~ s/script>/script>\n/g;
my $jsTemplate = '<script type="text/javascript" src="%s"></script>';
if(defined($data{FWEXT})) {
foreach my $k (sort keys %{$data{FWEXT}}) {
my $h = $data{FWEXT}{$k};
next if($h !~ m/HASH/ || !$h->{SCRIPT});
my $script = $h->{SCRIPT};
$script = ($script =~ m,^/,) ? "$FW_ME$script" : "$FW_ME/pgm2/$script";
$scripts .= sprintf($jsTemplate, $script);
}
}
# $scripts .= sprintf($jsTemplate,"$FW_ME/pgm2/jquery.min.js");
# $scripts .= sprintf($jsTemplate,"http://richhollis.github.com/vticker/downloads/jquery.vticker.min.js?v=1.15");
$scripts =~ s/script>/script>\n/g;
return $scripts;
}