A value is required!\n";
+ "job_launch_form." + fld + ".$error.required\">Please confirm the password.\n";
html += (field.awPassMatch) ? "Must match Password value
\n" : "";
+ ".$error.awpassmatch\">This value does not match the password you entered previously. Please confirm that password.\n" : "";
html += "\n";
html += "\n";
}
@@ -529,9 +529,9 @@ function($location, Wait, GetBasePath, LookUpInit, JobTemplateForm, CredentialLi
'ng-minlength="'+minlength+'" ng-maxlength="'+maxlength+'" '+
'class="form-control" ng-required='+question.required+'>'+
'
A value is required!
'+
+ 'job_launch_form.'+question.variable+'.$error.required\">Please enter an answer.'+
'
The answer must be between {{'+minlength+'}} to {{'+maxlength+'}} characters long.
'+
+ 'job_launch_form.'+question.variable+'.$error.maxlength\">Please enter an answer between {{'+minlength+'}} to {{'+maxlength+'}} characters long.'+
'';
}
@@ -543,9 +543,9 @@ function($location, Wait, GetBasePath, LookUpInit, JobTemplateForm, CredentialLi
'ng-minlength="'+minlength+'" ng-maxlength="'+maxlength+'" '+
'class="form-control final" ng-required="'+question.required+'" rows="3">'+
'
A value is required!
'+
+ 'job_launch_form.'+question.variable+'.$error.required\">Please enter an answer.'+
'
The answer must be between {{'+minlength+'}} to {{'+maxlength+'}} characters long.
'+
+ 'job_launch_form.'+question.variable+'.$error.maxlength\">Please enter an answer between {{'+minlength+'}} to {{'+maxlength+'}} characters long.'+
'';
}
@@ -562,7 +562,7 @@ function($location, Wait, GetBasePath, LookUpInit, JobTemplateForm, CredentialLi
''+choices[j] +' ' ;
}
html+= '
A value is required!
'+
+ 'job_launch_form.'+question.variable+'.$error.required\">Please select an answer.'+
'';
html+= ''; //end survey_taker_input
}
@@ -587,16 +587,16 @@ function($location, Wait, GetBasePath, LookUpInit, JobTemplateForm, CredentialLi
//surveyCheckboxes takes a list of checkboxes and connects them to one scope variable
html += ''+
'{{job_launch_form.'+question.variable+'_object.$error.checkbox}}'+
- '
\n";
+ this.form.name + '_form.' + fld + ".$error.required\">Please enter a value.\n";
}
if (field.type === "email") {
html += "
A valid email address is required!
\n";
+ this.form.name + '_form.' + fld + ".$error.email\">Please enter a valid email address.\n";
}
if (field.awPassMatch) {
html += "
Must match Password value
\n";
+ ".$error.awpassmatch\">This value does not match the password you entered previously. Please confirm that password.\n";
}
if (field.awValidUrl) {
html += "
URL must begin with ssh, http or https and may not contain '@'
\n";
+ ".$error.awvalidurl\">Please enter a URL that begins with ssh, http or https. The URL may not contain the '@' character. \n";
}
html += "\n";
@@ -796,7 +796,7 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'Utilities', 'ListGenerator
if (field.chkPass) {
// complexity error
html += "
Password must be stronger
\n";
+ ".$error.complexity\">Please enter a stronger password (see strength bar below).\n";
// progress bar
html += "
\n";
+ this.form.name + '_form.' + fld + ".$error.required\">Please enter a value.\n";
}
if (field.integer) {
- html += "
Must be an integer value
\n";
+ html += "
Please enter a number.
\n";
}
if (field.min !== undefined || field.max !== undefined) {
html += "
Must be an integer between " + field.min + " and ";
- html += (field.max !== undefined) ? field.max : 'unlimited';
+ this.form.name + '_form.' + fld + ".$error.max\">Please enter a number greater than " + field.min;
+ html += (field.max !== undefined) ? " and less than " + field.max + "." : ".";
html += "
\n";
+ this.form.name + '_form.' + fld + ".$error.required\">Please select at least one value.\n";
}
if (field.integer) {
- html += "
Must be an integer value
\n";
+ html += "
Please select a number.
\n";
}
if (field.min || field.max) {
html += "
Must be in range " + field.min + " to " +
+ this.form.name + '_form.' + fld + ".$error.max\">Please select a number between " + field.min + " and " +
field.max + "
\n";
}
html += "\n";
@@ -1066,7 +1066,7 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'Utilities', 'ListGenerator
if ((options.mode === 'add' && field.addRequired) || (options.mode === 'edit' && field.editRequired)) {
html += "
\n";
+ ".$error.awlookup\">That value was not found. Please enter or select a valid value.\n";
html += "\n";
html += "\n";
diff --git a/awx/ui/static/partials/configure_tower.html b/awx/ui/static/partials/configure_tower.html
index ea36a9b539..ac04adad18 100644
--- a/awx/ui/static/partials/configure_tower.html
+++ b/awx/ui/static/partials/configure_tower.html
@@ -26,6 +26,6 @@
\ No newline at end of file
diff --git a/awx/ui/static/partials/job_templates.html b/awx/ui/static/partials/job_templates.html
index df51fc051c..296a8ca820 100644
--- a/awx/ui/static/partials/job_templates.html
+++ b/awx/ui/static/partials/job_templates.html
@@ -8,7 +8,7 @@
\ No newline at end of file
diff --git a/awx/ui/static/partials/login-dialog.html b/awx/ui/static/partials/login-dialog.html
index f39c5155af..4e41aa5a8a 100644
--- a/awx/ui/static/partials/login-dialog.html
+++ b/awx/ui/static/partials/login-dialog.html
@@ -12,7 +12,7 @@