diff --git a/awx/ui/static/js/forms/JobTemplates.js b/awx/ui/static/js/forms/JobTemplates.js index 0ae218142e..eac75d070e 100644 --- a/awx/ui/static/js/forms/JobTemplates.js +++ b/awx/ui/static/js/forms/JobTemplates.js @@ -223,10 +223,10 @@ angular.module('JobTemplateFormDefinition', []) column: 2, awPopOver: "
Create a callback URL a host can use to contact Tower and request a configuration update " + "using the job template. The URL will look like the following:
\n" + - "http://your.server.com:999/api/v1/job_templates/1/callback/
" + + "http://your.server.com:999/api/v1/job_templates/1/callback/" + "
The request from the host must be a POST. Here is an example using curl:
\n" + - "curl --data \"host_config_key=5a8ec154832b780b9bdef1061764ae5a\" " + - "http://your.server.com:999/api/v1/job_templates/1/callback/
\n" + + "curl --data \"host_config_key=5a8ec154832b780b9bdef1061764ae5a\" " + + "http://your.server.com:999/api/v1/job_templates/1/callback/\n" + "
Note the requesting host must be defined in your inventory. If ansible fails to locate the host either by name or IP address " + "in one of your defined inventories, the request will be denied.
" + "Successful requests will result in an entry on the Jobs tab, where the results and history can be viewed.
", @@ -243,11 +243,10 @@ angular.module('JobTemplateFormDefinition', []) ngShow: "allow_callbacks", column: 2, required: false, - 'class': 'span12', awPopOver: "Using this URL a host can contact Tower and request a configuration update using the job " + "template. The request from the host must be a POST. Here is an example using curl:
\n" + - "curl --data \"host_config_key=5a8ec154832b780b9bdef1061764ae5a\" " + - "http://your.server.com:999/api/v1/job_templates/1/callback/
\n" + + "curl --data \"host_config_key=5a8ec154832b780b9bdef1061764ae5a\" " + + "http://your.server.com:999/api/v1/job_templates/1/callback/\n" + "
Note the requesting host must be defined in your inventory. If ansible fails to locate the host either by name or IP address " + "in one of your defined inventories, the request will be denied.
" + "Successful requests will result in an entry on the Jobs tab, where the results and history can be viewed.
", @@ -263,9 +262,10 @@ angular.module('JobTemplateFormDefinition', []) column: 2, awPopOver: "When contacting the Tower server using the callback URL, the calling host must authenticate by including " + "this key in the POST data of the request. Here's an example using curl:
\n" + - "curl --data \"host_config_key=5a8ec154832b780b9bdef1061764ae5a\" " + - "http://your.server.com:999/api/v1/job_templates/1/callback/
\n", + "curl --data \"host_config_key=5a8ec154832b780b9bdef1061764ae5a\" " + + "http://your.server.com:999/api/v1/job_templates/1/callback/\n", dataPlacement: 'right', + dataTitle: "Host Config Key", dataContainer: "body" } }, diff --git a/awx/ui/static/js/helpers/Hosts.js b/awx/ui/static/js/helpers/Hosts.js index 2165711644..dfe508b2e7 100644 --- a/awx/ui/static/js/helpers/Hosts.js +++ b/awx/ui/static/js/helpers/Hosts.js @@ -88,7 +88,7 @@ angular.module('HostsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', 'H return -1 * (a - b); }); title = "Recent Jobs"; - html = "
| ID\n"; @@ -106,7 +106,7 @@ angular.module('HostsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', 'H "aw-tool-tip=\"" + job.status.charAt(0).toUpperCase() + job.status.slice(1) + ". Click for details\" data-placement=\"top\">\n"; - html += " | Events " + + html += " | Events " + "Hosts | \n";
html += "" + ellipsis(job.name) + " | \n"; html += "
|---|