From 23ffafd6b9b63377733a0ef530753883a476513a Mon Sep 17 00:00:00 2001 From: Akita Noek Date: Tue, 21 Jun 2016 10:39:13 -0400 Subject: [PATCH] Fix funky layout on failed project job template warning Solves #2510 Root cause is the addition of `display: flex` added to `.alert-info` in https://github.com/ansible/ansible-tower/commit/cefb3713550f3266f02542bc49f8d5e5debbcda4#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. --- .../add/job-templates-add.controller.js | 12 ++++++------ .../edit/job-templates-edit.controller.js | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) 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 2b96c0c5e9..c8e518d5ba 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 @@ -278,17 +278,17 @@ 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 selected project has a failed status. Review the project's SCM settings" + + " and run an update before adding it to a template.
"; break; case 'never updated': - msg = 'The selected project has a never updated status. You will need to run a successful' + + 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.'; + ' to save this template.
'; break; case 'missing': - 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.'; + 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) { 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 dc76b353b5..5065046c52 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 @@ -198,17 +198,17 @@ 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 selected project has a failed status. Review the project's SCM settings" + + " and run an update before adding it to a template.
"; break; case 'never updated': - msg = 'The selected project has a never updated status. You will need to run a successful' + + 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.'; + ' to save this template.
'; break; case 'missing': - 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.'; + 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');