diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php index f524fb7d9e..9281c04e44 100644 --- a/pandora_console/godmode/agentes/agent_manager.php +++ b/pandora_console/godmode/agentes/agent_manager.php @@ -487,21 +487,18 @@ if (isset($groups[$grupo]) === true || $new_agent === true) { $tableAgent->data['primary_group'][0] .= html_print_input_hidden('grupo', $grupo, true); } -$tableAgent->data['primary_group'][0] .= html_print_div( - [ - 'content' => ui_print_group_icon( - $grupo, - true, - '', - ($id_agente === 0) ? 'display: none;' : '', - true, - false, - false, - 'after_input_icon' - ), - ], - true +$tableAgent->data['primary_group'][0] .= ''; +$tableAgent->data['primary_group'][0] .= ui_print_group_icon( + $grupo, + true, + '', + ($id_agente === 0) ? 'display: none;' : '', + true, + false, + false, + 'after_input_icon' ); +$tableAgent->data['primary_group'][0] .= ''; $tableAgent->data['caption_interval'][0] = __('Interval'); // $tableAgent->rowstyle['interval'] = 'width: 260px'; diff --git a/pandora_console/include/class/ExternalTools.class.php b/pandora_console/include/class/ExternalTools.class.php index 67345a61f8..3bcdce51ab 100644 --- a/pandora_console/include/class/ExternalTools.class.php +++ b/pandora_console/include/class/ExternalTools.class.php @@ -528,77 +528,103 @@ class ExternalTools extends HTML // Form table. $table = new StdClass(); - $table->class = 'fixed_filter_bar'; + $table->class = 'fixed_filter_bar filter-table-adv pdd_15px'; $table->id = 'externalToolTable'; - $table->cellstyle['captions'][0] = 'width: 0'; - $table->cellstyle['captions'][1] = 'width: 0'; - $table->cellstyle['captions'][2] = 'width: 0'; + $table->size[0] = '25%'; + $table->size[1] = '25%'; + $table->size[2] = '25%'; + $table->size[3] = '25%'; + $table->colspan = []; + $table->colspan[1][0] = 4; + // $table->cellclass[0][2] = 'snmpcolumn'; + // $table->cellclass[0][2] = 'snmpcolumn'; + // $table->cellclass[0][3] = 'snmpcolumn'; + // $table->cellclass[0][3] = 'snmpcolumn'; $table->data = []; - $table->data['captions'][0] = __('Operation'); - - $table->data['inputs'][0] = html_print_select( - $commandList, - 'operation', - $this->operation, - 'mostrarColumns(this.value)', - __('Please select'), - 0, - true + $table->data[0][0] = html_print_label_input_block( + __('Operation'), + html_print_select( + $commandList, + 'operation', + $this->operation, + 'mostrarColumns(this.value)', + __('Please select'), + 0, + true, + false, + true, + 'w100p', + false, + 'width: 100%;' + ) ); - $table->data['captions'][1] = __('IP Adress'); - $table->data['inputs'][1] = html_print_select( - $ipsSelect, - 'select_ips', - $principal_ip, - '', - '', - 0, - true + $table->data[0][1] = html_print_label_input_block( + __('IP Adress'), + html_print_select( + $ipsSelect, + 'select_ips', + $principal_ip, + '', + '', + 0, + true, + false, + true, + 'w100p', + false, + 'width: 100%;' + ) ); - $table->cellclass['captions'][2] = 'snmpcolumn'; - $table->cellclass['inputs'][2] = 'snmpcolumn'; - $table->data['captions'][2] = __('SNMP Version'); - $table->data['inputs'][2] = html_print_select( + $table->data[0][2] = html_print_label_input_block( + __('SNMP Version'), + html_print_select( + [ + '1' => 'v1', + '2c' => 'v2c', + ], + 'select_version', + $this->snmp_version, + '', + '', + 0, + true, + false, + true, + 'w100p', + false, + 'width: 100%;' + ), + ['div_class' => 'snmpcolumn'] + ); + + $table->data[0][3] = html_print_label_input_block( + __('SNMP Community'), + html_print_input_text( + 'community', + $this->community, + '', + 50, + 255, + true, + false, + false, + '', + 'w100p' + ), + ['div_class' => 'snmpcolumn'] + ); + + $table->data[1][0] = html_print_submit_button( + __('Execute'), + 'submit', + false, [ - '1' => 'v1', - '2c' => 'v2c', - ], - 'select_version', - $this->snmp_version, - '', - '', - 0, - true - ); - - $table->cellclass['captions'][3] = 'snmpcolumn'; - $table->cellclass['inputs'][3] = 'snmpcolumn'; - $table->data['captions'][3] = __('SNMP Community'); - $table->data['inputs'][3] = html_print_input_text( - 'community', - $this->community, - '', - 50, - 255, - true - ); - - $table->data['inputs'][4] = html_print_div( - [ - 'class' => 'action-buttons', - 'content' => html_print_submit_button( - __('Execute'), - 'submit', - false, - [ - 'icon' => 'cog', - 'mode' => 'mini', - ], - true - ), + 'icon' => 'cog', + 'mode' => 'mini', + 'class' => 'float-right mrgn_right_10px', ], true ); @@ -716,7 +742,7 @@ class ExternalTools extends HTML */ private function performExecution(string $command='', string $caption='') { - $output = ''; + $output = '