tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-04-08 18:55:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-13557-Black-Theme-Resultado-del-Item-NCM-Configuration-Changes-no-se-lee-correctamente-en-HTML' into 'develop'

Browse Source 
Ent 13557 black theme resultado del item ncm configuration changes no se lee correctamente en html

See merge request
This commit is contained in:
Diego Muñoz-Reja 2024-04-29 08:04:06 +00:00
commit 7912261fb8
4 changed files with 17 additions and 5 deletions
pandora_console
extensions/realtime_graphs
ajax.php
include
functions_menu.phpfunctions_reporting_html.php
styles
pandora_black.css

2
pandora_console/extensions/realtime_graphs/ajax.php

@ -55,7 +55,7 @@ switch ($graph) {
if ($os == 'windows') {
$data = exec('(FOR /F "skip=2 tokens=2 delims=\," %P IN (\'typeperf "\\Process(httpd)\\% processor time" -sc 1\') DO @echo %P)|find /V /I "..."');
} else {
$apache = exec("ps aux | grep apache2 | grep -v safe | grep -v grep && echo 1 || echo 0") == 1 ? "apache2" : "apache";
$apache = exec('ps aux | grep apache2 | grep -v safe | grep -v grep && echo 1 || echo 0') == 1 ? 'apache2' : 'apache';
$data = exec("ps aux | grep $apache | grep -v safe | grep -v grep | awk '{ sum+=$3 } END { print sum }'");
}
break;

2
pandora_console/include/functions_menu.php

@ -171,7 +171,7 @@ function menu_print_menu(&$menu)
$sec2 = 'godmode/users/token_list';
} else if ($sec2 === 'godmode/servers/modificar_server' && check_acl($config['id_user'], 0, 'AW') && (bool) check_acl($config['id_user'], 0, 'PM') === false) {
$sec2 = 'enterprise/godmode/servers/list_satellite';
}else if ($sec2 === 'enterprise/godmode/snmpconsole/snmp_trap_editor_form') {
} else if ($sec2 === 'enterprise/godmode/snmpconsole/snmp_trap_editor_form') {
$sec2 = 'enterprise/godmode/snmpconsole/snmp_trap_editor';
} else {
$sec2 = (string) get_parameter('sec2');

12
pandora_console/include/functions_reporting_html.php

@ -4107,7 +4107,7 @@ function reporting_html_historical_data($table, $item, $pdf=0)
// Center every row
foreach ($table1->data[0] as $k => $v) {
for ($i = 0; $i < count($table1->data); $i++){
for ($i = 0; $i < count($table1->data); $i++) {
$table1->cellstyle[$i][$k] = 'text-align: center;';
}
}
@ -4190,7 +4190,7 @@ function reporting_html_database_serialized($table, $item, $pdf=0)
// Center every row
foreach ($table1->data[0] as $k => $v) {
for ($i = 0; $i < count($table1->data); $i++){
for ($i = 0; $i < count($table1->data); $i++) {
$table1->cellstyle[$i][$k] = 'text-align: center;';
}
}
@ -6435,7 +6435,7 @@ function reporting_html_sql($table, $item, $pdf=0)
// Center every row
foreach ($table2->data[0] as $k => $v) {
for ($i = 0; $i < count($table2->data); $i++){
for ($i = 0; $i < count($table2->data); $i++) {
$table2->cellstyle[$i][$k] = 'text-align: center;';
}
}
@ -7886,6 +7886,12 @@ function reporting_html_ncm_list($table, $item, $pdf=0)
*/
function reporting_html_ncm_backups($table, $item, $pdf=0)
{
global $config;
if ($config['style'] === 'pandora_black') {
ui_require_css_file('pandora_black');
}
ui_require_css_file('diff2html.min');
ui_require_css_file('highlight.min');
ui_require_css_file('highlight/vs.min');

6
pandora_console/include/styles/pandora_black.css

@ -2097,6 +2097,12 @@ select option:checked {
filter: invert(1);
}
.d2h-file-list-header,
.d2h-file-name-wrapper,
.d2h-file-collapse {
color: #333 !important;
}
.grid-stack-item-content {
background-color: var(--secondary-color);
}