2013-05-20 Sergio Martin <sergio.martin@artica.es>

* include/styles/pandora.css
	include/functions_groups.php
	include/functions_graph.php
	include/functions_reporting.php
	operation/search_results.php
	operation/agentes/estado_generalagente.php
	operation/agentes/ver_agente.php
	operation/agentes/group_view.php
	operation/servers/recon_view.php
	images/min.png
	images/max.png
	images/agent.png
	images/cross_undo.png
	images/policies_brick.png
	images/agent_warning.png
	images/rosette.png
	images/darrowright.png
	images/god5.png
	images/module_critical.png
	images/filter.png
	images/help.png
	images/darrowup.png
	images/wrench_orange.png
	images/chart_curve.png
	images/control_stop_col.png
	images/history_database.png
	images/zoom_cross.png
	images/agent_critical.png
	images/god6.png
	images/policies_cog.png
	images/heart.png
	images/percentile_item.png
	images/module_warning.png
	images/policies_error.png
	images/agent_ok.png
	images/os_icons/network_small.png
	images/os_icons/network.png
	images/god7.png
	images/heart_col.png
	images/clock2.png
	images/div.png
	images/policies_error_db.png
	images/agent_notinit.png
	images/application_not_writable.png
	images/delete.png
	images/god8.png
	images/module.png
	images/applications.png
	images/cross.png
	images/camera.png
	images/sub.png
	images/tag_red.png
	images/module_notinit.png
	images/god1.png
	images/god9.png
	images/version.png
	images/chart_curve_threshold.png
	images/mul.png
	images/god2.png
	images/policies_not_brick.png
	images/control_pause_col.png
	images/history.png
	images/pdf.png
	images/god3.png
	images/chart_bar.png
	images/module_ok.png
	images/status_sets/faces/module_alertsfired_ball.png
	images/status_sets/faces/agent_alertsfired.png
	images/status_sets/faces/agent_alertsfired_ball.png
	images/status_sets/color_text/module_alertsfired_ball.png
	images/status_sets/color_text/agent_alertsfired.png
	images/status_sets/color_text/agent_agentsfired_ball.png
	images/status_sets/default/module_alertsfired_ball.png
	images/status_sets/default/agent_alertsfired.png
	images/status_sets/default/agent_alertsfired_ball.png
	images/error_red.png
	images/wrench.png
	images/control_play_col.png
	images/sum.png
	images/avg.png
	images/info.png
	images/god4.png
	images/module_unknown.png
	images/darrowleft.png
	images/plus.png
	images/information.png
	images/darrowdown.png
	images/chart_curve_overview.png
	godmode/agentes/configurar_agente.php
	godmode/servers/plugin.php: Improved visual graphics
	included agent layout, icons and group view



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8171 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f

pandora_console/ChangeLog

@@ -1,3 +1,97 @@
+2013-05-20  Sergio Martin <sergio.martin@artica.es>
+
+	* include/styles/pandora.css
+	include/functions_groups.php
+	include/functions_graph.php
+	include/functions_reporting.php
+	operation/search_results.php
+	operation/agentes/estado_generalagente.php
+	operation/agentes/ver_agente.php
+	operation/agentes/group_view.php
+	operation/servers/recon_view.php
+	images/min.png
+	images/max.png
+	images/agent.png
+	images/cross_undo.png
+	images/policies_brick.png
+	images/agent_warning.png
+	images/rosette.png
+	images/darrowright.png
+	images/god5.png
+	images/module_critical.png
+	images/filter.png
+	images/help.png
+	images/darrowup.png
+	images/wrench_orange.png
+	images/chart_curve.png
+	images/control_stop_col.png
+	images/history_database.png
+	images/zoom_cross.png
+	images/agent_critical.png
+	images/god6.png
+	images/policies_cog.png
+	images/heart.png
+	images/percentile_item.png
+	images/module_warning.png
+	images/policies_error.png
+	images/agent_ok.png
+	images/os_icons/network_small.png
+	images/os_icons/network.png
+	images/god7.png
+	images/heart_col.png
+	images/clock2.png
+	images/div.png
+	images/policies_error_db.png
+	images/agent_notinit.png
+	images/application_not_writable.png
+	images/delete.png
+	images/god8.png
+	images/module.png
+	images/applications.png
+	images/cross.png
+	images/camera.png
+	images/sub.png
+	images/tag_red.png
+	images/module_notinit.png
+	images/god1.png
+	images/god9.png
+	images/version.png
+	images/chart_curve_threshold.png
+	images/mul.png
+	images/god2.png
+	images/policies_not_brick.png
+	images/control_pause_col.png
+	images/history.png
+	images/pdf.png
+	images/god3.png
+	images/chart_bar.png
+	images/module_ok.png
+	images/status_sets/faces/module_alertsfired_ball.png
+	images/status_sets/faces/agent_alertsfired.png
+	images/status_sets/faces/agent_alertsfired_ball.png
+	images/status_sets/color_text/module_alertsfired_ball.png
+	images/status_sets/color_text/agent_alertsfired.png
+	images/status_sets/color_text/agent_agentsfired_ball.png
+	images/status_sets/default/module_alertsfired_ball.png
+	images/status_sets/default/agent_alertsfired.png
+	images/status_sets/default/agent_alertsfired_ball.png
+	images/error_red.png
+	images/wrench.png
+	images/control_play_col.png
+	images/sum.png
+	images/avg.png
+	images/info.png
+	images/god4.png
+	images/module_unknown.png
+	images/darrowleft.png
+	images/plus.png
+	images/information.png
+	images/darrowdown.png
+	images/chart_curve_overview.png
+	godmode/agentes/configurar_agente.php
+	godmode/servers/plugin.php: Improved visual graphics
+	included agent layout, icons and group view
+
 2013-05-20 Miguel de Dios <miguel.dedios@artica.es>
 
 	* include/ajax/skins.ajax.php, include/functions_gis.php,

