From 2ccb5135ff174b8b74b45246f566ba7b153b2f47 Mon Sep 17 00:00:00 2001
From: rudolfkoenig <>
Date: Wed, 24 Oct 2018 15:06:20 +0000
Subject: [PATCH] f18.js: fix line between readingGroups (Forum #92369)
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@17612 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
FHEM/01_FHEMWEB.pm | 5 ++++-
www/pgm2/f18.js | 4 +++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/FHEM/01_FHEMWEB.pm b/FHEM/01_FHEMWEB.pm
index 1be6e94d4..7af5a6ccf 100644
--- a/FHEM/01_FHEMWEB.pm
+++ b/FHEM/01_FHEMWEB.pm
@@ -1839,6 +1839,7 @@ FW_showRoom()
my @devs= grep { (($FW_rooms{$FW_room} && $FW_rooms{$FW_room}{$_}) ||
$FW_room eq "all") && !IsIgnored($_) } keys %defs;
my (%group, @atEnds, %usuallyAtEnd, %sortIndex);
+ my $nDevsInRoom = 0;
foreach my $dev (@devs) {
if($modules{$defs{$dev}{TYPE}}{FW_atPageEnd}) {
$usuallyAtEnd{$dev} = 1;
@@ -1854,6 +1855,7 @@ FW_showRoom()
next if($hge && $grp =~ m/$hge/);
$sortIndex{$dev} = FW_sortIndex($dev);
$group{$grp}{$dev} = 1;
+ $nDevsInRoom++;
}
}
@@ -1906,7 +1908,8 @@ FW_showRoom()
}
FW_pO "" if($maxc != -1);
- FW_pO "
";
+ FW_pO "";
+ FW_pO "
" if(@atEnds && $nDevsInRoom);
# Now the "atEnds"
my $doBC = (AttrVal($FW_wname, "plotfork", 0) &&
diff --git a/www/pgm2/f18.js b/www/pgm2/f18.js
index 030502865..37b4e8100 100644
--- a/www/pgm2/f18.js
+++ b/www/pgm2/f18.js
@@ -111,8 +111,10 @@ f18_menu()
function
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");
+ // multi-column roomoverview
$("table.column tbody tr:not(:first-child) .devType")
.css("margin-top", "20px");