nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-28 08:02:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/librenms/master' into ajax_headers_4

Browse Source
This commit is contained in:
pblasquez
2016-04-28 14:38:25 -07:00
parent 826cd17c33 940e98e41e
commit 21e2b45cec
7 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/pages/graphs.inc.php
+2 -2
View File
@@ -108,7 +108,7 @@ else {
echo('</tr></table>');
$graph_array = $vars;
$graph_array['height'] = "300";
$graph_array['height'] = $config['webui']['min_graph_height'];
$graph_array['width'] = $graph_width;
if($_SESSION['screen_width']) {
@@ -125,7 +125,7 @@ else {
$graph_array['height'] = ($_SESSION['screen_height'] - ($_SESSION['screen_height']/2));
}
else {
$graph_array['height'] = ($_SESSION['screen_height'] - ($_SESSION['screen_height']/1.5));
$graph_array['height'] = max($graph_array['height'],($_SESSION['screen_height'] - ($_SESSION['screen_height']/1.5)));
}
}
html/pages/settings/webui.inc.php
+8
View File
@@ -11,11 +11,19 @@ $search_conf = array(
),
);
$graph_conf = array(
array('name' => 'webui.min_graph_height',
'descr' => 'Set the minimum graph height',
'type' => 'text',
),
);
echo '
<div class="panel-group" id="accordion">
<form class="form-horizontal" role="form" action="" method="post">
';
echo generate_dynamic_config_panel('Graph settings',true,$config_groups,$graph_conf);
echo generate_dynamic_config_panel('Search settings',true,$config_groups,$search_conf);
echo '