tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-13507-Black-Theme-Netflow-Explorer-iconos-de-filtro-y-vista-con-fondo-negro-se-ven-mal' into 'develop' 

Ent 13507 black theme netflow explorer iconos de filtro y vista con fondo negro se ven mal

See merge request artica/pandorafms!7303
This commit is contained in:
Jose Martin 2024-04-30 08:57:31 +00:00
parent fed70d531e a2ab92f90b
commit e06b0928ac
3 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/include/functions_netflow.php
View File

@ -1570,8 +1570,12 @@ function netflow_draw_item(
); );
// Theme. // Theme.
$theme = $config['style']; $user_info = get_user_info($config['id_user']);
$text_color = ($theme !== 'pandora_black') ? '#333' : '#fff'; if (isset($user_info['id_skin']) === true && (int) $user_info['id_skin'] === 2) {
$text_color = '#ffffff';
} else {
$text_color = '#333333';
}
$graph_output = pie_graph( $graph_output = pie_graph(
$pie_data, $pie_data,

15
pandora_console/operation/network/network_report.php
View File

@ -483,6 +483,9 @@ $table->data = [];
$chart_data = []; $chart_data = [];
$labels = []; $labels = [];
$hide_filter = !empty($main_value) && ($action === 'udp' || $action === 'tcp'); $hide_filter = !empty($main_value) && ($action === 'udp' || $action === 'tcp');
$row_icon_color_filters = ($config['style'] === 'pandora') ? '' : 'filter: invert(100%) !important;';
$row_icon_color_eye = ($config['style'] === 'pandora') ? '' : 'filter: invert(100%) !important; background-color: transparent !important;';
foreach ($data as $item) { foreach ($data as $item) {
$row = []; $row = [];
$row['main'] = '<div class="flex_center">'; $row['main'] = '<div class="flex_center">';
@ -491,9 +494,17 @@ foreach ($data as $item) {
$row['main'] .= html_print_link_with_params( $row['main'] .= html_print_link_with_params(
'images/filters@svg.svg', 'images/filters@svg.svg',
array_merge($hidden_main_link, ['main_value' => $item['host']]), array_merge($hidden_main_link, ['main_value' => $item['host']]),
'image' 'image',
$row_icon_color_filters,
);
$row['main'] .= html_print_input_image(
'whois',
'images/eye.png',
'whois',
$row_icon_color_eye,
true,
['onclick' => 'whois(\''.$item['host'].'\')'],
); );
$row['main'] .= html_print_input_image('whois', 'images/eye.png', 'whois', '', true, ['onclick' => 'whois(\''.$item['host'].'\')']);
} }
$row['main'] .= '</div>'; $row['main'] .= '</div>';

11
pandora_console/vendor/artica/phpchartjs/src/Renderer/JavaScript.php vendored
View File

@ -128,6 +128,13 @@ class JavaScript extends Renderer
} }
} }
};'; };';
if ($this->chart->options()->getTheme() !== null) {
if ((int) $this->chart->options()->getTheme() === 2) {
$script[] = 'Chart.defaults.color = "#ffffff";';
}
}
$script[] = 'Chart.register(chart_watermark_'.$this->chart->getId().');'; $script[] = 'Chart.register(chart_watermark_'.$this->chart->getId().');';
} }
@ -163,6 +170,10 @@ class JavaScript extends Renderer
if (chart.config.options.title !== undefined ) { if (chart.config.options.title !== undefined ) {
chart.config.options.title.fontColor = "#ffffff"; chart.config.options.title.fontColor = "#ffffff";
} }
if (chart.config.options.plugins.legend.labels.font !== undefined ) {
chart.config.options.plugins.legend.labels.font.color = "#ffffff";
}
'; ';
} }
} }