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

2012-04-30 Vanessa Gil <vanessa.gil@artica.es> 

* operation/agentes/datos_agente.php: Fixed: bad layout in view data and
	changed calendar.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6231 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
vgilc 2012-04-30 14:07:23 +00:00
parent 61dca6acd6
commit dbf2f72d19
2 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2012-04-30 Vanessa Gil <vanessa.gil@artica.es>
* operation/agentes/datos_agente.php: Fixed: bad layout in view data and
changed calendar.
2012-04-30 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/visual_console_builder.php: fixed when the

38
pandora_console/operation/agentes/datos_agente.php
View File

@ -150,7 +150,13 @@ $header_title = __('Received data from')." ".modules_get_agentmodule_agent_name
echo "<h4>".$header_title. "</h4>";
$formtable->width = '98%';
$formtable->class = "databox";
$formtable->data = array ();
$formtable->size = array ();
$formtable->size[0] = '40%';
$formtable->size[1] = '20%';
$formtable->size[2] = '30%';
echo "<form method='post' action='index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=" . $agentId . "&tab=data_view&id=" . $module_id . "'>";
@ -158,13 +164,17 @@ $formtable->data[0][0] = html_print_radio_button_extended ("selection_mode", 'fr
$formtable->data[0][1] = html_print_extended_select_for_time ('period', $period, '', '', '0', 10, true);
$formtable->data[1][0] = html_print_radio_button_extended ("selection_mode", 'range','', $selection_mode, false, '', 'style="margin-right: 15px;"', true) . __("Specify time range");
$formtable->data[1][1] = __('Timestamp from');
$formtable->data[1][1] .= html_print_input_text ('date_from', $date_from, '', 10, 10, true);
$formtable->data[1][1] .= html_print_input_text ('time_from', $time_from, '', 7, 7, true);
$formtable->data[1][1] = __('Timestamp from:');
$formtable->data[1][2] = html_print_input_text ('date_from', $date_from, '', 10, 10, true);
$formtable->data[1][2] .= html_print_input_text ('time_from', $time_from, '', 7, 7, true);
$formtable->data[1][1] .= '<br />';
$formtable->data[1][1] .= __('Timestamp to');
$formtable->data[1][1] .= html_print_input_text ('date_to', $date_to, '', 10, 10, true);
$formtable->data[1][1] .= html_print_input_text ('time_to', $time_to, '', 7, 7, true);
$formtable->data[1][1] .= __('Timestamp to:');
$formtable->data[1][2] .= '<br />';
$formtable->data[1][2] .= html_print_input_text ('date_to', $date_to, '', 10, 10, true);
$formtable->data[1][2] .= html_print_input_text ('time_to', $time_to, '', 7, 7, true);
if (preg_match ("/string/", $moduletype_name) || $moduletype_name == "log4x") {
$formtable->data[2][0] = __('Free text for search');
@ -173,7 +183,7 @@ if (preg_match ("/string/", $moduletype_name) || $moduletype_name == "log4x") {
html_print_table ($formtable);
echo '<div class="action-buttons" style="width: 75%">';
echo '<div class="action-buttons" style="width:98%">';
html_print_submit_button (__('Update'), 'updbutton', false, 'class="sub upd"');
echo '</div>';
@ -215,21 +225,17 @@ else {
unset ($table);
}
ui_require_css_file ('datepicker');
ui_require_jquery_file ('ui.core');
ui_require_jquery_file ('ui.datepicker');
ui_require_jquery_file ('timeentry');
?>
<script language="javascript" type="text/javascript">
$(document).ready (function () {
$("#text-time_from, #text-time_to").timeEntry ({
spinnerImage: 'images/time-entry.png',
spinnerSize: [20, 20, 0]
});
$("#text-date_from, #text-date_to").datepicker ();
$.datepicker.regional["<?php echo $config['language']; ?>"];
$("#text-time_from").timeEntry ({spinnerImage: 'images/time-entry.png', spinnerSize: [20, 20, 0]});
$("#text-time_to").timeEntry ({spinnerImage: 'images/time-entry.png', spinnerSize: [20, 20, 0]});
$.datepicker.setDefaults($.datepicker.regional[ "<?php echo $config['language']; ?>"]);
$("#text-date_from").datepicker ({changeMonth: true, changeYear: true, showAnim: "slideDown"});
$("#text-date_to").datepicker ({changeMonth: true, changeYear: true, showAnim: "slideDown"});
});
</script>