tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 08:45:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed visual error

Browse Source
This commit is contained in:
Marcos Alconada 2021-03-29 07:23:03 +00:00 committed by Daniel Rodriguez
parent 3e8214850f
commit 9e1bacb66e
4 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pandora_console/include/ajax/events.php
View File

@ -1115,16 +1115,16 @@ if ($dialogue_event_response) {
); );
echo '</div><br>'; echo '</div><br>';
echo "<div id='response_loading_command_".$out_iterator."' class='invisible'>"; echo "<div id='response_loading_command_".$out_iterator."' style='display: none'>";
echo html_print_image( echo html_print_image(
'images/spinner.gif', 'images/spinner.gif',
true true
); );
echo '</div>'; echo '</div><br>';
echo "<br><div id='response_out_".$out_iterator."' class='invisible'></div>"; echo "<br><div id='response_out_".$out_iterator."'><br><br></div><br>";
if ($end) { if ($end) {
echo "<br><div id='re_exec_command_".$out_iterator."' class='invisible'>"; echo "<br><div id='re_exec_command_".$out_iterator."' style='display: none'><br>";
html_print_button( html_print_button(
__('Execute again'), __('Execute again'),
'btn_str', 'btn_str',
@ -1132,7 +1132,7 @@ if ($dialogue_event_response) {
'execute_event_response(false);', 'execute_event_response(false);',
"class='sub next'" "class='sub next'"
); );
echo "<span id='execute_again_loading' class='invisible'>"; echo "<span id='execute_again_loading' style='display: none'>";
echo html_print_image( echo html_print_image(
'images/spinner.gif', 'images/spinner.gif',
true true
@ -1146,10 +1146,10 @@ if ($dialogue_event_response) {
echo $prompt."Executing command: $command"; echo $prompt."Executing command: $command";
echo '</div><br>'; echo '</div><br>';
echo "<div id='response_loading_command' class='invisible'>".html_print_image('images/spinner.gif', true).'</div>'; echo "<div id='response_loading_command' style='display:none'>".html_print_image('images/spinner.gif', true).'</div>';
echo "<br><div id='response_out' class='left'></div>"; echo "<br><br><br><div id='response_out' class='left'></div>";
echo "<br><div id='re_exec_command' class='invisible'>"; echo "<br><div id='re_exec_command' style='display:none'><br><br>";
html_print_button(__('Execute again'), 'btn_str', false, "perform_response({'target':'".$command."','event_id':".$event_id.",'server_id':".$server_id.'}, '.$response_id.');', "class='sub next'"); html_print_button(__('Execute again'), 'btn_str', false, "perform_response({'target':'".$command."','event_id':".$event_id.",'server_id':".$server_id.'}, '.$response_id.');', "class='sub next'");
echo '</div>'; echo '</div>';

22
pandora_console/include/functions_events.php
View File

@ -4329,7 +4329,7 @@ function events_page_details($event, $server='')
if (!empty($agent)) { if (!empty($agent)) {
$data = []; $data = [];
$data[0] = '<div class="normal-weight mrgn_lft_20px">'.__('Name').'</div>'; $data[0] = '<div class="normal_weight mrgn_lft_20px">'.__('Name').'</div>';
if (can_user_access_node() && is_metaconsole() && empty($event['server_id']) === true) { if (can_user_access_node() && is_metaconsole() && empty($event['server_id']) === true) {
$data[1] = ui_print_truncate_text( $data[1] = ui_print_truncate_text(
$agent['alias'], $agent['alias'],
@ -4362,12 +4362,12 @@ function events_page_details($event, $server='')
$table_details->data[] = $data; $table_details->data[] = $data;
$data = []; $data = [];
$data[0] = '<div class="normal-weight mrgn_lft_20px">'.__('IP Address').'</div>'; $data[0] = '<div class="normal_weight mrgn_lft_20px">'.__('IP Address').'</div>';
$data[1] = empty($agent['direccion']) ? '<i>'.__('N/A').'</i>' : $agent['direccion']; $data[1] = empty($agent['direccion']) ? '<i>'.__('N/A').'</i>' : $agent['direccion'];
$table_details->data[] = $data; $table_details->data[] = $data;
$data = []; $data = [];
$data[0] = '<div class="normal-weight mrgn_lft_20px">'.__('OS').'</div>'; $data[0] = '<div class="normal_weight mrgn_lft_20px">'.__('OS').'</div>';
$data[1] = ui_print_os_icon($agent['id_os'], true, true); $data[1] = ui_print_os_icon($agent['id_os'], true, true);
if (!empty($agent['os_version'])) { if (!empty($agent['os_version'])) {
$data[1] .= ' ('.$agent['os_version'].')'; $data[1] .= ' ('.$agent['os_version'].')';
@ -4376,17 +4376,17 @@ function events_page_details($event, $server='')
$table_details->data[] = $data; $table_details->data[] = $data;
$data = []; $data = [];
$data[0] = '<div class="normal-weight mrgn_lft_20px">'.__('Last contact').'</div>'; $data[0] = '<div class="normal_weight mrgn_lft_20px">'.__('Last contact').'</div>';
$data[1] = ($agent['ultimo_contacto'] == '1970-01-01 00:00:00') ? '<i>'.__('N/A').'</i>' : ui_print_timestamp($agent['ultimo_contacto'], true); $data[1] = ($agent['ultimo_contacto'] == '1970-01-01 00:00:00') ? '<i>'.__('N/A').'</i>' : ui_print_timestamp($agent['ultimo_contacto'], true);
$table_details->data[] = $data; $table_details->data[] = $data;
$data = []; $data = [];
$data[0] = '<div class="normal-weight mrgn_lft_20px">'.__('Last remote contact').'</div>'; $data[0] = '<div class="normal_weight mrgn_lft_20px">'.__('Last remote contact').'</div>';
$data[1] = ($agent['ultimo_contacto_remoto'] == '1970-01-01 00:00:00') ? '<i>'.__('N/A').'</i>' : date_w_fixed_tz($agent['ultimo_contacto_remoto']); $data[1] = ($agent['ultimo_contacto_remoto'] == '1970-01-01 00:00:00') ? '<i>'.__('N/A').'</i>' : date_w_fixed_tz($agent['ultimo_contacto_remoto']);
$table_details->data[] = $data; $table_details->data[] = $data;
$data = []; $data = [];
$data[0] = '<div class="normal-weight mrgn_lft_20px">'.__('Custom fields').'</div>'; $data[0] = '<div class="normal_weight mrgn_lft_20px">'.__('Custom fields').'</div>';
$data[1] = html_print_button( $data[1] = html_print_button(
__('View custom fields'), __('View custom fields'),
'custom_button', 'custom_button',
@ -4418,13 +4418,13 @@ function events_page_details($event, $server='')
if (!empty($module)) { if (!empty($module)) {
// Module name. // Module name.
$data = []; $data = [];
$data[0] = '<div class="normal-weight mrgn_lft_20px">'.__('Name').'</div>'; $data[0] = '<div class="normal_weight mrgn_lft_20px">'.__('Name').'</div>';
$data[1] = $module['nombre']; $data[1] = $module['nombre'];
$table_details->data[] = $data; $table_details->data[] = $data;
// Module group. // Module group.
$data = []; $data = [];
$data[0] = '<div class="normal-weight mrgn_lft_20px">'.__('Module group').'</div>'; $data[0] = '<div class="normal_weight mrgn_lft_20px">'.__('Module group').'</div>';
$id_module_group = $module['id_module_group']; $id_module_group = $module['id_module_group'];
if ($id_module_group == 0) { if ($id_module_group == 0) {
$data[1] = __('No assigned'); $data[1] = __('No assigned');
@ -4461,7 +4461,7 @@ function events_page_details($event, $server='')
if ($acl_graph) { if ($acl_graph) {
$data = []; $data = [];
$data[0] = '<div class="normal-weight mrgn_lft_20px">'.__('Graph').'</div>'; $data[0] = '<div class="normal_weight mrgn_lft_20px">'.__('Graph').'</div>';
$module_type = -1; $module_type = -1;
if (isset($module['module_type'])) { if (isset($module['module_type'])) {
@ -4510,7 +4510,7 @@ function events_page_details($event, $server='')
if ($event['id_alert_am'] != 0) { if ($event['id_alert_am'] != 0) {
$data = []; $data = [];
$data[0] = '<div class="normal-weight mrgn_lft_20px">'.__('Source').'</div>'; $data[0] = '<div class="normal_weight mrgn_lft_20px">'.__('Source').'</div>';
$data[1] = '<a href="'.$serverstring.'index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$event['id_agente'].'&amp;tab=alert'.$hashstring.'">'; $data[1] = '<a href="'.$serverstring.'index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$event['id_agente'].'&amp;tab=alert'.$hashstring.'">';
$standby = db_get_value('standby', 'talert_template_modules', 'id', $event['id_alert_am']); $standby = db_get_value('standby', 'talert_template_modules', 'id', $event['id_alert_am']);
if (!$standby) { if (!$standby) {
@ -4542,7 +4542,7 @@ function events_page_details($event, $server='')
$table_details->data[] = $data; $table_details->data[] = $data;
$data = []; $data = [];
$data[0] = '<div class="normal-weight mrgn_lft_20px">'.__('Priority').'</div>'; $data[0] = '<div class="normal_weight mrgn_lft_20px">'.__('Priority').'</div>';
$priority_code = db_get_value('priority', 'talert_template_modules', 'id', $event['id_alert_am']); $priority_code = db_get_value('priority', 'talert_template_modules', 'id', $event['id_alert_am']);
$alert_priority = get_priority_name($priority_code); $alert_priority = get_priority_name($priority_code);

3
pandora_console/include/javascript/pandora_events.js
View File

@ -847,7 +847,8 @@ function execute_delete_event_reponse(table, id_evento, event_rep, row) {
// Imported from old files. // Imported from old files.
function execute_event_response(event_list_btn) { function execute_event_response(event_list_btn) {
var message = "<h4 style = 'text-align: center;' > Are you sure?</h4> "; var message =
"<h4 style = 'text-align: center; color:black' > Are you sure?</h4> ";
confirmDialog({ confirmDialog({
title: "ATTENTION", title: "ATTENTION",
message: message, message: message,

4
pandora_console/operation/events/events.php
View File

@ -1692,8 +1692,8 @@ echo "<div id='event_response_window'></div>";
echo "<div id='event_response_command_window' title='".__('Parameters')."'></div>"; echo "<div id='event_response_command_window' title='".__('Parameters')."'></div>";
// Load filter div for dialog. // Load filter div for dialog.
echo '<div id="load-modal-filter" class="invisible"></div>'; echo '<div id="load-modal-filter" style="display:none"></div>';
echo '<div id="save-modal-filter" class="invisible"></div>'; echo '<div id="save-modal-filter" style="display:none"></div>';
if ($_GET['refr'] || $do_refresh === true) { if ($_GET['refr'] || $do_refresh === true) {
$autorefresh_draw = true; $autorefresh_draw = true;