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

make widescreen better. made graphs change on devices page to fill widescreen.

Browse Source 
fix generic_multi_bits_separated. rrdtool_graph is so complicated! Thanks monrad.


git-svn-id: http://www.observium.org/svn/observer/trunk@2537 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-09-21 13:22:27 +00:00
parent c1fe765a86
commit 51d7ea9292
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
html/css/styles-wide.css
View File

@@ -6,3 +6,4 @@
margin:0 auto; margin:0 auto;
width: 1776px; width: 1776px;
} }

1
html/css/styles.css
View File

@@ -831,7 +831,6 @@ a.interface-upup:hover, a.interface-updown:hover, a.interface-admindown:hover {
.contentstyle { .contentstyle {
border: 1px solid #aaaaaa; border: 1px solid #aaaaaa;
width: 1176px;
margin-bottom: 1em; margin-bottom: 1em;
padding: 10px; padding: 10px;
float: left; float: left;

9
html/includes/graphs/generic_multi_bits_separated.inc.php
View File

@@ -65,10 +65,11 @@ foreach ($rrd_list as $rrd)
if (!$nototal) { $rrd_options .= " GPRINT:totin".$i.":%6.2lf%s$total_units"; } if (!$nototal) { $rrd_options .= " GPRINT:totin".$i.":%6.2lf%s$total_units"; }
$rrd_options .= " 'AREA:outB".$i."_neg#" . $colour_out . ":".$descr_out.":$stack'"; $rrd_options .= " 'HRULE:0#" . $colour_out.":".$descr_out."'";
$rrd_options .= " GPRINT:outB".$i.":LAST:%6.2lf%s$units"; $rrd_optionsb .= " 'AREA:outB".$i."_neg#" . $colour_out . "::$stack'";
$rrd_options .= " GPRINT:outB".$i.":AVERAGE:%6.2lf%s$units"; $rrd_options .= " GPRINT:outB".$i.":LAST:%6.2lf%s$units";
$rrd_options .= " GPRINT:outB".$i.":MAX:%6.2lf%s$units\l"; $rrd_options .= " GPRINT:outB".$i.":AVERAGE:%6.2lf%s$units";
$rrd_options .= " GPRINT:outB".$i.":MAX:%6.2lf%s$units\l";
if (!$nototal) { $rrd_options .= " GPRINT:totout".$i.":%6.2lf%s$total_unit"; } if (!$nototal) { $rrd_options .= " GPRINT:totout".$i.":%6.2lf%s$total_unit"; }

6
html/pages/devices.inc.php
View File

@@ -247,12 +247,14 @@ if($format == "graph")
{ {
$graph_type = "device_".$subformat; $graph_type = "device_".$subformat;
echo("<div style='display: block; padding: 1px; margin: 2px; min-width: 393px; max-width:393px; min-height:170px; max-height:170px; text-align: center; float: left; background-color: #f5f5f5;'> if($_SESSION['widescreen']) { $width=270; } else { $width=315; }
echo("<div style='display: block; padding: 1px; margin: 2px; min-width: ".($width+78)."px; max-width:".($width+78)."px; min-height:170px; max-height:170px; text-align: center; float: left; background-color: #f5f5f5;'>
<a href='device/device=".$device['device_id']."/' onmouseover=\"return overlib('\ <a href='device/device=".$device['device_id']."/' onmouseover=\"return overlib('\
<div style=\'font-size: 16px; padding:5px; font-weight: bold; color: #e5e5e5;\'>".$device['hostname']." - ".$interface['ifDescr']."</div>\ <div style=\'font-size: 16px; padding:5px; font-weight: bold; color: #e5e5e5;\'>".$device['hostname']." - ".$interface['ifDescr']."</div>\
<img src=\'graph.php?type=$graph_type&amp;id=".$device['device_id']."&amp;from=".$config['time']['day']."&amp;to=".$config['time']['now']."&amp;width=450&amp;height=150&amp;title=yes\'>\ <img src=\'graph.php?type=$graph_type&amp;id=".$device['device_id']."&amp;from=".$config['time']['day']."&amp;to=".$config['time']['now']."&amp;width=450&amp;height=150&amp;title=yes\'>\
', CENTER, LEFT, FGCOLOR, '#e5e5e5', BGCOLOR, '#e5e5e5', WIDTH, 400, HEIGHT, 150);\" onmouseout=\"return nd();\" >". ', CENTER, LEFT, FGCOLOR, '#e5e5e5', BGCOLOR, '#e5e5e5', WIDTH, 400, HEIGHT, 150);\" onmouseout=\"return nd();\" >".
"<img src='graph.php?type=$graph_type&amp;id=".$device['device_id']."&amp;from=".$config['time']['day']."&amp;to=".$config['time']['now']."&amp;width=315&amp;height=110&amp;legend=no&amp;title=yes'> "<img src='graph.php?type=$graph_type&amp;id=".$device['device_id']."&amp;from=".$config['time']['day']."&amp;to=".$config['time']['now']."&amp;width=".$width."&amp;height=110&amp;legend=no&amp;title=yes'>
</a> </a>
</div>"); </div>");
} }