diff --git a/pandora_console/godmode/netflow/nf_edit_form.php b/pandora_console/godmode/netflow/nf_edit_form.php index 14233b863d..dc3c362b8a 100644 --- a/pandora_console/godmode/netflow/nf_edit_form.php +++ b/pandora_console/godmode/netflow/nf_edit_form.php @@ -176,8 +176,6 @@ $table->class = "databox filters"; $table->style[0] = 'font-weight: bold'; if (defined('METACONSOLE')) { - $table->width = '100%'; - $table->class = 'databox data'; if($id) $table->head[0] = __("Update filter"); else diff --git a/pandora_console/godmode/reporting/map_builder.php b/pandora_console/godmode/reporting/map_builder.php index 5c46908f82..25560a5e5b 100644 --- a/pandora_console/godmode/reporting/map_builder.php +++ b/pandora_console/godmode/reporting/map_builder.php @@ -206,6 +206,9 @@ $table->head[0] = __('Map name'); $table->head[1] = __('Group'); $table->head[2] = __('Items'); +if (defined("METACONSOLE")) + $table->styleTable = "margin-top:0px"; + // Fix: IW was the old ACL for report editing, now is RW //Only for RW flag if ($vconsoles_write || $vconsoles_manage) { diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.php b/pandora_console/godmode/reporting/visual_console_builder.editor.php index 1af444147c..022c0976ca 100755 --- a/pandora_console/godmode/reporting/visual_console_builder.editor.php +++ b/pandora_console/godmode/reporting/visual_console_builder.editor.php @@ -119,7 +119,8 @@ foreach ($layoutDatas as $layoutData) { } -echo ""; +echo ""; echo ''; echo ''; diff --git a/pandora_console/godmode/reporting/visual_console_builder.elements.php b/pandora_console/godmode/reporting/visual_console_builder.elements.php index 329dc0b93e..fb031884e5 100755 --- a/pandora_console/godmode/reporting/visual_console_builder.elements.php +++ b/pandora_console/godmode/reporting/visual_console_builder.elements.php @@ -69,14 +69,9 @@ foreach ($all_images as $image_file) { } $table = new stdClass(); -if (!defined('METACONSOLE')) { - $table->width = '100%'; - $table->class = 'databox filters'; -} -else { - $table->width = '100%'; - $table->class = 'databox'; -} +$table->width = '100%'; +$table->class = 'databox data'; + $table->head = array(); $table->head['icon'] = ''; $table->head[0] = __('Label') . ' / ' . __('Agent') . ' / ' . __('Group'); diff --git a/pandora_console/godmode/reporting/visual_console_builder.wizard.php b/pandora_console/godmode/reporting/visual_console_builder.wizard.php index d3af899224..c2f5d67883 100644 --- a/pandora_console/godmode/reporting/visual_console_builder.wizard.php +++ b/pandora_console/godmode/reporting/visual_console_builder.wizard.php @@ -25,6 +25,8 @@ if (empty($visualConsole)) { exit; } +$strict_user = db_get_value('strict_acl', 'tusuario', 'id_user', $config['id_user']); + // ACL for the existing visual console // if (!isset($vconsole_read)) // $vconsole_read = check_acl ($config['id_user'], $visualConsole['id_group'], "VR"); @@ -53,8 +55,8 @@ if (!defined('METACONSOLE')) { else { $metaconsole_hack = '../../'; $table->width = '100%'; - $table->class = 'databox data'; - $table->styleTable = 'padding-top: 15px; margin-top:0px'; + $table->class = 'databox filters'; + $table->styleTable = ' margin-top:0px'; require_once($config['homedir'] . "/enterprise/meta/include/functions_html_meta.php"); } @@ -62,7 +64,7 @@ else { $table->style = array (); $table->style[0] = 'font-weight: bold; '; -$table->style[1] = 'font-weight: bold; '; + $table->style[2] = 'font-weight: bold; '; $table->size = array (); @@ -179,8 +181,13 @@ $table->data["percentileitem_4"][1] = html_print_radio_button_extended( if (defined('METACONSOLE')) { $table->rowstyle["all_2"] = 'display: none;'; $table->data["all_2"][0] = __('Servers'); - $table->data["all_2"][1] = html_meta_print_select_servers(false, - false, 'servers', '', 'metaconsole_init();', '', 0, true); + if ($strict_user) + $table->data["all_2"][1] = html_print_select('','server_id', + $server_id, 'metaconsole_init();', __('All'), '0', true); + else + $table->data["all_2"][1] = html_print_select_from_sql( + 'SELECT id, server_name FROM tmetaconsole_setup', + 'server_id', $server_id, 'metaconsole_init();', __('All'), '0', true); } diff --git a/pandora_console/include/functions_visual_map_editor.php b/pandora_console/include/functions_visual_map_editor.php index a282f563d1..c16de8081b 100755 --- a/pandora_console/include/functions_visual_map_editor.php +++ b/pandora_console/include/functions_visual_map_editor.php @@ -533,7 +533,11 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) { function visual_map_editor_print_toolbox() { global $config; - echo '
'; + if (defined("METACONSOLE")) + echo '
'; + else + echo '
'; + echo '
'; visual_map_print_button_editor('static_graph', __('Static Graph'), 'left', false, 'camera_min', true); visual_map_print_button_editor('percentile_item', __('Percentile Item'), 'left', false, 'percentile_item_min', true); diff --git a/pandora_console/operation/netflow/nf_live_view.php b/pandora_console/operation/netflow/nf_live_view.php index 0af6044d98..da279aae52 100644 --- a/pandora_console/operation/netflow/nf_live_view.php +++ b/pandora_console/operation/netflow/nf_live_view.php @@ -178,12 +178,7 @@ if (isset($config['netflow_disable_custom_lvfilters'])) { enterprise_hook('open_meta_frame'); -if (defined ('METACONSOLE')) { - $class = "databox data"; -} -else { - $class = "databox filters"; -} +$class = "databox filters"; echo '
'; echo ""; @@ -398,7 +393,7 @@ echo '
"; - echo html_print_submit_button (__('Draw'), 'draw_button', false, 'class="sub upd"',true) . "  " ; + echo html_print_submit_button (__('Draw'), 'draw_button', false, 'class="sub upd"',true) ; if (!$netflow_disable_custom_lvfilters) { if (check_acl ($config["id_user"], 0, "AW")) { diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php index ca447fa70d..8a909f1549 100644 --- a/pandora_console/operation/users/user_edit.php +++ b/pandora_console/operation/users/user_edit.php @@ -186,9 +186,6 @@ $table->cellspacing = 4; $table->cellpadding = 4; $table->class = 'databox filters'; if (defined('METACONSOLE')) { - - $table->width = '100%'; - $table->class = 'databox data'; $table->head[0] = __('Edit my User'); $table->head_colspan[0] = 5; $table->headstyle[0] = 'text-align: center'; @@ -400,11 +397,13 @@ if (!defined('METACONSOLE')) $table->width = '100%'; $table->class = 'databox data'; if (defined('METACONSOLE')) { - echo '
'; $table->width = '100%'; - $table->class = 'databox_tactical data'; + $table->class = 'databox data'; $table->title = __('Profiles/Groups assigned to this user'); $table->head_colspan[0] = 0; + $table->headstyle[] = "background-color: #82B93C"; + $table->headstyle[] = "background-color: #82B93C"; + $table->headstyle[] = "background-color: #82B93C"; } $table->data = array ();