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-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round

This commit is contained in:
Pablo Aragon 2023-03-21 13:31:18 +01:00
parent e8744b5d12 d2d8b43c87
commit 1f7183c701
5 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/include/functions_ui.php
View File

@ -283,6 +283,14 @@ function ui_print_message($message, $class='', $attributes='', $return=false, $t
if (empty($message['force_class']) === false) { if (empty($message['force_class']) === false) {
$force_class = $message['force_class']; $force_class = $message['force_class'];
} }
if (isset($message['autoclose']) === true) {
if ($message['autoclose'] === true) {
$autoclose = true;
} else {
$autoclose = false;
}
}
} else { } else {
$text_message = $message; $text_message = $message;
} }

2
pandora_console/include/styles/pandora.css
View File

@ -2667,7 +2667,7 @@ div#header_autorefresh_counter {
a.autorefresh_txt, a.autorefresh_txt,
#refrcounter { #refrcounter {
color: #ffffff; color: #1c1c1c;
font-size: 8.5pt; font-size: 8.5pt;
} }

6
pandora_console/include/styles/pandora_black.css
View File

@ -1528,3 +1528,9 @@ pre code.hljs {
background-color: #222222; background-color: #222222;
color: #fff; color: #fff;
} }
a.autorefresh_txt,
#refrcounter {
color: #ffffff;
font-size: 8.5pt;
}

4
pandora_console/operation/agentes/custom_fields.php
View File

@ -76,9 +76,9 @@ if ($fields === false) {
$data[0] = '<b>'.$field['name'].'</b>'; $data[0] = '<b>'.$field['name'].'</b>';
if ($field['display_on_front']) { if ($field['display_on_front']) {
$data[1] = html_print_image('images/validate.svg', true, ['class' => 'invert_filter']); $data[1] = html_print_image('images/validate.svg', true, ['class' => 'invert_filter main_menu_icon']);
} else { } else {
$data[1] = html_print_image('images/delete.svg', true, ['class' => 'invert_filter']); $data[1] = html_print_image('images/delete.svg', true, ['class' => 'invert_filter main_menu_icon']);
} }
$custom_value = db_get_all_rows_sql( $custom_value = db_get_all_rows_sql(

2
pandora_console/operation/snmpconsole/snmp_browser.php
View File

@ -203,7 +203,7 @@ function snmp_browser_show_add_module_massive(module_target = 'agent') {
function modal_preaction() { function modal_preaction() {
// Select all in select box. // Select all in select box.
$("input[name='select_all_right']").click(); $('#id_item2>option').prop('selected', true);
// Load adding modules modal. // Load adding modules modal.
waiting_modal(); waiting_modal();