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

fix visual module graph and monitor details more details

This commit is contained in:
Jonathan 2023-02-17 11:54:48 +01:00
parent 320b87b77e
commit e6eed5e471
4 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -225,8 +225,7 @@ if (check_login()) {
SECONDS_2YEARS => __('2 years'),
SECONDS_3YEARS => __('3 years'),
];
$formtable->data[0][0] = html_print_radio_button_extended(
$formtable->data[0][0] = '<div style="display:flex;align-items:center;font-weight:bold;">'.html_print_radio_button_extended(
'selection_mode',
'fromnow',
'',
@ -235,8 +234,9 @@ if (check_login()) {
'',
'class="mrgn_right_15px"',
true
).__('Choose a time from now');
$formtable->data[0][1] = html_print_select(
).__('Choose a time from now').'</div>';
$formtable->colspan[0][0] = 2;
$formtable->data[0][2] = html_print_select(
$periods,
'period',
$period,
@ -247,12 +247,11 @@ if (check_login()) {
false,
false
);
$formtable->data[0][2] = '';
$formtable->data[0][3] = "<a href='javascript: show_module_detail_dialog(".$module_id.', '.$agentId.', "'.$server_name.'", 0, -1,"'.modules_get_agentmodule_name($module_id)."\")'>".html_print_image('images/refresh.png', true, ['style' => 'vertical-align: middle;', 'border' => '0', 'class' => 'invert_filter' ]).'</a>';
$formtable->rowspan[0][3] = 2;
$formtable->cellstyle[0][3] = 'vertical-align: middle;';
$formtable->data[1][0] = html_print_radio_button_extended(
$formtable->data[1][0] = '<div style="display:flex;align-items:center;font-weight:bold;">'.html_print_radio_button_extended(
'selection_mode',
'range',
'',
@ -262,9 +261,9 @@ if (check_login()) {
'class="mrgn_right_15px"',
true
).__('Specify time range');
$formtable->data[1][1] = __('Timestamp from:');
$formtable->data[1][1] = '<span style="font-weight:bold">'.__('Timestamp from:').'</span></div>';
$formtable->data[1][2] = html_print_input_text(
$formtable->data[1][2] = '<div class="inputs_date_details">'.html_print_input_text(
'date_from',
$date_from,
'',
@ -277,12 +276,12 @@ if (check_login()) {
$time_from,
'',
9,
7,
8,
true
);
$formtable->data[1][1] .= '<br />';
$formtable->data[1][1] .= __('Timestamp to:');
$formtable->data[1][1] .= '<span style="font-weight:bold">'.__('Timestamp to:').'</span>';
$formtable->data[1][2] .= '<br />';
$formtable->data[1][2] .= html_print_input_text(
@ -298,9 +297,9 @@ if (check_login()) {
$time_to,
'',
9,
7,
8,
true
);
).'</div>';
$freesearch_object = '';
if (preg_match('/_string/', $moduletype_name)) {

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

@ -10558,6 +10558,7 @@ tr.bring_next_field {
vertical-align: middle;
text-align: left;
min-width: 150px !important;
z-index: 10002;
}
.select2-container .select2-selection--single,
@ -11200,3 +11201,7 @@ form#satellite_conf_edit > fieldset.full-column {
.action-buttons > button {
margin: 10px;
}
.inputs_date_details > input {
margin: 5px;
}

15
pandora_console/operation/agentes/stat_win.php
View File

@ -118,12 +118,12 @@ ui_print_message_dialog(
<link rel="stylesheet" href="../../include/styles/js/jquery-ui.min.css" type="text/css" />
<link rel="stylesheet" href="../../include/styles/js/jquery-ui_custom.css" type="text/css" />
<link rel="stylesheet" href="../../include/styles/select2.min.css" type="text/css" />
<script type='text/javascript' src='../../include/javascript/pandora.js'></script>
<script type='text/javascript' src='../../include/javascript/pandora_ui.js'></script>
<script type='text/javascript' src='../../include/javascript/jquery.current.js'></script>
<script type='text/javascript' src='../../include/javascript/jquery.pandora.js'></script>
<script type='text/javascript' src='../../include/javascript/jquery-ui.min.js'></script>
<script type='text/javascript' src='../../include/javascript/select2.min.js'></script>
<script type='text/javascript' src='../../include/javascript/pandora.js'></script>
<?php
require_once $config['homedir'].'/include/graphs/functions_flot.php';
echo include_javascript_dependencies_flot_graph(true, '../');
@ -202,10 +202,10 @@ ui_print_message_dialog(
$table = html_get_predefined_table('transparent', 2);
$table->width = '100%';
$table->id = 'stat_win_form_div';
$table->style[0] = 'text-align:left;';
$table->style[1] = 'text-align:left;';
$table->style[2] = 'text-align:left;font-weight: bold;';
$table->style[3] = 'text-align:left;';
$table->style[0] = 'text-align:left;font-weight: bold;font-size:8.5pt;line-height:30pt;';
$table->style[1] = 'text-align:left;font-weight: bold;line-height:30pt;';
$table->style[2] = 'text-align:left;font-weight: bold;line-height:30pt;';
$table->style[3] = 'text-align:left;font-weight: bold;line-height:30pt;';
$table->class = 'table_modal_alternate';
$table->data = [];
@ -451,7 +451,10 @@ ui_print_message_dialog(
__('Reload'),
'submit',
false,
'class="sub upd"',
[
'icon' => 'Icon search secondary mini',
'class' => 'float-right',
],
true
);
$form_table .= '</div>';

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

@ -2106,7 +2106,7 @@ if (!empty($result)) {
// End Build List Result.
echo "<div id='monitor_details_window'></div>";
echo "<div id='monitor_details_window' class='filter_table'></div>";
// Load filter div for dialog.
echo '<div id="load-modal-filter" style="display:none"></div>';
@ -2252,7 +2252,7 @@ function show_module_detail_dialog(module_id, id_agent, server_name, offset, per
opacity: 0.5,
background: "black"
},
width: 620,
width: 700,
height: 500
})
.show ();