From ecd8d1b0e62fff4c9f7a953ba238b91664b54966 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Tue, 6 Oct 2009 19:27:57 +0000 Subject: [PATCH] 2009-10-06 Miguel de Dios * godmode/agentes/agent_manager.php: change the textbox interval for "print_extended_select_for_time" widget. * include/styles/pandora_minimal.css, operation/agentes/stat_win.php: change the period widget for "print_extended_select_for_time" too, and change the css for enlarge the float menu for new item. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2004 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 8 ++++++++ pandora_console/godmode/agentes/agent_manager.php | 13 ++++++++++++- pandora_console/include/styles/pandora_minimal.css | 5 ++++- pandora_console/operation/agentes/stat_win.php | 8 +++++--- 4 files changed, 29 insertions(+), 5 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index fef5179493..a6855de0ee 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,11 @@ +2009-10-06 Miguel de Dios + + * godmode/agentes/agent_manager.php: change the textbox interval for + "print_extended_select_for_time" widget. + * include/styles/pandora_minimal.css, operation/agentes/stat_win.php: change + the period widget for "print_extended_select_for_time" too, and change + the css for enlarge the float menu for new item. + 2009-10-06 Miguel de Dios * include/functions.php: add "exactly" param to "human_time_description_raw" diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php index 00097f650e..44b5082f98 100644 --- a/pandora_console/godmode/agentes/agent_manager.php +++ b/pandora_console/godmode/agentes/agent_manager.php @@ -140,7 +140,18 @@ $table->data[3][0] = __('Group'); $table->data[3][1] = print_select_from_sql ('SELECT id_grupo, nombre FROM tgrupo WHERE id_grupo > 1 ORDER BY nombre', 'grupo', $grupo, '', '', 0, true); $table->data[4][0] = __('Interval'); -$table->data[4][1] = print_input_text ('intervalo', $intervalo, '', 16, 100, true); + +$intervals = array (); +$intervals[30] = human_time_description_raw (30); +$intervals[60] = human_time_description_raw (60); +$intervals[300] = human_time_description_raw (300); +$intervals[600] = human_time_description_raw (600); +$intervals[1200] = human_time_description_raw (1200); +$intervals[1800] = human_time_description_raw (1800); +$intervals[3600] = human_time_description_raw (3600); +$intervals[7200] = human_time_description_raw (7200); +$table->data[4][1] = print_extended_select_for_time ($intervals, 'intervalo', $intervalo, '', '', '0', 10, true) . __(" seconds."); +//$table->data[4][1] = print_input_text ('intervalo', $intervalo, '', 16, 100, true); $table->data[5][0] = __('OS'); $table->data[5][1] = print_select_from_sql ('SELECT id_os, name FROM tconfig_os', diff --git a/pandora_console/include/styles/pandora_minimal.css b/pandora_console/include/styles/pandora_minimal.css index 7bdb2ecb6a..b3a5922cee 100644 --- a/pandora_console/include/styles/pandora_minimal.css +++ b/pandora_console/include/styles/pandora_minimal.css @@ -85,8 +85,11 @@ table, img { font-size:10px; border:1px solid #000; position:absolute; - margin:0; width:315px; + margin:0; + + width:400px; height:240px; + visibility:hidden; filter:alpha(opacity=90); -moz-opacity: 0.90; diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php index 6cff4261d9..d5538770ba 100644 --- a/pandora_console/operation/agentes/stat_win.php +++ b/pandora_console/operation/agentes/stat_win.php @@ -56,7 +56,7 @@ var defOffset = 2; var defSlideTime = 220; var tnActive = 0; var visibleMargin = 15; -var menuW = 325; +var menuW = 400; var menuH = 310; window.onload = function() { var d; @@ -207,8 +207,10 @@ $options[2592000] = human_time_description_raw (2592000); $options[5184000] = human_time_description_raw (5184000); $options[15552000] = human_time_description_raw (15552000); -print_select ($options, "period", $period); - +print_extended_select_for_time($options, 'period', $period, '', '', 0, 7); +//print_select ($options, "period_select", $period,"javascript: $('#text-period').val($('#period_select').val());"); +//print_input_text ("period", $period, '', 10); +echo __(' secs.'); echo ''.__('Show events').''; print_checkbox ("draw_events", 1, (bool) $draw_events);