Discovery progress bars

This commit is contained in:
Jose Gonzalez 2023-03-13 15:44:55 +01:00
parent 3ae465c1fe
commit 1c85038ffa
4 changed files with 47 additions and 37 deletions

View File

@ -251,69 +251,69 @@ if (enterprise_installed()) {
switch ($section) {
case 'general':
$buttons['general']['active'] = true;
$subpage = ' &raquo '.__('General');
$subpage = __('General');
$help_header = 'setup_general_tab';
break;
case 'auth':
$buttons['auth']['active'] = true;
$subpage = ' &raquo '.__('Authentication');
$subpage = __('Authentication');
break;
case 'perf':
$buttons['perf']['active'] = true;
$subpage = ' &raquo '.__('Performance');
$subpage = __('Performance');
$help_header = '';
break;
case 'vis':
$buttons['vis']['active'] = true;
$subpage = ' &raquo '.__('Visual styles');
$subpage = __('Visual styles');
break;
case 'net':
$buttons['net']['active'] = true;
$subpage = ' &raquo '.__('Netflow');
$subpage = __('Netflow');
$help_header = 'setup_netflow_tab';
break;
case 'ehorus':
$buttons['ehorus']['active'] = true;
$subpage = ' &raquo '.__('eHorus');
$subpage = __('eHorus');
$help_header = 'setup_ehorus_tab';
break;
case 'integria':
$buttons['integria']['active'] = true;
$subpage = ' &raquo '.__('Integria IMS');
$subpage = __('Integria IMS');
$help_header = 'setup_integria_tab';
break;
case 'module_library':
$buttons['module_library']['active'] = true;
$subpage = ' &raquo '.__('Module Library');
$subpage = __('Module Library');
$help_header = 'setup_module_library_tab';
break;
case 'gis':
$buttons['gis']['active'] = true;
$subpage = ' &raquo '.__('Map conections GIS');
$subpage = __('Map conections GIS');
break;
case 'notifications':
$buttons['notifications']['active'] = true;
$subpage = ' &raquo '.__('Notifications');
$subpage = __('Notifications');
break;
case 'websocket_engine':
$buttons['websocket_engine']['active'] = true;
$subpage = ' &raquo '.__('Pandora Websocket Engine');
$subpage = __('Pandora Websocket Engine');
$help_header = 'quickshell_settings';
break;
case 'external_tools':
$buttons['external_tools']['active'] = true;
$subpage = ' &raquo '.__('External Tools');
$subpage = __('External Tools');
$help_header = '';
break;
@ -327,39 +327,49 @@ switch ($section) {
}
$buttons['welcome_tips']['active'] = true;
$subpage = ' &raquo '.$title;
$subpage = $title;
$help_header = '';
break;
case 'enterprise':
$buttons['enterprise']['active'] = true;
$subpage = ' &raquo '.__('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 '<div id="header_configuration" style="width: calc(100%);">';
// 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 '</div>';
if (isset($config['error_config_update_config'])) {
if ($config['error_config_update_config']['correct'] == false) {

View File

@ -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 .= '</div></div>';

View File

@ -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)

View File

@ -43,7 +43,7 @@ div.subtitle {
}
div.subtitle span {
font-size: 1.9em;
font-size: 1.3em;
}
div.subtitle div.manage {