From b40bd2f467faa48cce15e456afb0ea913d692a19 Mon Sep 17 00:00:00 2001 From: Louis Bailleul Date: Mon, 21 Dec 2015 13:26:48 +0000 Subject: [PATCH] Rebase --- html/includes/functions.inc.php | 7 +++++++ html/pages/device/overview/ports.inc.php | 6 ++++-- html/pages/device/overview/processors.inc.php | 6 ++++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/html/includes/functions.inc.php b/html/includes/functions.inc.php index b303255908..fa9664636a 100644 --- a/html/includes/functions.inc.php +++ b/html/includes/functions.inc.php @@ -473,10 +473,17 @@ function generate_lazy_graph_tag($args) { case 'height': $h = $arg; break; + case 'lazy_w': + $lazy_w = $arg; + break; } $urlargs[] = $key."=".urlencode($arg); } + if(isset($lazy_w)) { + $w=$lazy_w; + } + if ($config['enable_lazy_load'] === true) { return ''; } diff --git a/html/pages/device/overview/ports.inc.php b/html/pages/device/overview/ports.inc.php index 7701b29cd6..1d9ce8459b 100644 --- a/html/pages/device/overview/ports.inc.php +++ b/html/pages/device/overview/ports.inc.php @@ -12,12 +12,14 @@ if ($ports['total']) { if($_SESSION['screen_width']) { if($_SESSION['screen_width'] > 970) { - $graph_array['width'] = round(($_SESSION['screen_width'] - 190 )/2,0); + $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'] - 110; + $graph_array['width'] = $_SESSION['screen_width'] - 190; $graph_array['height'] = round($graph_array['width'] /3); + $graph_array['lazy_w'] = $graph_array['width'] + 80; } } diff --git a/html/pages/device/overview/processors.inc.php b/html/pages/device/overview/processors.inc.php index ca6bac04b2..6fbd0250cb 100644 --- a/html/pages/device/overview/processors.inc.php +++ b/html/pages/device/overview/processors.inc.php @@ -66,12 +66,14 @@ if (count($processors)) { if($_SESSION['screen_width']) { if($_SESSION['screen_width'] > 970) { - $graph_array['width'] = round(($_SESSION['screen_width'] - 190 )/2,0); + $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'] - 110; + $graph_array['width'] = $_SESSION['screen_width'] - 190; $graph_array['height'] = round($graph_array['width'] /3); + $graph_array['lazy_w'] = $graph_array['width'] + 80; } }