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

2013-03-06 Sergio Martin <sergio.martin@artica.es> 

* godmode/alerts/configure_alert_action.php: Put again
	a missed help hint for the action macros.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7794 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2013-03-06 12:43:20 +00:00
parent f9496129bb
commit 7a1caca724
2 changed files with 13 additions and 0 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 @@
2013-03-06 Sergio Martin <sergio.martin@artica.es>
* godmode/alerts/configure_alert_action.php: Put again
a missed help hint for the action macros.
2013-03-06 Sergio Martin <sergio.martin@artica.es> 2013-03-06 Sergio Martin <sergio.martin@artica.es>
* include/functions_alerts.php: Change the update counts * include/functions_alerts.php: Change the update counts

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

@ -102,6 +102,9 @@ if ($id) {
$action_threshold = $action ['action_threshold']; $action_threshold = $action ['action_threshold'];
} }
// Hidden div with help hint to fill with javascript
html_print_div(array('id' => 'help_alert_macros_hint', 'content' => ui_print_help_icon ('alert_macros', true, ui_get_full_url(false, false, false, false)), 'hidden' => true));
$table->width = '98%'; $table->width = '98%';
$table->style = array (); $table->style = array ();
$table->style[0] = 'font-weight: bold'; $table->style[0] = 'font-weight: bold';
@ -213,6 +216,11 @@ $(document).ready (function () {
else { else {
$('#table1-field'+i).replaceWith(data["fields_rows"][i]); $('#table1-field'+i).replaceWith(data["fields_rows"][i]);
$("[name=field"+i+"_value]").val(old_value); $("[name=field"+i+"_value]").val(old_value);
// Add help hint only in first field
if(i == 1) {
var td_content = $('#table1-field'+i).find('td').eq(0);
td_content.html(td_content.html() + $('#help_alert_macros_hint').html());
}
$('#table1-field').show(); $('#table1-field').show();
} }
} }