diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php index 9a9306c8d6..aa727692aa 100644 --- a/pandora_console/include/functions_html.php +++ b/pandora_console/include/functions_html.php @@ -6734,11 +6734,27 @@ function html_print_menu_button(array $options, bool $return=false) } -function html_print_label_input_block(?string $label, $calbackFn):string -{ - $output = '
'; +function html_print_label_input_block( + ?string $label, + $calbackFn, + ?array $options=[] +):string { + $div_class = ''; + $label_class = ''; + + if (empty($options) === false) { + if (isset($options['div_class']) === true) { + $div_class = $options['div_class']; + } + + if (isset($options['label_class']) === true) { + $label_class = $options['label_class']; + } + } + + $output = '
'; if ($label !== null) { - $output .= ''; + $output .= ''; } $output .= $calbackFn; diff --git a/pandora_console/include/styles/tables.css b/pandora_console/include/styles/tables.css index 7207dab249..1abf114934 100644 --- a/pandora_console/include/styles/tables.css +++ b/pandora_console/include/styles/tables.css @@ -521,9 +521,15 @@ a.pandora_pagination.current:hover { margin: 0 1em; } +/* table.filter-table-adv { max-width: 1024px; } +*/ + +table.filter-table-adv td { + vertical-align: top; +} table.filter-table-adv td > div { display: flex; @@ -540,6 +546,18 @@ table.filter-table-adv td > div label { margin-bottom: 10px; } +table.filter-table-adv td > div.add-input-reverse { + flex-direction: row-reverse; + justify-content: flex-end; + align-items: center; + margin-top: 5px; +} + +table.filter-table-adv td > div .label-thin { + color: #3f3f3f; + font-weight: 400; +} + /* padding-right: calc(100% - 1024px); */ diff --git a/pandora_console/operation/agentes/estado_agente.php b/pandora_console/operation/agentes/estado_agente.php index c2a9238952..5a0f6a97d5 100644 --- a/pandora_console/operation/agentes/estado_agente.php +++ b/pandora_console/operation/agentes/estado_agente.php @@ -257,17 +257,21 @@ $table->data['group'][0] = html_print_label_input_block( ) ); -$table->data['group'][1] = html_print_label_input_block( +$table->data['group'][0] .= html_print_label_input_block( __('Recursion'), html_print_checkbox_switch( 'recursion', 1, $recursion, true - ) + ), + [ + 'div_class' => 'add-input-reverse', + 'label_class' => 'label-thin', + ] ); -$table->data['group'][2] = html_print_label_input_block( +$table->data['group'][1] = html_print_label_input_block( __('Status'), html_print_select( $fields, @@ -314,12 +318,12 @@ $searchForm .= html_print_div( [ 'class' => 'action-buttons', 'content' => html_print_submit_button( - __('Search'), + __('Filter'), 'srcbutton', false, [ 'icon' => 'search', - 'mode' => 'secondary mini', + 'mode' => 'mini', ], true ),