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

Dashboard: fixed smallscreen issue - fixed some perl warnings

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@8969 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
talkabout 2015-07-14 16:29:35 +00:00
parent 47fac411b7
commit 44a04136fe
2 changed files with 16 additions and 14 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. # 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. # Do not insert empty lines here, update check depends on it.
- bugfix: Dashboard: fixed some perl warnings.
smallscreen styles are not destroying view any more..
- bugfix: Dashboard: text alignment issue for ios6touchpadstyle. - bugfix: Dashboard: text alignment issue for ios6touchpadstyle.
- change: 57_CALVIEW: -update fpr modi-management - change: 57_CALVIEW: -update fpr modi-management
-the modes now can be set with attribute modes -the modes now can be set with attribute modes

28
fhem/FHEM/95_Dashboard.pm
View File

@ -345,20 +345,20 @@ sub Dashboard_CGI($)
my $ret = ''; my $ret = '';
my $name = $params[1]; my $name = $params[1];
FW_pO '<div id="content">'; $ret = '<div id="content">';
if ($name && defined($defs{$name})) { if ($name && defined($defs{$name})) {
$ret = Dashboard_SummaryFN($FW_wname,$name,$FW_room,undef); $ret .= Dashboard_SummaryFN($FW_wname,$name,$FW_room,undef);
FW_pO $ret;
} }
else { else {
FW_pO 'Dashboard "' . $name . '" not found'; $ret .= 'Dashboard "' . $name . '" not found';
} }
FW_pO '</div>'; $ret .= '</div>';
return 0; FW_pO $ret;
return 1;
} }
sub DashboardAsHtml($) sub DashboardAsHtml($)
@ -546,26 +546,26 @@ sub BuildDashboardTab($$)
for (my $i=0;$i<@temptabgroup;$i++) { for (my $i=0;$i<@temptabgroup;$i++) {
my @stabgroup = split(":", trim($temptabgroup[$i])); my @stabgroup = split(":", trim($temptabgroup[$i]));
@index = grep { @groups[$_] eq @stabgroup[0] } (0 .. @groups-1); @index = grep { $groups[$_] eq $stabgroup[0] } (0 .. @groups-1);
if (@index > 0) { if (@index > 0) {
for (my $j=0; $j<@index;$j++) { for (my $j=0; $j<@index;$j++) {
my $groupname = @groups[@index[$j]]; my $groupname = @groups[$index[$j]];
if (@stabgroup > 1) { if (@stabgroup > 1) {
$groupname .= ':' . @stabgroup[1]; $groupname .= ':' . $stabgroup[1];
} }
push(@tabgroup,$groupname); push(@tabgroup,$groupname);
} }
} }
else { else {
my $matchGroup = '^' . @stabgroup[0] . '$'; my $matchGroup = '^' . $stabgroup[0] . '$';
@index = grep { @groups[$_] =~ m/$matchGroup/ } (0 .. @groups-1); @index = grep { $groups[$_] =~ m/$matchGroup/ } (0 .. @groups-1);
if (@index > 0) { if (@index > 0) {
for (my $j=0; $j<@index;$j++) { for (my $j=0; $j<@index;$j++) {
my $groupname = @groups[@index[$j]]; my $groupname = @groups[$index[$j]];
if (@stabgroup > 1) { if (@stabgroup > 1) {
$groupname .= ':' . @stabgroup[1]; $groupname .= ':' . $stabgroup[1];
} }
push(@tabgroup,$groupname); push(@tabgroup,$groupname);
} }