diff --git a/pandora_console/extensions/module_groups.php b/pandora_console/extensions/module_groups.php index d9843f9860..8b5075f77c 100644 --- a/pandora_console/extensions/module_groups.php +++ b/pandora_console/extensions/module_groups.php @@ -270,6 +270,12 @@ function mainModuleGroups() $table->style[0] = 'color: #ffffff; background-color: #373737; font-weight: bolder; min-width: 230px;'; $table->width = '100%'; + if ($config['style'] === 'pandora_black') { + $background_color = '#333'; + } else { + $background_color = '#fff'; + } + $head[0] = __('Groups'); $headstyle[0] = 'width: 20%; font-weight: bolder;'; foreach ($array_module_group as $key => $value) { @@ -314,7 +320,7 @@ function mainModuleGroups() $data[$i][$j] .= $array_data[$key][$k]['total_count']; $data[$i][$j] .= ''; } else { - $data[$i][$j] = "
"; + $data[$i][$j] = "
"; $data[$i][$j] .= 0; $data[$i][$j] .= '
'; } @@ -323,7 +329,7 @@ function mainModuleGroups() } } else { foreach ($value['gm'] as $k => $v) { - $data[$i][$j] = "
"; + $data[$i][$j] = "
"; $data[$i][$j] .= 0; $data[$i][$j] .= '
'; $j++; diff --git a/pandora_console/extras/pandora_diag.php b/pandora_console/extras/pandora_diag.php index f3b11177d1..9258a3be42 100644 --- a/pandora_console/extras/pandora_diag.php +++ b/pandora_console/extras/pandora_diag.php @@ -362,7 +362,7 @@ if ($console_mode == 1) { true ); - echo ""; + echo "
"; echo "'; } diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php index f34013944b..476b9a73dd 100644 --- a/pandora_console/godmode/agentes/module_manager_editor_common.php +++ b/pandora_console/godmode/agentes/module_manager_editor_common.php @@ -78,6 +78,13 @@ function push_table_advanced($row, $id=false) function add_component_selection($id_network_component_type) { global $table_simple; + global $config; + + if ($config['style'] === 'pandora_black') { + $background_row = 'background-color: #444'; + } else { + $background_row = 'background-color: #cfcfcf'; + } $data = []; $data[0] = __('Using module component').' '; @@ -116,7 +123,7 @@ function add_component_selection($id_network_component_type) $data[1] .= ''; $table_simple->colspan['module_component'][1] = 3; - $table_simple->rowstyle['module_component'] = 'background-color: #cfcfcf'; + $table_simple->rowstyle['module_component'] = $background_row; prepend_table_simple($data, 'module_component'); } diff --git a/pandora_console/images/heartbeat_green_black.gif b/pandora_console/images/heartbeat_green_black.gif new file mode 100644 index 0000000000..b365cade3f Binary files /dev/null and b/pandora_console/images/heartbeat_green_black.gif differ diff --git a/pandora_console/images/heartbeat_red_black.gif b/pandora_console/images/heartbeat_red_black.gif new file mode 100644 index 0000000000..90fed812db Binary files /dev/null and b/pandora_console/images/heartbeat_red_black.gif differ diff --git a/pandora_console/images/wizard/netscan_green.png b/pandora_console/images/wizard/netscan_green.png index faeae9b042..c602e96ac5 100644 Binary files a/pandora_console/images/wizard/netscan_green.png and b/pandora_console/images/wizard/netscan_green.png differ diff --git a/pandora_console/include/functions_agents.php b/pandora_console/include/functions_agents.php index b208d68ddf..a07af2ff1e 100644 --- a/pandora_console/include/functions_agents.php +++ b/pandora_console/include/functions_agents.php @@ -3391,11 +3391,22 @@ function agents_get_image_status($status) */ function agents_get_status_animation($up=true) { + global $config; + + // Gif with black background or white background + if ($config['style'] === 'pandora_black') { + $heartbeat_green = 'images/heartbeat_green_black.gif'; + $heartbeat_red = 'images/heartbeat_red_black.gif'; + } else { + $heartbeat_green = 'images/heartbeat_green.gif'; + $heartbeat_red = 'images/heartbeat_red.gif'; + } + switch ($up) { case true: default: return html_print_image( - 'images/heartbeat_green.gif', + $heartbeat_green, true, [ 'width' => '170', @@ -3405,7 +3416,7 @@ function agents_get_status_animation($up=true) case false: return html_print_image( - 'images/heartbeat_red.gif', + $heartbeat_red, true, [ 'width' => '170', diff --git a/pandora_console/include/functions_reporting_html.php b/pandora_console/include/functions_reporting_html.php index 2b296ff632..de32e94312 100644 --- a/pandora_console/include/functions_reporting_html.php +++ b/pandora_console/include/functions_reporting_html.php @@ -107,9 +107,15 @@ function html_do_report_info($report) { global $config; + if ($config['style'] === 'pandora_black') { + $background_color = '#222'; + } else { + $background_color = '#f5f5f5'; + } + $date_today = date($config['date_format']); - $html = '
".__('Pandora status info').'
+ $html = '
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index ed9ab770a0..0050ccdf9d 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -1755,6 +1755,12 @@ function ui_process_page_head($string, $bitfield) // Add the dialog styles CSS. $config['css']['dialog'] = 'include/styles/js/introjs.css'; + // If the theme is the default, we don't load it twice. + if ($config['style'] !== 'pandora') { + // It loads the last of all. + $config['css']['theme'] = 'include/styles/'.$config['style'].'.css'; + } + // If skin's css files exists then add them. if ($exists_css) { foreach ($skin_styles as $filename => $name) { @@ -1766,10 +1772,10 @@ function ui_process_page_head($string, $bitfield) // User style should go last so it can rewrite common styles. $config['css'] = array_merge( [ - 'common' => 'include/styles/common.css', - 'menu' => 'include/styles/menu.css', - 'tables' => 'include/styles/tables.css', - $config['style'] => 'include/styles/'.$config['style'].'.css', + 'common' => 'include/styles/common.css', + 'menu' => 'include/styles/menu.css', + 'tables' => 'include/styles/tables.css', + 'general' => 'include/styles/pandora.css', ], $config['css'] ); diff --git a/pandora_console/include/graphs/functions_d3.php b/pandora_console/include/graphs/functions_d3.php index b9f2212b16..fea1273015 100644 --- a/pandora_console/include/graphs/functions_d3.php +++ b/pandora_console/include/graphs/functions_d3.php @@ -740,6 +740,8 @@ function print_donut_narrow_graph( array $data, $data_total ) { + global $config; + if (empty($data)) { return graph_nodata_image($width, $height, 'pie'); } @@ -754,10 +756,31 @@ function print_donut_narrow_graph( $graph_id = uniqid('graph_'); + // This is for "Style template" in visual styles. + switch ($config['style']) { + case 'pandora': + $textColor = '#000'; + $strokeColor = '#fff'; + break; + + case 'pandora_black': + $textColor = '#fff'; + $strokeColor = '#222'; + break; + + default: + $textColor = '#000'; + $strokeColor = '#fff'; + break; + } + + $textColor = json_encode($textColor); + $strokeColor = json_encode($strokeColor); + $out = "
"; $out .= include_javascript_d3(true); $out .= "
'.__('Generated').': '.$date_today.'