';
+ echo '
';
html_print_button (__('Export'), 'export_btn', false, 'change_action()', 'class="sub wand"');
echo '
';
}
diff --git a/pandora_console/operation/agentes/graphs.php b/pandora_console/operation/agentes/graphs.php
index e6363786d5..4ff59a218f 100644
--- a/pandora_console/operation/agentes/graphs.php
+++ b/pandora_console/operation/agentes/graphs.php
@@ -110,44 +110,53 @@ $table->width = '100%';
$table->class = 'databox filters';
$table->style[0] = 'font-weight: bolder; text-align: left;';
-$table->style[1] = '';
+$table->size[0] = '10%';
+$table->style[1] = 'font-weight: bolder; text-align: left;';
+$table->size[1] = '15%';
$table->style[2] = 'font-weight: bolder; text-align: left;';
+$table->size[2] = '10%';
+$table->style[3] = 'font-weight: bolder; text-align: left;';
+$table->size[3] = '20%';
-$table->rowspan[0][0] = 6;
-$table->rowspan[0][1] = 6;
+$table->rowspan[0][0] = 7;
+$table->rowspan[0][1] = 7;
$table->data[0][0] = __('Modules');
$table->data[0][1] = html_print_select($list_modules, 'modules[]',
$modules, '', '', 0, true, true,
true, '', false, "width: 100%; height: 200px;");
-$table->data[0][2] = __('Begin date');
-$table->data[0][3] = html_print_input_text ("start_date", substr ($start_date, 0, 10),'', 10, 40, true);
-$table->data[0][3] .= html_print_image ("images/calendar_view_day.png", true, array ("onclick" => "scwShow(scwID('text-start_date'),this);"));
+$table->rowspan[2][0] = 7;
+$table->data[2][0] = "";
-$table->data[1][2] = __('Zoom factor');
+
+$table->data[2][1] = __('Begin date');
+$table->data[2][2] = html_print_input_text ("start_date", substr ($start_date, 0, 10),'', 10, 40, true);
+$table->data[2][2] .= html_print_image ("images/calendar_view_day.png", true, array ("onclick" => "scwShow(scwID('text-start_date'),this);"));
+
+$table->data[3][1] = __('Zoom factor');
$options = array ();
$options[$zoom] = 'x' . $zoom;
$options[1] = 'x1';
$options[2] = 'x2';
$options[3] = 'x3';
$options[4] = 'x4';
-$table->data[1][3] = html_print_select ($options, "zoom", $zoom, '', '', 0, true);
+$table->data[3][2] = html_print_select ($options, "zoom", $zoom, '', '', 0, true);
-$table->data[2][2] = __('Time range');
+$table->data[4][1] = __('Time range');
-$table->data[2][3] = html_print_extended_select_for_time('period', $period, '', '', 0, 7, true);
+$table->data[4][2] = html_print_extended_select_for_time('period', $period, '', '', 0, 7, true);
-$table->data[3][2] = __('Show events');
-$table->data[3][3] = html_print_checkbox ("draw_events", 1, (bool) $draw_events, true);
-$table->data[4][2] = __('Show alerts') .
+$table->data[5][2] = __('Show events');
+$table->data[5][3] = html_print_checkbox ("draw_events", 1, (bool) $draw_events, true);
+$table->data[6][2] = __('Show alerts') .
ui_print_help_tip(__('the combined graph does not show the alerts into this graph'), true);
-$table->data[4][3] = html_print_checkbox ("draw_alerts", 1, (bool) $draw_alerts, true);
-$table->data[5][2] = __('Show as one combined graph');
-$table->data[5][3] =
+$table->data[6][3] = html_print_checkbox ("draw_alerts", 1, (bool) $draw_alerts, true);
+$table->data[7][2] = __('Show as one combined graph');
+$table->data[7][3] =
html_print_radio_button('combined', 1, __('one combined graph'),
$combined, true);
-$table->data[5][3] .=
+$table->data[7][3] .=
html_print_radio_button('combined', 0, __('several graphs for each module'),
$combined, true);
@@ -156,8 +165,8 @@ $htmlForm .= html_print_table($table, true);
$htmlForm .= html_print_input_hidden('filter', 1, true);
$htmlForm .= '
';
$htmlForm .= html_print_button(__('Save as custom graph'), 'save_custom_graph',
- false, 'save_custom_graph();', 'class="sub add" style="margin-top:10px"',true) . ' ' .
- html_print_submit_button (__('Filter'), 'filter_button', false, 'class="sub upd" style="margin-top:10px"', true);
+ false, 'save_custom_graph();', 'class="sub add" style=""',true) . ' ' .
+ html_print_submit_button (__('Filter'), 'filter_button', false, 'class="sub upd" style=""', true);
$htmlForm .= '
';
$htmlForm .= '';
diff --git a/pandora_console/operation/agentes/networkmap_list.php b/pandora_console/operation/agentes/networkmap_list.php
index 4c50677c32..2a77785184 100644
--- a/pandora_console/operation/agentes/networkmap_list.php
+++ b/pandora_console/operation/agentes/networkmap_list.php
@@ -155,9 +155,9 @@ $table->style[3] = 'text-align: left;';
$table->style[4] = 'text-align: left;';
$table->size = array();
-$table->size[0] = '80%';
+$table->size[0] = '60%';
$table->size[1] = '60px';
-$table->size[2] = '30px';
+$table->size[2] = '70px';
if ($networkmaps_write || $networkmaps_manage) {
$table->size[3] = '30px';
@@ -241,7 +241,7 @@ if ($networkmaps_write || $networkmaps_manage) {
$table_manage->style = array();
$table_manage->style[0] = 'font-weight: bold';
$table_manage->style[2] = 'font-weight: bold';
- $table_manage->style[4] = 'text-align: right';
+ $table_manage->style[4] = 'text-align: center';
$table_manage->size = array();
$table_manage->head = array();
$table_manage->data = array();
diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php
index a44b8c9c42..e7fddb7a8b 100644
--- a/pandora_console/operation/agentes/status_monitor.php
+++ b/pandora_console/operation/agentes/status_monitor.php
@@ -471,11 +471,7 @@ if (!defined('METACONSOLE'))
$table->data[1][1] = html_print_select (index_array ($modules, 'nombre', 'nombre'), "ag_modulename",
$ag_modulename, '', __('All'), '', true, false, true, '', false, 'width: 150px;');
-if (!defined('METACONSOLE'))
- $table->data[1][2] = __('Search');
-else
- $table->data[1][2] = __('Search');
-
+$table->data[1][2] = __('Search');
$table->data[1][3] = html_print_input_text ("ag_freestring", $ag_freestring, '', 20,30, true);
@@ -546,6 +542,7 @@ if (defined('METACONSOLE')) {
}
else {
$table->colspan[2][0] = 7;
+ $table->cellstyle[2][0] = "padding-left: 10px;";
$table->data[2][0] = ui_toggle(html_print_table($table_custom_fields, true), __('Agent custom fields'),'',true,true);
$filters .= html_print_table($table, true);
@@ -955,7 +952,7 @@ if (! defined ('METACONSOLE')) {
}
if (! defined ('METACONSOLE'))
- $table->align[5] = "center";
+ $table->align[5] = "left";
$table->head[6] = __('Status');
if (! defined ('METACONSOLE')) {
@@ -963,10 +960,10 @@ if (! defined ('METACONSOLE')) {
'
' . html_print_image("images/sort_down.png", true, array("style" => $selectStatusDown, "alt" => "down")) . '';
}
-$table->align[6] = "center";
+$table->align[6] = "left";
$table->head[7] = __('Graph');
-$table->align[7] = "center";
+$table->align[7] = "left";
$table->head[8] = __('Warn');
$table->align[8] = "left";
diff --git a/pandora_console/operation/events/events.build_table.php b/pandora_console/operation/events/events.build_table.php
index dd3198c8ad..c5ff018eab 100644
--- a/pandora_console/operation/events/events.build_table.php
+++ b/pandora_console/operation/events/events.build_table.php
@@ -22,7 +22,7 @@ $table->id = "eventtable";
$table->cellpadding = 4;
$table->cellspacing = 4;
if(!isset($table->class)) {
- $table->class = "databox";
+ $table->class = "databox data";
}
$table->head = array ();
$table->data = array ();
@@ -38,10 +38,9 @@ else {
//headers
$i = 0;
$table->head[$i] = __('ID');
-if(defined("METACONSOLE"))
- $table->align[$i] = 'left';
- else
- $table->align[$i] = 'center';
+
+$table->align[$i] = 'left';
+
$i++;
if (in_array('server_name', $show_fields)) {
$table->head[$i] = __('Server');
@@ -55,10 +54,8 @@ 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';
+ $table->align[$i] = 'left';
+
$i++;
}
if (in_array('evento', $show_fields)) {
@@ -75,129 +72,99 @@ 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';
+ $table->align[$i] = 'left';
+
$i++;
}
if (in_array('id_usuario', $show_fields)) {
$table->head[$i] = __('User');
- if(defined("METACONSOLE"))
- $table->align[$i] = 'left';
- else
- $table->align[$i] = 'center';
+ $table->align[$i] = 'left';
+
$i++;
}
if (in_array('owner_user', $show_fields)) {
$table->head[$i] = __('Owner');
- if(defined("METACONSOLE"))
- $table->align[$i] = 'left';
- else
- $table->align[$i] = 'center';
+ $table->align[$i] = 'left';
+
$i++;
}
if (in_array('id_grupo', $show_fields)) {
$table->head[$i] = __('Group');
- if(defined("METACONSOLE"))
- $table->align[$i] = 'left';
- else
- $table->align[$i] = 'center';
+ $table->align[$i] = 'left';
+
$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->align[$i] = 'left';
+
$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';
+ $table->align[$i] = 'left';
+
$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';
+ $table->align[$i] = 'left';
+
$i++;
}
if (in_array('criticity', $show_fields)) {
$table->head[$i] = __('Severity');
- if(defined("METACONSOLE"))
- $table->align[$i] = 'left';
- else
- $table->align[$i] = 'center';
+ $table->align[$i] = 'left';
+
$i++;
}
if (in_array('user_comment', $show_fields)) {
$table->head[$i] = __('Comment');
- if(defined("METACONSOLE"))
- $table->align[$i] = 'left';
- else
- $table->align[$i] = 'center';
+ $table->align[$i] = 'left';
+
$i++;
}
if (in_array('tags', $show_fields)) {
$table->head[$i] = __('Tags');
- if(defined("METACONSOLE"))
- $table->align[$i] = 'left';
- else
- $table->align[$i] = 'center';
+ $table->align[$i] = 'left';
+
$i++;
}
if (in_array('source', $show_fields)) {
$table->head[$i] = __('Source');
- if(defined("METACONSOLE"))
- $table->align[$i] = 'left';
- else
- $table->align[$i] = 'center';
+ $table->align[$i] = 'left';
+
$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';
+ $table->align[$i] = 'left';
+
$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';
+ $table->align[$i] = 'left';
+
$i++;
}
if (in_array('instructions', $show_fields)) {
$table->head[$i] = __('Instructions');
- if(defined("METACONSOLE"))
- $table->align[$i] = 'left';
- else
- $table->align[$i] = 'center';
+ $table->align[$i] = 'left';
+
$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';
+ $table->align[$i] = 'left';
+
+ $table->size[$i] = '90px';
$i++;
if (check_acl ($config["id_user"], 0, "EW") == 1 && !$readonly) {
$table->head[$i] = html_print_checkbox ("all_validate_box", "1", false, true);
- $table->align[$i] = 'center';
+ $table->align[$i] = 'left';
}
}
@@ -644,7 +611,7 @@ foreach ($result as $event) {
echo '
';
if (!empty ($table->data)) {
- echo '
';
+
if ($allow_pagination) {
ui_pagination ($total_events, $url, $offset, $pagination);
}
diff --git a/pandora_console/operation/events/events_list.php b/pandora_console/operation/events/events_list.php
index 0816ebbe75..90bddc883b 100644
--- a/pandora_console/operation/events/events_list.php
+++ b/pandora_console/operation/events/events_list.php
@@ -35,12 +35,8 @@ if (! check_acl ($config["id_user"], 0, "ER")) {
return;
}
-if (defined('METACONSOLE')) {
- $jump = ' ';
-}
-else {
- $jump = "
";
-}
+
+$jump = ' ';
if (is_ajax()) {
$get_filter_values = get_parameter('get_filter_values', 0);
@@ -162,10 +158,6 @@ require('events.build_query.php');
$id_name = get_parameter('id_name', '');
-if (!defined("METACONSOLE"))
- echo "
";
-
-
// Trick to catch if any filter button has been pushed (don't collapse filter)
// or the filter was open before click or autorefresh is in use (collapse filter)
$update_pressed = get_parameter_post('update', '');
@@ -174,22 +166,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%';
- $table->style[0] = 'text-align: left;';
- $table->style[1] = 'text-align: right;';
- $table->data[0][1] = '
' . html_print_image('images/chart_curve.png', true, array('title' => __('Show events graph'))) . '';
- $table->cellstyle[0][1] = 'background: #ECECEC;';
-
- if(defined('METACONSOLE')) {
- $table->width = '100%';
- $table->class='events_list';
- }
- html_print_table($table);
-}
unset($table);
$filters = events_get_event_filter_select();
@@ -208,7 +185,7 @@ if (check_acl ($config["id_user"], 0, "EW") || check_acl ($config["id_user"], 0,
// Save filter div for dialog
echo '
';
$table->id = 'save_filter_form';
- $table->width = '98%';
+ $table->width = '100%';
$table->cellspacing = 4;
$table->cellpadding = 4;
$table->class = 'databox';
@@ -271,7 +248,7 @@ if (check_acl ($config["id_user"], 0, "EW") || check_acl ($config["id_user"], 0,
// Load filter div for dialog
echo '
';
$table->id = 'load_filter_form';
-$table->width = '98%';
+$table->width = '100%';
$table->cellspacing = 4;
$table->cellpadding = 4;
$table->class = 'databox';
@@ -340,21 +317,17 @@ if (defined('METACONSOLE')) {
$data = array();
-if (!defined("METACONSOLE"))
- $data[0] = html_print_select ($tags_select_with, 'select_with', '', '', '', 0,
- true, true, true, '', false, 'width: 120px; height: 70px;') . '
';
-else
- $data[0] = html_print_select ($tags_select_with, 'select_with', '', '', '', 0,
- true, true, true, '', false, 'width: auto; height: 70px;') . '
';
+
+$data[0] = html_print_select ($tags_select_with, 'select_with', '', '', '', 0,
+ true, true, true, '', false, 'width: 120px; height: 70px;') . $jump;
+
$data[1] = html_print_image('images/darrowright.png', true, array('id' => 'button-add_with', 'style' => 'cursor: pointer;', 'title' => __('Add')));
$data[1] .= html_print_input_hidden('tag_with', $tag_with_base64, true);
$data[1] .= '
' . html_print_image('images/darrowleft.png', true, array('id' => 'button-remove_with', 'style' => 'cursor: pointer;', 'title' => __('Remove')));
-if(!defined("METACONSOLE"))
- $data[2] = html_print_select ($tag_with_temp, 'tag_with_temp', array(), '', '',
- 0, true, true, true, '', false, "width: 120px; height: 70px;");
-else
- $data[2] = html_print_select ($tag_with_temp, 'tag_with_temp', array(), '', '',
- 0, true, true, true, '', false, "width: auto; height: 70px;");
+
+$data[2] = html_print_select ($tag_with_temp, 'tag_with_temp', array(), '', '',
+ 0, true, true, true, '', false, "width: 120px; height: 70px;");
+
$tabletags_with->data[] = $data;
$tabletags_with->rowclass[] = '';
@@ -375,7 +348,7 @@ $tabletags_without->styleTable = 'border: 0px;';
$data = array();
$data[0] = html_print_select ($tags_select_without, 'select_without', '', '', '', 0,
- true, true, true, '', false, 'width: 200px; height: 70px;') . '
';
+ true, true, true, '', false, 'width: 200px; height: 70px;') . $jump;
$data[1] = html_print_image('images/darrowright.png', true, array('id' => 'button-add_without', 'style' => 'cursor: pointer;', 'title' => __('Add')));
$data[1] .= html_print_input_hidden('tag_without', $tag_without_base64, true);
$data[1] .= '
' . html_print_image('images/darrowleft.png', true, array('id' => 'button-remove_without', 'style' => 'cursor: pointer;', 'title' => __('Remove')));
@@ -414,7 +387,7 @@ else {
//- INI ADVANCE FILTER -------------------------------------------------
$table_advanced = new stdClass();
$table_advanced->id = 'events_filter_form_advanced';
-$table_advanced->width = '98%';
+$table_advanced->width = '100%';
$table_advanced->cellspacing = 4;
$table_advanced->cellpadding = 4;
$table_advanced->class = 'transparent';
@@ -541,7 +514,7 @@ $table->id = 'events_filter_form';
$table->width = '100%';
$table->cellspacing = 4;
$table->cellpadding = 4;
-$table->class = 'databox';
+$table->class = 'databox filters';
if (defined('METACONSOLE')) {
$table->width = '96%';
$table->class = 'databox_filters';
@@ -609,43 +582,27 @@ if (check_acl ($config["id_user"], 0, "EW")) {
$data[0] .= '
' .
html_print_image("images/disk.png", true, array("border" => '0', "title" => __('Save filter'), "alt" => __('Save filter'))) . ' ';
}
-if (defined("METACONSOLE")) {
- $data[0] .= '
' .
+
+$data[0] .= '' .
html_print_image("images/load.png", true, array("border" => '0', "title" => __('Load filter'), "alt" => __('Load filter'))) . ' ';
- $data[0] .= '
' .
- html_print_image('images/chart_curve.png', true, array('title' => __('Show events graph'))) . ' ';
-}
-else
- $data[0] .= '
' .
- html_print_image("images/load.png", true, array("border" => '0', "title" => __('Load filter'), "alt" => __('Load filter'))) . ' ';
-if (defined("METACONSOLE")) {
- if (empty($id_name)) {
- $data[0] .= '
[' .
- __('No filter loaded') .
- ']
';
- }
- else {
- $data[0] .= '
[' .
- __('Filter loaded') . ': ' . $id_name .
- ']
';
- }
+$data[0] .= '
' .
+ html_print_image('images/chart_curve.png', true, array('title' => __('Show events graph'))) . ' ';
+
+
+if (empty($id_name)) {
+ $data[0] .= '
[' .
+ __('No filter loaded') .
+ ']
';
}
else {
- if (empty($id_name)) {
- $data[0] .= '
[' .
- __('No filter loaded') .
- ']';
- }
- else {
- $data[0] .= '[
' .
- __('Filter loaded') . ': ' . $id_name .
- ']';
- }
-
+ $data[0] .= '
[' .
+ __('Filter loaded') . ': ' . $id_name .
+ ']
';
}
+
$data[0] .= '
';
-$data[1] = html_print_submit_button (__('Update'), 'update', false, 'class="sub upd"', true);
+
$table->colspan[count($table->data)][1] = 4;
$table->rowstyle[count($table->data)] = 'text-align:right;';
$table->data[] = $data;
@@ -655,6 +612,12 @@ $events_filter .= html_print_table($table, true);
unset($table);
+$botom_update = "
";
+$botom_update .= html_print_submit_button (__('Update'), 'update', false, 'class="sub upd" style="float:right;"', true);
+$botom_update .= "
";
+
+$events_filter .= $botom_update;
+
$events_filter .= ""; //This is the filter div
if (defined('METACONSOLE'))
diff --git a/pandora_console/operation/gis_maps/index.php b/pandora_console/operation/gis_maps/index.php
index 180eee18cc..962715fb18 100644
--- a/pandora_console/operation/gis_maps/index.php
+++ b/pandora_console/operation/gis_maps/index.php
@@ -27,13 +27,14 @@ ui_print_page_header(__('GIS Maps')." » ".__('Summary'), "images/op_gis.pn
$maps = gis_get_maps();
-$table->width = "98%";
+$table->width = "100%";
+$table->class = "databox data";
$table->data = array ();
$table->head = array ();
$table->head[0] = __('Name');
$table->head[1] = __('Group');
$table->align = array ();
-$table->align[1] = 'center';
+$table->align[1] = 'left';
$rowPair = true;
$iterator = 0;
diff --git a/pandora_console/operation/incidents/incident.php b/pandora_console/operation/incidents/incident.php
index e10d6ef1f3..3dffe407d3 100755
--- a/pandora_console/operation/incidents/incident.php
+++ b/pandora_console/operation/incidents/incident.php
@@ -211,11 +211,12 @@ if (empty ($result)) {
echo '