pandora_console/godmode/agentes/configurar_agente.php

@@ -449,8 +449,7 @@ if ($id_agente) {
 			break;
 	}
 	
-	ui_print_page_header (__('Agent configuration') . ' - ' .
-		agents_get_name ($id_agente) .
+	ui_print_page_header (agents_get_name ($id_agente) .
 		' ' . $tab_description, "images/setup.png", false, $help_header , true, $onheader);
 }
 else {

pandora_console/godmode/servers/plugin.php

@@ -517,7 +517,7 @@ $(document).ready(function() {
 	
 	update_preview();
 	
-	$('.command_component').live( 'keyup', function() {
+	$('.command_component').keyup(function() {
 		update_preview();
 	});
 

pandora_console/include/functions_graph.php

@@ -1419,7 +1419,7 @@ function graph_agent_status ($id_agent = false, $width = 300, $height = 200, $re
 	}
 	
 	$out = pie2d_graph($config['flash_charts'], $data, $width, $height, __("other"),
-		'', $water_mark, $config['fontpath'], $config['font_size'], 1, "hidden", $colors);
+		'', '', $config['fontpath'], $config['font_size'], 1, "hidden", $colors);
 	
 	if ($return) {
 		return $out;

pandora_console/include/functions_groups.php

@@ -831,43 +831,54 @@ function groups_get_group_row($id_group, $group_all, $group, &$printed_groups) {
 	// Calculate entire row color
 	if ($data["monitor_alerts_fired"] > 0) {
 		$group_class = 'group_view_alrm';
+		$status_image = ui_print_status_image ('agent_alertsfired_ball.png', "", true);
 	}
 	elseif ($data["monitor_critical"] > 0) {
 		$group_class = 'group_view_crit';
+		$status_image = ui_print_status_image ('agent_critical_ball.png', "", true);
 	}
 	elseif ($data["monitor_warning"] > 0) {
 		$group_class = 'group_view_warn';
+		$status_image = ui_print_status_image ('agent_warning_ball.png', "", true);
 	}
 	elseif (($data["monitor_unknown"] > 0) ||  ($data["agents_unknown"] > 0)) {
 		$group_class = 'group_view_unk';
+		$status_image = ui_print_status_image ('agent_no_monitors_ball.png', "", true);
 	}
 	elseif ($data["monitor_ok"] > 0)  {
 		$group_class = 'group_view_ok';
+		$status_image = ui_print_status_image ('agent_ok_ball.png', "", true);
 	}
 	else {
 		$group_class = 'group_view_normal';
+		$status_image = ui_print_status_image ('agent_no_data_ball.png', "", true);
 	}
 	
 	ob_start();
 	
 	echo "<tr style='height: 35px;'>";
 	
-	// Group name
-	echo "<td class='group_view_data first $group_class opacity_cell' style='font-weight: bold; font-size: 12px;'>&nbsp;&nbsp;";
-	echo $group['prefix'] . ui_print_group_icon ($id_group, true, "groups_small", 'font-size: 7.5pt');
-	echo "&nbsp;<a class='group_view_data' href='index.php?sec=estado&sec2=operation/agentes/estado_agente&group_id=$id_group'>";
-	echo ui_print_truncate_text($group['name']);
-	echo "</a>";
-	echo "</td>";
-	echo "<td class='group_view_data' style='text-align: center; vertica-align: middle; background-color: #d3d3d3;'>";
+	// Force
+	echo "<td class='group_view_data' style='text-align: center; vertica-align: middle;'>";
 	if (check_acl ($config['id_user'], $id_group, "AW")) {
 		echo '<a href="index.php?sec=estado&sec2=operation/agentes/group_view&update_netgroup='.$id_group.'">' .
 			html_print_image("images/target.png", true, array("border" => '0', "alt" => __('Force'))) . '</a>';
 	}
 	echo "</td>";
 	
+	// Status
+	echo "<td style='text-align:center;'>" . $status_image . "</td>";
+	
+	// Group name
+	echo "<td class='' style='font-weight: bold; font-size: 12px;'>&nbsp;&nbsp;";
+	echo $group['prefix'] . ui_print_group_icon ($id_group, true, "groups_small", 'font-size: 7.5pt');
+	echo "&nbsp;<a class='' href='index.php?sec=estado&sec2=operation/agentes/estado_agente&group_id=$id_group'>";
+	echo ui_print_truncate_text($group['name']);
+	echo "</a>";
+	echo "</td>";
+	
 	// Total agents
-	echo "<td class='group_view_data $group_class opacity_cell' class='group_view_data' style='font-weight: bold; font-size: 18px; text-align: center;'>";
+	echo "<td class='group_view_data $group_class' class='group_view_data' style='font-weight: bold; font-size: 18px; text-align: center;'>";
 	if ($data["total_agents"] > 0)
 		echo "<a class='group_view_data' style='font-weight: bold; font-size: 18px; text-align: center;' 
 			href='index.php?sec=estado&sec2=operation/agentes/estado_agente&group_id=$id_group'>";
@@ -895,8 +906,8 @@ function groups_get_group_row($id_group, $group_all, $group, &$printed_groups) {
 	
 	// Agents unknown
 	if ($data["agents_unknown"] > 0) {
-		echo "<td class='group_view_data_unk $group_class' style='font-weight: bold; font-size: 18px; text-align: center;'>";
-		echo "<a class='group_view_data_unk' style='font-weight: bold; font-size: 18px; text-align: center;' 
+		echo "<td class='group_view_data group_view_data_unk $group_class' style='font-weight: bold; font-size: 18px; text-align: center;'>";
+		echo "<a class='group_view_data group_view_data_unk' style='font-weight: bold; font-size: 18px; text-align: center;' 
 			href='index.php?sec=estado&sec2=operation/agentes/estado_agente&group_id=$id_group&status=3'>";
 		echo $data["agents_unknown"];
 		echo "</a>";
@@ -908,22 +919,22 @@ function groups_get_group_row($id_group, $group_all, $group, &$printed_groups) {
 	
 	// Monitors Unknown
 	if ($data["monitor_unknown"] > 0) {
-		echo "<td class='group_view_data_unk $group_class opacity_cell' style='font-weight: bold; font-size: 18px; text-align: center;'>";
-		echo "<a style='font-weight: bold; font-size: 18px; color: #666; text-align: center;'
+		echo "<td class='group_view_data group_view_data_unk $group_class' style='font-weight: bold; font-size: 18px; text-align: center;'>";
+		echo "<a class='group_view_data' style='font-weight: bold; font-size: 18px; color: #666; text-align: center;'
 			href='index.php?sec=estado&sec2=operation/agentes/status_monitor&ag_group=$id_group&status=3'>";
 		echo $data["monitor_unknown"];
 		echo "</a>";
 		echo "</td>";
 	}
 	else {
-		echo "<td class='$group_class opacity_cell'></td>";
+		echo "<td class='$group_class'></td>";
 	}
 	
 	
 	// Monitors Not Init
 	if ($data["monitor_not_init"] > 0) {
-		echo "<td class='group_view_data_unk $group_class' style='font-weight: bold; font-size: 18px; text-align: center;'>";
-		echo "<a class='group_view_data_unk' style='font-weight: bold; font-size: 18px; text-align: center;'
+		echo "<td class='group_view_data group_view_data_unk $group_class' style='font-weight: bold; font-size: 18px; text-align: center;'>";
+		echo "<a class='group_view_data group_view_data_unk' style='font-weight: bold; font-size: 18px; text-align: center;'
 			href='index.php?sec=estado&sec2=operation/agentes/status_monitor&ag_group=$id_group&status=5'>";
 		echo $data["monitor_not_init"];
 		echo "</a>";
@@ -935,9 +946,9 @@ function groups_get_group_row($id_group, $group_all, $group, &$printed_groups) {
 	
 	
 	// Monitors OK
-	echo "<td class='group_view_data_ok $group_class opacity_cell' style='font-weight: bold; font-size: 18px; text-align: center;'>";
+	echo "<td class='group_view_data group_view_data_ok $group_class' style='font-weight: bold; font-size: 18px; text-align: center;'>";
 	if ($data["monitor_ok"] > 0) {
-		echo "<a class='group_view_data_unk' style='font-weight: bold; font-size: 18px; text-align: center;' href='index.php?sec=estado&sec2=operation/agentes/status_monitor&ag_group=$id_group&status=0'>";
+		echo "<a class='group_view_data group_view_data_unk' style='font-weight: bold; font-size: 18px; text-align: center;' href='index.php?sec=estado&sec2=operation/agentes/status_monitor&ag_group=$id_group&status=0'>";
 		echo $data["monitor_ok"];
 		echo "</a>";
 	}
@@ -948,8 +959,8 @@ function groups_get_group_row($id_group, $group_all, $group, &$printed_groups) {
 	
 	// Monitors Warning
 	if ($data["monitor_warning"] > 0) {
-		echo "<td class='group_view_data_warn $group_class' style='font-weight: bold; font-size: 18px; text-align: center;'>";
-		echo "<a class='group_view_data_warn' class='group_view_data_unk' style='font-weight: bold; font-size: 18px; text-align: center;'
+		echo "<td class='group_view_data group_view_data_warn $group_class' style='font-weight: bold; font-size: 18px; text-align: center;'>";
+		echo "<a class='group_view_data group_view_data_warn' class='group_view_data_unk' style='font-weight: bold; font-size: 18px; text-align: center;'
 			href='index.php?sec=estado&sec2=operation/agentes/status_monitor&ag_group=$id_group&status=1'>";
 		echo $data["monitor_warning"];
 		echo "</a>";
@@ -961,27 +972,27 @@ function groups_get_group_row($id_group, $group_all, $group, &$printed_groups) {
 	
 	// Monitors Critical
 	if ($data["monitor_critical"] > 0) {
-		echo "<td class='group_view_data_crit $group_class opacity_cell' style='font-weight: bold; font-size: 18px; text-align: center;'>";
-		echo "<a class='group_view_data_crit' style='font-weight: bold; font-size: 18px; text-align: center;'
+		echo "<td class='group_view_data group_view_data_crit $group_class' style='font-weight: bold; font-size: 18px; text-align: center;'>";
+		echo "<a class='group_view_data group_view_data_crit' style='font-weight: bold; font-size: 18px; text-align: center;'
 			href='index.php?sec=estado&sec2=operation/agentes/status_monitor&ag_group=$id_group&status=2'>";
 		echo $data["monitor_critical"];
 		echo "</a>";
 		echo "</td>";
 	}
 	else {
-		echo "<td class='$group_class opacity_cell'></td>";
+		echo "<td class='$group_class'></td>";
 	}
 	// Alerts fired
 	if ($data["monitor_alerts_fired"] > 0) {
-		echo "<td class='group_view_data_alrm $group_class last' style='font-weight: bold; font-size: 18px;  text-align: center;'>";
-		echo "<a class='group_view_data_alrm' style='font-weight: bold; font-size: 18px; text-align: center;'
+		echo "<td class='group_view_data group_view_data_alrm $group_class' style='font-weight: bold; font-size: 18px;  text-align: center;'>";
+		echo "<a class='group_view_data group_view_data_alrm' style='font-weight: bold; font-size: 18px; text-align: center;'
 			href='index.php?sec=estado&sec2=operation/agentes/alerts_status&ag_group=$id_group&filter=fired'>";
 		echo $data["monitor_alerts_fired"];
 		echo "</a>";
 		echo "</td>";
 	}
 	else {
-		echo "<td class='last $group_class'></td>";
+		echo "<td class='$group_class'></td>";
 	}
 	
 	echo "</tr>";

pandora_console/include/functions_reporting.php

@@ -1034,29 +1034,29 @@ function reporting_get_stats_modules_status($data, $graph_width = 250, $graph_he
 	$table_mbs = html_get_predefined_table();
 	
 	$tdata = array();
-	$tdata[0] = html_print_image('images/module_critical.png', true, array('title' => __('Monitor critical'), 'width' => '22px'));
+	$tdata[0] = html_print_image('images/module_critical.png', true, array('title' => __('Monitor critical')));
 	$tdata[1] = $data["monitor_critical"] <= 0 ? '-' : $data["monitor_critical"];
 	$tdata[1] = '<a style="color: ' . COL_CRITICAL . ';" class="big_data" href="' . $urls['monitor_critical'] . '">' . $tdata[1] . '</a>';
 	
-	$tdata[2] = html_print_image('images/module_warning.png', true, array('title' => __('Monitor warning'), 'width' => '22px'));
+	$tdata[2] = html_print_image('images/module_warning.png', true, array('title' => __('Monitor warning')));
 	$tdata[3] = $data["monitor_warning"] <= 0 ? '-' : $data["monitor_warning"];
 	$tdata[3] = '<a style="color: ' . COL_WARNING_DARK . ';" class="big_data" href="' . $urls['monitor_warning'] . '">' . $tdata[3] . '</a>';
 	$table_mbs->rowclass[] = '';
 	$table_mbs->data[] = $tdata;
 	
 	$tdata = array();
-	$tdata[0] = html_print_image('images/module_ok.png', true, array('title' => __('Monitor normal'), 'width' => '22px'));
+	$tdata[0] = html_print_image('images/module_ok.png', true, array('title' => __('Monitor normal')));
 	$tdata[1] = $data["monitor_ok"] <= 0 ? '-' : $data["monitor_ok"];
 	$tdata[1] = '<a style="color: ' . COL_NORMAL . ';" class="big_data" href="' . $urls["monitor_ok"] . '">' . $tdata[1] . '</a>';
 	
-	$tdata[2] = html_print_image('images/module_unknown.png', true, array('title' => __('Monitor unknown'), 'width' => '22px'));
+	$tdata[2] = html_print_image('images/module_unknown.png', true, array('title' => __('Monitor unknown')));
 	$tdata[3] = $data["monitor_unknown"] <= 0 ? '-' : $data["monitor_unknown"];
 	$tdata[3] = '<a style="color: ' . COL_UNKNOWN . ';" class="big_data" href="' . $urls["monitor_unknown"] . '">' . $tdata[3] . '</a>';
 	$table_mbs->rowclass[] = '';
 	$table_mbs->data[] = $tdata;
 	
 	$tdata = array();
-	$tdata[0] = html_print_image('images/module_notinit.png', true, array('title' => __('Monitor not init'), 'width' => '22px'));
+	$tdata[0] = html_print_image('images/module_notinit.png', true, array('title' => __('Monitor not init')));
 	$tdata[1] = $data["monitor_not_init"] <= 0 ? '-' : $data["monitor_not_init"];
 	$tdata[1] = '<a style="color: ' . COL_NOTINIT . ';" class="big_data" href="' . $urls["monitor_not_init"] . '">' . $tdata[1] . '</a>';
 	
@@ -1154,11 +1154,11 @@ function reporting_get_stats_alerts($data) {
 	$table_al = html_get_predefined_table();
 	
 	$tdata = array();
-	$tdata[0] = html_print_image('images/bell.png', true, array('title' => __('Defined alerts'), 'width' => '20px'));
+	$tdata[0] = html_print_image('images/bell.png', true, array('title' => __('Defined alerts')));
 	$tdata[1] = $data["monitor_alerts"] <= 0 ? '-' : $data["monitor_alerts"];
 	$tdata[1] = '<a style="color: black;" class="big_data" href="' . $urls["monitor_alerts"] . '">' . $tdata[1] . '</a>';
 	
-	$tdata[2] = html_print_image('images/bell_error.png', true, array('title' => __('Fired alerts'), 'width' => '20px'));
+	$tdata[2] = html_print_image('images/bell_error.png', true, array('title' => __('Fired alerts')));
 	$tdata[3] = $data["monitor_alerts_fired"] <= 0 ? '-' : $data["monitor_alerts_fired"];
 	$tdata[3] = '<a style="color: ' . COL_ALERTFIRED . ';" class="big_data" href="' . $urls["monitor_alerts_fired"] . '">' . $tdata[3] . '</a>';
 	$table_al->rowclass[] = '';
@@ -1189,7 +1189,7 @@ function reporting_get_stats_users($data) {
 	$table_us = html_get_predefined_table();
 	
 	$tdata = array();
-	$tdata[0] = html_print_image('images/user_green.png', true, array('title' => __('Defined users'), 'width' => '20px'));
+	$tdata[0] = html_print_image('images/user_green.png', true, array('title' => __('Defined users')));
 	$tdata[1] = count (get_users ());
 	$tdata[1] = '<a style="color: black;" class="big_data" href="' . $urls["defined_users"] . '">' . $tdata[1] . '</a>';
 	
@@ -1232,11 +1232,11 @@ function reporting_get_stats_agents_monitors($data) {
 	$table_am = html_get_predefined_table();
 	
 	$tdata = array();
-	$tdata[0] = html_print_image('images/agent.png', true, array('title' => __('Total agents'), 'width' => '22px'));
+	$tdata[0] = html_print_image('images/agent.png', true, array('title' => __('Total agents')));
 	$tdata[1] = $data["total_agents"] <= 0 ? '-' : $data["total_agents"];
 	$tdata[1] = '<a style="color: black;" class="big_data" href="' . $urls['total_agents'] . '">' . $tdata[1] . '</a>';
 	
-	$tdata[2] = html_print_image('images/module.png', true, array('title' => __('Monitor checks'), 'width' => '22px'));
+	$tdata[2] = html_print_image('images/module.png', true, array('title' => __('Monitor checks')));
 	$tdata[3] = $data["monitor_checks"] <= 0 ? '-' : $data["monitor_checks"];
 	$tdata[3] = '<a style="color: black;" class="big_data" href="' . $urls['monitor_checks'] . '">' . $tdata[3] . '</a>';
 	$table_am->rowclass[] = '';
@@ -6757,7 +6757,7 @@ function reporting_get_count_events_validated ($filter, $period = 0,
  * 
  * @return string html formatted tiny stats of modules/alerts of an agent
  */
-function reporting_tiny_stats ($counts_info, $return = false, $type = 'agent') {
+function reporting_tiny_stats ($counts_info, $return = false, $type = 'agent', $separator = ':') {
 	$out = '';
 	
 	// Depend the type of object, the stats will refer agents, modules...
@@ -6829,17 +6829,17 @@ function reporting_tiny_stats ($counts_info, $return = false, $type = 'agent') {
 		$total_count = 0;
 	}
 	
-	$out .= '<b>' . '<span id="total_count_' . $uniq_id . '" class="forced_title">' . $total_count . '</span>';
+	$out .= '<b>' . '<span id="total_count_' . $uniq_id . '" class="forced_title" style="font-size: 7pt">' . $total_count . '</span>';
 	if (isset($fired_count) && $fired_count > 0)
-		$out .= ' : <span class="orange forced_title" id="fired_count_' . $uniq_id . '">' . $fired_count . '</span>';
+		$out .= ' ' . $separator . ' <span class="orange forced_title" id="fired_count_' . $uniq_id . '" style="font-size: 7pt">' . $fired_count . '</span>';
 	if (isset($critical_count) && $critical_count > 0)
-		$out .= ' : <span class="red forced_title" id="critical_count_' . $uniq_id . '">' . $critical_count . '</span>';
+		$out .= ' ' . $separator . ' <span class="red forced_title" id="critical_count_' . $uniq_id . '" style="font-size: 7pt">' . $critical_count . '</span>';
 	if (isset($warning_count) && $warning_count > 0)
-		$out .= ' : <span class="yellow forced_title" id="warning_count_' . $uniq_id . '">' . $warning_count . '</span>';
+		$out .= ' ' . $separator . ' <span class="yellow forced_title" id="warning_count_' . $uniq_id . '" style="font-size: 7pt">' . $warning_count . '</span>';
 	if (isset($unknown_count) && $unknown_count > 0)
-		$out .= ' : <span class="grey forced_title" id="unknown_count_' . $uniq_id . '">' . $unknown_count . '</span>';
+		$out .= ' ' . $separator . ' <span class="grey forced_title" id="unknown_count_' . $uniq_id . '" style="font-size: 7pt">' . $unknown_count . '</span>';
 	if (isset($normal_count) && $normal_count > 0)
-		$out .= ' : <span class="green forced_title" id="normal_count_' . $uniq_id . '">' . $normal_count . '</span>';
+		$out .= ' ' . $separator . ' <span class="green forced_title" id="normal_count_' . $uniq_id . '" style="font-size: 7pt">' . $normal_count . '</span>';
 	
 	$out .= '</b>';
 	

pandora_console/include/styles/pandora.css

@@ -1509,6 +1509,7 @@ span.rmess, span.nrmess {
 	border-radius: 4px;
 	padding: 8px 8px 8px 8px;
 }
+
 table.databox {
 	background-color: #f9faf9;
 	border-spacing: 2px;
@@ -1524,6 +1525,10 @@ table.databox {
 	border: 0px solid #fff;
 }
 
+.databox th {
+	padding: 10px 7px;
+}
+
 .tabletitle {
 	background: url(../../images/header_blackout.png) no-repeat;
 }
@@ -2270,7 +2275,7 @@ tr.group_view_warn, .group_view_warn, tr.group_view_warn.a, a.group_view_warn, t
 }
 
 a.group_view_warn {
-	color: #111;
+	color: #111 !important;
 }
 
 tr.group_view_alrm, .group_view_alrm {
@@ -2282,30 +2287,9 @@ tr.group_view_unk, .group_view_unk {
 }
 
 tr.group_view_data, .group_view_data {
-	color: #111;
+	color: #fff !important;
 }
 
-.group_view_data_unk {
-	color: #303030;
-}
-
-.group_view_data_ok{
-	color: #00C000;
-}
-
-.group_view_data_crit {
-	color: #5C0000;
-}
-
-.group_view_data_alrm {
-	color: #5C1D00;
-}
-
-.group_view_data_warn {
-	color: #5C5900;
-}
-
-
 /* classes for event priorities. Sits now in functions.php */
 .datos_green, .datos_greenf9, .datos_green a, .datos_greenf9 a {
 	background-color: #6EB432;

pandora_console/operation/agentes/estado_generalagente.php

@@ -56,8 +56,10 @@ $table_agent->width = '100%';
 $table_agent->cellspacing = 4;
 $table_agent->cellpadding = 4;
 $table_agent->class = 'databox_frame';
-$table_agent->style[1] = 'width: 100px; text-align:center;';
-$table_agent->style[2] = 'width: 16px; text-align:center;';
+$table_agent->style[0] = 'width: 16px; text-align:center; padding: 0px;';
+$table_agent->style[5] = 'width: 16px; text-align:center; padding: 0px;';
+$table_agent->styleTable = 'padding:0px;';
+$table_agent->data = array();
 $data = array();
 
 $agent_name = ui_print_agent_name ($agent["id_agente"], true, 500, "font-size: medium;", true);
@@ -72,27 +74,38 @@ else {
 	$agent_name = $agent_name;
 }
 
-$data[0] = ui_print_group_icon ($agent["id_grupo"], true) . ' ';
-$data[0] .= $agent_name;
+$data[0] = ui_print_group_icon ($agent["id_grupo"], true);
+$table_agent->cellstyle[count($table_agent->data)][0] = 'width: 16px; text-align:center; padding: 0px; vertical-align: top;';
+
+$data[2] = $agent_name;
+$table_agent->colspan[count($table_agent->data)][2] = 3;
 
 $status_img = agents_detail_view_status_img ($agent["critical_count"],
 	$agent["warning_count"], $agent["unknown_count"]);
-$data[1] = reporting_tiny_stats ($agent, true);
-$data[2] = $status_img;
+$data[5] = $status_img;
 
 $table_agent->data[] = $data;
 $table_agent->rowclass[] = '';
-$table_agent->cellstyle[][0] = '';
 
 
 $data = array();
 
-$data[0] = ui_print_os_icon ($agent["id_os"], true, true, true, false, false, false) . ' ';
-$data[0] .= ui_print_help_tip($agent["os_version"], true);
-$table_agent->cellstyle[][0] = 'padding-left:40px;';
+//$data[0] = reporting_tiny_stats ($agent, true, 'agent', '<div style="height: 5px;"></div>');
+//$table_agent->rowspan[count($table_agent->data)][0] = 6;
 
-$data[1] = graph_agent_status ($id_agente, 160, 120, true);
-$table_agent->rowspan[1][1] = 6;
+$data[0] = '<div style="margin: 0 auto; width: 140px;">';
+$data[0] .= graph_agent_status ($id_agente, 140, 120, true);
+$data[0] .= reporting_tiny_stats ($agent, true);
+$data[0] .= '</div>';
+$table_agent->rowspan[count($table_agent->data)][0] = 6;
+$table_agent->colspan[count($table_agent->data)][0] = 2;
+
+$data[2] = ui_print_os_icon ($agent["id_os"], false, true, true, false, false, false);
+$table_agent->cellstyle[count($table_agent->data)][2] = 'width: 16px; text-align:center; padding: 0px; vertical-align: top;';
+//$data[3] = get_os_name ((int) $agent["id_os"]);
+//$data[3] .= ui_print_help_tip($agent["os_version"], true);
+$data[3] = $agent["os_version"];
+$table_agent->colspan[count($table_agent->data)][3] = 2;
 
 $table_agent->data[] = $data;
 $table_agent->rowclass[] = '';
@@ -107,30 +120,34 @@ foreach ($addresses as $k => $add) {
 
 if(!empty($address)) {
 	$data = array();
-	$data[0] = html_print_image('images/world.png', true, array('title' => __('IP address'))) . '&nbsp;&nbsp;';
-	$data[0] .= '<span style="vertical-align:top; padding-top: 6px; display: inline-block;">';
-	$data[0] .= empty($address) ? '<em>' . __('N/A') . '</em>' : $address;
-	$data[0] .= '</div>';
-	$table_agent->cellstyle[][0] = 'padding-left:40px;';
+	$data[2] = html_print_image('images/world.png', true, array('title' => __('IP address')));
+	$table_agent->cellstyle[count($table_agent->data)][2] = 'width: 16px; text-align:center; padding: 0px; vertical-align: top;';
+	$data[3] = '<span style="vertical-align:top; display: inline-block;">';
+	$data[3] .= empty($address) ? '<em>' . __('N/A') . '</em>' : $address;
+	$data[3] .= '</span>';
+	$table_agent->colspan[count($table_agent->data)][3] = 2;
 	$table_agent->data[] = $data;
 	$table_agent->rowclass[] = '';
 }
 
 $data = array();
-$data[0] = html_print_image('images/version.png', true, array('title' => __('Agent Version'))) . '&nbsp;&nbsp;';
-$data[0] .= '<span style="vertical-align:top; padding-top: 6px; display: inline-block;">';
-$data[0] .= $agent["agent_version"];
-$data[0] .= '</span>';
-$table_agent->cellstyle[][0] = 'padding-left:40px;';
+$data[2] = html_print_image('images/version.png', true, array('title' => __('Agent Version')));
+$table_agent->cellstyle[count($table_agent->data)][2] = 'width: 16px; text-align:center; padding: 0px; vertical-align: top;';
+$data[3] = '<span style="vertical-align:top; display: inline-block;">';
+$data[3] .= $agent["agent_version"];
+$data[3] .= '</span>';
+$table_agent->colspan[count($table_agent->data)][3] = 2;
 $table_agent->data[] = $data;
 $table_agent->rowclass[] = '';
 
 $data = array();
-$data[0] = html_print_image('images/default_list.png', true, array('title' => __('Description'))) . '&nbsp;&nbsp;';
-$data[0] .= '<span style="vertical-align:top; padding-top: 6px; display: inline-block;">';
-$data[0] .= empty($agent["comentarios"]) ? '<em>' . __('N/A') . '</em>' : $agent["comentarios"];
-$data[0] .= '</span>';
-$table_agent->cellstyle[][0] = 'padding-left:40px;';
+$data[2] = html_print_image('images/default_list.png', true, array('title' => __('Description')));
+$table_agent->cellstyle[count($table_agent->data)][2] = 'width: 16px; text-align:center; padding: 0px; vertical-align: top;';
+$data[3] = '<span style="vertical-align:top; display: inline-block;">';
+$data[3] .= empty($agent["comentarios"]) ? '<em>' . __('N/A') . '</em>' : $agent["comentarios"];
+$data[3] .= '</span>';
+$table_agent->colspan[count($table_agent->data)][3] = 2;
+
 $table_agent->data[] = $data;
 $table_agent->rowclass[] = '';
 
@@ -301,7 +318,7 @@ $table->data[] = $data;
 $table->rowclass[] = '';
 
 $data = array();
-$data[0] = '<fieldset class="databox" style="width:96%; position: static;">
+$data[0] = '<fieldset class="databox" style="position: static;">
 				<legend style="text-align:left; color: #666;">' . 
 					__('Events (24h)') . 
 				'</legend>' . 
@@ -312,7 +329,7 @@ $data[0] = '<fieldset class="databox" style="width:96%; position: static;">
 
 // ACCESS RATE GRAPH
 if ($config["agentaccess"]) {
-	$data[0] .= '<fieldset class="databox" style="width:96%; position: static;">
+	$data[0] .= '<fieldset class="databox" style="position: static;">
 					<legend style="text-align:left; color: #666;">' . 
 						__('Agent access rate (24h)') . 
 					'</legend>' . 

pandora_console/operation/agentes/group_view.php

@@ -91,18 +91,19 @@ if (count($agents) > 0) {
 	$groups_get_groups_with_agent = groups_get_groups_with_agent($config['id_user'], "AR", true, true);
 	ui_pagination(count($groups_get_groups_with_agent));
 	
-	echo '<table cellpadding="0" cellspacing="0" style="margin-top:10px;" class="groupsview" border="0" width="98%">';
+	echo '<table cellpadding="0" cellspacing="0" style="margin-top:10px;" class="databox" border="0" width="98%">';
 	echo "<tr>";
-	echo "<th width='25%' class='first opacity_cell'>" . __("Group") . "</th>";
-	echo "<th style='min-width:26px;'></th>";
-	echo "<th width='10%' class='opacity_cell'>" . __("Agents") . "</th>";
+	echo "<th style='width: 26px;'>" . __("Force") . "</th>";
+	echo "<th style='width: 26px;'>" . __("Status") . "</th>";
+	echo "<th width='25%'>" . __("Group") . "</th>";
+	echo "<th width='10%'>" . __("Agents") . "</th>";
 	echo "<th width='10%'>" . __("Agent unknown") . "</th>";
-	echo "<th width='10%' class='opacity_cell'>" . __("Unknown") . "</th>";
+	echo "<th width='10%'>" . __("Unknown") . "</th>";
 	echo "<th width='10%'>" . __("Not Init") . "</th>";
-	echo "<th width='10%' class='opacity_cell'>" . __("Normal") . "</th>";
+	echo "<th width='10%'>" . __("Normal") . "</th>";
 	echo "<th width='10%'>" . __("Warning") . "</th>";
-	echo "<th width='10%' class='opacity_cell'>" . __("Critical") . "</th>";
-	echo "<th width='10%' class='last' style='min-width: 100px'>" . __("Alert fired") . "</th>";
+	echo "<th width='10%'>" . __("Critical") . "</th>";
+	echo "<th width='10%' style='min-width: 100px'>" . __("Alert fired") . "</th>";
 	
 	$printed_groups = array();
 	

pandora_console/operation/agentes/ver_agente.php

@@ -908,8 +908,7 @@ switch($tab) {
 		break;
 }
 
-ui_print_page_header(__('Agent') . ' - ' .
-	agents_get_name($id_agente) .
+ui_print_page_header(agents_get_name($id_agente) .
 	$header_description, $icon, false, "", false, $onheader);
 
 

pandora_console/operation/search_results.php

@@ -105,7 +105,7 @@ else {
 
 if ($searchMaps) {
 	$maps_tab = array('text' => "<a href='index.php?search_category=maps&keywords=".$config['search_keywords']."&head_search_keywords=Search'>"
-		. html_print_image ("images/op_network.png", true, array ("title" => __('Maps'))) . "</a>", 'active' => $searchTab == "maps");
+		. html_print_image ("images/visual_console.png", true, array ("title" => __('Maps'))) . "</a>", 'active' => $searchTab == "maps");
 }
 else {
 	$maps_tab = '';

pandora_console/operation/servers/recon_view.php

@@ -23,7 +23,7 @@ require_once ($config["homedir"] . '/include/functions_graph.php');
 require_once ($config["homedir"] . '/include/functions_servers.php');
 require_once ($config['homedir'] . "/include/functions_network_profiles.php");
 
-$options[]['text'] = "<a href='index.php?sec=estado&sec2=operation/servers/recon_view'>" . html_print_image("images/header_refresh.png", true) . "</a>";
+$options[]['text'] = "<a href='index.php?sec=estado&sec2=operation/servers/recon_view'>" . html_print_image("images/refresh_mc.png", true) . "</a>";
 
 ui_print_page_header (__('Recon View'), "images/op_recon.png", false, "", false, $options);