shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 08:21:15 +03:00
Code Releases Activity

Fix funky layout on failed project job template warning

Browse Source 
Solves #2510

Root cause is the addition of `display: flex` added to `.alert-info` in
cefb371355 (diff-9ef281f21346102e21d32991c5c756a3R599)

however this is apparently needed elsewhere so the easy workaround is to
just wrap any content we don't want flexified in a div.
This commit is contained in:
Akita Noek 2016-06-21 10:39:13 -04:00
parent 020424ff3a
commit 23ffafd6b9
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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