diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php index 805567677b..cb49e49227 100644 --- a/pandora_console/godmode/agentes/agent_manager.php +++ b/pandora_console/godmode/agentes/agent_manager.php @@ -377,21 +377,23 @@ if ($new_agent === true) { $tableAgent->data['additional_alias'][0] = html_print_checkbox_switch('alias_as_name', 1, $config['alias_as_name'], true); $tableAgent->data['additional_alias'][1] = __('Use alias as name'); } else { - $tableAgent->data['alias'][0] .= html_print_anchor( - [ - 'href' => 'index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=remote_configuration&id_agente='.$id_agente.'&disk_conf='.$agent_md5, - 'content' => html_print_image( - 'images/remote-configuration@svg.svg', - true, - [ - 'border' => 0, - 'title' => __('This agent can be remotely configured'), - 'class' => 'invert_filter after_input_icon', - ] - ), - ], - true - ); + if ($remote_agent === true) { + $tableAgent->data['alias'][0] .= html_print_anchor( + [ + 'href' => 'index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=remote_configuration&id_agente='.$id_agente.'&disk_conf='.$agent_md5, + 'content' => html_print_image( + 'images/remote-configuration@svg.svg', + true, + [ + 'border' => 0, + 'title' => __('This agent can be remotely configured'), + 'class' => 'invert_filter after_input_icon', + ] + ), + ], + true + ); + } } // Ip adress. @@ -794,29 +796,30 @@ $tableAdvancedAgent->data['agent_quiet'][0] = html_print_checkbox_switch('quiet' // Remote configuration. if ($new_agent === false && isset($filename) === true && file_exists($filename['md5']) === true) { $tableAdvancedAgent->data['caption_remote_configuration'][0] = __('Remote configuration'); - $tableAdvancedAgent->rowclass['remote_configuration'] = 'w540px'; + $tableAdvancedAgent->cellstyle['remote_configuration'][0] = 'display: flex; align-items: center;'; + $tableAdvancedAgent->cellclass['remote_configuration'][0] = 'w540px'; $tableAdvancedAgent->data['remote_configuration'][0] = html_print_input_text( 'remote_file_timestamp', date('F d Y H:i:s', fileatime($filename['md5'])), '', - 68, - 255, + 0, + 100, true, true, false, '', - '' + 'w540px' ); $tableAdvancedAgent->data['remote_configuration'][0] .= html_print_anchor( [ 'href' => 'index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=main&disk_conf_delete=1&id_agente='.$id_agente, - 'class' => 'after_input_icon', 'content' => html_print_image( - 'images/cross.png', + 'images/delete.svg', true, [ - 'title' => __('Delete remote configuration file'), - 'class' => 'vertical_middle invert_filter mrgn_lft_5px', + 'border' => 0, + 'title' => __('Delete remote configuration file'), + 'class' => 'invert_filter after_input_icon', ] ), ], diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php index 54a8cee808..85f4b64cba 100644 --- a/pandora_console/godmode/agentes/configurar_agente.php +++ b/pandora_console/godmode/agentes/configurar_agente.php @@ -910,7 +910,7 @@ if (isset($_GET['fix_module'])) { } $update_agent = (bool) get_parameter('update_agent'); - +hd($_REQUEST, true); // Update AGENT. if ($update_agent) { // If modified some agent paramenter. diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php index 64c85e9da0..497ada7483 100644 --- a/pandora_console/godmode/agentes/module_manager.php +++ b/pandora_console/godmode/agentes/module_manager.php @@ -55,21 +55,25 @@ $sec2 = (string) get_parameter('sec2'); $filterTable = new stdClass(); $filterTable->class = 'fixed_filter_bar'; $filterTable->data = []; -$filterTable->cellstyle[0][0] = 'flex: 0 1 20%;'; -$filterTable->data[0][0] = ''.__('Search').''; +$filterTable->cellstyle[0][0] = 'flex: 0 1 20%;align-items: center;'; +$filterTable->data[0][0] = html_print_div([ 'content' => __('Search') ], true); $filterTable->data[0][0] .= html_print_input_text( 'search_string', $search_string, '', - 15, + 0, 255, - true + true, + false, + false, + '', + 'w100p' ); $filterTable->data[0][0] .= html_print_input_hidden('search', 1, true); if ((bool) $policy_page === false) { $filterTable->cellstyle[0][1] = 'flex: 0 1 20%'; - $filterTable->data[0][1] = ''.__('Show in hierachy mode').''; + $filterTable->data[0][1] = html_print_div([ 'content' => __('Show in hierachy mode') ], true); $filterTable->data[0][1] .= html_print_checkbox_switch( 'status_hierachy_mode', '', @@ -1205,7 +1209,7 @@ foreach ($modules as $module) { } if (check_acl_one_of_groups($config['id_user'], $all_groups, 'AW')) { - echo '
'; } @@ -1249,9 +1253,7 @@ if ((bool) check_acl_one_of_groups($config['id_user'], $all_groups, 'AW') === tr false, '', false, - false, - false, - 300 + 'width: 260px;', ); html_print_action_buttons( diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php index 2446814241..70bfac59c3 100644 --- a/pandora_console/godmode/agentes/module_manager_editor_common.php +++ b/pandora_console/godmode/agentes/module_manager_editor_common.php @@ -372,8 +372,6 @@ if ($edit === false) { ); } -hd($type_names_hash); -hd($_REQUEST); // Store the relation between id and name of the types on a hidden field. $table_simple->data['module_n_type'][1] .= html_print_input_hidden( 'type_names', @@ -866,17 +864,31 @@ $tagsCompleteData = html_print_div( true ); +$sqlGetTags = sprintf( + 'SELECT a.id_tag, name FROM ttag a, %s b WHERE a.id_tag = b.id_tag AND %s = %s %s ORDER BY name', + $__table_modules, + $__id_where, + $__id, + $__sql +); + +$listSelectedTags = db_get_all_rows_sql($sqlGetTags); + +$listSelectedTagShow = array_reduce( + $listSelectedTags, + function ($carry, $item) { + $carry[] = $item['id_tag']; + return $carry; + } +); + $tagsCompleteData .= html_print_div( [ 'class' => 'tags_selected_container', 'content' => html_print_select_from_sql( - "SELECT a.id_tag, name - FROM ttag a, $__table_modules b - WHERE a.id_tag = b.id_tag AND $__id_where = $__id - $__sql - ORDER BY name", + $sqlGetTags, 'id_tag_selected[]', - '', + $listSelectedTagShow, '', '', '', @@ -890,7 +902,22 @@ $tagsCompleteData .= html_print_div( ], true ); - +/* + $tagsCompleteData .= html_print_select( + $listSelectedTags, + 'id_tag_selected[]', + $listSelectedTagShow, + '', + '', + 0, + true, + true, + false, + '', + $disabledBecauseInPolicy, + 'width: 200px;' + ); +*/ $table_advanced->data['tags_module_parent'][0] .= html_print_div( [ 'class' => 'tags_complete_container', diff --git a/pandora_console/images/close@svg.svg b/pandora_console/images/close@svg.svg index 5edfda4101..788e5205de 100644 --- a/pandora_console/images/close@svg.svg +++ b/pandora_console/images/close@svg.svg @@ -1,5 +1,5 @@ - + Dark / 20 / close@svg Created with Sketch. diff --git a/pandora_console/images/delete-v2@svg.svg b/pandora_console/images/delete-v2@svg.svg index 7afbbfe985..6147c6d253 100644 --- a/pandora_console/images/delete-v2@svg.svg +++ b/pandora_console/images/delete-v2@svg.svg @@ -1,5 +1,5 @@ - + Dark / 20 / delete-v2@svg Created with Sketch. diff --git a/pandora_console/images/house@svg.svg b/pandora_console/images/house@svg.svg index 92c4feac72..0ad7202b5b 100644 --- a/pandora_console/images/house@svg.svg +++ b/pandora_console/images/house@svg.svg @@ -1,5 +1,5 @@ - + Dark / 20 / house@svg Created with Sketch. diff --git a/pandora_console/images/info@svg.svg b/pandora_console/images/info@svg.svg index 96c0dcc14d..fa748eb489 100644 --- a/pandora_console/images/info@svg.svg +++ b/pandora_console/images/info@svg.svg @@ -1,5 +1,5 @@ - + Dark / 14 / info@svg Created with Sketch. diff --git a/pandora_console/images/star@svg.svg b/pandora_console/images/star@svg.svg index 8cb0babae1..08255e6a8f 100644 --- a/pandora_console/images/star@svg.svg +++ b/pandora_console/images/star@svg.svg @@ -1,5 +1,5 @@ - + Dark / 20 / star@svg Created with Sketch. diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 48cdeb08d0..7370d75291 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -10666,7 +10666,6 @@ pre.external_tools_output { .fixed_filter_bar { position: sticky; - height: 60px; top: 114px; border: 1px solid #e5e9ed; background-color: #fff; @@ -10689,8 +10688,13 @@ pre.external_tools_output { justify-content: flex-start; } -.fixed_filter_bar span { - margin-right: 15px; +.fixed_filter_bar td > div { + margin-right: 10px; + font-size: 10pt; +} + +.fixed_filter_bar input { + height: 32px; } .fixed_filter_content { diff --git a/pandora_console/include/styles/tables.css b/pandora_console/include/styles/tables.css index 6ae7bdbc0a..d675d09d5d 100644 --- a/pandora_console/include/styles/tables.css +++ b/pandora_console/include/styles/tables.css @@ -446,3 +446,7 @@ a.pandora_pagination.current:hover { .ff_thresholds_line input { width: 100%; } + +.datatable_form { + margin: 0 1em; +}