External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-12 18:40:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

Keep whitespace between field label asterisk and title

Browse Source
This commit is contained in:
Marliana Lara 2017-08-25 14:10:26 -04:00
parent d1503e974b
commit a64bd7e829
4 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/client/legacy-styles/ansible-ui.less
View File

@ -348,6 +348,10 @@ textarea.allowresize {
margin-right: -5px;
}
.prepend-asterisk.user-password:before {
margin-right: 0;
}
.subtitle {
font-size: 16px;
}

4
awx/ui/client/src/shared/directives.js
View File

@ -420,6 +420,10 @@ function(ConfigurationUtils, i18n, $rootScope) {
.directive('awRequiredWhen', function() {
return {
require: 'ngModel',
compile: function(tElem) {
let label = $(tElem).closest('.form-group').find('label').first();
$(label).addClass('prepend-asterisk');
},
link: function(scope, elm, attrs, ctrl) {
function updateRequired() {

9
awx/ui/client/src/templates/survey-maker/shared/question-definition.form.js
View File

@ -41,15 +41,18 @@ export default ['i18n', function(i18n){
variable: {
realName: 'variable',
type: 'custom',
control:'<label class="prepend-asterisk" for="variable"><span class="Form-inputLabel" translate> ANSWER VARIABLE NAME</span>'+
'<a id="awp-variable" href="" aw-pop-over="The suggested format for variable names is lowercase and underscore-separated (for example, foo_bar, user_id, host_name, etc.). Variable names with spaces are not allowed." '+
'data-placement="right" data-container="body" popover-title="Answer Variable Name" class="help-link" data-original-title="" title="" tabindex="-1"><i class="fa fa-question-circle"></i></a> </label>'+
label: i18n._('Answer Variable Name'),
control:
'<div><input type="text" ng-model="variable" name="variable" id="survey_question_variable" class="form-control Form-textInput ng-pristine ng-invalid ng-invalid-required" required="" aw-survey-variable-name>'+
'<div class="error ng-hide" id="survey_question-variable-required-error" ng-show="survey_question_form.variable.$dirty && survey_question_form.variable.$error.required" translate>Please enter an answer variable name.</div>'+
'<div class="error ng-hide" id="survey_question-variable-variable-error" ng-show="survey_question_form.variable.$dirty && survey_question_form.variable.$error.variable" translate>Please remove the illegal character from the survey question variable name.</div>'+
'<div class="error ng-hide" id="survey_question-variable-duplicate-error" ng-show="duplicate" translate>This question variable is already in use. Please enter a different variable name.</div>' +
'<div class="error api-error ng-binding" id="survey_question-variable-api-error" ng-bind="variable_api_error"></div>'+
'</div>',
awPopOver: i18n._("The suggested format for variable names is lowercase and underscore-separated (for example, foo_bar, user_id, host_name, etc.). Variable names with spaces are not allowed."),
dataTitle: i18n._('Answer Variable Name'),
dataPlacement: 'right',
dataContainer: "body",
required: true,
column: 1,
class: 'Form-formGroup--singleColumn'

4
awx/ui/client/src/users/users.form.js
View File

@ -70,7 +70,7 @@ export default ['i18n', function(i18n) {
hasShowInputButton: true,
ngShow: 'ldap_user == false && socialAuthUser === false && external_account === null',
ngRequired: "$state.match('add')",
labelNGClass: "{'prepend-asterisk' : $state.matches('add')}",
labelNGClass: "{'prepend-asterisk user-password' : $state.matches('add')}",
ngChange: "clearPWConfirm('password_confirm')",
autocomplete: false,
ngDisabled: '!(user_obj.summary_fields.user_capabilities.edit || canAdd)'
@ -81,7 +81,7 @@ export default ['i18n', function(i18n) {
hasShowInputButton: true,
ngShow: 'ldap_user == false && socialAuthUser === false && external_account === null',
ngRequired: "$state.match('add')",
labelNGClass: "{'prepend-asterisk' : $state.matches('add')}",
labelNGClass: "{'prepend-asterisk user-password' : $state.matches('add')}",
awPassMatch: true,
associated: 'password',
autocomplete: false,