Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

webCmd also hyperlink in detail window

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@3359 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2013-06-29 11:33:47 +00:00
parent 46d2a00866
commit f3db90d11b
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
FHEM/01_FHEMWEB.pm
View File

@ -691,22 +691,23 @@ FW_makeTable($$$@)
if($n eq "DEF" && !$FW_hiddenroom{input}) { if($n eq "DEF" && !$FW_hiddenroom{input}) {
FW_makeEdit($name, $n, $val); FW_makeEdit($name, $n, $val);
} else { }
else {
FW_pO "<td><div class=\"dname\">$n</div></td>"; FW_pO "<td><div class=\"dname\">$n</div></td>";
if(ref($val)) { if(ref($val)) {#handle readings
my ($v, $t) = ($val->{VAL}, $val->{TIME}); my ($v, $t) = ($val->{VAL}, $val->{TIME});
$v = FW_htmlEscape($v); $v = FW_htmlEscape($v);
if($FW_ss) { if($FW_ss) {
$t = ($t ? "<br><div class=\"tiny\">$t</div>" : ""); $t = ($t ? "<br><div class=\"tiny\">$t</div>" : "");
FW_pO "<td><div class=\"dval\">$v$t</div></td>"; FW_pO "<td><div class=\"dval\">$v$t</div></td>";
} else { } else {
$t = "" if(!$t); $t = "" if(!$t);
FW_pO "<td><div id=\"$name-$n\">$v</div></td>"; FW_pO "<td><div id=\"$name-$n\">$v</div></td>";
FW_pO "<td><div id=\"$name-$n-ts\">$t</div></td>"; FW_pO "<td><div id=\"$name-$n-ts\">$t</div></td>";
} }
} else { }
else {
$val = FW_htmlEscape($val); $val = FW_htmlEscape($val);
# if possible provide link to reference # if possible provide link to reference
if ($n eq "room"){ if ($n eq "room"){
@ -716,6 +717,13 @@ FW_makeTable($$$@)
.join(",",@tmp) .join(",",@tmp)
."</div></td>"; ."</div></td>";
} }
elsif ($n eq "webCmd"){
my @tmp;
push @tmp,FW_pH("cmd.$name=set $name $_&detail=$name" , $_ ,0,"",1,1)foreach(split(":",$val));
FW_pO "<td><div id=\"$name-$n\">"
.join(":",@tmp)
."</div></td>";
}
elsif ($n =~ m/^fp_(.*)/ && $defs{$1}){#special for Floorplan elsif ($n =~ m/^fp_(.*)/ && $defs{$1}){#special for Floorplan
FW_pH "detail=$1", $val,1; FW_pH "detail=$1", $val,1;
} }

1
FHEM/HMConfig.pm
View File

@ -345,6 +345,7 @@ my %culHmRegDefine = (
# addr Dec!! # addr Dec!!
# SEC-WM55 02:01 (AES on?) # SEC-WM55 02:01 (AES on?)
# SEC-WDS 02:01 16:01(sabotage) ? # SEC-WDS 02:01 16:01(sabotage) ?
# HM-SEC-MDIR 02:01 ?
# SEC-SC 02:00 ? # SEC-SC 02:00 ?
# Blind 9:00 10:00 20:00 # Blind 9:00 10:00 20:00
# BL1TPBU 02:01 21:FF # BL1TPBU 02:01 21:FF