From 2b20713e2b6ed0877572fda222c22e490368dfef Mon Sep 17 00:00:00 2001 From: nasseeder1 Date: Fri, 29 Jun 2018 12:01:56 +0000 Subject: [PATCH] 95_Dashboard: V3.10.1, added FW_hideDisplayName, Forum #88727 git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@16920 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- CHANGED | 1 + FHEM/95_Dashboard.pm | 24 +++++++++++++++--------- MAINTAINER.txt | 2 +- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/CHANGED b/CHANGED index 7cda70523..0f6c35440 100644 --- a/CHANGED +++ b/CHANGED @@ -1,5 +1,6 @@ # 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. + - change: 95_Dashboard: V3.10.1, added FW_hideDisplayName, Forum #88727 - change: 98_feels_like.pm: Improved algorithms New attribute "sensorType" minor bugfixes diff --git a/FHEM/95_Dashboard.pm b/FHEM/95_Dashboard.pm index ea791ba76..04ed46054 100644 --- a/FHEM/95_Dashboard.pm +++ b/FHEM/95_Dashboard.pm @@ -62,6 +62,10 @@ # Minor improvements in javascript and css. # 3.10: added attribute dashboard_tabXdevices, which can contain devspec definitions and thus allow to also shown not grouped devices # +# ---- Changes by DS_Starter ---- +# 3.10.1 29.06.2018 added FW_hideDisplayName, Forum #88727 +# +# # Known Bugs/Todos: # BUG: Nicht alle Inhalte aller Tabs laden, bei Plots dauert die bedienung des Dashboards zu lange. -> elemente hidden? -> widgets aus js über XHR nachladen und dann anzeigen (jquery xml nachladen...) # BUG: Variabler abstand wird nicht gesichert @@ -97,13 +101,13 @@ package main; use strict; use warnings; use vars qw(%FW_icons); # List of icons -use vars qw($FW_dir); # base directory for web server -use vars qw($FW_icondir); # icon base directory +use vars qw($FW_dir); # base directory for web server +use vars qw($FW_icondir); # icon base directory use vars qw($FW_room); # currently selected room use vars qw(%defs); # FHEM device/button definitions #use vars qw(%FW_groups); # List of Groups -use vars qw($FW_wname); # Web instance -use vars qw(%FW_types); # device types +use vars qw($FW_wname); # Web instance +use vars qw(%FW_types); # device types use vars qw($FW_ss); # is smallscreen, needed by 97_GROUP/95_VIEW ######################### @@ -116,7 +120,7 @@ my %group; my $dashboard_groupListfhem; my $fwjquery = "jquery.min.js"; my $fwjqueryui = "jquery-ui.min.js"; -my $dashboardversion = "3.10"; +my $dashboardversion = "3.10.1"; ############################################################################################# sub Dashboard_Initialize ($) { @@ -289,9 +293,10 @@ sub Dashboard_define ($$) { my @args = split (" ", $def); - my $now = time(); - my $name = $hash->{NAME}; + my $now = time(); + my $name = $hash->{NAME}; $hash->{VERSION} = $dashboardversion; + readingsSingleUpdate( $hash, "state", "Initialized", 0 ); RemoveInternalTimer($hash); @@ -803,8 +808,8 @@ sub BuildGroup } @devices; foreach my $d (@devices) { - next if (!defined($defs{$d})); - $foundDevices++; + next if (!defined($defs{$d})); + $foundDevices++; $ret .= sprintf("", ($row&1)?"odd":"even"); @@ -814,6 +819,7 @@ sub BuildGroup $icon = FW_makeImage($icon,$icon,"icon dashboard_groupicon") . " " if($icon); + $devName="" if($modules{$defs{$d}{TYPE}}{FW_hideDisplayName}); # Forum 88667 if (!$modules{$defs{$d}{TYPE}}{FW_atPageEnd}) { # Don't show Link for "atEnd"-devices $ret .= FW_pH "detail=$d", "$icon$devName", 1, "col1", 1; } diff --git a/MAINTAINER.txt b/MAINTAINER.txt index 1de3d7598..75b54e770 100644 --- a/MAINTAINER.txt +++ b/MAINTAINER.txt @@ -402,7 +402,7 @@ FHEM/95_Astro.pm pahenning Unterstützende Dienste FHEM/95_Babble.pm pahenning Unterstützende Dienste FHEM/95_PostMe.pm pahenning Unterstützende Dienste FHEM/95_YAAHM.pm pahenning Unterstützende Dienste -FHEM/95_Dashboard.pm svenson08 Frontends +FHEM/95_Dashboard.pm DS_Starter/orphan Frontends FHEM/95_PachLog.pm rudolfkoenig/orphan Sonstiges FHEM/95_holiday.pm rudolfkoenig Sonstiges FHEM/95_remotecontrol.pm ulimaass Frontends