diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php index 939a15b790..f80313287a 100644 --- a/pandora_console/godmode/agentes/module_manager_editor_common.php +++ b/pandora_console/godmode/agentes/module_manager_editor_common.php @@ -1455,18 +1455,18 @@ html_print_input_hidden('module_macro_count', $macro_count); $table_new_relations = new stdClass(); $table_new_relations->id = 'module_new_relations'; $table_new_relations->width = '100%'; -$table_new_relations->class = 'no-class filter-table-adv'; +$table_new_relations->class = 'filter-table-adv'; $table_new_relations->data = []; $table_new_relations->style = []; -$table_new_relations->size[0] = '25%'; -$table_new_relations->size[1] = '25%'; -$table_new_relations->size[2] = '25%'; -$table_new_relations->size[3] = '25%'; +$table_new_relations->size[0] = '33%'; +$table_new_relations->size[1] = '33%'; +$table_new_relations->size[2] = '33%'; $params = []; $params['return'] = true; $params['show_helptip'] = true; $params['input_name'] = 'autocomplete_agent_name'; +$params['helptip_text'] = ''; $params['use_hidden_input_idagent'] = true; $params['print_hidden_input_idagent'] = true; $params['hidden_input_idagent_id'] = 'hidden-autocomplete_id_agent'; @@ -1476,15 +1476,15 @@ $table_new_relations->data[0][0] = html_print_label_input_block( ui_print_agent_autocomplete_input($params) ); + $table_new_relations->data[0][1] = html_print_label_input_block( __('Module'), - "
" + '
'.html_print_input_text('', '', '', false, 255, true, true, false, '', 'w100p').'
' ); $array_rel_type = []; $array_rel_type['direct'] = __('Direct'); $array_rel_type['failover'] = __('Failover'); - $table_new_relations->data[0][2] = html_print_label_input_block( __('Rel. type'), html_print_select( @@ -1497,43 +1497,55 @@ $table_new_relations->data[0][2] = html_print_label_input_block( true, false, true, - '' + 'w100p', + false, + 'width:100%' ) ); -$table_new_relations->data[0][3] = html_print_label_input_block( - ' ', - '
'.html_print_button( - __('Add relationship'), - 'add_relation', - false, - 'javascript: add_new_relation();', - [ - 'class' => 'w150px secondary', - 'icon' => 'plus', - ], - true - )."
" +$table_new_relations->data[1][0] = ' '; +$table_new_relations->data[1][1] = ' '; +$table_new_relations->cellstyle[1][2] = 'width:100% !important;'; +$table_new_relations->cellclass[1][2] = 'flex flex-end'; +$table_new_relations->data[1][2] = "
".html_print_button( + __('Add relationship')."
", + 'add_relation', + false, + 'add_new_relation();', + [ + 'class' => 'mini', + 'icon' => 'next', + 'mode' => 'secondary', + 'style' => 'margin-top: 10px; margin-right: 10px', + ], + true ); // Relationship list. $table_relations = new stdClass(); $table_relations->id = 'module_relations'; $table_relations->width = '100%'; -$table_relations->class = 'databox data'; +$table_relations->class = 'info_table'; +$table_relations->styleTable = 'border: none'; $table_relations->head = []; $table_relations->data = []; -$table_relations->rowstyle = []; $table_relations->rowstyle[-1] = 'display: none;'; -$table_relations->style = []; -$table_relations->style[3] = 'width: 10%; text-align: center;'; -$table_relations->style[4] = 'width: 10%; text-align: center;'; $table_relations->head[0] = __('Agent'); $table_relations->head[1] = __('Module'); $table_relations->head[2] = __('Type'); $table_relations->head[3] = __('Changes'); $table_relations->head[4] = __('Delete'); +$table_relations->headclass[0] = 'w20p'; +$table_relations->headclass[1] = 'w20p'; +$table_relations->headclass[2] = 'w20p'; +$table_relations->headclass[3] = 'w20p'; +$table_relations->headclass[4] = 'w20p'; +$table_relations->style[0] = 'width:20%'; +$table_relations->style[1] = 'width:20%'; +$table_relations->style[2] = 'width:20%'; +$table_relations->style[3] = 'width:20%'; +$table_relations->style[4] = 'width:20%'; // Create an invisible row to use their html to add new rows. $table_relations->data[-1][0] = ''; @@ -1565,6 +1577,9 @@ if ($id_agent_module) { $relations_count = 0; foreach ($module_relations as $key => $module_relation) { + // Styles. + $table_relations->cellclass[$relations_count][4] = 'table_action_buttons'; + if ($module_relation['module_a'] == $id_agent_module) { $module_id = $module_relation['module_b']; $agent_id = modules_give_agent_id_from_module_id( @@ -2047,6 +2062,7 @@ function change_modules_autocomplete_input () { else { module_autocomplete.html(error_icon); } + $('#text-autocomplete_module_name').addClass('w90p'); }, error: function (data) { module_autocomplete.removeClass('working'); @@ -2109,15 +2125,15 @@ function add_new_relation () { } var rowHTML = '' + - '' + agent_b_name + '' + - '' + module_b_name + '' + - '' + relation_type + '' + - '' + + '' + agent_b_name + '' + + '' + module_b_name + '' + + '' + relation_type + '' + + '' + '' + ' 'main_menu_icon invert_filter']); ?>' + '' + '' + - '' + + '' + '' + ' 'main_menu_icon invert_filter']); ?>' + '' + diff --git a/pandora_console/godmode/reporting/graph_container.php b/pandora_console/godmode/reporting/graph_container.php index 370285d7bf..0ec7c6b242 100644 --- a/pandora_console/godmode/reporting/graph_container.php +++ b/pandora_console/godmode/reporting/graph_container.php @@ -71,11 +71,11 @@ $max_graph = $config['max_graph_container']; $buttons['graph_list'] = [ 'active' => false, 'text' => ''.html_print_image( - 'images/list.png', + 'images/logs@svg.svg', true, [ 'title' => __('Graph list'), - 'class' => 'invert_filter', + 'class' => 'main_menu_icon invert_filter', ] ).'', ]; diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php index 3494ff8f78..68ff0baf8e 100755 --- a/pandora_console/godmode/reporting/reporting_builder.php +++ b/pandora_console/godmode/reporting/reporting_builder.php @@ -3557,7 +3557,7 @@ switch ($action) { $buttons = [ 'list_reports' => [ 'active' => false, - 'text' => ''.html_print_image('images/report_list.png', true, ['title' => __('Reports list'), 'class' => 'invert_filter']).'', + 'text' => ''.html_print_image('images/logs@svg.svg', true, ['title' => __('Reports list'), 'class' => 'invert_filter main_menu_icon']).'', ], ]; diff --git a/pandora_console/godmode/users/user_list.php b/pandora_console/godmode/users/user_list.php index a9f28ef4c6..99c121c180 100644 --- a/pandora_console/godmode/users/user_list.php +++ b/pandora_console/godmode/users/user_list.php @@ -1045,20 +1045,6 @@ if ($is_management_allowed === true) { } else { echo ''.__("The current authentication scheme doesn't support creating users on %s", get_product_name()).''; } -} else { - html_print_action_buttons( - html_print_submit_button( - __('Create user'), - 'none', - true, - [ 'icon' => 'wand' ], - true - ), - [ - 'type' => 'form_action', - 'right_content' => $tablePagination, - ], - ); } ?> diff --git a/pandora_console/include/functions_menu.php b/pandora_console/include/functions_menu.php index 2a52aed31b..3bf0799599 100644 --- a/pandora_console/include/functions_menu.php +++ b/pandora_console/include/functions_menu.php @@ -81,6 +81,12 @@ function menu_print_menu(&$menu) $sec2 = 'godmode/setup/setup§ion=gis'; } else if ($sec2 === 'enterprise/godmode/agentes/agent_autoconfiguration.definition') { $sec2 = 'enterprise/godmode/agentes/agent_autoconfiguration'; + } else if ($sec2 === 'enterprise/godmode/reporting/graph_template_list') { + $sec2 = 'godmode/reporting/graphs'; + } else if ($sec2 === 'enterprise/godmode/reporting/graph_template_wizard') { + $sec2 = 'godmode/reporting/graphs'; + } else if ($sec2 === 'godmode/reporting/graph_container') { + $sec2 = 'godmode/reporting/graphs'; } else if ($sec2 === 'operation/gis_maps/render_view') { $map_id = (int) get_parameter('map_id'); if (empty($map_id) === false) { diff --git a/pandora_console/include/javascript/tree/TreeController.js b/pandora_console/include/javascript/tree/TreeController.js index 5282cf58e4..368ebd69a9 100644 --- a/pandora_console/include/javascript/tree/TreeController.js +++ b/pandora_console/include/javascript/tree/TreeController.js @@ -652,13 +652,10 @@ var TreeController = { typeof element.icon != "undefined" && element.icon.length > 0 ) { - console.log("a"); - console.log(controller); $content.append( '
div > div#ui-datepicker-div { width: 400px; } +#module_relations > thead > tr { + border: none !important; + border-bottom: 1px solid #e2e2e2 !important; +} + span.help_icon_15px > img { height: 15px !important; } diff --git a/pandora_console/views/dashboard/header.php b/pandora_console/views/dashboard/header.php index b8e4cadb17..93fa76bc29 100644 --- a/pandora_console/views/dashboard/header.php +++ b/pandora_console/views/dashboard/header.php @@ -216,11 +216,12 @@ $enable_disable['text'] = html_print_div( // New Widget. $newWidget['text'] = '';