Module: check_mk
Branch: master
Commit: 3613d2558698e7dba0739757529b55ce0b88d318
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3613d2558698e7…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri Mar 2 12:10:37 2012 +0100
Relayout of dashboard
---
web/htdocs/dashboard.css | 7 ++++---
web/htdocs/dashboard.py | 7 +++++--
web/htdocs/js/dashboard.js | 4 ++--
3 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/web/htdocs/dashboard.css b/web/htdocs/dashboard.css
index 05f5aef..ae4168e 100644
--- a/web/htdocs/dashboard.css
+++ b/web/htdocs/dashboard.css
@@ -51,8 +51,9 @@ div.dashlet div.dashlet_inner {
/* Dashlets with "background" set to True */
div.dashlet div.dashlet_inner.background {
- background-image: url("images/form_background.png");
- background-repeat: repeat;
+ /* background-image: url("images/form_background.png"); */
+ /* background-repeat: repeat; */
+ background-color: #ccc;
}
div.dashlet iframe {
@@ -118,7 +119,7 @@ div.dashlet img.shadow.sw {
}
div.dashlet img.shadow.ne {
top: -2px;
- right: -2px;
+ right: 3px;
width: 13px;
height: 23px;
}
diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py
index 34d70a0..5c4b666 100644
--- a/web/htdocs/dashboard.py
+++ b/web/htdocs/dashboard.py
@@ -47,7 +47,8 @@ MAX = -1
header_height = 60 # Distance from top of the screen to the lower border of
the heading
screen_margin = 5 # Distance from the left border of the main-frame to the
dashboard area
-dashlet_padding = 21, 11, 10, 11 # Margin (N, E, S, W) between outer border of dashlet
and its content
+dashlet_padding = 21, 5, 5, 0 # Margin (N, E, S, W) between outer border of dashlet and
its content
+corner_overlap = 22
title_height = 0 # Height of dashlet title-box
raster = 32, 32 # Raster the dashlet choords are measured in
@@ -148,12 +149,14 @@ var header_height = %d;
var screen_margin = %d;
var title_height = %d;
var dashlet_padding = Array%s;
+var corner_overlap = %d;
var refresh_dashlets = %r;
var dashboard_name = '%s';
set_dashboard_size();
window.onresize = function () { set_dashboard_size(); }
dashboard_scheduler(1);
- """ % (header_height, screen_margin, title_height, dashlet_padding,
refresh_dashlets, name))
+ """ % (header_height, screen_margin, title_height, dashlet_padding,
+ corner_overlap, refresh_dashlets, name))
html.body_end() # omit regular footer with status icons, etc.
diff --git a/web/htdocs/js/dashboard.js b/web/htdocs/js/dashboard.js
index 64a1a89..5fabf24 100644
--- a/web/htdocs/js/dashboard.js
+++ b/web/htdocs/js/dashboard.js
@@ -79,12 +79,12 @@ function resize_dashlets(id, code)
oShadow = document.getElementById("dashadow_n_" + d_number);
if (oShadow) oShadow.style.display = disstyle;
if (oShadow && d_width - 32 > 0)
- oShadow.style.width = netto_width + "px";
+ oShadow.style.width = netto_width - corner_overlap + "px";
oShadow = document.getElementById("dashadow_s_" + d_number);
if (oShadow) oShadow.style.display = disstyle;
if (oShadow && d_width - 32 > 0)
- oShadow.style.width = netto_width + "px";
+ oShadow.style.width = netto_width - corner_overlap + "px";
// resize content div
oDash = document.getElementById("dashlet_inner_" + d_number);