diff --git a/pandora_console/extensions/agents_modules.php b/pandora_console/extensions/agents_modules.php index 0abde09010..f93dec02a4 100644 --- a/pandora_console/extensions/agents_modules.php +++ b/pandora_console/extensions/agents_modules.php @@ -1,16 +1,29 @@ '', + 'label' => __('Monitoring'), + ], + [ + 'link' => '', + 'label' => __('Views'), + ], + ] ); + echo ''; echo ''; echo "'; diff --git a/pandora_console/extensions/module_groups.php b/pandora_console/extensions/module_groups.php index 3b9670a8e0..4e1f0e791c 100644 --- a/pandora_console/extensions/module_groups.php +++ b/pandora_console/extensions/module_groups.php @@ -196,7 +196,6 @@ function mainModuleGroups() ON ta.id_agente = tam.id_agente WHERE ta.disabled = 0 AND tam.disabled = 0 - AND tam.id_modulo <> 0 AND tam.delete_pending = 0 AND ta.id_grupo IN (%s) GROUP BY tam.id_agente_modulo @@ -246,13 +245,24 @@ function mainModuleGroups() $array_data[$value['id_grupo']][$value['id_mg']] = $value; } - ui_print_page_header( + // Header. + ui_print_standard_header( __('Combined table of agent group and module group'), 'images/module_group.png', false, '', false, - '' + [], + [ + [ + 'link' => '', + 'label' => __('Monitoring'), + ], + [ + 'link' => '', + 'label' => __('Views'), + ], + ] ); echo "
".$fullscreen['text'].'
diff --git a/pandora_console/extensions/realtime_graphs.php b/pandora_console/extensions/realtime_graphs.php index 86fcfc4f0e..51d987ae25 100644 --- a/pandora_console/extensions/realtime_graphs.php +++ b/pandora_console/extensions/realtime_graphs.php @@ -49,13 +49,24 @@ function pandora_realtime_graphs() $hide_header = get_parameter('hide_header', 0); if ($hide_header === 0) { - ui_print_page_header( + // Header. + ui_print_standard_header( __('Realtime graphs'), 'images/extensions.png', false, 'real_time_view', false, - $onheader + $onheader, + [ + [ + 'link' => '', + 'label' => __('Monitoring'), + ], + [ + 'link' => '', + 'label' => __('Views'), + ], + ] ); } diff --git a/pandora_console/extensions/resource_registration.php b/pandora_console/extensions/resource_registration.php index 950f4e2b81..2f904dbf9f 100755 --- a/pandora_console/extensions/resource_registration.php +++ b/pandora_console/extensions/resource_registration.php @@ -1096,13 +1096,8 @@ function resource_registration_extension_main() } $xml = simplexml_load_file($_FILES['resource_upload']['tmp_name'], null, LIBXML_NOCDATA); - if ($xml === false) { - ui_print_error_message( - __('Error uploading resource. Check if the selected file is a valid resource template in .ptr format') - ); - } else { - process_upload_xml($xml); - } + + process_upload_xml($xml); } diff --git a/pandora_console/general/first_task/cluster_builder.php b/pandora_console/general/first_task/cluster_builder.php index 08ea618cce..157bdce0d7 100644 --- a/pandora_console/general/first_task/cluster_builder.php +++ b/pandora_console/general/first_task/cluster_builder.php @@ -24,12 +24,20 @@ if (! check_acl($config['id_user'], 0, 'AR') && ! check_acl($config['id_user'], return; } -\ui_print_page_header( - __('Monitoring').' » '.__('Clusters'), +// Header. +ui_print_standard_header( + __('Clusters'), 'images/chart.png', false, '', - false + false, + [], + [ + [ + 'link' => '', + 'label' => __('Monitoring'), + ], + ] ); ui_require_css_file('first_task'); diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php index 6d9516bad7..807635bd80 100644 --- a/pandora_console/godmode/agentes/modificar_agente.php +++ b/pandora_console/godmode/agentes/modificar_agente.php @@ -1,17 +1,32 @@ $viewtab]; // Header. -ui_print_page_header( +ui_print_standard_header( __('Agents defined in %s', get_product_name()), 'images/agent.png', false, '', true, - $onheader + $onheader, + [ + [ + 'link' => '', + 'label' => __('Resources'), + ], + [ + 'link' => '', + 'label' => __('Manage agents'), + ], + ] ); if (is_central_policies_on_node()) { diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php index d8dd0eeef2..91c6395b96 100644 --- a/pandora_console/godmode/agentes/module_manager.php +++ b/pandora_console/godmode/agentes/module_manager.php @@ -1072,7 +1072,6 @@ foreach ($modules as $module) { [ 'alt' => __('Enable module'), 'title' => __('Enable module'), - 'class' => 'invert_filter_important', ] ).''; } else { diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php index 1a4577c4ee..7e9f29f2eb 100644 --- a/pandora_console/godmode/agentes/module_manager_editor_common.php +++ b/pandora_console/godmode/agentes/module_manager_editor_common.php @@ -115,12 +115,7 @@ function add_component_selection($id_network_component_type) '', '---'.__('Manual setup').'---', 0, - true, - false, - true, - '', - false, - 'width: 460px; ' + true ); $data[1] .= ''; $data[1] .= '