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

Merge pull request #2537 from Alucardfh/scaleDeviceOverview

Browse Source 
Use browser width to scale cpu and bandwidth graphs on device overview
This commit is contained in:
Paul Gear
2016-01-07 08:11:39 +10:00
parent d4c4f9d858 b40bd2f467
commit 590593e43d
3 changed files with 38 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
html/pages/device/overview/ports.inc.php
View File

@@ -10,8 +10,19 @@ if ($ports['total']) {
</div>
<table class="table table-hover table-condensed table-striped">';
$graph_array['height'] = '100';
$graph_array['width'] = '485';
if($_SESSION['screen_width']) {
if($_SESSION['screen_width'] > 970) {
$graph_array['width'] = round(($_SESSION['screen_width'] - 390 )/2,0);
$graph_array['height'] = round($graph_array['width'] /3);
$graph_array['lazy_w'] = $graph_array['width'] + 80;
}
else {
$graph_array['width'] = $_SESSION['screen_width'] - 190;
$graph_array['height'] = round($graph_array['width'] /3);
$graph_array['lazy_w'] = $graph_array['width'] + 80;
}
}
$graph_array['to'] = $config['time']['now'];
$graph_array['device'] = $device['device_id'];
$graph_array['type'] = 'device_bits';
@@ -19,6 +30,9 @@ if ($ports['total']) {
$graph_array['legend'] = 'no';
$graph = generate_lazy_graph_tag($graph_array);
#Generate tooltip
$graph_array['width'] = 210;
$graph_array['height'] = 100;
$link_array = $graph_array;
$link_array['page'] = 'graphs';
unset($link_array['height'], $link_array['width']);

18
html/pages/device/overview/processors.inc.php
View File

@@ -64,9 +64,20 @@ if (count($processors)) {
if ($config['cpu_details_overview'] === false)
{
if($_SESSION['screen_width']) {
if($_SESSION['screen_width'] > 970) {
$graph_array['width'] = round(($_SESSION['screen_width'] - 390 )/2,0);
$graph_array['height'] = round($graph_array['width'] /3);
$graph_array['lazy_w'] = $graph_array['width'] + 80;
}
else {
$graph_array['width'] = $_SESSION['screen_width'] - 190;
$graph_array['height'] = round($graph_array['width'] /3);
$graph_array['lazy_w'] = $graph_array['width'] + 80;
}
}
//Generate average cpu graph
$graph_array['height'] = '100';
$graph_array['width'] = '485';
$graph_array['device'] = $device['device_id'];
$graph_array['type'] = 'device_processor';
$graph = generate_lazy_graph_tag($graph_array);
@@ -78,7 +89,8 @@ if (count($processors)) {
$link = generate_url($link_array);
//Generate tooltip
$graph_array['width'] = '210';
$graph_array['width']=210;
$graph_array['height']=100;
$overlib_content = generate_overlib_content($graph_array, $device['hostname'].' - CPU usage');
echo '<tr>