From b4d7ae224cafcf3ef9c35f650b512a14e97fe71a Mon Sep 17 00:00:00 2001 From: rudolfkoenig Date: Fri, 15 Nov 2013 12:57:17 +0000 Subject: [PATCH] FHEMWEB: Removed left text with link in the room overview. from elements with 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 --- fhem/FHEM/01_FHEMWEB.pm | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm index b1fd650a0..40a65588c 100755 --- a/fhem/FHEM/01_FHEMWEB.pm +++ b/fhem/FHEM/01_FHEMWEB.pm @@ -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 "
$icon$devName
"; } 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 "$txt"; + my $colSpan = ($usuallyAtEnd{$d} ? ' colspan="2"' : ''); + FW_pO "$txt"; ###### # Commands, slider, dropdown