diff --git a/pandora_console/godmode/setup/setup.php b/pandora_console/godmode/setup/setup.php index e693d2f2e2..ae24d914e4 100644 --- a/pandora_console/godmode/setup/setup.php +++ b/pandora_console/godmode/setup/setup.php @@ -251,69 +251,69 @@ if (enterprise_installed()) { switch ($section) { case 'general': $buttons['general']['active'] = true; - $subpage = ' » '.__('General'); + $subpage = __('General'); $help_header = 'setup_general_tab'; break; case 'auth': $buttons['auth']['active'] = true; - $subpage = ' » '.__('Authentication'); + $subpage = __('Authentication'); break; case 'perf': $buttons['perf']['active'] = true; - $subpage = ' » '.__('Performance'); + $subpage = __('Performance'); $help_header = ''; break; case 'vis': $buttons['vis']['active'] = true; - $subpage = ' » '.__('Visual styles'); + $subpage = __('Visual styles'); break; case 'net': $buttons['net']['active'] = true; - $subpage = ' » '.__('Netflow'); + $subpage = __('Netflow'); $help_header = 'setup_netflow_tab'; break; case 'ehorus': $buttons['ehorus']['active'] = true; - $subpage = ' » '.__('eHorus'); + $subpage = __('eHorus'); $help_header = 'setup_ehorus_tab'; break; case 'integria': $buttons['integria']['active'] = true; - $subpage = ' » '.__('Integria IMS'); + $subpage = __('Integria IMS'); $help_header = 'setup_integria_tab'; break; case 'module_library': $buttons['module_library']['active'] = true; - $subpage = ' » '.__('Module Library'); + $subpage = __('Module Library'); $help_header = 'setup_module_library_tab'; break; case 'gis': $buttons['gis']['active'] = true; - $subpage = ' » '.__('Map conections GIS'); + $subpage = __('Map conections GIS'); break; case 'notifications': $buttons['notifications']['active'] = true; - $subpage = ' » '.__('Notifications'); + $subpage = __('Notifications'); break; case 'websocket_engine': $buttons['websocket_engine']['active'] = true; - $subpage = ' » '.__('Pandora Websocket Engine'); + $subpage = __('Pandora Websocket Engine'); $help_header = 'quickshell_settings'; break; case 'external_tools': $buttons['external_tools']['active'] = true; - $subpage = ' » '.__('External Tools'); + $subpage = __('External Tools'); $help_header = ''; break; @@ -327,39 +327,49 @@ switch ($section) { } $buttons['welcome_tips']['active'] = true; - $subpage = ' » '.$title; + $subpage = $title; $help_header = ''; break; case 'enterprise': $buttons['enterprise']['active'] = true; - $subpage = ' » '.__('Enterprise'); + $subpage = __('Enterprise'); $help_header = 'setup_enterprise_tab'; break; + case 'hist_db': + $buttons['hist_db']['active'] = true; + $subpage = __('Historical database'); + $help_header = ''; + break; + + case 'pass': + $buttons['pass']['active'] = true; + $subpage = __('Password policies'); + $help_header = ''; + break; + default: + $subpage = 'seccion: '.$section; // Default. break; } -// Put header inside div for special sizing.(No right margin). -echo '
'; // Header. -ui_print_page_header( - __('Configuration').$subpage, +ui_print_standard_header( + $subpage, '', false, $help_header, true, $buttons, - false, - '', - GENERIC_SIZE_TEXT, - '', - '', - true + [ + [ + 'link' => '', + 'label' => __('Setup'), + ], + ] ); -echo '
'; if (isset($config['error_config_update_config'])) { if ($config['error_config_update_config']['correct'] == false) { diff --git a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php index 781ec7e536..f610f48e4d 100644 --- a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php +++ b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php @@ -873,7 +873,7 @@ class DiscoveryTaskList extends HTML '100%', 1.9, // Color. - '#82b92e', + '#ececec', // Return. true, // Text. @@ -1218,12 +1218,12 @@ class DiscoveryTaskList extends HTML $result .= progress_circular_bar( $task['id_rt'], ($task['status'] < 0) ? 100 : $task['status'], - 200, - 200, - '#7eb641', + 150, + 150, + '#3A3A3A', '%', '', - '#3A3A3A', + '#ececec', 0 ); @@ -1288,12 +1288,12 @@ class DiscoveryTaskList extends HTML $result .= progress_circular_bar( $task['id_rt'].'_detail', $task['stats']['c_network_percent'], - 200, - 200, - '#7eb641', + 150, + 150, + '#3A3A3A', '%', '', - '#3A3A3A', + '#ececec', 0 ); $result .= ''; diff --git a/pandora_console/include/graphs/pandora.d3.js b/pandora_console/include/graphs/pandora.d3.js index 3e181edceb..09150de658 100644 --- a/pandora_console/include/graphs/pandora.d3.js +++ b/pandora_console/include/graphs/pandora.d3.js @@ -2167,7 +2167,7 @@ function print_circular_progress_bar( var numberText = circle .append("text") - .attr("fill", label_color) + .attr("fill", "#333333") .style("font-weight", "bold") .style("font-size", numberSize) .attr("text-anchor", "middle") @@ -2175,7 +2175,7 @@ function print_circular_progress_bar( var percentText = circle .append("text") - .attr("fill", label_color) + .attr("fill", "#333333") .style("font-weight", "bold") .style("font-size", unitSize) .text(unit) diff --git a/pandora_console/include/styles/task_list.css b/pandora_console/include/styles/task_list.css index 0169775201..74db6d1e5b 100644 --- a/pandora_console/include/styles/task_list.css +++ b/pandora_console/include/styles/task_list.css @@ -43,7 +43,7 @@ div.subtitle { } div.subtitle span { - font-size: 1.9em; + font-size: 1.3em; } div.subtitle div.manage {