[checkmk-commits] Check_MK Git: check_mk: Minor cleanup in default dashboard

Module: check_mk Branch: master Commit: e6f7c014d9fb80e07ba496b49618afddeb1f9e9b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e6f7c014d9fb80… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Sat Oct 1 11:28:47 2011 +0200 Minor cleanup in default dashboard --- ChangeLog | 1 + web/htdocs/dashboard.py | 5 +++++ web/plugins/dashboard/builtin.py | 8 ++++---- web/plugins/pages/shipped.py | 1 + web/plugins/views/dashboard.py | 11 ++++++----- 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0e4a5eb..1550f66 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,7 @@ * Service Perfdata Sorters are sorting correctly now * Added "Administration" snapin to default sidebar * Tactical Overview: make link clickable even if count is zero + * Minor cleanup in default dashboard Livestatus: * Write messages after initialization into an own livestatus.log diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index dbf649c..15458e0 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -391,6 +391,11 @@ def dashlet_overview(): html.write('</tr></table>') +def dashlet_mk_logo(): + html.write('<a href="http://mathias-kettner.de/check_mk.html">' + '<img style="margin-right: 30px;" src="images/check_mk.trans.120.png"></a>') + + def dashlet_hoststats(): table = [ diff --git a/web/plugins/dashboard/builtin.py b/web/plugins/dashboard/builtin.py index 02392ae..7fc6cdc 100644 --- a/web/plugins/dashboard/builtin.py +++ b/web/plugins/dashboard/builtin.py @@ -29,16 +29,16 @@ builtin_dashboards = { "title" : _("Main Overview"), "dashlets" : [ { - "url" : "dashlet_overview.py", + "url" : "dashlet_mk_logo.py", "position" : (1, 1), - "size" : (10, 5), + "size" : (4, 5), "shadow" : False, "background" : False, }, { "title" : _("Host Statistics"), "url" : "dashlet_hoststats.py", - "position" : (11, 1), + "position" : (6, 1), "size" : (10, 6), "shadow" : True, "background" : True, @@ -47,7 +47,7 @@ builtin_dashboards = { { "title" : _("Service Statistics"), "url" : "dashlet_servicestats.py", - "position" : (21, 1), + "position" : (16, 1), "size" : (10, 6), "shadow" : True, "background" : True, diff --git a/web/plugins/pages/shipped.py b/web/plugins/pages/shipped.py index d6ddc71..b29dcf1 100644 --- a/web/plugins/pages/shipped.py +++ b/web/plugins/pages/shipped.py @@ -64,6 +64,7 @@ pagehandlers.update({ "dashboard" : dashboard.page_dashboard, "dashboard_resize" : dashboard.ajax_resize, "dashlet_overview" : dashboard.dashlet_overview, + "dashlet_mk_logo" : dashboard.dashlet_mk_logo, "dashlet_hoststats" : dashboard.dashlet_hoststats, "dashlet_servicestats" : dashboard.dashlet_servicestats, "dashlet_pnpgraph" : dashboard.dashlet_pnpgraph, diff --git a/web/plugins/views/dashboard.py b/web/plugins/views/dashboard.py index 7543430..e0da15c 100644 --- a/web/plugins/views/dashboard.py +++ b/web/plugins/views/dashboard.py @@ -60,14 +60,15 @@ multisite_builtin_views.update({ ('host_state', None), ('host', 'host'), ('host_icons', None), - ('host_plugin_output', None), ('host_state_age', None), + ('host_plugin_output', None), # ('host_check_age', None), # save space # ('num_services_ok', 'host_ok'), # save space - ('num_services_warn', 'host_warn'), - ('num_services_crit', 'host_crit'), - ('num_services_unknown', 'host_unknown'), - ('num_services_pending', 'host_pending')], + #('num_services_warn', 'host_warn'), + #('num_services_crit', 'host_crit'), + #('num_services_unknown', 'host_unknown'), + #('num_services_pending', 'host_pending'), + ], 'public': True, 'show_filters': [], 'sorters': [('hoststate', True)],