diff --git a/doc/General/Credits.md b/doc/General/Credits.md index dbc4d03ca..513b416d4 100644 --- a/doc/General/Credits.md +++ b/doc/General/Credits.md @@ -30,6 +30,12 @@ LibreNMS ships with the following software components: Mark Gibbons Initial code base submited via PR721 +- Jquery LazyLoad + http://www.appelsiini.net/projects/lazyload + Mika Tuupola (@tuupola on github) + MIT License + + Other components (needs details filled in): - JpGraph (html/includes/jpgraph): QPL 1.0 license diff --git a/html/includes/functions.inc.php b/html/includes/functions.inc.php index 0b62367cf..aa83aca1f 100644 --- a/html/includes/functions.inc.php +++ b/html/includes/functions.inc.php @@ -256,7 +256,7 @@ function overlib_link($url, $text, $contents, $class) { $output .= '>'; } else { - $output .= " onmouseover=\"return overlib('".$contents."'".$config['overlib_defaults'].', WRAP,HAUTO,VAUTO);" onmouseout="return nd();">'; + $output .= " onmouseover=\"return overlib('".$contents."'".$config['overlib_defaults'].",WRAP,HAUTO,VAUTO); \" onmouseout=\"return nd();\">"; } $output .= $text.''; @@ -430,6 +430,26 @@ function generate_graph_tag($args) { }//end generate_graph_tag() +function generate_lazy_graph_tag($args) { + $urlargs = array(); + $w = 0; + $h = 0; + foreach ($args as $key => $arg) { + switch (strtolower($key)) { + case 'width': + $w = $arg; + break; + case 'height': + $h = $arg; + break; + } + $urlargs[] = $key."=".urlencode($arg); + } + + return ''; + +}//end generate_lazy_graph_tag() + function generate_graph_js_state($args) { // we are going to assume we know roughly what the graph url looks like here. diff --git a/html/includes/print-graphrow.inc.php b/html/includes/print-graphrow.inc.php index db451315f..2ee411551 100644 --- a/html/includes/print-graphrow.inc.php +++ b/html/includes/print-graphrow.inc.php @@ -52,9 +52,9 @@ foreach ($periods as $period) { $link = generate_url($link_array); if ($return_data === true) { - $graph_data[] = overlib_link($link, generate_graph_tag($graph_array), generate_graph_tag($graph_array_zoom), null); + $graph_data[] = overlib_link($link, generate_lazy_graph_tag($graph_array), generate_graph_tag($graph_array_zoom), NULL); } else { - echo overlib_link($link, generate_graph_tag($graph_array), generate_graph_tag($graph_array_zoom), null); + echo(overlib_link($link, generate_lazy_graph_tag($graph_array), generate_graph_tag($graph_array_zoom), NULL)); } } diff --git a/html/includes/table/mempool.inc.php b/html/includes/table/mempool.inc.php index 2afb80edc..ce8193504 100644 --- a/html/includes/table/mempool.inc.php +++ b/html/includes/table/mempool.inc.php @@ -49,7 +49,7 @@ foreach (dbFetchRows($sql, $param) as $mempool) { $graph_array_zoom['height'] = '150'; $graph_array_zoom['width'] = '400'; $link = 'graphs/id='.$graph_array['id'].'/type='.$graph_array['type'].'/from='.$graph_array['from'].'/to='.$graph_array['to'].'/'; - $mini_graph = overlib_link($link, generate_graph_tag($graph_array), generate_graph_tag($graph_array_zoom), null); + $mini_graph = overlib_link($link, generate_lazy_graph_tag($graph_array), generate_graph_tag($graph_array_zoom), NULL); $background = get_percentage_colours($perc); $bar_link = overlib_link($link, print_percentage_bar(400, 20, $perc, "$used / $total", 'ffffff', $background['left'], $free, 'ffffff', $background['right']), generate_graph_tag($graph_array_zoom), null); diff --git a/html/includes/table/processor.inc.php b/html/includes/table/processor.inc.php index bcedd6196..42ad7344c 100644 --- a/html/includes/table/processor.inc.php +++ b/html/includes/table/processor.inc.php @@ -46,7 +46,7 @@ foreach (dbFetchRows($sql, $param) as $processor) { $graph_array_zoom['height'] = '150'; $graph_array_zoom['width'] = '400'; $link = 'graphs/id='.$graph_array['id'].'/type='.$graph_array['type'].'/from='.$graph_array['from'].'/to='.$graph_array['to'].'/'; - $mini_graph = overlib_link($link, generate_graph_tag($graph_array), generate_graph_tag($graph_array_zoom), null); + $mini_graph = overlib_link($link, generate_lazy_graph_tag($graph_array), generate_graph_tag($graph_array_zoom), NULL); $background = get_percentage_colours($perc); $bar_link = overlib_link($link, print_percentage_bar(400, 20, $perc, $perc.'%', 'ffffff', $background['left'], (100 - $perc).'%', 'ffffff', $background['right']), generate_graph_tag($graph_array_zoom), null); diff --git a/html/includes/table/storage.inc.php b/html/includes/table/storage.inc.php index 3d301456f..6236ff892 100644 --- a/html/includes/table/storage.inc.php +++ b/html/includes/table/storage.inc.php @@ -58,7 +58,7 @@ foreach (dbFetchRows($sql, $param) as $drive) { $graph_array_zoom['height'] = '150'; $graph_array_zoom['width'] = '400'; $link = 'graphs/id='.$graph_array['id'].'/type='.$graph_array['type'].'/from='.$graph_array['from'].'/to='.$graph_array['to'].'/'; - $mini_graph = overlib_link($link, generate_graph_tag($graph_array), generate_graph_tag($graph_array_zoom), null); + $mini_graph = overlib_link($link, generate_lazy_graph_tag($graph_array), generate_graph_tag($graph_array_zoom), NULL); $background = get_percentage_colours($perc); $bar_link = overlib_link($link, print_percentage_bar(400, 20, $perc, "$used / $total", 'ffffff', $background['left'], $free, 'ffffff', $background['right']), generate_graph_tag($graph_array_zoom), null); diff --git a/html/index.php b/html/index.php index a3de9ba0c..9dc7a454a 100644 --- a/html/index.php +++ b/html/index.php @@ -155,6 +155,8 @@ else { + +