mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rewrite code for less repetition, removed unused css classes

Browse Source
This commit is contained in:
crcro
2016-08-15 01:42:02 +03:00
parent 1270028b2f
commit a4234a00f0
4 changed files with 102 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
html/css/dark.css
View File

@@ -144,15 +144,10 @@
color:#D9534F; color:#D9534F;
} }
.page-availability-report-entry {
text-align:center;
width:50px;
}
.page-availability-title-left { .page-availability-title-left {
width:50%; width:50%;
float:left; float:left;
height:60px; height:40px;
} }
.page-availability-title-right { .page-availability-title-right {
@@ -162,19 +157,19 @@
} }
.page-availability-title { .page-availability-title {
font-size:26px; font-size:18px;
font-weight: bold; font-weight: bold;
line-height:40px;
} }
.page-availability-report-select { .page-availability-report-select {
font-size:16px;
border:none; border:none;
font-size:24px;
font-weight:bold; font-weight:bold;
padding-right:10px; padding-right:10px;
margin-left:10px; margin-left:10px;
} }
.page-availability-report-host { .page-availability-report-host {
float:right; float:right;
text-align:right; text-align:right;
@@ -203,4 +198,9 @@
.label-font-border { .label-font-border {
text-shadow: -1px 0 black, 0 1px black, 1px 0 black, 0 -1px black; text-shadow: -1px 0 black, 0 1px black, 1px 0 black, 0 -1px black;
font-size: 10px;
}
.label-font-border.label-border {
margin:0px 2px 0px 2px;
} }

18
html/css/light.css
View File

@@ -140,15 +140,10 @@
color:#D9534F; color:#D9534F;
} }
.page-availability-report-entry {
text-align:center;
width:50px;
}
.page-availability-title-left { .page-availability-title-left {
width:50%; width:50%;
float:left; float:left;
height:60px; height:40px;
} }
.page-availability-title-right { .page-availability-title-right {
@@ -158,19 +153,19 @@
} }
.page-availability-title { .page-availability-title {
font-size:26px; font-size:18px;
font-weight: bold; font-weight: bold;
line-height:40px;
} }
.page-availability-report-select { .page-availability-report-select {
font-size:16px;
border:none; border:none;
font-size:24px;
font-weight:bold; font-weight:bold;
padding-right:10px; padding-right:10px;
margin-left:10px; margin-left:10px;
} }
.page-availability-report-host { .page-availability-report-host {
float:right; float:right;
text-align:right; text-align:right;
@@ -199,4 +194,9 @@
.label-font-border { .label-font-border {
text-shadow: -1px 0 black, 0 1px black, 1px 0 black, 0 -1px black; text-shadow: -1px 0 black, 0 1px black, 1px 0 black, 0 -1px black;
font-size: 10px;
}
.label-font-border.label-border {
margin:0px 2px 0px 2px;
} }

18
html/css/mono.css
View File

@@ -144,15 +144,10 @@
color:#D9534F; color:#D9534F;
} }
.page-availability-report-entry {
text-align:center;
width:50px;
}
.page-availability-title-left { .page-availability-title-left {
width:50%; width:50%;
float:left; float:left;
height:60px; height:40px;
} }
.page-availability-title-right { .page-availability-title-right {
@@ -162,19 +157,19 @@
} }
.page-availability-title { .page-availability-title {
font-size:26px; font-size:18px;
font-weight: bold; font-weight: bold;
line-height:40px;
} }
.page-availability-report-select { .page-availability-report-select {
font-size:16px;
border:none; border:none;
font-size:24px;
font-weight:bold; font-weight:bold;
padding-right:10px; padding-right:10px;
margin-left:10px; margin-left:10px;
} }
.page-availability-report-host { .page-availability-report-host {
float:right; float:right;
text-align:right; text-align:right;
@@ -203,4 +198,9 @@
.label-font-border { .label-font-border {
text-shadow: -1px 0 black, 0 1px black, 1px 0 black, 0 -1px black; text-shadow: -1px 0 black, 0 1px black, 1px 0 black, 0 -1px black;
font-size: 10px;
}
.label-font-border.label-border {
margin:0px 2px 0px 2px;
} }

163
html/includes/common/availability-map.inc.php
View File

@@ -15,30 +15,28 @@ if (defined('show_settings')) {
$current_mode = isset($widget_settings['mode']) ? $widget_settings['mode'] : 0; $current_mode = isset($widget_settings['mode']) ? $widget_settings['mode'] : 0;
$current_width = isset($widget_settings['tile_width']) ? $widget_settings['tile_width'] : 10; $current_width = isset($widget_settings['tile_width']) ? $widget_settings['tile_width'] : 10;
$common_output[] = '<form class="form-horizontal" onsubmit="return widget_settings(this)">'; $common_output[] = '
$common_output[] = '<div class="form-group">'; <form class="form-horizontal" onsubmit="return widget_settings(this)">
$common_output[] = '<label for="tile_width" class="col-sm-4 control-label">Tile width</label>'; <div class="form-group">
$common_output[] = '<div class="col-sm-6">'; <label for="tile_width" class="col-sm-4 control-label">Tile width</label>
$common_output[] = '<input class="form-control" name="tile_width" placeholder="I.e 10" value="'.$current_width.'">'; <div class="col-sm-6">
$common_output[] = '</div>'; <input class="form-control" name="tile_width" placeholder="I.e 10" value="'.$current_width.'">
$common_output[] = '</div>'; </div>
$common_output[] = '<div class="form-group">'; </div>
$common_output[] = '<label for="show_services" class="col-sm-4 control-label">Show</label>'; <div class="form-group">
$common_output[] = '<div class="col-sm-6">'; <label for="show_services" class="col-sm-4 control-label">Show</label>
$common_output[] = '<select class="form-control" name="mode">'; <div class="col-sm-6">
$common_output[] = '<option value="0" '.($current_mode == 0 ? 'selected':'').'>only devices</option>'; <select class="form-control" name="mode">
$common_output[] = '<option value="1"' .($current_mode == 1 ? 'selected':'').'>only services</option>'; <option value="0" '.($current_mode == 0 ? 'selected':'').'>only devices</option>
$common_output[] = '<option value="2"' .($current_mode == 2 ? 'selected':'').'>devices and services</option>'; <option value="1"' .($current_mode == 1 ? 'selected':'').'>only services</option>
$common_output[] = '</select>'; <option value="2"' .($current_mode == 2 ? 'selected':'').'>devices and services</option>
$common_output[] = '</div>'; </select>
$common_output[] = '</div>'; </div>
$common_output[] = '<div class="form-group">'; </div>
$common_output[] = '<div class="col-sm-offset-6 col-sm-4">'; <div class="form-group">
$common_output[] = '<button type="submit" class="btn btn-primary">Set</button>'; <div class="col-sm-offset-6 col-sm-4"><button type="submit" class="btn btn-primary">Set</button></div>
$common_output[] = '</div>'; </div>
$common_output[] = '</div>'; </form>';
$common_output[] = '</form>';
} else { } else {
require_once 'includes/object-cache.inc.php'; require_once 'includes/object-cache.inc.php';
$mode = isset($_SESSION["mapView"]) ? $_SESSION["mapView"] : 0; $mode = isset($_SESSION["mapView"]) ? $_SESSION["mapView"] : 0;
@@ -86,18 +84,19 @@ if (defined('show_settings')) {
if ($directpage == "yes") { if ($directpage == "yes") {
$deviceIcon = getImage($device); $deviceIcon = getImage($device);
$temp_output[] = '<a href="' . generate_url(array('page' => 'device', 'device' => $device['device_id'])) . '" '; $temp_output[] = '
$temp_output[] = 'title="' . $device['hostname'] . " - " . formatUptime($device['uptime']) . '">'; <a href="'.generate_url(array('page' => 'device', 'device' => $device['device_id'])).'" title="'.$device['hostname']." - ".formatUptime($device['uptime']).'">
$temp_output[] = '<div class="device-availability ' . $deviceState . '">'; <div class="device-availability '.$deviceState.'">
$temp_output[] = '<label class="availability-label label ' . $deviceLabel . ' label-font-border">' . $deviceState . '</label>'; <label class="availability-label label '.$deviceLabel.' label-font-border">'.$deviceState.'</label>
$temp_output[] = '<span class="device-icon">' . $deviceIcon . '</span><br>'; <span class="device-icon">'.$deviceIcon.'</span><br>
$temp_output[] = '<span class="small">' . $device["hostname"] . '</span>'; <span class="small">'.$device["hostname"].'</span>
$temp_output[] = '</div></a>'; </div>
</a>';
} else { } else {
$temp_output[] = '<a href="' . generate_url(array('page' => 'device', 'device' => $device['device_id'])) . '" '; $temp_output[] = '
$temp_output[] = 'title="' . $device['hostname'] . " - " . formatUptime($device['uptime']) . '">'; <a href="'.generate_url(array('page' => 'device', 'device' => $device['device_id'])).'" title="'.$device['hostname']." - ".formatUptime($device['uptime']).'">
$temp_output[] = '<label class="label '.$deviceLabel.' widget-availability label-font-border">'.$deviceState.'</label>'; <label class="label '.$deviceLabel.' widget-availability label-font-border">'.$deviceState.'</label>
$temp_output[] = '</a>'; </a>';
} }
} }
@@ -122,77 +121,65 @@ if (defined('show_settings')) {
if ($directpage == "yes") { if ($directpage == "yes") {
$deviceIcon = getImage($service); $deviceIcon = getImage($service);
$temp_output[] = '<a href="' . generate_url(array('page' => 'device', 'tab' => 'services', 'device' => $service['device_id'])) . '"'; $temp_output[] = '
$temp_output[] = 'title="' . $service['hostname'] . " - " . $service['service_type'] . " - " . $service['service_desc'] . '">'; <a href="'.generate_url(array('page' => 'device', 'tab' => 'services', 'device' => $service['device_id'])).'" title="'.$service['hostname']." - ".$service['service_type']." - ".$service['service_desc'].'">
$temp_output[] = '<div class="service-availability ' . $serviceState . '">'; <div class="service-availability '.$serviceState.'">
$temp_output[] = '<label class="service-name-label label ' . $serviceLabel . ' label-font-border">' . $service["service_type"] . '</label>'; <label class="service-name-label label '.$serviceLabel.' label-font-border">'.$service["service_type"].'</label>
$temp_output[] = '<label class="availability-label label ' . $serviceLabel . ' label-font-border">' . $serviceState . '</label>'; <label class="availability-label label '.$serviceLabel.' label-font-border">'.$serviceState.'</label>
$temp_output[] = '<span class="device-icon">' . $deviceIcon . '</span><br>'; <span class="device-icon">'.$deviceIcon.'</span><br>
$temp_output[] = '<span class="small">' . $service["hostname"] . '</span>'; <span class="small">'.$service["hostname"].'</span>
$temp_output[] = '</div></a>'; </div>
</a>';
} else { } else {
$temp_output[] = '<a href="' . generate_url(array('page' => 'device', 'tab' => 'services', 'device' => $service['device_id'])) . '"'; $temp_output[] = '
$temp_output[] = 'title="' . $service['hostname'] . " - " . $service['service_type'] . " - " . $service['service_desc'] . '">'; <a href="'.generate_url(array('page' => 'device', 'tab' => 'services', 'device' => $service['device_id'])).'" title="'.$service['hostname']." - ".$service['service_type']." - ".$service['service_desc'].'">
$temp_output[] = '<label class="label '.$serviceLabel.' widget-availability label-font-border">'.$service['service_type'].' - '.$serviceState.'</label>'; <label class="label '.$serviceLabel.' widget-availability label-font-border">'.$service['service_type'].' - '.$serviceState.'</label>
$temp_output[] = '</a>'; </a>';
} }
} }
} }
if ($directpage == "yes") { if ($directpage == "yes") {
$temp_header[] = '<div class="page-availability-title-left">'; $temp_header[] = '
$temp_header[] = '<span class="page-availability-title">Availability map for</span>'; <div class="page-availability-title-left">
$temp_header[] = '<select id="mode" class="page-availability-report-select" name="mode">'; <span class="page-availability-title">Availability map for</span>
$temp_header[] = '<option value="0" ' . ($mode == 0 ? 'selected' : '') . '>devices</option>'; <select id="mode" class="page-availability-report-select" name="mode">
$temp_header[] = '<option value="1"' . ($mode == 1 ? 'selected' : '') . '>services</option>'; <option value="0"'.($mode == 0 ? 'selected' : '').'>devices</option>
$temp_header[] = '<option value="2"' . ($mode == 2 ? 'selected' : '') . '>devices and services</option>'; <option value="1"'.($mode == 1 ? 'selected' : '').'>services</option>
$temp_header[] = '</select></div>'; <option value="2"'.($mode == 2 ? 'selected' : '').'>devices and services</option>
$temp_header[] = '<div class="page-availability-title-right">'; </select>
</div>
<div class="page-availability-title-right">';
} }
if ($mode == 0 || $mode == 2) { if ($mode == 0 || $mode == 2) {
if ($directpage == "yes") { if ($directpage == "yes") {
$temp_header[] = '<div class="page-availability-report-host">'; $headerClass = 'page-availability-report-host';
$temp_header[] = '<span>Hosts report:</span>';
$temp_header[] = '<div style="float:right;">';
$temp_header[] = '<div class="small page-availability-report-entry"><label class="label label-success label-font-border">up</label></div>';
$temp_header[] = '<div class="small page-availability-report-entry"><span>' . $host_up_count . '</span></div>';
$temp_header[] = '</div>';
$temp_header[] = '<div style="float:right;">';
$temp_header[] = '<div class="small page-availability-report-entry"><label class="label label-warning label-font-border">warn</label></div>';
$temp_header[] = '<div class="small page-availability-report-entry"><span>' . $host_warn_count . '</span></div>';
$temp_header[] = '</div>';
$temp_header[] = '<div style="float:right;">';
$temp_header[] = '<div class="small page-availability-report-entry"><label class="label label-danger label-font-border">down</label></div>';
$temp_header[] = '<div class="small page-availability-report-entry"><span>' . $host_down_count . '</span></div>';
$temp_header[] = '</div>';
$temp_header[] = '</div>';
} else { } else {
$temp_header[] = '<div class="widget-availability-host">Total hosts <label class="label label-success label-font-border">up</label> '.$host_up_count.' <label class="label label-warning label-font-border">warn</label> '.$host_warn_count.' <label class="label label-danger label-font-border">down</label> '.$host_down_count.'</div>'; $headerClass = 'widget-availability-host';
} }
$temp_header[] = '
<div class="'.$headerClass.'">
<span>Total hosts</span>
<label class="label label-success label-font-border label-border">up: '.$host_up_count.'</label>
<label class="label label-warning label-font-border label-border">warn: '.$host_warn_count.'</label>
<label class="label label-danger label-font-border label-border">down: '.$host_down_count.'</label>
</div>';
} }
if ($mode == 1 || $mode == 2) { if ($mode == 1 || $mode == 2) {
if ($directpage == "yes") { if ($directpage == "yes") {
$temp_header[] = '<div class="page-availability-report-service">'; $headerClass = 'page-availability-report-service';
$temp_header[] = '<span>Services report:</span>';
$temp_header[] = '<div style="float:right;">';
$temp_header[] = '<div class="small page-availability-report-entry"><label class="label label-success label-font-border">up</label></div>';
$temp_header[] = '<div class="small page-availability-report-entry"><span>' . $service_up_count . '</span></div>';
$temp_header[] = '</div>';
$temp_header[] = '<div style="float:right;">';
$temp_header[] = '<div class="small page-availability-report-entry"><label class="label label-warning label-font-border">warn</label></div>';
$temp_header[] = '<div class="small page-availability-report-entry"><span>' . $service_warn_count . '</span></div>';
$temp_header[] = '</div>';
$temp_header[] = '<div style="float:right;">';
$temp_header[] = '<div class="small page-availability-report-entry"><label class="label label-danger label-font-border">down</label></div>';
$temp_header[] = '<div class="small page-availability-report-entry"><span>' . $service_down_count . '</span></div>';
$temp_header[] = '</div>';
$temp_header[] = '</div>';
} else { } else {
$temp_header[] = '<div class="widget-availability-service">Total services <label class="label label-success label-font-border">up</label> '.$service_up_count.' <label class="label label-warning label-font-border">warn</label> '.$service_warn_count.' <label class="label label-danger label-font-border">down</label> '.$service_down_count.'</div>'; $headerClass = 'widget-availability-service';
} }
$temp_header[] = '
<div class="'.$headerClass.'">
<span>Total services</span>
<label class="label label-success label-font-border label-border">up: '.$service_up_count.'</label>
<label class="label label-warning label-font-border label-border">warn: '.$service_warn_count.'</label>
<label class="label label-danger label-font-border label-border">down: '.$service_down_count.'</label>
</div>';
} }
$temp_header[] = '</div>'; $temp_header[] = '</div>';