FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 12:49:34 +00:00
Code Issues Releases Wiki Activity

f18.js: fix line between readingGroups (Forum #92369)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@17612 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2018-10-24 15:06:20 +00:00
parent 777eff18cc
commit 152f62c95d
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fhem/FHEM/01_FHEMWEB.pm
View File

@ -1839,6 +1839,7 @@ FW_showRoom()
my @devs= grep { (($FW_rooms{$FW_room} && $FW_rooms{$FW_room}{$_}) || my @devs= grep { (($FW_rooms{$FW_room} && $FW_rooms{$FW_room}{$_}) ||
$FW_room eq "all") && !IsIgnored($_) } keys %defs; $FW_room eq "all") && !IsIgnored($_) } keys %defs;
my (%group, @atEnds, %usuallyAtEnd, %sortIndex); my (%group, @atEnds, %usuallyAtEnd, %sortIndex);
my $nDevsInRoom = 0;
foreach my $dev (@devs) { foreach my $dev (@devs) {
if($modules{$defs{$dev}{TYPE}}{FW_atPageEnd}) { if($modules{$defs{$dev}{TYPE}}{FW_atPageEnd}) {
$usuallyAtEnd{$dev} = 1; $usuallyAtEnd{$dev} = 1;
@ -1854,6 +1855,7 @@ FW_showRoom()
next if($hge && $grp =~ m/$hge/); next if($hge && $grp =~ m/$hge/);
$sortIndex{$dev} = FW_sortIndex($dev); $sortIndex{$dev} = FW_sortIndex($dev);
$group{$grp}{$dev} = 1; $group{$grp}{$dev} = 1;
$nDevsInRoom++;
} }
} }
@ -1906,7 +1908,8 @@ FW_showRoom()
} }
FW_pO "</tr>" if($maxc != -1); FW_pO "</tr>" if($maxc != -1);
FW_pO "</table><br>"; FW_pO "</table>";
FW_pO "<br>" if(@atEnds && $nDevsInRoom);
# Now the "atEnds" # Now the "atEnds"
my $doBC = (AttrVal($FW_wname, "plotfork", 0) && my $doBC = (AttrVal($FW_wname, "plotfork", 0) &&

4
fhem/www/pgm2/f18.js
View File

@ -111,8 +111,10 @@ f18_menu()
function function
f18_tables() f18_tables()
{ {
$("table.roomoverview > tbody > tr > td > .devType:not(:first)") // one-column roomoverview & readingsGroup
$("div#content > table > tbody > tr > td > .devType:not(:first)")
.css("margin-top", "20px"); .css("margin-top", "20px");
// multi-column roomoverview
$("table.column tbody tr:not(:first-child) .devType") $("table.column tbody tr:not(:first-child) .devType")
.css("margin-top", "20px"); .css("margin-top", "20px");