External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-17 06:17:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2581 from mabashian/job-template-audit-items

Browse Source 
Job template audit items
This commit is contained in:
Michael Abashian
2016-06-23 15:05:22 -04:00
committed by GitHub
parent 5a156ba688 8105f62589
commit 169002b623
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -404,6 +404,10 @@ textarea.allowresize {
/* TB tooltip overrides */ /* TB tooltip overrides */
.popover-content { .popover-content {
width: 100%; width: 100%;
.table>tbody>tr>td {
border-top: 1px solid @b7grey;
}
} }
h3.popover-title, .popover-content, .popover-content blockquote, .popover-content a { h3.popover-title, .popover-content, .popover-content blockquote, .popover-content a {
font-size: 12px; font-size: 12px;

2
awx/ui/client/legacy-styles/jquery-ui-overrides.less
View File

@@ -97,7 +97,7 @@ table.ui-datepicker-calendar {
button.btn.btn-default { button.btn.btn-default {
text-transform: uppercase; text-transform: uppercase;
border-color: @default-border; border-color: @d7grey;
color: @default-interface-txt; color: @default-interface-txt;
} }

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

@@ -45,9 +45,9 @@ export default
ealName: 'variable', ealName: 'variable',
type: 'custom', type: 'custom',
control:'<label for="variable"><span class="Form-inputLabel prepend-asterisk"> ANSWER VARIABLE NAME</span>'+ control:'<label for="variable"><span class="Form-inputLabel prepend-asterisk"> ANSWER VARIABLE NAME</span>'+
'<a id="awp-variable" href="" aw-pop-over="<p>The suggested format for variable names is lowercase and underscore-separated. Also note that this field cannot accept variable names with spaces.</p><p>For example: <br>foo_bar<br>'+ '<a id="awp-variable" href="" popover-title="ANSWER VARIABLE NAME" aw-pop-over="<p>The suggested format for variable names is lowercase and underscore-separated. Also note that this field cannot accept variable names with spaces.</p><p>For example: <br>foo_bar<br>'+
'user_id<br>host_name<br><div class=&quot;popover-footer&quot;><span class=&quot;key&quot;>esc</span> or click to close</div>" '+ 'user_id<br>host_name<br>" '+
'data-placement="right" data-container="body" data-title="Answer Variable Name" class="help-link" data-original-title="" title="" tabindex="-1"><i class="fa fa-question-circle"></i></a> </label>'+ 'data-placement="right" data-container="body" class="help-link" data-original-title="" title="" tabindex="-1"><i class="fa fa-question-circle"></i></a> </label>'+
'<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><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">Please enter an answer variable name.</div>'+ '<div class="error ng-hide" id="survey_question-variable-required-error" ng-show="survey_question_form.variable.$dirty && survey_question_form.variable.$error.required">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">Please remove the illegal character from the survey question 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">Please remove the illegal character from the survey question variable name.</div>'+

1
awx/ui/client/src/shared/branding/colors.default.less
View File

@@ -19,6 +19,7 @@
@default-no-items-bord: #F6F6F6; // also white button hovers @default-no-items-bord: #F6F6F6; // also white button hovers
@default-stdout-txt: #707070; @default-stdout-txt: #707070;
@default-dark: #000000; @default-dark: #000000;
@b7grey: #B7B7B7;
@default-warning: #F0AD4E; @default-warning: #F0AD4E;