FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-03 16:56:54 +00:00
Code Issues Releases Wiki Activity

FHEMWEB: weblink with group attribute is shown together with other elements

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@1902 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2012-09-30 06:08:12 +00:00
parent b1b292a993
commit 4aaa5b9b47
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -62,6 +62,7 @@
- feature: module IPCAM added. (M. Fischer)
- feature: module HTTPSRV added (Boris)
- feature: module FLOORPLAN added (Uli Maass)
- bugfix: FHEMWEB: weblink with group attribute is shown together with other elements
- 2011-12-31 (5.2)
- bugfix: applying smallscreen attributes to firefox/opera

13
fhem/FHEM/01_FHEMWEB.pm
View File

@ -1008,7 +1008,7 @@ FW_showRoom()
my %group;
foreach my $dev (@devs) {
next if($defs{$dev}{TYPE} eq "weblink");
next if($defs{$dev}{TYPE} eq "weblink" && !AttrVal($dev, "group", undef));
foreach my $grp (split(",", AttrVal($dev, "group", $FW_types{$dev}))) {
$group{$grp}{$dev} = 1;
}
@ -1047,9 +1047,18 @@ FW_showRoom()
}
$row++;
if($type eq "weblink") {
FW_pO "<td>";
FW_showWeblink($d, $defs{$d}{LINK}, $defs{$d}{WLTYPE}, undef);
FW_pO "</td>";
next;
}
my ($allSets, $cmdlist, $txt) = FW_devState($d, $rf);
FW_pO "<td id=\"$d\">$txt";
######
# Commands, slider, dropdown
if(!$FW_ss) {
FW_pO "</td>";
if($cmdlist) {
@ -1125,7 +1134,7 @@ FW_showRoom()
foreach my $d (sort @list) {
next if(IsIgnored($d));
my $type = $defs{$d}{TYPE};
next if(!$type || $type ne "weblink");
next if(!$type || $type ne "weblink" || AttrVal($d, "group", undef));
$buttons = FW_showWeblink($d, $defs{$d}{LINK}, $defs{$d}{WLTYPE}, $buttons);
}