diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index b82cd834e4..0e5de8b908 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,9 @@ +2011-07-12 Juan Manuel Ramon + + * include/functions_graph.php: Truncate agent name when is large in + graphs legends and add missed ttl variable. + * include/styles/pandora.css: Changed style in submit buttons. + 2011-07-13 Sergio Martin * godmode/agentes/module_manager_editor_prediction.php diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php index a713eeaf14..1ecab6161c 100755 --- a/pandora_console/include/functions_graph.php +++ b/pandora_console/include/functions_graph.php @@ -335,7 +335,7 @@ function grafico_modulo_sparse2 ($agent_module_id, $period, $show_events, */ function graphic_combined_module2 ($module_list, $weight_list, $period, $width, $height, $title, $unit_name, $show_events = 0, $show_alerts = 0, $pure = 0, - $stacked = 0, $date = 0, $only_image = false, $homeurl = '') { + $stacked = 0, $date = 0, $only_image = false, $homeurl = '', $ttl = 1) { global $config; global $graphic_type; @@ -410,7 +410,7 @@ function graphic_combined_module2 ($module_list, $weight_list, $period, $width, $agent_name = modules_get_agentmodule_agent_name ($agent_module_id); $agent_id = agents_get_agent_id ($agent_name); $module_name = modules_get_agentmodule_name ($agent_module_id); - $module_name_list[$i] = $agent_name." / ".substr ($module_name, 0, 40); + $module_name_list[$i] = substr($agent_name, 0,80) ." / ".substr ($module_name, 0, 40); $id_module_type = modules_get_agentmodule_type ($agent_module_id); $module_type = modules_get_moduletype_name ($id_module_type); $uncompressed_module = is_module_uncompressed ($module_type); diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index d84ff90901..de1020ac31 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -317,52 +317,52 @@ input.camera_min, input.config_min, input.label_min, input.icon_min { padding-right: 25px; } input.next { - background: #e5e5e5 url(../../images/go.png) no-repeat right 2px; + background: #e5e5e5 url(../../images/go.png) no-repeat 98% 2px; } input.upd { - background: #e5e5e5 url(../../images/upd.png) no-repeat right 3px; + background: #e5e5e5 url(../../images/upd.png) no-repeat 98% 3px; } input.wand { - background: #e5e5e5 url(../../images/wand.png) no-repeat right 3px; + background: #e5e5e5 url(../../images/wand.png) no-repeat 98% 3px; } input.search { - background: #e5e5e5 url(../../images/zoom.png) no-repeat right 3px; + background: #e5e5e5 url(../../images/zoom.png) no-repeat 98% 3px; } input.copy { - background: #e5e5e5 url(../../images/copy.png) no-repeat right 3px; + background: #e5e5e5 url(../../images/copy.png) no-repeat 98% 3px; } input.ok { - background: #e5e5e5 url(../../images/ok.png) no-repeat right 3px; + background: #e5e5e5 url(../../images/ok.png) no-repeat 98% 3px; } input.add { - background: #e5e5e5 url(../../images/add.png) no-repeat right 3px; + background: #e5e5e5 url(../../images/add.png) no-repeat 98% 3px; } input.cancel { - background: #e5e5e5 url(../../images/cancel.png) no-repeat right 3px; + background: #e5e5e5 url(../../images/cancel.png) no-repeat 98% 3px; } input.delete { - background: #e5e5e5 url(../../images/cross.png) no-repeat right 3px; + background: #e5e5e5 url(../../images/cross.png) no-repeat 98% 3px; } input.cog { - background: #e5e5e5 url(../../images/cog.png) no-repeat right 3px; + background: #e5e5e5 url(../../images/cog.png) no-repeat 98% 3px; } input.target { - background: #e5e5e5 url(../../images/target.png) no-repeat right 3px; + background: #e5e5e5 url(../../images/target.png) no-repeat 98% 3px; } input.graph { - background: #e5e5e5 url(../../images/chart_curve.png) no-repeat right 3px; + background: #e5e5e5 url(../../images/chart_curve.png) no-repeat 98% 3px; } input.percentile { - background: #e5e5e5 url(../../images/chart_bar.png) no-repeat right 3px; + background: #e5e5e5 url(../../images/chart_bar.png) no-repeat 98% 3px; } input.binary { - background: #e5e5e5 url(../../images/binary.png) no-repeat right 3px; + background: #e5e5e5 url(../../images/binary.png) no-repeat 98% 3px; } input.camera { - background: #e5e5e5 url(../../images/camera.png) no-repeat right 3px; + background: #e5e5e5 url(../../images/camera.png) no-repeat 98% 3px; } input.config { - background: #e5e5e5 url(../../images/config.png) no-repeat right 3px; + background: #e5e5e5 url(../../images/config.png) no-repeat 98% 3px; } input.delete_min { background: #e5e5e5 url(../../images/cross.png) no-repeat center;