Changed visual and changed images

pandora_console/extensions/agents_modules.php

@@ -176,7 +176,7 @@ function mainAgentsModules() {
 		return;
 	}
 	
-	echo '<table cellpadding="4" cellspacing="4" border="0" style="width:98%;" class="agents_modules_table">';
+	echo '<table cellpadding="4" cellspacing="4" border="0" style="width:100%;" class="agents_modules_table">';
 	
 	echo "<tr>";
 	

pandora_console/extensions/realtime_graphs.php

@@ -46,6 +46,8 @@ function pandora_realtime_graphs () {
 	$table->id = 'table-form';
 	$table->class = 'databox filters';
 	$table->style = array ();
+	$table->cellpadding = '0';
+	$table->cellspacing = '0';
 	$table->style[0] = 'font-weight: bold;';
 	$table->style[1] = 'font-weight: bold;';
 	$table->style[2] = 'font-weight: bold;';
@@ -63,7 +65,6 @@ function pandora_realtime_graphs () {
 	$refresh = get_parameter('refresh', '1000');
 	
 	$data['graph'] = __('Graph') . '  ' . html_print_select ($graph_fields, 'graph', $graph, '', '', 0, true);
-	$data['reset'] = html_print_button(__('Clear graph'), 'reset', false, 'clearGraph()', 'class="sub delete"', true);
 
 	$refresh_fields[1000] = human_time_description_raw(1, true, 'large');
 	$refresh_fields[5000] = human_time_description_raw(5, true, 'large');
@@ -72,7 +73,7 @@ function pandora_realtime_graphs () {
 	
 	$data['refresh'] = __('Refresh interval') . '  ' . html_print_select ($refresh_fields, 'refresh', $refresh, '', '', 0, true);
 	$data['incremental'] = __('Incremental') . '  ' . html_print_checkbox ('incremental', 1, 0, true);
-
+	$data['reset'] = html_print_button(__('Clear graph'), 'reset', false, 'clearGraph()', 'class="sub delete" style="margin-top:0px;"', true);
 	$table->data[] = $data;
 	
 	

pandora_console/include/functions_ui.php

@@ -876,13 +876,13 @@ function ui_format_alert_row ($alert, $agent = true, $url = '', $agent_style = f
 	$actions = alerts_get_alert_agent_module_actions ($alert['id'], false);
 	
 	if (!empty($actions)) {
-		$actionText = '<div style="margin-left: 10px;"><ul class="action_list">';
+		$actionText = '<div><ul class="action_list">';
 		foreach ($actions as $action) {
-			$actionText .= '<div><span class="action_name"><li>' . $action['name'];
+			$actionText .= '<div style="margin-bottom: 5px;" ><span class="action_name"><li>' . $action['name'];
 			if ($action["fires_min"] != $action["fires_max"]){
 				$actionText .=  " (".$action["fires_min"] . " / ". $action["fires_max"] . ")";
 			}
-			$actionText .= '</li></span><br /></div>';
+			$actionText .= '</li></span></div>';
 		}
 		$actionText .= '</ul></div>';
 	}

pandora_console/include/styles/pandora.css

@@ -2957,6 +2957,12 @@ table#policy_modules td * {
 	vertical-align: middle;
 	margin-left: 5px;
 }
+.databox.data td>img, .databox.data td>div>a>img, 
+.databox.data td>span>img, .databox.data td>span>a>img,
+.databox.data td>a>img{
+	vertical-align: middle;
+	margin-left: 5px;
+}
 
 .databox_color td{
 	padding-left: 10px;

pandora_console/operation/agentes/alerts_status.functions.php

@@ -41,6 +41,8 @@ function printFormFilterAlert($id_group, $filter, $free_search, $url, $filter_st
 	
 	$table->width = '100%';
 	$table->class = 'databox filters';
+	$table->cellpadding = '0';
+	$table->cellspacing = '0';
 	if(defined('METACONSOLE')){
 		$table->class = 'databox_filters';
 		$table->width = '96%';

pandora_console/operation/agentes/alerts_status.php

@@ -377,7 +377,6 @@ if ($print_agent) {
 		ui_toggle(printFormFilterAlert($id_group, $filter, $free_search, $url, $filter_standby, $tag_filter, true, $strict_user),__('Show Options'));;
 	}
 	else{
-		echo '<br>';
 		ui_toggle(printFormFilterAlert($id_group, $filter, $free_search, $url, $filter_standby, $tag_filter, true, $strict_user),__('Alert control filter'), __('Toggle filter(s)'));
 	}
 }
@@ -418,9 +417,11 @@ if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
 		$table->head[7] = __('Last fired');
 		$table->head[8] = __('Status');
 		if (!defined('METACONSOLE')) {
+			$table->size[8] = '4%';
 			if (check_acl ($config["id_user"], $id_group, "LW") || check_acl ($config["id_user"], $id_group, "LM")) {
 				$table->head[9] = __('Validate');
 				$table->align[9] = 'center';
+				$table->size[9] = '5%';
 			}
 		}
 		
@@ -456,9 +457,11 @@ if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
 		$table->head[6] = __('Last fired');
 		$table->head[7] = __('Status');
 		if (!defined('METACONSOLE')) {
+			$table->size[7] = '5%';
 			if (check_acl ($config["id_user"], $id_group, "LW") || check_acl ($config["id_user"], $id_group, "LM")) {
 				$table->head[8] = __('Validate');
 				$table->align[8] = 'center';
+				$table->size[8] = '5%';
 			}
 		}
 		$table->align[7] = 'center';
@@ -487,9 +490,11 @@ else {
 		$table->head[6] = __('Last fired');
 		$table->head[7] = __('Status');
 		if (!defined('METACONSOLE')) {
+			$table->size[7] = '5%';
 			if (check_acl ($config["id_user"], $id_group, "LW") || check_acl ($config["id_user"], $id_group, "LM")) {
 				$table->head[8] = __('Validate');
 				$table->align[8] = 'center';
+				$table->size[8] = '5%';
 			}
 		}
 		$table->align[7] = 'center';
@@ -518,9 +523,11 @@ else {
 		$table->head[5] = __('Last fired');
 		$table->head[6] = __('Status');
 		if (!defined('METACONSOLE')) {
+			$table->size[6] = '5%';
 			if (check_acl ($config["id_user"], $id_group, "LW") || check_acl ($config["id_user"], $id_group, "LM")) {
 				$table->head[7] = __('Validate');
 				$table->align[7] = 'center';
+				$table->size[7] = '5%';
 			}
 		}
 		$table->align[6] = 'center';

pandora_console/operation/agentes/group_view.php

@@ -90,11 +90,12 @@ foreach ($result_groups as $data) {
 	$monitor_critical += $data["_monitors_critical_"];
 	$monitor_unknown += $data["_monitors_unknown_"];
 }
-$total = $monitor_ok + $monitor_warning + $monitor_critical;
+$total = $monitor_ok + $monitor_warning + $monitor_critical+$monitor_unknown;
 $total_ok = format_numeric (($monitor_ok*100)/$total,0);
 $total_warning = format_numeric (($monitor_warning*100)/$total,0);
 $total_critical = format_numeric (($monitor_critical*100)/$total,0);
 $total_unknown = format_numeric (($monitor_unknown*100)/$total,0);
+
 echo '<table cellpadding="0" cellspacing="0" border="0" width="100%" class="databox">';
 	echo "<tr>";
 		echo "<th style='text-align: center;'>" . __("Summary of the status groups") . "</th>";

pandora_console/operation/agentes/status_monitor.php

@@ -453,14 +453,9 @@ $rows_select[0] = __('Not assigned');
 
 $table->data[0][5] = html_print_select($rows_select, 'modulegroup', $modulegroup, '', __('All'),-1,true, false, true, '', false, 'width: 120px;');
 
-
+$table->rowspan[0][6] = 2;
-if(defined('METACONSOLE')){
+$table->data[0][6] = html_print_submit_button (__('Show'), "uptbutton",
-	
+						false, 'class="sub search" style="margin-top:0px;"',true);
-	$table->rowspan[0][6] = 2;
-	$table->data[0][6] = html_print_submit_button (__('Show'), "uptbutton",
-							false, 'class="sub search" style="margin-top:0px;"',true);
-
-}
 
 $table->data[1][0] = __('Module name');
 
@@ -496,11 +491,6 @@ else {
 		$tag_filter, '', __('All'), '', true, false, true, '', false, 'width: 150px;');
 }
 
-
-if(!defined('METACONSOLE')){
-	$table->data[1][6] = html_print_submit_button (__('Show'), "uptbutton", false, 'class="sub search"',true);
-}
-
 $table_custom_fields = new stdClass();
 $table_custom_fields->class = 'filters';
 $table_custom_fields->width = '100%';