FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 12:49:34 +00:00
Code Issues Releases Wiki Activity

dashboard_showfullsize not applied in room "all"

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@5333 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
svenson08 2014-03-26 20:03:04 +00:00
parent 19f30c8b62
commit 9f999072be
3 changed files with 36 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -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)

28
fhem/FHEM/95_Dashboard.pm
View File

@ -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 .= "<table class=\"block wide\" id=\"dashboardtoolbar\" style=\"width:100%\">\n";
$ret .= "<tr><td><div>\n";
$ret .= " <div> <a href=\"javascript:dashboard_setposition()\"><button id=\"dashboard_setpositionbutton\" type=\"button\" title=\"Set the Positions\" disabled>Set Positions</button></a>\n";
$ret .= " <a href=\"javascript:dashboard_tooglelock()\"><button id=\"dashboard_tooglelockbutton\" type=\"button\" title=\"Lock Dashboard\" disabled>Lock Dashboard</button></a>\n";
$ret .= " <a href=\"$FW_ME?room=$dashboardhiddenroom\"><button type=\"button\">Return to Dashboard</button></a>\n";
$ret .= " <div id=\"resultText\" style=\"padding-top: 8px;\"></div>\n";
$ret .= " </div>\n";
$ret .= " </div></td></tr>\n";
$ret .= "</table>\n";
return $ret;
}
#############################################################################################
#############################################################################################
sub DashboardAsHtml($)
{
my ($d) = @_;

22
fhem/www/pgm2/dashboard.js
View File

@ -13,6 +13,7 @@
// 2.03: Fix showhelper Bug on lock/unlock. The error that after a trigger action the curren tab is changed to the "old" activetab tab has
// been fixed.
// 2.04: Dashboard position near Top in showfullsize-mode. Restore ActiveTab funktion
// 2.04: dashboard_showfullsize not applied in room "all" resp. "Everything"
//
// Known Bugs/Todo's
// See 95_Dashboard.pm
@ -234,12 +235,14 @@ $(document).ready( function () {
//-------------------------------------------------------------------------------------------------------------------------------------
$("body").attr("longpollfilter", ".*") //need for longpoll
if (params[13] == 1){ //disable roomlist and header
$("#menuScrollArea").remove();
$("#hdr").remove();
$(".roomoverview:first").remove();
$("br:first").remove();
$("#content").css({position: 'inherit'});
if (params[13] == 1){ //disable roomlist and header, but not in room Everything
if ($('#content').attr("room") != "all") {
$("#menuScrollArea").remove();
$("#hdr").remove();
$(".roomoverview:first").remove();
$("br:first").remove();
$("#content").css({position: 'inherit'});
}
}
$(".dashboard_column").sortable({
@ -302,12 +305,7 @@ $(document).ready( function () {
restoreOrder();
},
activate: function (event, ui) {
restoreOrder();
//var activeTab = ($( "#tabs" ).tabs( "option", "active" ))+1;
//if (params[11] != activeTab){
// FW_cmd(document.location.pathname+'?XHR=1&cmd.'+params[0]+'=attr '+params[0]+' dashboard_activetab '+activeTab);
// }
restoreOrder();
}
});
if ($("#dashboard_tabnav").hasClass("dashboard_tabnav_bottom")) { $(".dashboard_tabnav").appendTo(".dashboard_tabs"); } //set Tabs on the Bottom