From 87ff439d8f53f8342b580f85b297069d3a8ccaa3 Mon Sep 17 00:00:00 2001 From: jonathon-k Date: Sat, 15 Oct 2016 10:58:27 -0600 Subject: [PATCH] webui: Option to display devices as a uniform size w/o labels in availability map widget --- html/css/styles.css | 8 ++++++- html/includes/common/availability-map.inc.php | 24 +++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/html/css/styles.css b/html/css/styles.css index 89086a8417..d520755128 100644 --- a/html/css/styles.css +++ b/html/css/styles.css @@ -1994,6 +1994,12 @@ label { curosr: pointer; } +.widget-availability-fixed { + min-width: 2.4em; + min-height: 1.3em; + max-height: 1.6em; +} + .widget-availability-host { float:left; margin-bottom: 10px; @@ -2035,7 +2041,7 @@ label { } .availability-map-widget-header { - line-height:30px; + line-height:34px; } @media only screen and (max-width: 1240px) and (min-width: 1200px) { diff --git a/html/includes/common/availability-map.inc.php b/html/includes/common/availability-map.inc.php index 7e44ef1d44..e386c9f4f8 100644 --- a/html/includes/common/availability-map.inc.php +++ b/html/includes/common/availability-map.inc.php @@ -42,6 +42,22 @@ if (defined('SHOW_SETTINGS')) { '; + if ($config['webui']['availability_map_compact'] === false) { + $common_output[] = ' +
+
+ +
+
+ +
+
+'; + } + if ($config['webui']['availability_map_compact'] == 1) { $common_output[] = '
@@ -196,6 +212,10 @@ if (defined('SHOW_SETTINGS')) {
'; } else { + if ($widget_settings['color_only_select'] == 1) { + $deviceState = ' '; + $deviceLabel .= ' widget-availability-fixed'; + } $temp_output[] = ' ' . $deviceState . ' @@ -242,6 +262,10 @@ if (defined('SHOW_SETTINGS')) { '; } else { + if ($widget_settings['color_only_select'] == 1) { + $serviceState = ' '; + $serviceLabel .= ' widget-availability-fixed'; + } $temp_output[] = ' ' . $service['service_type'] . ' - ' . $serviceState . '