mirror of
https://github.com/librenms/librenms.git
synced 2024-10-07 16:52:45 +00:00
fix alignment, removed redunant css classes, align layout with the rest (#7954)
This commit is contained in:
crcro
Neil Lathwood
@@ -2157,40 +2157,8 @@ label {
|
||||
margin-right: 15px;
|
||||
}
|
||||
|
||||
.severity-ok {
|
||||
color: green;
|
||||
}
|
||||
|
||||
.severity-info {
|
||||
color: royalblue;
|
||||
}
|
||||
|
||||
.severity-notice {
|
||||
color: gold;
|
||||
}
|
||||
|
||||
.severity-warning {
|
||||
color: darkorange;
|
||||
}
|
||||
|
||||
.severity-critical {
|
||||
color: red;
|
||||
}
|
||||
|
||||
.severity-unknown {
|
||||
color: darkgrey;
|
||||
}
|
||||
|
||||
.alert-status {
|
||||
display: inline-block;
|
||||
width: 7px;
|
||||
min-height: 27px;
|
||||
}
|
||||
|
||||
.service-status {
|
||||
width:10px;
|
||||
height:50px;
|
||||
display: block;
|
||||
margin: 0;
|
||||
border-radius: 0;
|
||||
}
|
||||
|
||||
@@ -1,185 +1,208 @@
|
||||
<?php
|
||||
/*
|
||||
* LibreNMS
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
* Free Software Foundation, either version 3 of the License, or (at your
|
||||
* option) any later version. Please see LICENSE.txt at the top level of
|
||||
* the source code distribution for details.
|
||||
*
|
||||
* @package LibreNMS
|
||||
* @subpackage webui
|
||||
* @link http://librenms.org
|
||||
* @copyright 2017 LibreNMS
|
||||
* @author LibreNMS Contributors
|
||||
*/
|
||||
|
||||
$pagetitle[] = 'Services';
|
||||
|
||||
require_once 'includes/modal/new_service.inc.php';
|
||||
require_once 'includes/modal/delete_service.inc.php';
|
||||
?>
|
||||
<div class="container-fluid">
|
||||
<div class="row">
|
||||
<?php
|
||||
print_optionbar_start();
|
||||
require_once 'includes/modal/new_service.inc.php';
|
||||
<div class="row">
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading">
|
||||
<span style="font-weight: bold;">Services</span> »
|
||||
|
||||
require_once 'includes/modal/delete_service.inc.php';
|
||||
<?php
|
||||
$menu_options = array(
|
||||
'basic' => 'Basic',
|
||||
);
|
||||
|
||||
echo "<span style='font-weight: bold;'>Services</span> » ";
|
||||
$menu_options = array(
|
||||
'basic' => 'Basic',
|
||||
);
|
||||
if (!$vars['view']) {
|
||||
$vars['view'] = 'basic';
|
||||
}
|
||||
|
||||
if (!$vars['view']) {
|
||||
$vars['view'] = 'basic';
|
||||
}
|
||||
$status_options = array(
|
||||
'all' => 'All',
|
||||
'ok' => 'Ok',
|
||||
'warning' => 'Warning',
|
||||
'critical' => 'Critical',
|
||||
);
|
||||
|
||||
$status_options = array(
|
||||
'all' => 'All',
|
||||
'ok' => 'Ok',
|
||||
'warning' => 'Warning',
|
||||
'critical' => 'Critical',
|
||||
);
|
||||
if (!$vars['state']) {
|
||||
$vars['state'] = 'all';
|
||||
}
|
||||
|
||||
if (!$vars['state']) {
|
||||
$vars['state'] = 'all';
|
||||
}
|
||||
// The menu option - on the left
|
||||
|
||||
// The menu option - on the left
|
||||
$sep = '';
|
||||
|
||||
$sep = '';
|
||||
foreach ($menu_options as $option => $text) {
|
||||
if (empty($vars['view'])) {
|
||||
$vars['view'] = $option;
|
||||
}
|
||||
|
||||
foreach ($menu_options as $option => $text) {
|
||||
if (empty($vars['view'])) {
|
||||
$vars['view'] = $option;
|
||||
}
|
||||
echo $sep;
|
||||
if ($vars['view'] == $option) {
|
||||
echo "<span class='pagemenu-selected'>";
|
||||
}
|
||||
|
||||
echo $sep;
|
||||
if ($vars['view'] == $option) {
|
||||
echo "<span class='pagemenu-selected'>";
|
||||
}
|
||||
echo generate_link($text, $vars, array(
|
||||
'view' => $option
|
||||
));
|
||||
if ($vars['view'] == $option) {
|
||||
echo '</span>';
|
||||
}
|
||||
|
||||
echo generate_link($text, $vars, array(
|
||||
'view' => $option
|
||||
));
|
||||
if ($vars['view'] == $option) {
|
||||
echo '</span>';
|
||||
}
|
||||
$sep = ' | ';
|
||||
}
|
||||
|
||||
$sep = ' | ';
|
||||
}
|
||||
unset($sep);
|
||||
|
||||
unset($sep);
|
||||
// The status option - on the right
|
||||
|
||||
// The status option - on the right
|
||||
echo '<div class="pull-right">';
|
||||
$sep = '';
|
||||
|
||||
echo '<div class="pull-right">';
|
||||
$sep = '';
|
||||
foreach ($status_options as $option => $text) {
|
||||
if (empty($vars['state'])) {
|
||||
$vars['state'] = $option;
|
||||
}
|
||||
|
||||
foreach ($status_options as $option => $text) {
|
||||
if (empty($vars['state'])) {
|
||||
$vars['state'] = $option;
|
||||
}
|
||||
echo $sep;
|
||||
if ($vars['state'] == $option) {
|
||||
echo "<span class='pagemenu-selected'>";
|
||||
}
|
||||
|
||||
echo $sep;
|
||||
if ($vars['state'] == $option) {
|
||||
echo "<span class='pagemenu-selected'>";
|
||||
}
|
||||
echo generate_link($text, $vars, array(
|
||||
'state' => $option
|
||||
));
|
||||
if ($vars['state'] == $option) {
|
||||
echo '</span>';
|
||||
}
|
||||
|
||||
echo generate_link($text, $vars, array(
|
||||
'state' => $option
|
||||
));
|
||||
if ($vars['state'] == $option) {
|
||||
echo '</span>';
|
||||
}
|
||||
$sep = ' | ';
|
||||
}
|
||||
|
||||
$sep = ' | ';
|
||||
}
|
||||
unset($sep);
|
||||
echo '</div>';
|
||||
echo '</div>';
|
||||
echo '<div class="panel-body">';
|
||||
|
||||
unset($sep);
|
||||
echo '</div>';
|
||||
print_optionbar_end();
|
||||
$sql_param = array();
|
||||
$sql_param = array();
|
||||
|
||||
if (isset($vars['state'])) {
|
||||
if ($vars['state'] == 'ok') {
|
||||
$state = '0';
|
||||
} elseif ($vars['state'] == 'critical') {
|
||||
$state = '2';
|
||||
} elseif ($vars['state'] == 'warning') {
|
||||
$state = '1';
|
||||
}
|
||||
}
|
||||
if (isset($vars['state'])) {
|
||||
if ($vars['state'] == 'ok') {
|
||||
$state = '0';
|
||||
} elseif ($vars['state'] == 'critical') {
|
||||
$state = '2';
|
||||
} elseif ($vars['state'] == 'warning') {
|
||||
$state = '1';
|
||||
}
|
||||
}
|
||||
|
||||
if (isset($state)) {
|
||||
$where.= " AND service_status= ? AND service_disabled='0' AND `service_ignore`='0'";
|
||||
$sql_param[] = $state;
|
||||
}
|
||||
?>
|
||||
<div class="row col-sm-12"><span id="message"></span></div>
|
||||
<?php
|
||||
if ($_SESSION['userlevel'] >= '5') {
|
||||
$host_sql = 'SELECT `D`.`device_id`,`D`.`hostname`,`D`.`sysName` FROM devices AS D, services AS S WHERE D.device_id = S.device_id GROUP BY `D`.`hostname`, `D`.`device_id` ORDER BY D.hostname';
|
||||
$host_par = array();
|
||||
} else {
|
||||
$host_sql = 'SELECT `D`.`device_id`,`D`.`hostname`,`D`.`sysName` FROM devices AS D, services AS S, devices_perms AS P WHERE D.device_id = S.device_id AND D.device_id = P.device_id AND P.user_id = ? GROUP BY `D`.`hostname`, `D`.`device_id` ORDER BY D.hostname';
|
||||
$host_par = array($_SESSION['user_id']);
|
||||
}
|
||||
if (isset($state)) {
|
||||
$where .= " AND service_status= ? AND service_disabled='0' AND `service_ignore`='0'";
|
||||
$sql_param[] = $state;
|
||||
}
|
||||
?>
|
||||
<div class="row col-sm-12"><span id="message"></span></div>
|
||||
<?php
|
||||
if ($_SESSION['userlevel'] >= '5') {
|
||||
$host_sql = 'SELECT `D`.`device_id`,`D`.`hostname`,`D`.`sysName` FROM devices AS D, services AS S WHERE D.device_id = S.device_id GROUP BY `D`.`hostname`, `D`.`device_id` ORDER BY D.hostname';
|
||||
$host_par = array();
|
||||
} else {
|
||||
$host_sql = 'SELECT `D`.`device_id`,`D`.`hostname`,`D`.`sysName` FROM devices AS D, services AS S, devices_perms AS P WHERE D.device_id = S.device_id AND D.device_id = P.device_id AND P.user_id = ? GROUP BY `D`.`hostname`, `D`.`device_id` ORDER BY D.hostname';
|
||||
$host_par = array($_SESSION['user_id']);
|
||||
}
|
||||
|
||||
$shift = 1;
|
||||
foreach (dbFetchRows($host_sql, $host_par) as $device) {
|
||||
$device_id = $device['device_id'];
|
||||
$device_hostname = $device['hostname'];
|
||||
$device_sysName = $device['sysName'];
|
||||
$devlink = generate_device_link($device, null, array('tab' => 'services'));
|
||||
if ($shift == 1) {
|
||||
array_unshift($sql_param, $device_id);
|
||||
$shift = 0;
|
||||
} else {
|
||||
$sql_param[0] = $device_id;
|
||||
}
|
||||
$head=true;
|
||||
$shift = 1;
|
||||
foreach (dbFetchRows($host_sql, $host_par) as $device) {
|
||||
$device_id = $device['device_id'];
|
||||
$device_hostname = $device['hostname'];
|
||||
$device_sysName = $device['sysName'];
|
||||
$devlink = generate_device_link($device, null, array('tab' => 'services'));
|
||||
if ($shift == 1) {
|
||||
array_unshift($sql_param, $device_id);
|
||||
$shift = 0;
|
||||
} else {
|
||||
$sql_param[0] = $device_id;
|
||||
}
|
||||
$head = true;
|
||||
|
||||
foreach (dbFetchRows("SELECT * FROM `services` WHERE `device_id` = ? $where ORDER BY service_type", $sql_param) as $service) {
|
||||
if ($service['service_status'] == '2') {
|
||||
$label = 'danger';
|
||||
$title = 'CRITICAL';
|
||||
} elseif ($service['service_status'] == '1') {
|
||||
$label = 'warning';
|
||||
$title = 'WARNING';
|
||||
} elseif ($service['service_status'] == '0') {
|
||||
$label = 'success';
|
||||
$title = 'OK';
|
||||
} else {
|
||||
$label = 'info';
|
||||
$title = 'UNKNOWN';
|
||||
}
|
||||
if ($head) {
|
||||
echo '
|
||||
foreach (dbFetchRows("SELECT * FROM `services` WHERE `device_id` = ? $where ORDER BY service_type", $sql_param) as $service) {
|
||||
if ($service['service_status'] == '2') {
|
||||
$label = 'label-danger';
|
||||
$title = 'CRITICAL';
|
||||
} elseif ($service['service_status'] == '1') {
|
||||
$label = 'label-warning';
|
||||
$title = 'WARNING';
|
||||
} elseif ($service['service_status'] == '0') {
|
||||
$label = 'label-success';
|
||||
$title = 'OK';
|
||||
} else {
|
||||
$label = 'label-info';
|
||||
$title = 'UNKNOWN';
|
||||
}
|
||||
if ($head) {
|
||||
echo '
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading">
|
||||
<h3 class="panel-title">'.$devlink.'</h3>
|
||||
'.$device_sysName.'
|
||||
<h3 class="panel-title">' . $devlink . '</h3>
|
||||
' . $device_sysName . '
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
<table class="table table-hover table-condensed">
|
||||
<thead>
|
||||
<tr>
|
||||
<th></th>
|
||||
<th>Service</th>
|
||||
<th>Last Changed</th>
|
||||
<th>Message</th>
|
||||
<th style="width:1%;max-width:1%;"></th>
|
||||
<th style="width:10%;max-width: 10%;">Service</th>
|
||||
<th style="width:15%;max-width: 15%;">Last Changed</th>
|
||||
<th style="width:15%;max-width: 15%;">Description</th>
|
||||
<th >Message</th>
|
||||
<th style="width:5%;max-width:5%;"></th>
|
||||
</tr>
|
||||
</thead>
|
||||
';
|
||||
}
|
||||
$head=false;
|
||||
?>
|
||||
<tr>
|
||||
<td><span data-toggle='tooltip' title='<?php echo $title?>' class='service-status label label-<?php echo $label?>'> </span></td>
|
||||
<td><?php echo nl2br(display($service['service_type']))?></td>
|
||||
<td><?php echo formatUptime(time() - $service['service_changed'])?></td>
|
||||
<td><?php echo nl2br(display($service['service_desc']))?></td>
|
||||
<td><?php echo nl2br(display($service['service_message']))?></td>
|
||||
<?php
|
||||
if (is_admin() === true) {
|
||||
echo " <td><button type='button' class='btn btn-primary btn-sm' aria-label='Edit' data-toggle='modal' data-target='#create-service' data-service_id='{$service['service_id']}' name='edit-service'><i class='fa fa-pencil' aria-hidden='true'></i></button>
|
||||
<button type='button' class='btn btn-danger btn-sm' aria-label='Delete' data-toggle='modal' data-target='#confirm-delete' data-service_id='{$service['service_id']}' name='delete-service'><i class='fa fa-trash' aria-hidden='true'></i></button></td>";
|
||||
}
|
||||
?>
|
||||
</tr>
|
||||
<?php
|
||||
}//end foreach
|
||||
}
|
||||
$head = false;
|
||||
?>
|
||||
<tr>
|
||||
<td><span data-toggle='tooltip' title='<?php echo $title ?>'
|
||||
class='alert-status <?php echo $label ?>'> </span></td>
|
||||
<td><?php echo nl2br(display($service['service_type'])) ?></td>
|
||||
<td><?php echo formatUptime(time() - $service['service_changed']) ?></td>
|
||||
<td><?php echo nl2br(display($service['service_desc'])) ?></td>
|
||||
<td><?php echo nl2br(display($service['service_message'])) ?></td>
|
||||
<?php
|
||||
if (is_admin() === true) {
|
||||
echo "<td>
|
||||
<button type='button' class='btn btn-primary btn-sm' aria-label='Edit' data-toggle='modal' data-target='#create-service' data-service_id='{$service['service_id']}' name='edit-service'><i class='fa fa-pencil' aria-hidden='true'></i></button>
|
||||
<button type='button' class='btn btn-danger btn-sm' aria-label='Delete' data-toggle='modal' data-target='#confirm-delete' data-service_id='{$service['service_id']}' name='delete-service'><i class='fa fa-trash' aria-hidden='true'></i></button>
|
||||
</td>";
|
||||
}
|
||||
?>
|
||||
</tr>
|
||||
<?php
|
||||
}//end foreach
|
||||
|
||||
echo "</table></div></div>";
|
||||
unset($samehost);
|
||||
}//end foreach
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
echo "</table></div></div>";
|
||||
unset($samehost);
|
||||
}//end foreach
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user