From 97ffa43780fb38b456cf8afab0cddb5582b05a25 Mon Sep 17 00:00:00 2001 From: rudolfkoenig Date: Fri, 30 Oct 2015 09:51:09 +0000 Subject: [PATCH] 10_ZWave.pm: resize/reseat the pepper image (Forum #43218) git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@9722 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/10_ZWave.pm | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/fhem/FHEM/10_ZWave.pm b/fhem/FHEM/10_ZWave.pm index 50289fed7..83434219e 100755 --- a/fhem/FHEM/10_ZWave.pm +++ b/fhem/FHEM/10_ZWave.pm @@ -21,7 +21,7 @@ sub ZWave_secEnd($); use vars qw(%zw_func_id); use vars qw(%zw_type6); -use vars qw($FW_ME); +use vars qw($FW_ME $FW_tp $FW_ss); my %zwave_id2class; my %zwave_class = ( @@ -2948,13 +2948,21 @@ ZWave_fhemwebFn($$$$) { my ($FW_wname, $d, $room, $pageHash) = @_; # pageHash is set for summaryFn. - my $pl=""; # Pepper link and image + my $pl = ""; # Pepper link and image my $model = ReadingsVal($d, "modelId", ""); if($model) { - $pl .= "
"; + my $link = $zwave_pepperLink{$model}; + $pl .= ""; + my $img = $zwave_pepperImg{$model}; - if($img) { - $pl .= ""; + if($img && !$FW_ss) { + $pl .= "
"; + $pl .= ""; + $pl .= "
"; my $fn = $attr{global}{modpath}."/www/deviceimages/zwave/$img"; if(!-f $fn) { # Cache the picture my $data = GetFileFromURL("http://fhem.de/deviceimages/zwave/$img"); @@ -2964,18 +2972,16 @@ ZWave_fhemwebFn($$$$) } } } - my $link = $zwave_pepperLink{$model}; - $pl .= "
Details in pepper1.net" if($link); - $pl .= "
"; } return - '
'.$pl. + "
$pl". '