2013-06-11 Miguel de Dios <miguel.dedios@artica.es>
* godmode/alerts/configure_alert_template.php, godmode/reporting/reporting_builder.item_editor.php, godmode/agentes/planned_downtime.editor.php, operation/reporting/reporting_viewer.php, operation/netflow/nf_live_view.php: added lost help tips for the formats time and date. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8288 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper
parent
a513b70822
commit
e923c14fc1
|
|
@ -1,3 +1,12 @@
|
|||
2013-06-11 Miguel de Dios <miguel.dedios@artica.es>
|
||||
|
||||
* godmode/alerts/configure_alert_template.php,
|
||||
godmode/reporting/reporting_builder.item_editor.php,
|
||||
godmode/agentes/planned_downtime.editor.php,
|
||||
operation/reporting/reporting_viewer.php,
|
||||
operation/netflow/nf_live_view.php: added lost help tips for the
|
||||
formats time and date.
|
||||
|
||||
2013-06-11 Miguel de Dios <miguel.dedios@artica.es>
|
||||
|
||||
* extensions/insert_data.php,
|
||||
|
|
|
|||
|
|
@ -330,14 +330,22 @@ $table->data[5][1] = "
|
|||
<div id='once_time' style='display: none;'>
|
||||
<table>
|
||||
<tr>
|
||||
<td>" . __('From:') . "</td>
|
||||
<td>" .
|
||||
__('From:') .
|
||||
ui_print_help_tip(__('Date format in Pandora is year/month/day'), true) .
|
||||
ui_print_help_tip(__('Time format in Pandora is hours(24h):minutes:seconds'), true) .
|
||||
"</td>
|
||||
<td>".
|
||||
html_print_input_text ('once_date_from', $once_date_from, '', 10, 10, true) .
|
||||
html_print_input_text ('once_time_from', $once_time_from, '', 7, 7, true) .
|
||||
"</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>" . __('To:') . "</td>
|
||||
<td>" .
|
||||
__('To:') .
|
||||
ui_print_help_tip(__('Date format in Pandora is year/month/day'), true) .
|
||||
ui_print_help_tip(__('Time format in Pandora is hours(24h):minutes:seconds'), true) .
|
||||
"</td>
|
||||
<td>".
|
||||
html_print_input_text ('once_date_to', $once_date_to, '', 10, 10, true) .
|
||||
html_print_input_text ('once_time_to', $once_time_to, '', 7, 7, true) .
|
||||
|
|
|
|||
|
|
@ -281,7 +281,7 @@ function update_template ($step) {
|
|||
}
|
||||
|
||||
// Different datetimes format for oracle
|
||||
switch ($config['dbtype']){
|
||||
switch ($config['dbtype']) {
|
||||
case "mysql":
|
||||
case "postgresql":
|
||||
$values['time_from'] = $time_from;
|
||||
|
|
@ -499,10 +499,12 @@ if ($step == 2) {
|
|||
$table->data[0][2] = __('Use special days list');
|
||||
$table->data[0][3] = html_print_checkbox ('special_day', 1, $special_day, true);
|
||||
|
||||
$table->data[1][0] = __('Time from');
|
||||
$table->data[1][0] = __('Time from') . ' ' .
|
||||
ui_print_help_tip(__('Time format in Pandora is hours(24h):minutes:seconds'), true);
|
||||
$table->data[1][1] = html_print_input_text ('time_from', $time_from, '', 7, 7,
|
||||
true);
|
||||
$table->data[1][2] = __('Time to');
|
||||
$table->data[1][2] = __('Time to') . ' ' .
|
||||
ui_print_help_tip(__('Time format in Pandora is hours(24h):minutes:seconds'), true);
|
||||
$table->data[1][3] = html_print_input_text ('time_to', $time_to, '', 7, 7,
|
||||
true);
|
||||
|
||||
|
|
@ -554,8 +556,9 @@ if ($step == 2) {
|
|||
break;
|
||||
}
|
||||
$table->data[4][1] = html_print_select_from_sql ($sql_query,
|
||||
'default_action', $default_action, '', __('None'), 0,
|
||||
true, false, false).ui_print_help_tip (__('In case you fill any Field 1, Field 2 or Field 3 above, those will replace the corresponding fields of this associated "Default action".'), true);
|
||||
'default_action', $default_action, '', __('None'), 0,
|
||||
true, false, false) .
|
||||
ui_print_help_tip (__('In case you fill any Field 1, Field 2 or Field 3 above, those will replace the corresponding fields of this associated "Default action".'), true);
|
||||
}
|
||||
else if ($step == 3) {
|
||||
/* Alert recover */
|
||||
|
|
|
|||
|
|
@ -621,11 +621,21 @@ html_print_input_hidden('id_item', $idItem);
|
|||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><?php echo __('Time from');?></td>
|
||||
<td>
|
||||
<?php
|
||||
echo __('Time from') .
|
||||
ui_print_help_tip(__('Time format in Pandora is hours(24h):minutes:seconds'), true);
|
||||
?>
|
||||
</td>
|
||||
<td colspan="6"><?php html_print_input_text ('time_from', $time_from, '', 7, 7);?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><?php echo __('Time to');?></td>
|
||||
<td>
|
||||
<?php
|
||||
echo __('Time to') .
|
||||
ui_print_help_tip(__('Time format in Pandora is hours(24h):minutes:seconds'), true);
|
||||
?>
|
||||
</td>
|
||||
<td colspan="6"><?php html_print_input_text ('time_to', $time_to, '', 7, 7);?></td>
|
||||
</tr>
|
||||
</table>
|
||||
|
|
@ -697,43 +707,6 @@ html_print_input_hidden('id_item', $idItem);
|
|||
$params['input_name'] = 'agent_text';
|
||||
}
|
||||
ui_print_agent_autocomplete_input($params);
|
||||
//////////////////
|
||||
/*
|
||||
$params = array();
|
||||
$params['show_helptip'] = false;
|
||||
$params['input_name'] = 'agent';
|
||||
// Input id is only used in metaconsole events
|
||||
if ($meta) {
|
||||
$params['input_id'] = 'agent_autocomplete';
|
||||
}
|
||||
$params['value'] = $agent_name;
|
||||
|
||||
$params['javascript_is_function_select'] = true;
|
||||
$params['selectbox_id'] = 'id_agent_module';
|
||||
$params['add_none_module'] = false;
|
||||
$params['use_hidden_input_idagent'] = true;
|
||||
$params['hidden_input_idagent_id'] = 'hidden-id_agent';
|
||||
if ($meta) {
|
||||
$params['use_input_server'] = true;
|
||||
$params['input_server_id'] = 'hidden-server_name';
|
||||
//It is a page in the new metaconsole.
|
||||
$params['metaconsole_enabled'] = true;
|
||||
}
|
||||
|
||||
//ui_print_agent_autocomplete_input($params);
|
||||
|
||||
// Print a specific control to metaconsole events
|
||||
if ($meta) {
|
||||
$params['input_id'] = 'agent_autocomplete_events';
|
||||
$params['javascript_page'] = 'include/ajax/agent'; //'enterprise/meta/include/ajax/events.ajax';
|
||||
$params['javascript_is_function_select'] = false;
|
||||
//$params['use_hidden_input_idagent'] = false;
|
||||
$params['use_input_server'] = false;
|
||||
$params['input_name'] = 'agent_text';
|
||||
|
||||
ui_print_agent_autocomplete_input($params);
|
||||
}
|
||||
*/
|
||||
?>
|
||||
</td>
|
||||
</tr>
|
||||
|
|
@ -741,8 +714,10 @@ html_print_input_hidden('id_item', $idItem);
|
|||
<td style="vertical-align: top;"><?php echo __('Module'); ?></td>
|
||||
<td style="max-width: 180px">
|
||||
<?php
|
||||
if($idAgent) {
|
||||
$sql = "SELECT id_agente_modulo, nombre FROM tagente_modulo WHERE id_agente = " . $idAgent . " AND delete_pending = 0";
|
||||
if ($idAgent) {
|
||||
$sql = "SELECT id_agente_modulo, nombre
|
||||
FROM tagente_modulo
|
||||
WHERE id_agente = " . $idAgent . " AND delete_pending = 0";
|
||||
|
||||
if ($meta) {
|
||||
$connection = metaconsole_get_connection($server_name);
|
||||
|
|
|
|||
|
|
@ -173,7 +173,9 @@ echo '<form method="post" action="' . $config['homeurl'] . 'index.php?sec=netf&s
|
|||
html_print_input_text ('date', $date, false, 13, 10, true) .
|
||||
html_print_image ("images/calendar_view_day.png", true,
|
||||
array("alt" => "calendar")) .
|
||||
ui_print_help_tip(__('Date format in Pandora is year/month/day'), true) .
|
||||
html_print_input_text ('time', $time, false, 10, 5, true) .
|
||||
ui_print_help_tip(__('Time format in Pandora is hours(24h):minutes:seconds'), true) .
|
||||
"</td>";
|
||||
|
||||
echo "<td>" . '<b>'.__('Interval').'</b>' . "</td>";
|
||||
|
|
|
|||
|
|
@ -64,13 +64,13 @@ $enable_init_date = get_parameter('enable_init_date', 0);
|
|||
$url = "index.php?sec=reporting&sec2=operation/reporting/reporting_viewer&id=$id_report&date=$date&time=$time&pure=$pure";
|
||||
|
||||
$options['main']['text'] = '<a href="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=main&action=edit&id_report=' . $id_report . '&pure='.$pure.'">' .
|
||||
html_print_image("images/op_reporting.png", true, array ("title" => __('Main data'))) .'</a>';
|
||||
html_print_image("images/op_reporting.png", true, array ("title" => __('Main data'))) .'</a>';
|
||||
|
||||
$options['list_items']['text'] = '<a href="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=edit&id_report=' . $id_report . '&pure='.$pure.'">' .
|
||||
html_print_image("images/list.png", true, array ("title" => __('List items'))) .'</a>';
|
||||
html_print_image("images/list.png", true, array ("title" => __('List items'))) .'</a>';
|
||||
|
||||
$options['item_editor']['text'] = '<a href="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=item_editor&action=new&id_report=' . $id_report . '&pure='.$pure.'">' .
|
||||
html_print_image("images/pen.png", true, array ("title" => __('Item editor'))) .'</a>';
|
||||
html_print_image("images/pen.png", true, array ("title" => __('Item editor'))) .'</a>';
|
||||
|
||||
if (enterprise_installed()) {
|
||||
$options = reporting_enterprise_add_Tabs($options, $id_report);
|
||||
|
|
@ -80,7 +80,7 @@ $options['view'] = array('active' => true,
|
|||
'text' => '<a href="index.php?sec=reporting&sec2=operation/reporting/reporting_viewer&id=' . $id_report . '&pure='.$pure.'">' .
|
||||
html_print_image("images/operation.png", true, array ("title" => __('View report'))) .'</a>');
|
||||
|
||||
if(!defined('METACONSOLE')) {
|
||||
if (!defined('METACONSOLE')) {
|
||||
if ($config["pure"] == 0) {
|
||||
$options['screen']['text'] = "<a href='$url&pure=1&enable_init_date=$enable_init_date&date_init=$date_init&time_init=$time_init'>"
|
||||
. html_print_image ("images/full_screen.png", true, array ("title" => __('Full screen mode')))
|
||||
|
|
|
|||
Loading…
Reference in New Issue