From 0b704ea4a4b796074fee3163353e88c63e8e0932 Mon Sep 17 00:00:00 2001
From: betateilchen <>
Date: Sat, 14 Feb 2015 13:29:02 +0000
Subject: [PATCH] 55_InfoPanel.pm: updated

added Dashboard compatibility

git-svn-id: https://svn.fhem.de/fhem/trunk@7974 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/55_InfoPanel.pm | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/fhem/FHEM/55_InfoPanel.pm b/fhem/FHEM/55_InfoPanel.pm
index 94043e512..7131e8236 100644
--- a/fhem/FHEM/55_InfoPanel.pm
+++ b/fhem/FHEM/55_InfoPanel.pm
@@ -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; 
 }