From f3db90d11bd62e4731df49f49f2bbe75edea1d2b Mon Sep 17 00:00:00 2001 From: martinp876 <> Date: Sat, 29 Jun 2013 11:33:47 +0000 Subject: [PATCH] webCmd also hyperlink in detail window git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@3359 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- FHEM/01_FHEMWEB.pm | 18 +++++++++++++----- FHEM/HMConfig.pm | 1 + 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/FHEM/01_FHEMWEB.pm b/FHEM/01_FHEMWEB.pm index 11cc338c1..34f63adf2 100755 --- a/FHEM/01_FHEMWEB.pm +++ b/FHEM/01_FHEMWEB.pm @@ -691,22 +691,23 @@ FW_makeTable($$$@) if($n eq "DEF" && !$FW_hiddenroom{input}) { FW_makeEdit($name, $n, $val); - } else { + } + else { FW_pO "
$n
"; - if(ref($val)) { + if(ref($val)) {#handle readings my ($v, $t) = ($val->{VAL}, $val->{TIME}); $v = FW_htmlEscape($v); if($FW_ss) { $t = ($t ? "
$t
" : ""); FW_pO "
$v$t
"; - - } else { + } else { $t = "" if(!$t); FW_pO "
$v
"; FW_pO "
$t
"; } - } else { + } + else { $val = FW_htmlEscape($val); # if possible provide link to reference if ($n eq "room"){ @@ -716,6 +717,13 @@ FW_makeTable($$$@) .join(",",@tmp) .""; } + elsif ($n eq "webCmd"){ + my @tmp; + push @tmp,FW_pH("cmd.$name=set $name $_&detail=$name" , $_ ,0,"",1,1)foreach(split(":",$val)); + FW_pO "
" + .join(":",@tmp) + ."
"; + } elsif ($n =~ m/^fp_(.*)/ && $defs{$1}){#special for Floorplan FW_pH "detail=$1", $val,1; } diff --git a/FHEM/HMConfig.pm b/FHEM/HMConfig.pm index 9637a5ed2..7f5e476a1 100644 --- a/FHEM/HMConfig.pm +++ b/FHEM/HMConfig.pm @@ -345,6 +345,7 @@ my %culHmRegDefine = ( # addr Dec!! # SEC-WM55 02:01 (AES on?) # SEC-WDS 02:01 16:01(sabotage) ? +# HM-SEC-MDIR 02:01 ? # SEC-SC 02:00 ? # Blind 9:00 10:00 20:00 # BL1TPBU 02:01 21:FF