zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-04-12 11:01:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6895 from wenottingham/de-tower-ify

Browse Source 
Remove assorted references to Tower.
This commit is contained in:
Bill Nottingham
2017-07-05 17:17:26 -04:00
committed by GitHub
parent 87454ed90a f8515857b2
commit 92bc5fd3f0
14 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.form.js
View File

@@ -126,7 +126,7 @@ return {
dataTitle: 'Source Regions',
dataPlacement: 'right',
awPopOver: "<p>Click on the regions field to see a list of regions for your cloud provider. You can select multiple regions, " +
"or choose <em>All</em> to include all regions. Tower will only be updated with Hosts associated with the selected regions." +
"or choose <em>All</em> to include all regions. Only Hosts associated with the selected regions will be updated." +
"</p>",
dataContainer: 'body',
ngDisabled: '!(inventory_source_obj.summary_fields.user_capabilities.edit || canAdd)'
@@ -138,7 +138,7 @@ return {
dataTitle: 'Instance Filters',
dataPlacement: 'right',
awPopOver: "<p>Provide a comma-separated list of filter expressions. " +
"Hosts are imported to Tower when <em>ANY</em> of the filters match.</p>" +
"Hosts are imported when <em>ANY</em> of the filters match.</p>" +
"Limit to hosts having a tag:<br />\n" +
"<blockquote>tag-key=TowerManaged</blockquote>\n" +
"Limit to hosts using either key pair:<br />\n" +

2
awx/ui/client/src/setup-menu/setup-menu.partial.html
View File

@@ -21,7 +21,7 @@
<a ui-sref="credentials" class="SetupItem">
<h4 class="SetupItem-title" translate>Credentials</h4>
<p class="SetupItem-description" translate>
Add passwords, SSH keys, etc. for Tower to use when launching jobs against machines, or when syncing inventories or projects.
Add passwords, SSH keys, and other credentials to use when launching jobs against machines, or when syncing inventories or projects.
</p>
</a>
<a ui-sref="managementJobsList" class="SetupItem" ng-if="user_is_superuser || user_is_system_auditor">

2
awx/ui/client/src/templates/job_templates/job-template.form.js
View File

@@ -338,7 +338,7 @@ function(NotificationsList, CompletedJobsList, i18n) {
multiSelect: true,
dataTitle: i18n._('Labels'),
dataPlacement: 'right',
awPopOver: "<p>" + i18n._("Optional labels that describe this job template, such as 'dev' or 'test'. Labels can be used to group and filter job templates and completed jobs in the Tower display.") + "</p>",
awPopOver: "<p>" + i18n._("Optional labels that describe this job template, such as 'dev' or 'test'. Labels can be used to group and filter job templates and completed jobs.") + "</p>",
dataContainer: 'body',
ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAddJobTemplate)'
},

2
awx/ui/client/src/templates/workflows.form.js
View File

@@ -63,7 +63,7 @@ export default ['NotificationsList', 'i18n', function(NotificationsList, i18n) {
multiSelect: true,
dataTitle: i18n._('Labels'),
dataPlacement: 'right',
awPopOver: "<p>" + i18n._("Optional labels that describe this job template, such as 'dev' or 'test'. Labels can be used to group and filter job templates and completed jobs in the Tower display.") + "</p>",
awPopOver: "<p>" + i18n._("Optional labels that describe this job template, such as 'dev' or 'test'. Labels can be used to group and filter job templates and completed jobs.") + "</p>",
dataContainer: 'body',
ngDisabled: '!(workflow_job_template_obj.summary_fields.user_capabilities.edit || canAddWorkflowJobTemplate)'
},