From cfc5714d131a6405c7fd7ceec4aa163e38bbad35 Mon Sep 17 00:00:00 2001 From: talkabout <> Date: Mon, 6 Jul 2015 16:45:02 +0000 Subject: [PATCH] Dashboard: fixed CSS height issue for rows (top, center, bottom) git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@8903 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- CHANGED | 1 + www/pgm2/dashboard.js | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGED b/CHANGED index 8aa0dad66..806877d1c 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. + - bugfix: Dashboard: fixed CSS height issue for rows (top, center, bottom) - feature: FB_CALLLIST: new attribute "external-mapping", new column for external_connection reading (see commandref for details, by Michael) - feature: Dashboard: release version 3.0 diff --git a/www/pgm2/dashboard.js b/www/pgm2/dashboard.js index a5b37009d..f60f84c6d 100644 --- a/www/pgm2/dashboard.js +++ b/www/pgm2/dashboard.js @@ -212,9 +212,9 @@ function restoreOrder(ActiveTabId) { //--------------------------------------------- Set Row and Column Settings -------------------------------------------------------------------------------------------- $("#dashboard").width(params[1]); - if (ActiveTab.has("#dashboard_rowtop_tab"+ActiveTabId).length){ $("#dashboard_rowtop_tab"+ActiveTabId).height(params[8]); } - if (ActiveTab.has("#dashboard_rowcenter_tab"+ActiveTabId).length){ $("#dashboard_rowcenter_tab"+ActiveTabId).height(params[5]); } - if (ActiveTab.has("#dashboard_rowbottom_tab"+ActiveTabId).length){ $("#dashboard_rowbottom_tab"+ActiveTabId).height(params[9]); } + if (ActiveTab.has("#dashboard_rowtop_tab"+ActiveTabId).length){ $("#dashboard_rowtop_tab"+ActiveTabId).css('min-height', params[8] + 'px'); } + if (ActiveTab.has("#dashboard_rowcenter_tab"+ActiveTabId).length){ $("#dashboard_rowcenter_tab"+ActiveTabId).css('min-height', params[5] + 'px'); } + if (ActiveTab.has("#dashboard_rowbottom_tab"+ActiveTabId).length){ $("#dashboard_rowbottom_tab"+ActiveTabId).css('min-height', params[9] + 'px'); } for (var i = 0, n = colCount; i <= n; i++) { if (ActiveTab.has("#dashboard_tab"+ActiveTabId+"column"+i).length) { $("#dashboard_tab"+ActiveTabId+"column"+i).width(aColWidth[i]+"%"); }