Changed visual of metaconsole

pandora_console/godmode/alerts/configure_alert_command.php

@@ -41,7 +41,6 @@ else
 	ui_print_page_header (__('Alerts') . ' » ' .
 		__('Configure alert command'), "images/gm_alerts.png", false, "alerts_config", true);
 
-enterprise_hook('open_meta_frame');
 
 if ($update_command) {
 	$id = (int) get_parameter ('id');

pandora_console/godmode/events/event_edit_filter.php

@@ -158,11 +158,19 @@ $table->style[0] = 'vertical-align: top;';
 
 $table->valign[1] = 'top';
 if (defined('METACONSOLE')){
-	echo '<div class="title_tactical">' . __('Create Filter') . '</div>';
 	$table->width = '100%';
 	$table->border = 0;
 	$table->cellspacing = 3;
 	$table->cellpadding = 5;
+	if ($id) {
+		$table->head[0] = __('Update Filter');
+	}
+	else {
+		$table->head[0] = __('Create Filter');
+	}
+	
+	$table->head_colspan[0] = 4;
+	$table->headstyle[0] = 'text-align: center';
 	$table->class = "databox data";
 	$table->style[0] = '';
 	$table->valign[1] = '';
@@ -276,6 +284,37 @@ $remove_with_tag_disabled = empty($tag_with_temp);
 $add_without_tag_disabled = empty($tags_select_without);
 $remove_without_tag_disabled = empty($tag_without_temp);
 
+
+if (defined("METACONSOLE")){
+	
+	$table->data[13][0] = '<b>' . __('Events with following tags') . '</b>';
+	$table->data[13][0] .= '<br>' . html_print_select ($tags_select_with, 'select_with',
+		'', '', '', 0, true, false, true, '', false, 'width: 120px;');
+	$table->data[13][0] .= '&nbsp;' . html_print_button(__('Add'), 'add_whith', $add_with_tag_disabled,
+		'', 'class="add sub"', true);
+	$table->data[13][0] .= '<br>' . html_print_select ($tag_with_temp,
+		'tag_with_temp', array(), '', '', 0, true, true,
+		true, '', false, "width: 120px; height: 50px;");
+	$table->data[13][0] .= '&nbsp;' . html_print_button(__('Remove'),
+		'remove_whith', $remove_with_tag_disabled, '', 'class="delete sub"', true);
+	$table->data[13][0] .= html_print_input_hidden('tag_with',
+		$tag_with_base64, true);
+
+	$table->data[13][1] = '<b>' . __('Events without following tags') . '</b>';
+	$table->data[13][1] .= '<br>' . html_print_select ($tags_select_without, 'select_without',
+		'', '', '', 0, true, false, true, '', false, 'width: 120px;');
+	$table->data[13][1] .= '&nbsp;' . html_print_button(__('Add'), 'add_whithout', $add_without_tag_disabled,
+		'', 'class="add sub"', true);
+	$table->data[13][1] .= '<br>' . html_print_select ($tag_without_temp,
+		'tag_without_temp', array(), '', '', 0, true, true,
+		true, '', false, "width: 120px; height: 50px;");
+	$table->data[13][1] .= '&nbsp;' . html_print_button(__('Remove'), 'remove_whithout', $remove_without_tag_disabled,
+		'', 'class="delete sub"', true);
+	$table->data[13][1] .= html_print_input_hidden('tag_without',
+		$tag_without_base64, true);
+}
+else{
+	
 	$table->colspan[13][0] = '2';
 	$table->data[13][0] = '<b>' . __('Events with following tags') . '</b>';
 	$table->data[14][0] = html_print_select ($tags_select_with, 'select_with',
@@ -291,8 +330,6 @@ $table->data[15][0] .= html_print_input_hidden('tag_with',
 	$table->data[15][1] = html_print_button(__('Remove'),
 		'remove_whith', $remove_with_tag_disabled, '', 'class="delete sub"', true);
 
-
-
 	$table->colspan[16][0] = '2';
 	$table->data[16][0] = '<b>' . __('Events without following tags') . '</b>';
 	$table->data[17][0] = html_print_select ($tags_select_without, 'select_without',
@@ -307,8 +344,7 @@ $table->data[18][0] .= html_print_input_hidden('tag_without',
 		$tag_without_base64, true);
 	$table->data[18][1] = html_print_button(__('Remove'), 'remove_whithout', $remove_without_tag_disabled,
 		'', 'class="delete sub"', true);
-
+}
-
 
 $table->data[19][0] = '<b>' . __('Alert events') . '</b>';
 $table->data[19][1] = html_print_select(

pandora_console/godmode/events/event_filter.php

@@ -86,7 +86,7 @@ if ($filters === false)
 
 $table->width = '98%';
 if(defined("METACONSOLE"))
-	$table->width = '98%';
+	$table->width = '100%';
 $table->head = array ();
 $table->head[0] = __('Name');
 $table->head[1] = __('Filter group');
@@ -100,6 +100,7 @@ $table->style[0] = 'font-weight: bold';
 $table->align = array ();
 $table->align[1] = 'center';
 $table->align[2] = 'center';
+if(!defined("METACONSOLE"))
 	$table->align[3] = 'center';
 $table->align[4] = 'center';
 $table->align[5] = 'center';
@@ -137,7 +138,10 @@ if (isset($data)) {
 	echo "<form method='post' action='index.php?sec=geventos&sec2=godmode/events/events&amp;pure=".$config['pure']."'>";
 	html_print_input_hidden('multiple_delete', 1);
 	html_print_table ($table);
-	echo "<div style='padding-bottom: 20px; text-align: right; width:" . $table->width . "'>";
+	if(!defined("METACONSOLE"))
+		echo "<div style='padding-bottom: 20px; text-align: right; width:100%;'>";
+	else
+		echo "<div style='text-align: right; width:100%;'>";
 	html_print_submit_button(__('Delete'), 'delete_btn', false, 'class="sub delete"');
 	echo "</div>";
 	echo "</form>";
@@ -148,7 +152,10 @@ else {
 }
 
 echo '<form method="post" action="index.php?sec=geventos&sec2=godmode/events/events&section=edit_filter&amp;pure='.$config['pure'].'">';
-	echo "<div style='padding-bottom: 20px; text-align: right; width:" . $table->width . "'>";
+	if(!defined("METACONSOLE"))
+		echo "<div style='padding-bottom: 20px; text-align: right; width:100%;'>";
+	else
+		echo "<div style='text-align: right; width:100%;'>";
 	html_print_submit_button (__('Create filter'), 'crt', false, 'class="sub wand"');
 	echo "</div>";
 	echo '</form>';

pandora_console/godmode/reporting/reporting_builder.item_editor.php

@@ -515,7 +515,7 @@ else
 				echo "<thead>
 						<tr>
 							<th align=center colspan=5>
-								" . __('Wizard') . "
+								" . __('Item Editor') . "
 							</th>
 						</tr>
 					</thead>";			
@@ -1140,6 +1140,8 @@ else
 		</tr>
 	</tbody>
 </table>
+<br />
+<br />
 <?php
 print_SLA_list('95%', $action, $idItem);
 print_General_list('95%', $action, $idItem);
@@ -1458,8 +1460,7 @@ $(document).ready (function () {
 		minuteText: '<?php echo __('Minute');?>',
 		secondText: '<?php echo __('Second');?>',
 		currentText: '<?php echo __('Now');?>',
-		closeText: '<?php echo __('Close');?>'
+		closeText: '<?php echo __('Close');?>'});
-	});
 });
 
 function create_custom_graph() {

pandora_console/godmode/reporting/reporting_builder.php

@@ -475,6 +475,9 @@ switch ($action) {
 				
 				$table->head[$next] = __('Private');
 				$table->size[$next] = '40px';
+				if(defined('METACONSOLE'))
+					$table->align[$next] = '';
+				else
 					$table->align[$next] = 'center';
 				$next++;
 				$table->head[$next] = __('Group');
@@ -1590,9 +1593,9 @@ switch ($action) {
 			else
 				ui_print_page_header (__('Reporting') . $subsection, "images/op_reporting.png", false, "", false, $buttons);
 			
-			enterprise_hook('open_meta_frame');
+			
 			reporting_enterprise_select_main_tab($action);
-			enterprise_hook('close_meta_frame');
+			
 		}
 		
 		return;
@@ -1661,7 +1664,7 @@ else {
 		"reporting_" . $activeTab . "_tab", false, $buttons);
 }
 
-enterprise_hook('open_meta_frame');
+
 
 if ($resultOperationDB !== null) {
 	ui_print_result_message ($resultOperationDB, __('Successfull action'), __('Unsuccessfull action'));

pandora_console/include/functions_reporting.php

@@ -1512,6 +1512,7 @@ function reporting_get_stats_modules_status($data, $graph_width = 250, $graph_he
 		$table_mbs->data[] = $tdata;
 	}
 	
+	if(!defined("METACONSOLE")){
 		$output = '
 			<fieldset class="databox tactical_set">
 				<legend>' . 
@@ -1519,7 +1520,17 @@ function reporting_get_stats_modules_status($data, $graph_width = 250, $graph_he
 				'</legend>' . 
 				html_print_table($table_mbs, true) .
 			'</fieldset>';
-	
+	}
+	else{
+		$table_mbs->class = "tactical_view";
+		$output = '
+			<fieldset class="tactical_set">
+				<legend>' . 
+					__('Monitors by status') . 
+				'</legend>' . 
+				html_print_table($table_mbs, true) .
+			'</fieldset>';
+	}
 	return $output;
 }
 
@@ -8376,6 +8387,7 @@ function reporting_get_last_activity() {
 	
 	if(defined("METACONSOLE"))
 		$table->class="databox_tactical";
+		
 	return html_print_table ($table, true);
 	
 }
@@ -8458,7 +8470,7 @@ function reporting_get_event_histogram ($events) {
 	}
 	else{
 		$table->class='tactical_view';
-		$event_graph = '<fieldset class="tactical_set">' . 
+		$event_graph = '<fieldset id="event_tactical" class="tactical_set">' . 
 					html_print_table($table, true) . '</fieldset>';
 	}
 	

pandora_console/include/styles/jquery-ui-1.10.0.custom.css

@@ -423,7 +423,7 @@ button.ui-button::-moz-focus-inner {
 	position: absolute;
 	right: .3em;
 	width: 21px;
-	margin: -2px 0 0 0;
+	margin: 0px 0 0 0;
 	padding: 1px;
 	height: 20px;
 }

pandora_console/operation/events/events.build_table.php

@@ -37,6 +37,9 @@ else {
 //headers
 $i = 0;
 $table->head[$i] = __('ID');
+if(defined("METACONSOLE"))
+		$table->align[$i] = 'left';
+	else
 		$table->align[$i] = 'center';
 $i++;
 if (in_array('server_name', $show_fields)) {
@@ -51,6 +54,9 @@ if (in_array('estado', $show_fields)) {
 }
 if (in_array('id_evento', $show_fields)) {
 	$table->head[$i] = __('Event ID');
+	if(defined("METACONSOLE"))
+		$table->align[$i] = 'left';
+	else
 		$table->align[$i] = 'center';
 	$i++;
 }
@@ -68,78 +74,123 @@ if (in_array('id_agente', $show_fields)) {
 }
 if (in_array('timestamp', $show_fields)) {
 	$table->head[$i] = __('Timestamp');
+	if(defined("METACONSOLE"))
+		$table->align[$i] = 'left';
+	else
 		$table->align[$i] = 'center';
 	$i++;
 }
 if (in_array('id_usuario', $show_fields)) {
 	$table->head[$i] = __('User');
+	if(defined("METACONSOLE"))
+		$table->align[$i] = 'left';
+	else
 		$table->align[$i] = 'center';
 	$i++;
 }
 if (in_array('owner_user', $show_fields)) {
 	$table->head[$i] = __('Owner');
+	if(defined("METACONSOLE"))
+		$table->align[$i] = 'left';
+	else
 		$table->align[$i] = 'center';
 	$i++;
 }
 if (in_array('id_grupo', $show_fields)) {
 	$table->head[$i] = __('Group');
+	if(defined("METACONSOLE"))
+		$table->align[$i] = 'left';
+	else
 		$table->align[$i] = 'center';
 	$i++;
 }
 if (in_array('event_type', $show_fields)) {
 	$table->head[$i] = __('Event type');
+	if(defined("METACONSOLE"))
+		$table->align[$i] = 'left';
+	else
 		$table->align[$i] = 'center';
 	$table->style[$i] = 'min-width: 85px;';
 	$i++;
 }
 if (in_array('id_agentmodule', $show_fields)) {
 	$table->head[$i] = __('Agent Module');
+	if(defined("METACONSOLE"))
+		$table->align[$i] = 'left';
+	else
 		$table->align[$i] = 'center';
 	$i++;
 }
 if (in_array('id_alert_am', $show_fields)) {
 	$table->head[$i] = __('Alert');
+	if(defined("METACONSOLE"))
+		$table->align[$i] = 'left';
+	else
 		$table->align[$i] = 'center';
 	$i++;
 }
 
 if (in_array('criticity', $show_fields)) {
 	$table->head[$i] = __('Severity');
+	if(defined("METACONSOLE"))
+		$table->align[$i] = 'left';
+	else
 		$table->align[$i] = 'center';
 	$i++;
 }
 if (in_array('user_comment', $show_fields)) {
 	$table->head[$i] = __('Comment');
+	if(defined("METACONSOLE"))
+		$table->align[$i] = 'left';
+	else
 		$table->align[$i] = 'center';
 	$i++;
 }
 if (in_array('tags', $show_fields)) {
 	$table->head[$i] = __('Tags');
+	if(defined("METACONSOLE"))
+		$table->align[$i] = 'left';
+	else
 		$table->align[$i] = 'center';
 	$i++;
 }
 if (in_array('source', $show_fields)) {
 	$table->head[$i] = __('Source');
+	if(defined("METACONSOLE"))
+		$table->align[$i] = 'left';
+	else
 		$table->align[$i] = 'center';
 	$i++;
 }
 if (in_array('id_extra', $show_fields)) {
 	$table->head[$i] = __('Extra ID');
+	if(defined("METACONSOLE"))
+		$table->align[$i] = 'left';
+	else
 		$table->align[$i] = 'center';
 	$i++;
 }
 if (in_array('ack_utimestamp', $show_fields)) {
 	$table->head[$i] = __('ACK Timestamp');
+	if(defined("METACONSOLE"))
+		$table->align[$i] = 'left';
+	else
 		$table->align[$i] = 'center';
 	$i++;
 }
 if (in_array('instructions', $show_fields)) {
 	$table->head[$i] = __('Instructions');
+	if(defined("METACONSOLE"))
+		$table->align[$i] = 'left';
+	else
 		$table->align[$i] = 'center';
 	$i++;
 }
 if ($i != 0 && $allow_action) {
 	$table->head[$i] = __('Action');
+	if(defined("METACONSOLE"))
+		$table->align[$i] = 'left';
+	else
 		$table->align[$i] = 'center';
 	$table->size[$i] = '80px';
 	$i++;
@@ -597,6 +648,9 @@ if (!empty ($table->data)) {
 		echo "<input type='hidden' name='delete' id='hidden_delete_events' value='0' />";
 	}
 	
+	if (defined("METACONSOLE"))
+		echo '<div style="width: ' . $table->width . ';">';
+	else
 		echo '<div style="width: ' . $table->width . '; overflow-x: auto;">';
 	html_print_table ($table);
 	echo '</div>';

pandora_console/operation/events/events_list.php

@@ -125,9 +125,6 @@ if (is_ajax()) {
 // Get the tags where the user have permissions in Events reading tasks
 $tags = tags_get_user_tags($config['id_user'], 'ER');
 
-// Error div for ajax messages
-echo "<div id='show_filter_error'>";
-echo "</div>";
 
 if ($id_agent == 0 && $text_agent != __('All')) {
 	$id_agent = -1;
@@ -147,6 +144,7 @@ require('events.build_query.php');
 
 $id_name = get_parameter('id_name', '');
 
+if(!defined("METACONSOLE"))
 	echo "<br>";
 
 
@@ -158,7 +156,7 @@ $update_pressed = (int) !empty($update_pressed);
 if ($update_pressed || $open_filter) {
 	$open_filter = true;
 }
-
+if(!defined("METACONSOLE")){
 	$table = html_get_predefined_table('transparent', 2);
 	$table->styleTable = 'width: 23px; float: right; background: #ECECEC;';
 	$table->width = '98%';
@@ -172,9 +170,8 @@ if(defined('METACONSOLE')){
 		$table->width = '100%';
 		$table->class='events_list';
 	}
-
 	html_print_table($table);
-
+}
 unset($table);
 
 $filters = events_get_event_filter_select();
@@ -238,6 +235,7 @@ if (check_acl ($config["id_user"], 0, "EW") || check_acl ($config["id_user"], 0,
 	
 	$data[0] .= html_print_select ($_filters_update, "overwrite_filter", '', '', '', 0, true);
 	$data[1] = html_print_submit_button (__('Update filter'), 'update_filter', false, 'class="sub upd"', true);
+
 	$table->data[] = $data;
 	$table->rowclass[] = '';
 	
@@ -500,7 +498,7 @@ $table->cellspacing = 4;
 $table->cellpadding = 4;
 $table->class = 'databox';
 if (defined('METACONSOLE')){
-	$table->width = '70%';
+	$table->width = '96%';
 	$table->class = 'databox_filters';
 }
 $table->styleTable = 'font-weight: bold; color: #555;';
@@ -536,7 +534,7 @@ $fields = events_get_all_status();
 $data[0] .= html_print_select ($fields, 'status', $status, '', '', '', true);
 $data[1] = __('Max. hours old') . $jump;
 $data[1] .= html_print_input_text ('event_view_hr', $event_view_hr, '', 5, 255, true);
-$data[2] = __("Repeated") . '<br>';
+$data[2] = __("Repeated") . $jump;
 $repeated_sel[0] = __("All events");
 $repeated_sel[1] = __("Group events");
 $data[2] .= html_print_select ($repeated_sel, "group_rep", $group_rep, '', '', 0, true);
@@ -561,19 +559,43 @@ $table->rowclass[] = '';
 $data = array();
 $data[0] = '<div style="width:100%; text-align:left">';
 if (check_acl ($config["id_user"], 0, "EW")) {
-	$data[0] .= '<a href="javascript:" onclick="show_save_filter_dialog();">' . html_print_image("images/disk.png", true, array("border" => '0', "title" => __('Save filter'), "alt" => __('Save filter'))) . '</a> &nbsp;';
+	$data[0] .= '<a href="javascript:" onclick="show_save_filter_dialog();">' . 
+				html_print_image("images/disk.png", true, array("border" => '0', "title" => __('Save filter'), "alt" => __('Save filter'))) . '</a> &nbsp;';
 }
-$data[0] .= '<a href="javascript:" onclick="show_load_filter_dialog();">' . html_print_image("images/load.png", true, array("border" => '0', "title" => __('Load filter'), "alt" => __('Load filter'))) . '</a><br>';
+if(defined("METACONSOLE")){
+	$data[0] .= '<a href="javascript:" onclick="show_load_filter_dialog();">' . 
+				html_print_image("images/load.png", true, array("border" => '0', "title" => __('Load filter'), "alt" => __('Load filter'))) . '</a> &nbsp;';
+	$data[0] .= '<a id="events_graph_link" href="javascript: show_events_graph_dialog()">' . 
+						html_print_image('images/chart_curve.png', true, array('title' => __('Show events graph'))) . '</a> <br />';
+}
+else
+	$data[0] .= '<a href="javascript:" onclick="show_load_filter_dialog();">' . 
+				html_print_image("images/load.png", true, array("border" => '0', "title" => __('Load filter'), "alt" => __('Load filter'))) . '</a> <br />';
+if(defined("METACONSOLE")){
 	if (empty($id_name)) {
-	$data[0] .= '[<span id="filter_loaded_span" style="font-weight: normal">' .
+		$data[0] .= '<div id="filter_loaded_span" style="font-weight: normal">[' .
 			__('No filter loaded') .
-		'</span>]';
+			']</div>';
+	}
+	else {
+		$data[0] .= '<div id="filter_loaded_span" style="font-weight: normal">[' .
+			__('Filter loaded') . ': ' . $id_name .
+			']</div>';
+	}
+}
+else{
+	if (empty($id_name)) {
+		$data[0] .= '<span id="filter_loaded_span" style="font-weight: normal">[' .
+			__('No filter loaded') .
+			']</span>';
 	}
 	else {
 		$data[0] .= '[<span id="filter_loaded_span" style="font-weight: normal">' .
 			__('Filter loaded') . ': ' . $id_name .
 			'</span>]';
 	}
+
+}
 $data[0] .= '</div>';
 
 $data[1] = html_print_submit_button (__('Update'), 'update', false, 'class="sub upd"', true);
@@ -593,6 +615,10 @@ if (defined('METACONSOLE'))
 else
 	ui_toggle($events_filter, __('Event control filter'), '', !$open_filter);
 
+// Error div for ajax messages
+echo "<div id='show_filter_error'>";
+echo "</div>";
+
 $event_table = events_get_events_table($meta, $history);
 
 if ($group_rep == 0) {