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

2013-07-25 Sergio Martin <sergio.martin@artica.es> 

* godmode/alerts/configure_alert_template.php: Fix alert
	template hint javascript problem for bug #2357

	* godmode/massive/massive_edit_modules.php: Change 
	help tip to clarify user experience



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8578 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2013-07-25 15:30:17 +00:00
parent 3f63819696
commit 1464fd9813
3 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -1,3 +1,11 @@
2013-07-25 Sergio Martin <sergio.martin@artica.es>
* godmode/alerts/configure_alert_template.php: Fix alert
template hint javascript problem for bug #2357
* godmode/massive/massive_edit_modules.php: Change
help tip to clarify user experience
2013-07-25 Juan Manuel Ramon Vigo <juanmanuel.ramon@artica.es>
* include/functions.php: Modified function get_user_language

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

@ -669,11 +669,13 @@ else {
$table->data['value'][1] .= html_print_image ('images/suc.png', true,
array ('style' => 'display:none',
'id' => 'regex_good',
'title' => __('The regular expression is valid')));
'title' => __('The regular expression is valid'),
'width' => '20px'));
$table->data['value'][1] .= html_print_image ('images/err.png', true,
array ('style' => 'display:none',
'id' => 'regex_bad',
'title' => __('The regular expression is not valid')));
'title' => __('The regular expression is not valid'),
'width' => '20px'));
$table->data['value'][1] .= '</span>';
//Min first, then max, that's more logical
@ -732,7 +734,8 @@ enterprise_hook('close_meta_frame');
ui_require_javascript_file ('pandora_alerts');
ui_require_jquery_file ("ui-timepicker-addon");
ui_require_javascript_file("i18n/jquery-ui-timepicker-" . get_user_language());
// This script is included manually to be included after jquery and avoid error
echo '<script type="text/javascript" src="' . $config['homeurl'] . 'include/javascript/i18n/jquery-ui-timepicker-' . get_user_language() . '"></script>';
ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascript/i18n/");
?>
@ -753,13 +756,13 @@ var onchange_not = <?php echo "'" . __("The alert would fire when the module val
var unknown = <?php echo "'" . __("The alert would fire when the module is in unknown status") . "'";?>;
function check_regex () {
if ($("#type").attr ('value') != 'regex') {
if ($("#type").val() != 'regex') {
$("img#regex_good, img#regex_bad").hide ();
return;
}
try {
re = new RegExp ($("#text-value").attr ("value"));
re = new RegExp ($("#text-value").val());
} catch (error) {
$("img#regex_good").hide ();
$("img#regex_bad").show ();
@ -771,7 +774,7 @@ function check_regex () {
function render_example () {
/* Set max */
vmax = parseInt ($("input#text-max").attr ("value"));
var vmax = parseInt ($("input#text-max").val());
if (isNaN (vmax) || vmax == "") {
$("span#max").empty ().append ("0");
}
@ -780,7 +783,7 @@ function render_example () {
}
/* Set min */
vmin = parseInt ($("input#text-min").attr ("value"));
var vmin = parseInt ($("input#text-min").val());
if (isNaN (vmin) || vmin == "") {
$("span#min").empty ().append ("0");
}
@ -789,7 +792,7 @@ function render_example () {
}
/* Set value */
vvalue = $("input#text-value").attr ("value");
var vvalue = $("input#text-value").val();
if (vvalue == "") {
$("span#value").empty ().append ("<em><?php echo __('Empty');?></em>");
}
@ -917,7 +920,7 @@ if ($step == 1) {
$("#checkbox-matches_value").click (function () {
enabled = this.checked;
type = $("#type").attr ("value");
type = $("#type").val();
if (type == "regex") {
if (enabled) {
$("span#example").empty ().append (matches);
@ -963,7 +966,7 @@ elseif ($step == 2) {
$("#threshold").change (function () {
if (this.value == -1) {
$("#text-other_threshold").attr ("value", "");
$("#text-other_threshold").val("");
$("#template-threshold-other_label").show ();
$("#template-threshold-other_input").show ();
}

2
pandora_console/godmode/massive/massive_edit_modules.php
View File

@ -423,7 +423,7 @@ $table->data['edit8'][3] = html_print_select (categories_get_all_categories('for
if(enterprise_installed()) {
$table->rowspan['edit8'][0] = $table->rowspan['edit8'][1] = 2;
$table->data['edit81'][2] = __('Policy linking status') . ui_print_help_tip(__("This field only has sense in modules adopted by a policy.") . '<br><br>' . __("This action only set the module as pending to link/unlink. Is necessary to apply the policy that affects these modules to perform the change."), true);
$table->data['edit81'][2] = __('Policy linking status') . ui_print_help_tip(__("This field only has sense in modules adopted by a policy."), true);
$table->data['edit81'][3] = html_print_select (array(MODULE_PENDING_LINK => __('Linked'), MODULE_PENDING_UNLINK => __('Unlinked')), 'policy_linked', '','', __('No change'), '', true, false, false);
}