2
0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-27 04:35:34 +00:00

Minor repair of html-output

git-svn-id: https://svn.fhem.de/fhem/trunk@1524 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
ulimaass 2012-05-02 17:59:43 +00:00
parent f0ec5f874c
commit dbd38c849c

View File

@ -22,6 +22,7 @@
# 0014: deleted $data{FWEXT}{$fhem_url}{STYLESHEET} , added attr-values for FHEMWEB-detail-screen, adapted FHT-representation to FHT.pm updates (Apr 19, 2012) # 0014: deleted $data{FWEXT}{$fhem_url}{STYLESHEET} , added attr-values for FHEMWEB-detail-screen, adapted FHT-representation to FHT.pm updates (Apr 19, 2012)
# 0015: implemented Tobias' icon subfolder solution, fp_arrange detail always (fp_arrange detail deprecated, fp_arrange 1 shows all detail), # 0015: implemented Tobias' icon subfolder solution, fp_arrange detail always (fp_arrange detail deprecated, fp_arrange 1 shows all detail),
# changed backimg-size to 99% to avoid scrollbars , adopted slider & new FHT representation (May 1, 2012) # changed backimg-size to 99% to avoid scrollbars , adopted slider & new FHT representation (May 1, 2012)
# 0016: Minor repair of html-output
# #
################################################################ ################################################################
# #
@ -452,7 +453,7 @@ FP_show(){
my @cList = split(":", $cmdlist); my @cList = split(":", $cmdlist);
my @rList = map { ReplaceEventMap($d,$_,1) } @cList; my @rList = map { ReplaceEventMap($d,$_,1) } @cList;
my $firstIdx = 0; my $firstIdx = 0;
FW_pO " <tr class=\"devicecommands\" id=\"$d\">";
# Special handling (slider, dropdown) # Special handling (slider, dropdown)
my $cmd = $cList[0]; my $cmd = $cList[0];
if($allSets && $allSets =~ m/$cmd:([^ ]*)/) { if($allSets && $allSets =~ m/$cmd:([^ ]*)/) {
@ -488,25 +489,22 @@ FP_show(){
$txt = Value($d); $txt = Value($d);
$txt =~ s/$cmd //; $txt =~ s/$cmd //;
} }
FW_pO "<td>". FW_pO "<td>\n".
FP_input("dev.$d", $d, "hidden") . FP_input("dev.$d", $d, "hidden") .
FP_input("arg.$d", "desired-temp", "hidden") . FP_input("arg.$d", "desired-temp", "hidden") .
FW_select("val.$d", \@tv, ReadingsVal($d, "desired-temp", $txt),"devicecommands") . FW_select("val.$d", \@tv, ReadingsVal($d, "desired-temp", $txt),"devicecommands") .
# FW_select("val.$d", \@tv,
# ReadingsVal($d, "desired-temp", $txt),"fht") .
FW_submit("cmd.$d", "set"). FW_submit("cmd.$d", "set").
"</td></tr>"; "</td>";
} }
} }
for(my $idx=$firstIdx; $idx < @cList; $idx++) { for(my $idx=$firstIdx; $idx < @cList; $idx++) {
FW_pH "cmd.$d=set $d $cList[$idx]", FW_pH "cmd.$d=set $d $cList[$idx]",
ReplaceEventMap($d,$cList[$idx],1),1,"devicecommands"; ReplaceEventMap($d,$cList[$idx],1),1,"devicecommands";
} }
FW_pO "</tr>";
} elsif($type eq "FileLog") { } elsif($type eq "FileLog") {
# $row = FW_dumpFileLog($d, 1, $row); # $row = FW_dumpFileLog($d, 1, $row);
} }
FW_pO "</td>";
FW_pO "</table></form>"; FW_pO "</table></form>";
FW_pO "</div>\n"; FW_pO "</div>\n";