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-11140-algunos-wizards-siguen-sin-tener-los-estilos-aplicados' into 'develop' 

Ent 11140 algunos wizards siguen sin tener los estilos aplicados

See merge request artica/pandorafms!5883
This commit is contained in:
Matias Didier 2023-05-22 11:38:53 +00:00
parent 1920a8d599 995737fc77
commit 47430f926e
3 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/godmode/servers/servers.build_table.php
View File

@ -167,19 +167,22 @@ foreach ($servers as $server) {
break;
}
$data[6] = $server['threads'].' : '.$server['queued_modules'];
$data[6] = '';
if ($server['queued_modules'] > 500) {
$data[6] .= '&nbsp;&nbsp;<div class="inline"><a onclick="show_dialog();" >'.html_print_image(
$data[6] .= '<div class="inline"><a onclick="show_dialog();" >'.html_print_image(
'images/info-warning.svg',
true,
[
'width' => 16,
'heght' => 16,
'class' => 'pulsate clickable',
'style' => 'margin-left: -25px;',
]
).'</a></div>';
).'</a></div>&nbsp;&nbsp;';
}
$data[6] .= $server['threads'].' : '.$server['queued_modules'];
$data[7] = ui_print_timestamp($server['keepalive'], true);

3
pandora_console/include/ajax/module.php
View File

@ -1182,7 +1182,6 @@ if (check_login()) {
$last_status_change_text = __('Time elapsed since last status change: ');
$last_status_change_text .= (empty($module['last_status_change']) === false) ? human_time_comparation($module['last_status_change']) : __('N/A');
$data[4] .= ui_print_status_image($status, htmlspecialchars($title), true, false, false, true, $last_status_change_text);
if ($show_context_help_first_time === false) {
$show_context_help_first_time = true;
@ -1191,6 +1190,8 @@ if (check_login()) {
}
}
$data[4] .= ui_print_status_image($status, htmlspecialchars($title), true, false, false, true, $last_status_change_text);
// Module thresholds.
$data[5] = '';
if ((int) $module['id_tipo_modulo'] !== 25) {

38
pandora_console/include/functions_clippy.php
View File

@ -296,22 +296,34 @@ function clippy_context_help($help=null)
$code = str_replace('{clippy}', '#'.$id, $code);
$code = str_replace('{clippy_obj}', 'intro_'.$id, $code);
$return = $code.'<div id="'.$id.'" class="inline"><a onclick="show_'.$id.'();" href="javascript: void(0);" >'.html_print_image(
'images/clippy_icon.png',
true
).'</a></div>
if ($help === 'module_unknow') {
$img = html_print_image(
'images/info-warning.svg',
true,
[
'class' => 'main_menu_icon invert_filter',
'style' => 'margin-left: -25px;',
]
);
} else {
$img = html_print_image(
'images/info-warning.svg',
true,
['class' => 'main_menu_icon invert_filter']
);
}
$return = $code.'<div id="'.$id.'" class="inline"><a onclick="show_'.$id.'();" href="javascript: void(0);" >'.$img.'</a></div>
<script type="text/javascript">
function show_'.$id.'() {
if (intro_'.$id.'.started()) {
started = 1;
}
else {
started = 0;
}
if (started == 0)
intro_'.$id.'.start();
confirmDialog({
title: "'.__('You have unknown modules in this agent.').'",
message: "'.('Unknown modules are modules which receive data normally at least in one occassion, but at this time are not receving data. Please check our troubleshoot help page to help you determine why you have unknown modules.').'",
strOKButton: "'.__('Close').'",
hideCancelButton: true,
size: 675,
});
}
$(document).ready(function() {