From f7724ab7636949c368a49ece674a50605b122a95 Mon Sep 17 00:00:00 2001 From: Pablo Aragon Date: Tue, 23 Apr 2024 15:15:15 +0200 Subject: [PATCH] 13188-Move filter module in custom graph --- pandora_console/include/functions_html.php | 104 +++++++++++---------- pandora_console/include/styles/pandora.css | 23 ++++- 2 files changed, 78 insertions(+), 49 deletions(-) diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php index 003ba7483a..620ec19d4f 100644 --- a/pandora_console/include/functions_html.php +++ b/pandora_console/include/functions_html.php @@ -1686,6 +1686,60 @@ function html_print_select_multiple_modules_filtered(array $data):string ); $output .= ''; + $agent_class = ''; + if (empty($data['searchBar']) === false && $data['searchBar'] === true) { + $output .= ''; + } + $output .= '
'; // Agent. $agents = agents_get_group_agents( @@ -1738,6 +1792,7 @@ function html_print_select_multiple_modules_filtered(array $data):string 'style' => 'min-width: 200px;max-width:200px;', 'script' => 'fmModuleChange(\''.$uniqId.'\', '.(int) is_metaconsole().')', 'placeholder' => (isset($data['placeholderAgents']) === true) ? $data['placeholderAgents'] : '', + 'input_class' => $agent_class, ] ); } else { @@ -1754,6 +1809,7 @@ function html_print_select_multiple_modules_filtered(array $data):string 'style' => 'min-width: 200px;max-width:200px;', 'script' => 'fmModuleChange(\''.$uniqId.'\', '.(int) is_metaconsole().')', 'placeholder' => (isset($data['placeholderAgents']) === true) ? $data['placeholderAgents'] : '', + 'input_class' => $agent_class, ] ); } @@ -1821,54 +1877,6 @@ function html_print_select_multiple_modules_filtered(array $data):string $output .= '
'; - if (empty($data['searchBar']) === false && $data['searchBar'] === true) { - $output .= ''; - } - if ($data['return'] === false) { echo $output; } diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index f787c7db25..0dce777841 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -14272,8 +14272,29 @@ table.filter-table-adv td > div.row-flex input { #select_multiple_modules_filtered > div.agents-modules-multiple-search-bar > div + > div > input { width: 100%; max-width: 100%; - height: 30px; +} + +.custom-graph-editor + #select_multiple_modules_filtered + > div.agents-modules-multiple-search-bar + > div + > div { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + flex-wrap: wrap; + width: 100%; +} + +.custom-graph-editor-agents-module-filter { + margin-top: -69px; +} + +.custom-graph-editor-agents-module-filter > span.select2.select2-container { + height: 189px; }