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

2011-04-18 Miguel de Dios <miguel.dedios@artica.es> 

* include/functions_graph.php, godmode/reporting/graph_builder.preview.php:
	fixes for the new graph engine.
	
	* operation/agentes/estado_monitores.php: added a toggle button to show the
	the entire value or sub string for value (by default).



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4240 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2011-04-18 16:07:20 +00:00
parent efe2342ce9
commit 2e3c56cc9e
4 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -1,3 +1,11 @@
2011-04-18 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_graph.php, godmode/reporting/graph_builder.preview.php:
fixes for the new graph engine.
* operation/agentes/estado_monitores.php: added a toggle button to show the
the entire value or sub string for value (by default).
2011-04-18 Miguel de Dios <miguel.dedios@artica.es> 2011-04-18 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_graph.php, include/graphs/functions_fsgraph.php, * include/functions_graph.php, include/graphs/functions_fsgraph.php,

2
pandora_console/godmode/reporting/graph_builder.preview.php
View File

@ -139,6 +139,8 @@ echo "<tr><td>";
if(!empty($modules)) { if(!empty($modules)) {
require_once ($config["homedir"] . '/include/functions_graph.php'); require_once ($config["homedir"] . '/include/functions_graph.php');
echo graphic_combined_module2(explode (',', $modules), explode (',', $weights), $period, $width, $height, echo graphic_combined_module2(explode (',', $modules), explode (',', $weights), $period, $width, $height,
'Combined%20Sample%20Graph', '', $events, 0, 0, $stacked, $unixdate); 'Combined%20Sample%20Graph', '', $events, 0, 0, $stacked, $unixdate);
} }

2
pandora_console/include/functions_graph.php
View File

@ -327,6 +327,8 @@ function graphic_combined_module2 ($module_list, $weight_list, $period, $width,
global $config; global $config;
global $graphic_type; global $graphic_type;
include_flash_chart_script();
// Set the title and time format // Set the title and time format
if ($period <= 3600) { if ($period <= 3600) {

25
pandora_console/operation/agentes/estado_monitores.php
View File

@ -323,7 +323,18 @@ foreach ($modules as $module) {
$salida = format_numeric($module["datos"]); $salida = format_numeric($module["datos"]);
} }
else { else {
$salida = "<span title='".$module['datos']."' style='white-space: nowrap;'>".substr(safe_output($module["datos"]),0,12)."</span>"; $module_value = safe_output($module["datos"]);
$sub_string = substr(safe_output($module["datos"]),0, 12);
if ($module_value == $sub_string) {
$salida = $module_value;
}
else {
$salida = "<span id='value_module_" . $module["id_agente_modulo"] . "'
title='".$module_value."' style='white-space: nowrap;'>" .
'<span id="value_module_text_' . $module["id_agente_modulo"] . '">' . $sub_string . '</span> ' .
"<a href='javascript: toggle_full_value(" . $module["id_agente_modulo"] . ")'>" . print_image("images/rosette.png", true) . "" . "</span>";
}
} }
} }
@ -357,6 +368,18 @@ foreach ($modules as $module) {
$rowIndex++; $rowIndex++;
} }
?>
<script type="text/javascript">
function toggle_full_value(id) {
value_title = $("#value_module_" + id).attr('title');
$("#value_module_" + id).attr('title', $("#value_module_text_" + id).html());
$("#value_module_text_" + id).html(value_title);
}
</script>
<?php
if (empty ($table->data)) { if (empty ($table->data)) {
echo '<div class="nf">'.__('This agent doesn\'t have any active monitors').'</div>'; echo '<div class="nf">'.__('This agent doesn\'t have any active monitors').'</div>';
} }