From 242667e162edd5104a5977816532a0f344942161 Mon Sep 17 00:00:00 2001 From: Arturo Gonzalez Date: Tue, 27 Jun 2017 11:10:07 +0200 Subject: [PATCH] Fixed selector --- pandora_console/extensions/agents_alerts.php | 2 +- pandora_console/godmode/reporting/reporting_builder.php | 2 +- pandora_console/operation/agentes/exportdata.php | 2 +- pandora_console/operation/events/events_list.php | 2 +- pandora_console/operation/events/sound_events.php | 5 ++++- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pandora_console/extensions/agents_alerts.php b/pandora_console/extensions/agents_alerts.php index 91dc8a630c..97f1bc7589 100755 --- a/pandora_console/extensions/agents_alerts.php +++ b/pandora_console/extensions/agents_alerts.php @@ -93,7 +93,7 @@ function mainAgentsAlerts() { $groups = users_get_groups (); $filter_groups .= ''.__('Group').''; - $filter_groups .= html_print_select_groups(false, "AR", true, 'group_id', $group_id, false, '', '', true, false, true, '', false , 'width: 100px; margin-right: 10px;; margin-top: 5px;'); + $filter_groups .= html_print_select_groups(false, "AR", true, 'group_id', $group_id, false, '', '', true, false, true, '', false , 'margin-right: 10px; margin-top: 5px;'); $check = ''.__('Show modules without alerts').''; $check .= html_print_checkbox('slides_ids[]', $d['id'], $show_modules, true, false, '', true); diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php index ca470dc79b..b7994e6a1c 100755 --- a/pandora_console/godmode/reporting/reporting_builder.php +++ b/pandora_console/godmode/reporting/reporting_builder.php @@ -430,7 +430,7 @@ switch ($action) { $table_aux->colspan[0][0] = 4; $table_aux->data[0][0] = "". __("Group") . ""; - $table_aux->data[0][1] = html_print_select_groups(false, $access, true, 'id_group', $id_group, '', '', '', true, false, true, '', false, 'width:150px', false, false, 'id_grupo', $strict_user). '
'; + $table_aux->data[0][1] = html_print_select_groups(false, $access, true, 'id_group', $id_group, '', '', '', true, false, true, '', false, "", false, false, 'id_grupo', $strict_user). '
'; $table_aux->data[0][2] = "". __("Free text for search: ") . ui_print_help_tip( __('Search by report name or description, list matches.'),true) . ""; diff --git a/pandora_console/operation/agentes/exportdata.php b/pandora_console/operation/agentes/exportdata.php index 0532def5f4..b79b558ef5 100644 --- a/pandora_console/operation/agentes/exportdata.php +++ b/pandora_console/operation/agentes/exportdata.php @@ -238,7 +238,7 @@ if (empty($export_btn) || $show_form) { $table->data[0][1] = html_print_select_groups($config['id_user'], "RR", users_can_manage_group_all(), "group", $group, '', '', 0, true, false, true, - 'w130', false); + '', false); //Agent selector $table->data[1][0] = ''.__('Source agent').''; diff --git a/pandora_console/operation/events/events_list.php b/pandora_console/operation/events/events_list.php index 901ebf97db..b2ba0a338e 100644 --- a/pandora_console/operation/events/events_list.php +++ b/pandora_console/operation/events/events_list.php @@ -613,7 +613,7 @@ $data = array(); $data[0] = __('Group') . $jump; $data[0] .= html_print_select_groups($config["id_user"], $access, true, - 'id_group', $id_group, '', '', 0, true, false, false, 'w130', false, false, false, false, 'id_grupo', $strict_user). $jump; + 'id_group', $id_group, '', '', 0, true, false, false, '', false, false, false, false, 'id_grupo', $strict_user). $jump; //********************************************************************** // TODO // This code is disabled for to enabled in Pandora 5.1 diff --git a/pandora_console/operation/events/sound_events.php b/pandora_console/operation/events/sound_events.php index 173de7c339..f9a89364a1 100644 --- a/pandora_console/operation/events/sound_events.php +++ b/pandora_console/operation/events/sound_events.php @@ -77,7 +77,7 @@ $table->style[1] = 'font-weight: bold; vertical-align: top;'; $table->style[2] = 'font-weight: bold; vertical-align: top;'; $table->data[0][0] = __('Group'); -$table->data[0][1] = html_print_select_groups(false, $access, true, 'group', '', 'changeGroup();', '', 0, true, false, true, '', false, 'width:120px;') . '
' . '
'; +$table->data[0][1] = html_print_select_groups(false, $access, true, 'group', '', 'changeGroup();', '', 0, true, false, true, '', false, 'max-width:200px;') . '
' . '
'; $table->data[0][2] = __('Type'); $table->data[0][3] = html_print_checkbox('alert_fired', 'alert_fired', true, true, false, 'changeType();') . __('Alert fired') . '
' . @@ -276,6 +276,9 @@ $(document).ready (function () { setInterval("check_event()", (10 * 1000)); //10 seconds between ajax request $("#table1").css("background-color", "#fff"); $("#table2").css("background-color", "#fff"); + + group_width = $("#group").width(); + $("#id_agents").width(group_width + 9); });