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

Merge pull request #2743 from jlmitch5/fixFailedProjectModalWording

Browse Source 
fix text transforming and wording of project failure jt modals
This commit is contained in:
jlmitch5
2016-07-01 11:45:43 -04:00
committed by GitHub
parent c00d32d0eb 4c1456a0f6
commit a974860de6
3 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -605,3 +605,7 @@ input[type='radio']:checked:before {
color: @default-icon; color: @default-icon;
text-transform: uppercase; text-transform: uppercase;
} }
.alert-info--noTextTransform {
text-transform: none;
}

11
awx/ui/client/src/job-templates/add/job-templates-add.controller.js
View File

@@ -297,21 +297,18 @@
var msg; var msg;
switch (data.status) { switch (data.status) {
case 'failed': case 'failed':
msg = "<div>The selected project has a <em>failed</em> status. Review the project's SCM settings" + msg = "<div>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.";
" and run an update before adding it to a template.</div>";
break; break;
case 'never updated': case 'never updated':
msg = '<div>The selected project has a <em>never updated</em> status. You will need to run a successful' + msg = "<div>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.";
' update in order to selected a playbook. Without a valid playbook you will not be able ' +
' to save this template.</div>';
break; break;
case 'missing': case 'missing':
msg = '<div>The selected project has a status of <em>missing</em>. Please check the server and make sure ' + msg = '<div>The selected project has a status of \"missing\". Please check the server and make sure ' +
' the directory exists and file permissions are set correctly.</div>'; ' the directory exists and file permissions are set correctly.</div>';
break; break;
} }
if (msg) { 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) { .error(function (data, status) {

11
awx/ui/client/src/job-templates/edit/job-templates-edit.controller.js
View File

@@ -201,22 +201,19 @@ export default
var msg; var msg;
switch (data.status) { switch (data.status) {
case 'failed': case 'failed':
msg = "<div>The selected project has a <em>failed</em> status. Review the project's SCM settings" + msg = "<div>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.";
" and run an update before adding it to a template.</div>";
break; break;
case 'never updated': case 'never updated':
msg = '<div>The selected project has a <em>never updated</em> status. You will need to run a successful' + msg = "<div>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.";
' update in order to selected a playbook. Without a valid playbook you will not be able ' +
' to save this template.</div>';
break; break;
case 'missing': case 'missing':
msg = '<div>The selected project has a status of <em>missing</em>. Please check the server and make sure ' + msg = '<div>The selected project has a status of \"missing\". Please check the server and make sure ' +
' the directory exists and file permissions are set correctly.</div>'; ' the directory exists and file permissions are set correctly.</div>';
break; break;
} }
Wait('stop'); Wait('stop');
if (msg) { 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) { .error(function (data, status) {