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

95_Dashboard: fixed issue with disappearing menu and command input in room 'Everything'

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@9035 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
talkabout 2015-08-08 16:17:43 +00:00
parent 3b8e93cb17
commit 5d86e73da9
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fhem/CHANGED
View File

@ -1,5 +1,7 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it.
- bugfix: 95_Dashboard: fixed issue with disappearing menu and command input in
room "Everything"
- feature: 57_Calendar: made download from URL non-blocking
- bugfix: 95_Dashboard: fixed problem with smallscreen styles that caused devices
to be shown in wrong tabs

20
fhem/FHEM/95_Dashboard.pm
View File

@ -357,6 +357,17 @@ sub Dashboard_CGI($)
$ret = '<div id="content">';
if ($name && defined($defs{$name})) {
my $showfullsize = AttrVal($defs{$name}{NAME}, "dashboard_showfullsize", 0);
if ($showfullsize) {
if ($FW_RET =~ m/<body[^>]*class="([^"]+)"[^>]*>/) {
$FW_RET =~ s/class="$1"/class="$1 dashboard_fullsize"/;
}
else {
$FW_RET =~ s/<body/<body class="dashboard_fullsize"/;
}
}
$ret .= Dashboard_SummaryFN($FW_wname,$name,$FW_room,undef);
}
else {
@ -417,15 +428,6 @@ sub Dashboard_SummaryFN($$$$)
my @tabnames = ();
my @tabsortings = ();
if ($showfullsize) {
if ($FW_RET =~ m/<body[^>]*class="([^"]+)"[^>]*>/) {
$FW_RET =~ s/class="$1"/class="$1 dashboard_fullsize"/;
}
else {
$FW_RET =~ s/<body/<body class="dashboard_fullsize"/;
}
}
for (my $i = 0; $i < $tabcount; $i++) {
$tabnames[$i] = AttrVal($defs{$d}{NAME}, "dashboard_tab" . ($i + 1) . "name", "Dashboard-Tab " . ($i + 1));
$tabsortings[$i] = AttrVal($defs{$d}{NAME}, "dashboard_tab" . ($i + 1) . "sorting", "");