From eaa2227890438655cbaeba626e01b281265f8677 Mon Sep 17 00:00:00 2001 From: mabashian Date: Thu, 19 Apr 2018 11:28:11 -0400 Subject: [PATCH] Replace styles with classes and move string to strings file --- awx/ui/client/features/templates/templates.strings.js | 1 + awx/ui/client/src/templates/prompt/prompt.block.less | 7 +++++++ .../prompt/steps/credential/prompt-credential.partial.html | 6 +++--- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/awx/ui/client/features/templates/templates.strings.js b/awx/ui/client/features/templates/templates.strings.js index 0b4e6be732..f275e522a0 100644 --- a/awx/ui/client/features/templates/templates.strings.js +++ b/awx/ui/client/features/templates/templates.strings.js @@ -33,6 +33,7 @@ function TemplatesStrings (BaseString) { NO_INVENTORY_SELECTED: t.s('No inventory selected'), REVERT: t.s('REVERT'), 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.'), PLEASE_ENTER_PASSWORD: t.s('Please enter a password.'), credential_passwords: { diff --git a/awx/ui/client/src/templates/prompt/prompt.block.less b/awx/ui/client/src/templates/prompt/prompt.block.less index 62275ecc0b..4b2814d5f5 100644 --- a/awx/ui/client/src/templates/prompt/prompt.block.less +++ b/awx/ui/client/src/templates/prompt/prompt.block.less @@ -169,3 +169,10 @@ margin-bottom: 20px; color: @default-err; } +.Prompt-credsWarning { + margin-bottom: 5px; + color: @default-err; +} +.Prompt-credsWarningList { + margin-bottom: 20px; +} diff --git a/awx/ui/client/src/templates/prompt/steps/credential/prompt-credential.partial.html b/awx/ui/client/src/templates/prompt/steps/credential/prompt-credential.partial.html index bcafc859d8..214401b55f 100644 --- a/awx/ui/client/src/templates/prompt/steps/credential/prompt-credential.partial.html +++ b/awx/ui/client/src/templates/prompt/steps/credential/prompt-credential.partial.html @@ -46,11 +46,11 @@
-
+
- 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: + {{ vm.strings.get('prompt.CREDENTIAL_PASSWORD_WARNING')}}
-
+
{{promptData.prompts.credentials.passwords.ssh.name || promptData.prompts.credentials.passwords.become.name || promptData.prompts.credentials.passwords.ssh_key_unlock.name}}
{{vaultCred.name}}