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

css changes. fixes to graph browser.

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@2573 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-09-26 12:16:05 +00:00
parent 0a253c1073
commit e394048ee4
5 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
html/css/styles.css
View File

@ -49,7 +49,10 @@ ul ul ul { list-style: square outside; }
.pagemenu-selected { .pagemenu-selected {
font-weight: bold; font-weight: bold;
background-color: #cecece; background-color: #dfdfdf;
border: 1px solid #c0c0c0;
margin: -1px;
padding:3px 8px 4px 8px; padding:3px 8px 4px 8px;
@ -58,6 +61,11 @@ ul ul ul { list-style: square outside; }
-webkit-border-radius: 10px; -webkit-border-radius: 10px;
border-radius: 10px; border-radius: 10px;
-webkit-box-shadow: #CCC 0 0 2px;
-moz-box-shadow: #CCC 0 0 2px;
box-shadow: #CCC 0 0 2px;
} }
.submit { .submit {

6
html/includes/functions.inc.php
View File

@ -82,7 +82,7 @@ function generate_overlib_content($graph_array, $text)
{ {
global $config; global $config;
$overlib_content = '<div style="width: 580px;"><span style="font-weight: bold; font-size: 16px;">'.$text."</span>"; $overlib_content = '<div style="width: 580px;"><span style="font-weight: bold; font-size: 16px;">'.$text."</span><br />";
foreach (array('day','week','month','year') as $period) foreach (array('day','week','month','year') as $period)
{ {
$graph_array['from'] = $config['time'][$period]; $graph_array['from'] = $config['time'][$period];
@ -421,9 +421,9 @@ function generate_port_thumbnail($args)
function print_optionbar_start ($height = 0, $width = 0, $marginbottom = 5) function print_optionbar_start ($height = 0, $width = 0, $marginbottom = 5)
{ {
echo(" echo("
<div class='rounded-5px' style='display: block; background: #e5e5e5; text-align: left; margin-top: 0px; <div class='rounded-5px' style='border: 1px solid #ccc; display: block; background: #eee; text-align: left; margin-top: 0px;
margin-bottom: ".$marginbottom."px; " . ($width ? 'max-width: ' . $width . (strstr($width,'%') ? '' : 'px') . '; ' : '') . " margin-bottom: ".$marginbottom."px; " . ($width ? 'max-width: ' . $width . (strstr($width,'%') ? '' : 'px') . '; ' : '') . "
padding: 7px 14px'>"); padding: 7px 14px 8px 14px'>");
} }
function print_optionbar_end() function print_optionbar_end()

7
html/pages/graphs.inc.php
View File

@ -31,7 +31,12 @@ if (!$auth)
{ {
include("includes/error-no-perm.inc.php"); include("includes/error-no-perm.inc.php");
} else { } else {
if (isset($config['graph_types'][$type][$subtype]['descr'])) { $title .= " :: ".$config['graph_types'][$type][$subtype]['descr']; } else { $title .= " :: ".$graph_type; } if (isset($config['graph_types'][$type][$subtype]['descr']))
{
$title .= " :: ".$config['graph_types'][$type][$subtype]['descr'];
} else {
$title .= " :: ".ucfirst($subtype);
}
$graph_array = $vars; $graph_array = $vars;
$graph_array['height'] = "60"; $graph_array['height'] = "60";

14
html/pages/ports.inc.php
View File

@ -35,14 +35,6 @@ foreach (dbFetchRows("SELECT `device_id`,`hostname` FROM `devices` GROUP BY `hos
<option value="up" <?php if ($vars['state'] == "up") { echo("selected"); } ?>>Up</option> <option value="up" <?php if ($vars['state'] == "up") { echo("selected"); } ?>>Up</option>
<option value="down"<?php if ($vars['state'] == "down") { echo("selected"); } ?>>Down</option> <option value="down"<?php if ($vars['state'] == "down") { echo("selected"); } ?>>Down</option>
<option value="admindown" <?php if ($vars['state'] == "admindown") { echo("selected"); } ?>>Shutdown</option> <option value="admindown" <?php if ($vars['state'] == "admindown") { echo("selected"); } ?>>Shutdown</option>
<option value="errors" <?php if ($vars['state'] == "errors") { echo("selected"); } ?>>Errors</option>
<option value="ignored" <?php if ($vars['state'] == "ignored") { echo("selected"); } ?>>Ignored</option>
<option value="ethernet" <?php if ($vars['state'] == "ethernet") { echo("selected"); } ?>>Ethernet</option>
<option value="l2vlan" <?php if ($vars['state'] == "l2vlan") { echo("selected"); } ?>>L2 VLAN</option>
<option value="sonet" <?php if ($vars['state'] == "sonet") { echo("selected"); } ?>>SONET</option>
<option value="propvirtual" <?php if ($vars['state'] == "propvirtual") { echo("selected"); } ?>>Virtual</option>
<option value="ppp" <?php if ($vars['state'] == "ppp") { echo("selected"); } ?>>PPP</option>
<option value="loopback" <?php if ($vars['state'] == "loopback") { echo("selected"); } ?>>Loopback</option>
</select> </select>
<br /> <br />
@ -271,6 +263,12 @@ foreach($vars as $var => $value)
$where .= " AND I.$var LIKE ?"; $where .= " AND I.$var LIKE ?";
$param[] = "%".$value."%"; $param[] = "%".$value."%";
break; break;
case 'errors':
if ($value == 1)
{
$where .= " AND (I.`ifInErrors_delta` > '0' OR I.`ifOutErrors_delta` > '0')";
}
break;
case 'state': case 'state':
if ($value == "down") if ($value == "down")
{ {

2
html/pages/ports/graph.inc.php
View File

@ -34,7 +34,7 @@ foreach ($ports as $port)
$link_array['page'] = "graphs"; $link_array['page'] = "graphs";
unset($link_array['height'], $link_array['width'], $link_array['legend']); unset($link_array['height'], $link_array['width'], $link_array['legend']);
$link = generate_url($link_array); $link = generate_url($link_array);
$overlib_content = generate_overlib_content($graph_array, $device['hostname'] . " - " . $port['ifDescr']); $overlib_content = generate_overlib_content($graph_array, $port['hostname'] . " - " . $port['label']);
$graph_array['title'] = "yes"; $graph_array['title'] = "yes";
$graph_array['width'] = 315; $graph_array['height'] = 119; $graph_array['width'] = 315; $graph_array['height'] = 119;
$graph = generate_graph_tag($graph_array); $graph = generate_graph_tag($graph_array);