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

2013-04-12 Mario Pulido <mario.pulido@artica.es> 

* godmode/alerts/configure_alert_action.php,
        godmode/alerts/configure_alert_command.php,
        godmode/alerts/configure_alert_template.php:Fixed help views 
	in Metaconsole



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7976 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mariopulido87 2013-04-12 12:39:59 +00:00
parent f9384d9fff
commit 98532d2191
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2013-04-12 Mario Pulido <mario.pulido@artica.es>
* godmode/alerts/configure_alert_action.php,
godmode/alerts/configure_alert_command.php,
godmode/alerts/configure_alert_template.php:Fixed help views
in Metaconsole
2013-04-12 Miguel de Dios <miguel.dedios@artica.es> 2013-04-12 Miguel de Dios <miguel.dedios@artica.es>
* ChangeLog: updload lost changes. * ChangeLog: updload lost changes.

2
pandora_console/godmode/alerts/configure_alert_action.php
View File

@ -139,7 +139,7 @@ if (check_acl ($config['id_user'], 0, "PM")){
$table->data[2][1] .= '<div id="command_description" style=""></div>'; $table->data[2][1] .= '<div id="command_description" style=""></div>';
$table->data[3][0] = __('Threshold'); $table->data[3][0] = __('Threshold');
$table->data[3][1] = html_print_input_text ('action_threshold', $action_threshold, '', 5, 7, true); $table->data[3][1] = html_print_input_text ('action_threshold', $action_threshold, '', 5, 7, true);
$table->data[3][1] .= ' '.__('seconds') . ui_print_help_icon ('action_threshold', true, ui_get_full_url(false, false, false, false)); $table->data[3][1] .= ' '.__('seconds') . ui_print_help_icon ('action_threshold', true);
$table->data[4][0] = __('Command preview'); $table->data[4][0] = __('Command preview');
$table->data[4][1] = html_print_textarea ('command_preview', 10, 30, '', $table->data[4][1] = html_print_textarea ('command_preview', 10, 30, '',
'disabled="disabled"', true); 'disabled="disabled"', true);

6
pandora_console/godmode/alerts/configure_alert_command.php
View File

@ -74,7 +74,7 @@ $table->data[0][2] = html_print_input_text ('name', $name, '', 35, 255, true);
$table->colspan[1][1] = 3; $table->colspan[1][1] = 3;
$table->data[1][0] = __('Command'); $table->data[1][0] = __('Command');
$table->data[1][0] .= ui_print_help_icon ('alert_macros', true, ui_get_full_url(false, false, false, false)); $table->data[1][0] .= ui_print_help_icon ('alert_macros', true);
$table->data[1][1] = html_print_input_text ('command', $command, '', 80, 255, true); $table->data[1][1] = html_print_input_text ('command', $command, '', 80, 255, true);
$table->colspan[2][1] = 3; $table->colspan[2][1] = 3;
@ -87,7 +87,7 @@ for ($i=1; $i<=10; $i++) {
// Only show help on first row // Only show help on first row
if ($i == 1) { if ($i == 1) {
$table->data['field'.$i][0] .= ui_print_help_icon ('alert_fields_description', true, ui_get_full_url(false, false, false, false)); $table->data['field'.$i][0] .= ui_print_help_icon ('alert_fields_description', true);
} }
if (!empty($fields_descriptions)) { if (!empty($fields_descriptions)) {
@ -102,7 +102,7 @@ for ($i=1; $i<=10; $i++) {
// Only show help on first row // Only show help on first row
if ($i == 1) { if ($i == 1) {
$table->data['field'.$i][2] .= ui_print_help_icon ('alert_fields_values', true, ui_get_full_url(false, false, false, false)); $table->data['field'.$i][2] .= ui_print_help_icon ('alert_fields_values', true);
} }
if (!empty($fields_values)) { if (!empty($fields_values)) {

2
pandora_console/godmode/alerts/configure_alert_template.php
View File

@ -537,7 +537,7 @@ if ($step == 2) {
$table->colspan['field'.$i][1] = 3; $table->colspan['field'.$i][1] = 3;
$table->rowclass['field'.$i] = 'row_field'; $table->rowclass['field'.$i] = 'row_field';
$table->data['field'.$i][0] = sprintf(__('Field %s'), $i) . ui_print_help_icon ('alert_macros', true, ui_get_full_url(false, false, false, false)); $table->data['field'.$i][0] = sprintf(__('Field %s'), $i) . ui_print_help_icon ('alert_macros', true);
$table->data['field'.$i][1] = html_print_textarea ('field'.$i, 1, 1, isset($fields[$i]) ? $fields[$i] : '', 'style="min-height:40px;" class="fields"', true); $table->data['field'.$i][1] = html_print_textarea ('field'.$i, 1, 1, isset($fields[$i]) ? $fields[$i] : '', 'style="min-height:40px;" class="fields"', true);
} }