From 06229b5baf841f69226742ee670f400a719e4998 Mon Sep 17 00:00:00 2001 From: laf Date: Thu, 23 Jul 2015 22:55:37 +0100 Subject: [PATCH] Updates from Rosiak for visual styles --- html/includes/common/availability-map.inc.php | 3 ++- .../common/device-summary-horiz.inc.php | 24 +++++++++---------- html/pages/front/tiles.php | 7 ++++-- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/html/includes/common/availability-map.inc.php b/html/includes/common/availability-map.inc.php index c3990c544..b8cf1c379 100644 --- a/html/includes/common/availability-map.inc.php +++ b/html/includes/common/availability-map.inc.php @@ -9,6 +9,7 @@ * option) any later version. Please see LICENSE.txt at the top level of * the source code distribution for details. */ +require_once 'includes/object-cache.inc.php'; $sql = 'SELECT `D`.`hostname`,`D`.`device_id`,`D`.`status`,`D`.`uptime` FROM `devices` AS `D`'; @@ -40,5 +41,5 @@ foreach(dbFetchRows($sql,$param) as $device) { $temp_rows = count($temp_output); $temp_output[] = ''; -$temp_header = array('

All Devices(' . $temp_rows . ')

'); +$temp_header = array('
'.$devices['up'].' 0 '.$devices['down'].'

'); $common_output = array_merge($temp_header,$temp_output); diff --git a/html/includes/common/device-summary-horiz.inc.php b/html/includes/common/device-summary-horiz.inc.php index 4d150ef8c..439234af4 100644 --- a/html/includes/common/device-summary-horiz.inc.php +++ b/html/includes/common/device-summary-horiz.inc.php @@ -18,18 +18,18 @@ $temp_output = ' Devices '.$devices['count'].' - '.$devices['up'].' up - '.$devices['down'].' down - '.$devices['ignored'].' ignored - '.$devices['disabled'].' disabled + '.$devices['up'].' + '.$devices['down'].' + '.$devices['ignored'].' + '.$devices['disabled'].' Ports '.$ports['count'].' - '.$ports['up'].' up - '.$ports['down'].' down - '.$ports['ignored'].' ignored - '.$ports['shutdown'].' shutdown + '.$ports['up'].' + '.$ports['down'].' + '.$ports['ignored'].' + '.$ports['shutdown'].' '; if ($config['show_services']) { @@ -37,10 +37,10 @@ $temp_output .= ' Services '.$services['count'].' - '.$services['up'].' up - '.$services['down'].' down - '.$services['ignored'].' ignored - '.$services['disabled'].' disabled + '.$services['up'].' + '.$services['down'].' + '.$services['ignored'].' + '.$services['disabled'].' '; } $temp_output .= ' diff --git a/html/pages/front/tiles.php b/html/pages/front/tiles.php index 46530220c..617b2af91 100644 --- a/html/pages/front/tiles.php +++ b/html/pages/front/tiles.php @@ -27,8 +27,11 @@ $dash_config = unserialize(stripslashes($data)); ?> - -Clear dashboard +
+ Widgets + + +