From 4c1456a0f65bc47cb5c4495f2f3c1a7f4a4db6c7 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Fri, 1 Jul 2016 11:30:59 -0400 Subject: [PATCH] fix text transforming and wording of project failure jt modals --- awx/ui/client/legacy-styles/forms.less | 4 ++++ .../job-templates/add/job-templates-add.controller.js | 11 ++++------- .../edit/job-templates-edit.controller.js | 11 ++++------- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/awx/ui/client/legacy-styles/forms.less b/awx/ui/client/legacy-styles/forms.less index 6e56199957..b77d3738a2 100644 --- a/awx/ui/client/legacy-styles/forms.less +++ b/awx/ui/client/legacy-styles/forms.less @@ -605,3 +605,7 @@ input[type='radio']:checked:before { color: @default-icon; text-transform: uppercase; } + +.alert-info--noTextTransform { + text-transform: none; +} diff --git a/awx/ui/client/src/job-templates/add/job-templates-add.controller.js b/awx/ui/client/src/job-templates/add/job-templates-add.controller.js index 750dcadae8..7abcf5dfca 100644 --- a/awx/ui/client/src/job-templates/add/job-templates-add.controller.js +++ b/awx/ui/client/src/job-templates/add/job-templates-add.controller.js @@ -297,21 +297,18 @@ var msg; switch (data.status) { case 'failed': - msg = "
The selected project has a failed status. Review the project's SCM settings" + - " and run an update before adding it to a template.
"; + msg = "
The Project selected has a status of \"failed\". You must run a successful update before you can select a playbook. You will not be able to save this Job Template without a valid playbook."; break; case 'never updated': - msg = '
The selected project has a never updated status. You will need to run a successful' + - ' update in order to selected a playbook. Without a valid playbook you will not be able ' + - ' to save this template.
'; + msg = "
The Project selected has a status of \"never updated\". You must run a successful update before you can select a playbook. You will not be able to save this Job Template without a valid playbook."; break; case 'missing': - msg = '
The selected project has a status of missing. Please check the server and make sure ' + + msg = '
The selected project has a status of \"missing\". Please check the server and make sure ' + ' the directory exists and file permissions are set correctly.
'; break; } if (msg) { - Alert('Warning', msg, 'alert-info', null, null, null, null, true); + Alert('Warning', msg, 'alert-info alert-info--noTextTransform', null, null, null, null, true); } }) .error(function (data, status) { diff --git a/awx/ui/client/src/job-templates/edit/job-templates-edit.controller.js b/awx/ui/client/src/job-templates/edit/job-templates-edit.controller.js index b9a195a921..ad0be5fd6a 100644 --- a/awx/ui/client/src/job-templates/edit/job-templates-edit.controller.js +++ b/awx/ui/client/src/job-templates/edit/job-templates-edit.controller.js @@ -201,22 +201,19 @@ export default var msg; switch (data.status) { case 'failed': - msg = "
The selected project has a failed status. Review the project's SCM settings" + - " and run an update before adding it to a template.
"; + msg = "
The Project selected has a status of \"failed\". You must run a successful update before you can select a playbook. You will not be able to save this Job Template without a valid playbook."; break; case 'never updated': - msg = '
The selected project has a never updated status. You will need to run a successful' + - ' update in order to selected a playbook. Without a valid playbook you will not be able ' + - ' to save this template.
'; + msg = "
The Project selected has a status of \"never updated\". You must run a successful update before you can select a playbook. You will not be able to save this Job Template without a valid playbook."; break; case 'missing': - msg = '
The selected project has a status of missing. Please check the server and make sure ' + + msg = '
The selected project has a status of \"missing\". Please check the server and make sure ' + ' the directory exists and file permissions are set correctly.
'; break; } Wait('stop'); if (msg) { - Alert('Warning', msg, 'alert-info', null, null, null, null, true); + Alert('Warning', msg, 'alert-info alert-info--noTextTransform', null, null, null, null, true); } }) .error(function (data, status) {