mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FHEMWEB: Removed left text with link in the room overview. from elements with

Browse Source 
group attribute, which are rendered usually at end (e.g. readingsGroup, SVG)


git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@4226 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig
2013-11-15 12:57:17 +00:00
parent a8f59067f1
commit b4d7ae224c
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
fhem/FHEM/01_FHEMWEB.pm
View File

@@ -1110,12 +1110,14 @@ FW_showRoom()
# attribute)
my @devs= grep { ($FW_rooms{$FW_room}{$_}||$FW_room eq "all") &&
!IsIgnored($_) } keys %defs;
my (%group, @atEnds);
my (%group, @atEnds, %usuallyAtEnd);
foreach my $dev (@devs) {
if($modules{$defs{$dev}{TYPE}}{FW_atPageEnd} &&
!AttrVal($dev, "group", undef)) {
push @atEnds, $dev;
next;
if($modules{$defs{$dev}{TYPE}}{FW_atPageEnd}) {
$usuallyAtEnd{$dev} = 1;
if(!AttrVal($dev, "group", undef)) {
push @atEnds, $dev;
next;
}
}
foreach my $grp (split(",", AttrVal($dev, "group", $FW_types{$dev}))) {
next if($FW_hiddengroup{$grp});
@@ -1156,13 +1158,14 @@ FW_showRoom()
if($FW_hiddenroom{detail}) {
FW_pO "<td><div class=\"col1\">$icon$devName</div></td>";
} else {
FW_pH "detail=$d", "$icon$devName", 1, "col1";
FW_pH "detail=$d", "$icon$devName", 1, "col1" if(!$usuallyAtEnd{$d});
}
$row++;
my ($allSets, $cmdlist, $txt) = FW_devState($d, $rf, \%extPage);
FW_pO "<td informId=\"$d\">$txt</td>";
my $colSpan = ($usuallyAtEnd{$d} ? ' colspan="2"' : '');
FW_pO "<td informId=\"$d\"$colSpan>$txt</td>";
######
# Commands, slider, dropdown