mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

htmlCode type for weblink added

Browse Source 
git-svn-id: https://fhem.svn.sourceforge.net/svnroot/fhem/trunk/fhem@1311 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig
2012-03-04 09:20:26 +00:00
parent 9c6fc67556
commit b05e222b78
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
webfrontend/pgm2/01_FHEMWEB.pm
View File

@@ -1681,7 +1681,12 @@ FW_showWeblink($$$$)
my ($d, $v, $t, $buttons) = @_; my ($d, $v, $t, $buttons) = @_;
my $attr = AttrVal($d, "htmlattr", ""); my $attr = AttrVal($d, "htmlattr", "");
if($t eq "link") {
if($t eq "htmlCode") {
$v = AnalyzePerlCommand(undef, $v) if($v =~ m/^{(.*)}$/);
FW_pO $v;
} elsif($t eq "link") {
FW_pO "<a href=\"$v\" $attr>$d</a>"; # no FW_pH, want to open extra browser FW_pO "<a href=\"$v\" $attr>$d</a>"; # no FW_pH, want to open extra browser
} elsif($t eq "image") { } elsif($t eq "image") {

2
webfrontend/pgm2/98_weblink.pm
View File

@@ -22,7 +22,7 @@ weblink_Define($$)
{ {
my ($hash, $def) = @_; my ($hash, $def) = @_;
my ($type, $name, $wltype, $link) = split("[ \t]+", $def, 4); my ($type, $name, $wltype, $link) = split("[ \t]+", $def, 4);
my %thash = ( link=>1, fileplot=>1, image=>1, iframe=>1 ); my %thash = ( link=>1, fileplot=>1, image=>1, iframe=>1, htmlCode=>1 );
if(!$link || !$thash{$wltype}) { if(!$link || !$thash{$wltype}) {
return "Usage: define <name> weblink [" . return "Usage: define <name> weblink [" .