FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-16 23:06:05 +00:00
Code Issues Releases Wiki Activity

01_FHEMWEB.pm: fix webCmdLabel for widgets (Forum #72581)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@14861 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2017-08-07 09:52:16 +00:00
parent 23e90dc80b
commit d2b86d5556
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
fhem/FHEM/01_FHEMWEB.pm
View File

@ -1721,29 +1721,27 @@ FW_makeDeviceLine($$$$$)
last if(defined($htmlTxt));
}
}
if($htmlTxt) {
FW_pO $htmlTxt;
if($htmlTxt) {
$htmlTxt =~ s,^<td[^>]*>(.*)</td>$,$1,;
} else {
my $nCmd = $cmdIcon{$cmd} ?
FW_makeImage($cmdIcon{$cmd},$cmd,"webCmd") : $cmd;
if(@wcl > $i1) {
if($nRows > 1) {
FW_pO "<td><table class='wide'><tr>" if($i1 == 0);
FW_pO "<td>$wcl[$i1]</td><td>";
FW_pH "cmd.$d=set $d $cmd$rf", $nCmd, 0, "col3";
FW_pO "</td>";
FW_pO "</tr><tr>" if($wcl[$i1] =~ m/\n/);
FW_pO "</tr></table></td>" if($i1 == @cl-1);
} else {
FW_pO "<td><div class='col3'>$wcl[$i1] ";
FW_pH "cmd.$d=set $d $cmd$rf", $nCmd, 0, "", 0, 1;
FW_pO "</div></td>";
}
$htmlTxt = FW_pH "cmd.$d=set $d $cmd$rf", $nCmd, 0, "", 1, 1;
}
if(@wcl > $i1) {
if($nRows > 1) {
FW_pO "<td><table class='wide'><tr>" if($i1 == 0);
FW_pO "<td>$wcl[$i1]</td><td>$htmlTxt</td>";
FW_pO "</tr><tr>" if($wcl[$i1] =~ m/\n/);
FW_pO "</tr></table></td>" if($i1 == @cl-1);
} else {
FW_pH "cmd.$d=set $d $cmd$rf", $nCmd, 1, "col3";
FW_pO "<td><div class='col3'>$wcl[$i1]$ htmlTxt</div></td>";
}
} else {
FW_pO "<td><div class='col3'>$htmlTxt</div></td>";
}
}
}