tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1632-Pandora_FMS_charts_2' into 'develop' 

fixed minor errors

See merge request artica/pandorafms!1196
This commit is contained in:
vgilc 2017-12-19 10:04:02 +01:00
parent 9fce865099 fd66f84d0b
commit 32b81ae7aa
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/include/functions_html.php
View File

@ -801,7 +801,7 @@ function html_print_extended_select_for_time ($name, $selected = '',
$readonly = false, $custom_fields = false,$style_icon = '') { $readonly = false, $custom_fields = false,$style_icon = '') {
global $config; global $config;
$admin = is_user_admin($config['id_user']);
if($custom_fields){ if($custom_fields){
$fields = $custom_fields; $fields = $custom_fields;
} else { } else {
@ -853,7 +853,7 @@ function html_print_extended_select_for_time ($name, $selected = '',
html_print_select ($fields, $uniq_name . '_select', $selected,"" . $script, html_print_select ($fields, $uniq_name . '_select', $selected,"" . $script,
$nothing, $nothing_value, false, false, false, $class, $readonly, 'font-size: xx-small;'.$select_style); $nothing, $nothing_value, false, false, false, $class, $readonly, 'font-size: xx-small;'.$select_style);
// The advanced control is only for admins // The advanced control is only for admins
if (is_user_admin($config['id_user'])) { if ($admin) {
echo ' <a href="javascript:">' . echo ' <a href="javascript:">' .
html_print_image('images/pencil.png', true, html_print_image('images/pencil.png', true,
array('class' => $uniq_name . '_toggler', array('class' => $uniq_name . '_toggler',

2
pandora_console/include/help/en/help_graphs.php
View File

@ -48,7 +48,7 @@ div.img_title {
</style> </style>
<body class="hlp_graphs"> <body class="hlp_graphs">
<h1>INTERPRETING GHRAPHS IN PANDORA FMS</h1> <h1>INTERPRETING GRAPHS IN PANDORA FMS</h1>
<p>In Pandora FMS, graphs represent the values a module has had during a given period.</p> <p>In Pandora FMS, graphs represent the values a module has had during a given period.</p>