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

Replace styles with classes and move string to strings file

Browse Source
This commit is contained in:
mabashian
2018-04-19 11:28:11 -04:00
parent 895ad70a12
commit eaa2227890
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
awx/ui/client/features/templates/templates.strings.js
View File

@@ -33,6 +33,7 @@ function TemplatesStrings (BaseString) {
NO_INVENTORY_SELECTED: t.s('No inventory selected'), NO_INVENTORY_SELECTED: t.s('No inventory selected'),
REVERT: t.s('REVERT'), REVERT: t.s('REVERT'),
CREDENTIAL_TYPE: t.s('Credential Type'), CREDENTIAL_TYPE: t.s('Credential Type'),
CREDENTIAL_PASSWORD_WARNING: t.s('Credentials that require passwords on launch are not permitted for template schedules and workflow nodes. The following credentials must be removed or replaced to proceed:'),
PASSWORDS_REQUIRED_HELP: t.s('Launching this job requires the passwords listed below. Enter and confirm each password before continuing.'), PASSWORDS_REQUIRED_HELP: t.s('Launching this job requires the passwords listed below. Enter and confirm each password before continuing.'),
PLEASE_ENTER_PASSWORD: t.s('Please enter a password.'), PLEASE_ENTER_PASSWORD: t.s('Please enter a password.'),
credential_passwords: { credential_passwords: {

7
awx/ui/client/src/templates/prompt/prompt.block.less
View File

@@ -169,3 +169,10 @@
margin-bottom: 20px; margin-bottom: 20px;
color: @default-err; color: @default-err;
} }
.Prompt-credsWarning {
margin-bottom: 5px;
color: @default-err;
}
.Prompt-credsWarningList {
margin-bottom: 20px;
}

6
awx/ui/client/src/templates/prompt/steps/credential/prompt-credential.partial.html
View File

@@ -46,11 +46,11 @@
</div> </div>
<span> <span>
<div ng-if="preventCredsWithPasswords && (promptData.prompts.credentials.passwords.ssh || promptData.prompts.credentials.passwords.become || promptData.prompts.credentials.passwords.ssh_key_unlock || (promptData.prompts.credentials.passwords.vault && promptData.prompts.credentials.passwords.vault.length > 0))"> <div ng-if="preventCredsWithPasswords && (promptData.prompts.credentials.passwords.ssh || promptData.prompts.credentials.passwords.become || promptData.prompts.credentials.passwords.ssh_key_unlock || (promptData.prompts.credentials.passwords.vault && promptData.prompts.credentials.passwords.vault.length > 0))">
<div style="margin-bottom: 5px;color:#D9534F;"> <div class="Prompt-credsWarning">
<span class="fa fa-warning"></span> <span class="fa fa-warning"></span>
<span>Credentials that require passwords on launch are not permitted for template schedules and workflow nodes. The following credentials must be removed or replaced to proceed:</span> <span>{{ vm.strings.get('prompt.CREDENTIAL_PASSWORD_WARNING')}}</span>
</div> </div>
<div style="margin-bottom: 20px;"> <div class="Prompt-credsWarningList">
<div ng-if="promptData.prompts.credentials.passwords.ssh || promptData.prompts.credentials.passwords.become || promptData.prompts.credentials.passwords.ssh_key_unlock">{{promptData.prompts.credentials.passwords.ssh.name || promptData.prompts.credentials.passwords.become.name || promptData.prompts.credentials.passwords.ssh_key_unlock.name}}</div> <div ng-if="promptData.prompts.credentials.passwords.ssh || promptData.prompts.credentials.passwords.become || promptData.prompts.credentials.passwords.ssh_key_unlock">{{promptData.prompts.credentials.passwords.ssh.name || promptData.prompts.credentials.passwords.become.name || promptData.prompts.credentials.passwords.ssh_key_unlock.name}}</div>
<div ng-if="promptData.prompts.credentials.passwords.vault && promptData.prompts.credentials.passwords.vault.length > 0" ng-repeat="vaultCred in promptData.prompts.credentials.passwords.vault">{{vaultCred.name}}</div> <div ng-if="promptData.prompts.credentials.passwords.vault && promptData.prompts.credentials.passwords.vault.length > 0" ng-repeat="vaultCred in promptData.prompts.credentials.passwords.vault">{{vaultCred.name}}</div>
</div> </div>