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

room all readded

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@1034 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2011-10-01 15:48:02 +00:00
parent f9134349ca
commit 4e5a7d404e
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fhem/webfrontend/pgm2/01_FHEMWEB.pm
View File

@ -776,7 +776,6 @@ FW_showRoom()
pO "<div id=\"content\">";
pO " <table>"; # Need for equal width of subtables
my @list = ($FW_room eq "all" ? keys %defs : keys %{$FW_rooms{$FW_room}});
my $rf = ($FW_room ? "&amp;room=$FW_room" : ""); # stay in the room
my $row=1;
@ -786,9 +785,10 @@ FW_showRoom()
#################
# Check if there is a device of this type in the room
my @devs = grep { $FW_rooms{$FW_room}{$_} && !IsIgnored($_) }
keys %{$FW_types{$type}};
next if($FW_room && $FW_room ne "all" && !@devs);
$FW_room = "" if(!defined($FW_room));
my @devs = grep { ($FW_rooms{$FW_room}{$_}||$FW_room eq "all") &&
!IsIgnored($_) } keys %{$FW_types{$type}};
next if(!@devs);
pO " <tr><td><div class=\"devType\">$type</div></td></tr>";
pO " <tr><td>";
@ -879,6 +879,7 @@ FW_showRoom()
# Now the weblinks
my $buttonsDisplayed;
my @list = ($FW_room eq "all" ? keys %defs : keys %{$FW_rooms{$FW_room}});
foreach my $d (sort @list) {
next if(IsIgnored($d));
my $type = $defs{$d}{TYPE};