diff --git a/CHANGED b/CHANGED index 82c41194e..dfd528a73 100644 --- a/CHANGED +++ b/CHANGED @@ -1,6 +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. - SVN + - bugfix: Dashboard: dashboard_showfullsize not applied in room "all" - feature: new module 98_PID20.pm added (John / betateilchen) - feature: new module 00_RPII2C.pm, 52_I2C_PCA9532.pm, 52_I2C_PCF8574.pm, 52_I2C_SHT21.pm added (klausw) diff --git a/FHEM/95_Dashboard.pm b/FHEM/95_Dashboard.pm index fa8b5c8aa..8283723e2 100644 --- a/FHEM/95_Dashboard.pm +++ b/FHEM/95_Dashboard.pm @@ -42,6 +42,7 @@ # Custom CSS over new Attribute dashboard_customcss. Fix Bug that affect new groups. # 2.07: Fix GroupWidget-Error with readingGroups in hiddenroom # 2.08: Fix dashboard_webfrontendfilter Error-Message. Internal changes. Attribute dashboard_colwidth and dashboard_sorting removed. +# 2.09: dashboard_showfullsize not applied in room "all" resp. "Everything". First small implementation over Dashboard_DetailFN. # # Known Bugs/Todos: # BUG: Nicht alle Inhalte aller Tabs laden, bei Plots dauert die bedienung des Dashboards zu lange. -> elemente hidden? @@ -94,15 +95,16 @@ my $fwjquery = "jquery.min.js"; my $fwjqueryui = "jquery-ui.min.js"; my $dashboardname = "Dashboard"; # Link Text my $dashboardhiddenroom = "DashboardRoom"; # Hiddenroom -my $dashboardversion = "2.08"; +my $dashboardversion = "2.09"; # ------------------------------------------------------------------------------------------- +############################################################################################# sub Dashboard_Initialize ($) { my ($hash) = @_; $hash->{DefFn} = "Dashboard_define"; $hash->{UndefFn} = "Dashboard_undef"; - #$hash->{FW_detailFn} = "Dashboard_detailFn"; + $hash->{FW_detailFn} = "Dashboard_DetailFN"; $hash->{AttrFn} = "Dashboard_attr"; $hash->{AttrList} = "disable:0,1 ". "dashboard_colcount:1,2,3,4,5 ". @@ -160,7 +162,7 @@ sub Dashboard_Initialize ($) { $data{FWEXT}{jquery}{SCRIPT} = "/pgm2/".$fwjquery if (!$data{FWEXT}{jquery}{SCRIPT}); $data{FWEXT}{jqueryui}{SCRIPT} = "/pgm2/".$fwjqueryui if (!$data{FWEXT}{jqueryui}{SCRIPT}); - $data{FWEXT}{testjs}{SCRIPT} = "/pgm2/dashboard.js"; + $data{FWEXT}{z_dashboard}{SCRIPT} = "/pgm2/dashboard.js" if (!$data{FWEXT}{z_dashboard}); $data{FWEXT}{Dashboardx}{LINK} = "?room=".$dashboardhiddenroom; $data{FWEXT}{Dashboardx}{NAME} = $dashboardname; @@ -168,6 +170,26 @@ sub Dashboard_Initialize ($) { return undef; } +sub Dashboard_DetailFN() { + my ($name, $d, $room, $pageHash) = @_; + my $hash = $defs{$name}; + + my $ret = ""; + $ret .= "