diff --git a/awx/ui/client/features/applications/applications.strings.js b/awx/ui/client/features/applications/applications.strings.js index f6fb73f56a..27a05fb0ed 100644 --- a/awx/ui/client/features/applications/applications.strings.js +++ b/awx/ui/client/features/applications/applications.strings.js @@ -16,10 +16,6 @@ function ApplicationsStrings (BaseString) { USERS: t.s('Tokens') }; - ns.tooltips = { - ADD: t.s('Create a new Application') - }; - ns.add = { PANEL_TITLE: t.s('NEW APPLICATION'), CLIENT_ID_LABEL: t.s('CLIENT ID'), @@ -32,7 +28,8 @@ function ApplicationsStrings (BaseString) { PANEL_TITLE: t.s('APPLICATIONS'), ROW_ITEM_LABEL_EXPIRED: t.s('EXPIRATION'), ROW_ITEM_LABEL_ORGANIZATION: t.s('ORG'), - ROW_ITEM_LABEL_MODIFIED: t.s('LAST MODIFIED') + ROW_ITEM_LABEL_MODIFIED: t.s('LAST MODIFIED'), + ADD: t.s('Create a new Application') }; ns.inputs = { diff --git a/awx/ui/client/features/applications/list-applications.controller.js b/awx/ui/client/features/applications/list-applications.controller.js index 254b31930b..5ac065163c 100644 --- a/awx/ui/client/features/applications/list-applications.controller.js +++ b/awx/ui/client/features/applications/list-applications.controller.js @@ -43,10 +43,6 @@ function ListApplicationsController ( paginateQuerySet = queryset; }); - vm.tooltips = { - add: strings.get('tooltips.ADD') - }; - const toolbarSortDefault = { label: `${strings.get('sort.NAME_ASCENDING')}`, value: 'name' diff --git a/awx/ui/client/features/applications/list-applications.view.html b/awx/ui/client/features/applications/list-applications.view.html index e30c45e249..be08782f53 100644 --- a/awx/ui/client/features/applications/list-applications.view.html +++ b/awx/ui/client/features/applications/list-applications.view.html @@ -19,11 +19,12 @@
diff --git a/awx/ui/client/features/output/output.strings.js b/awx/ui/client/features/output/output.strings.js index 47b2e74883..caa53e9fa7 100644 --- a/awx/ui/client/features/output/output.strings.js +++ b/awx/ui/client/features/output/output.strings.js @@ -51,6 +51,8 @@ function OutputStrings (BaseString) { SHOW_MORE: t.s('Show More'), UNKNOWN: t.s('Finished'), WEBHOOK: t.s('Webhook'), + CANCEL_JOB: t.s('Cancel Job'), + DELETE_JOB: t.s('Delete Job'), }; ns.labels = { @@ -107,13 +109,15 @@ function OutputStrings (BaseString) { PLACEHOLDER_RUNNING: t.s('JOB IS STILL RUNNING'), REJECT_DEFAULT: t.s('Failed to update search results.'), REJECT_INVALID: t.s('Invalid search filter provided.'), + SUBMIT: t.s('Submit search') }; ns.stats = { ELAPSED: t.s('Elapsed'), PLAYS: t.s('Plays'), TASKS: t.s('Tasks'), - HOSTS: t.s('Hosts') + HOSTS: t.s('Hosts'), + TOGGLE_EXPANDED_OUTPUT: t.s('Toggle expanded output') }; ns.stdout = { @@ -128,7 +132,8 @@ function OutputStrings (BaseString) { MODULE: t.s('MODULE'), NO_RESULT_FOUND: t.s('No result found'), STANDARD_OUT: t.s('Standard Out'), - STANDARD_ERROR: t.s('Standard Error') + STANDARD_ERROR: t.s('Standard Error'), + CLOSE_HOST_EVENT_MODAL: t.s('Close host event modal') }; ns.workflow_status = { diff --git a/awx/ui/client/features/output/search.partial.html b/awx/ui/client/features/output/search.partial.html index b6e6a7342f..d7d91ac493 100644 --- a/awx/ui/client/features/output/search.partial.html +++ b/awx/ui/client/features/output/search.partial.html @@ -14,6 +14,7 @@ diff --git a/awx/ui/client/features/output/stats.partial.html b/awx/ui/client/features/output/stats.partial.html index 1827c52888..688476b151 100644 --- a/awx/ui/client/features/output/stats.partial.html +++ b/awx/ui/client/features/output/stats.partial.html @@ -19,6 +19,7 @@ + diff --git a/awx/ui/client/lib/components/components.strings.js b/awx/ui/client/lib/components/components.strings.js index 436e0b3dda..38e26ad818 100644 --- a/awx/ui/client/lib/components/components.strings.js +++ b/awx/ui/client/lib/components/components.strings.js @@ -17,7 +17,8 @@ function ComponentsStrings (BaseString) { }; ns.file = { - PLACEHOLDER: t.s('CHOOSE A FILE') + PLACEHOLDER: t.s('CHOOSE A FILE'), + SELECT_FILE: t.s('Select file') }; ns.form = { @@ -44,7 +45,8 @@ function ComponentsStrings (BaseString) { }; ns.lookup = { - NOT_FOUND: t.s('That value was not found. Please enter or select a valid value.') + NOT_FOUND: t.s('That value was not found. Please enter or select a valid value.'), + PERFORM_LOOKUP: t.s('Perform lookup') }; ns.truncate = { @@ -129,7 +131,12 @@ function ComponentsStrings (BaseString) { NOTIFICATIONS: t.s('NOTIFICATIONS'), WORKFLOW_TEMPLATE: t.s('Workflow Template'), EXPIRES: t.s('Expires:'), - EXPIRES_NEVER: t.s('Expires: Never') + EXPIRES_NEVER: t.s('Expires: Never'), + CLOSE_APPROVALS: t.s('Close Approvals') + }; + + ns.secret = { + REPLACE: t.s('Replace secret') }; } diff --git a/awx/ui/client/lib/components/input/file.partial.html b/awx/ui/client/lib/components/input/file.partial.html index 7e42af2390..d779bf4c62 100644 --- a/awx/ui/client/lib/components/input/file.partial.html +++ b/awx/ui/client/lib/components/input/file.partial.html @@ -4,9 +4,12 @@
- diff --git a/awx/ui/client/lib/components/input/lookup.partial.html b/awx/ui/client/lib/components/input/lookup.partial.html index 5a951cdb31..62eb2145da 100644 --- a/awx/ui/client/lib/components/input/lookup.partial.html +++ b/awx/ui/client/lib/components/input/lookup.partial.html @@ -3,9 +3,12 @@
-
diff --git a/awx/ui/client/lib/components/relaunchButton/relaunchButton.component.js b/awx/ui/client/lib/components/relaunchButton/relaunchButton.component.js index 197eb801d8..7b68d427ac 100644 --- a/awx/ui/client/lib/components/relaunchButton/relaunchButton.component.js +++ b/awx/ui/client/lib/components/relaunchButton/relaunchButton.component.js @@ -20,6 +20,7 @@ function atRelaunchCtrl ( $state, $q, $scope ) { const vm = this; + vm.strings = strings; const jobObj = new Job(); const jobTemplate = new JobTemplate(); diff --git a/awx/ui/client/lib/components/relaunchButton/relaunchButton.partial.html b/awx/ui/client/lib/components/relaunchButton/relaunchButton.partial.html index 22f7120152..eaf6fce323 100644 --- a/awx/ui/client/lib/components/relaunchButton/relaunchButton.partial.html +++ b/awx/ui/client/lib/components/relaunchButton/relaunchButton.partial.html @@ -5,10 +5,13 @@ data-placement="top">
- @@ -26,9 +29,12 @@
- diff --git a/awx/ui/client/lib/services/base-string.service.js b/awx/ui/client/lib/services/base-string.service.js index 3e7b3b7cd7..1a70d21bd9 100644 --- a/awx/ui/client/lib/services/base-string.service.js +++ b/awx/ui/client/lib/services/base-string.service.js @@ -76,6 +76,7 @@ function BaseStringService (namespace) { this.YES = t.s('YES'); this.CLOSE = t.s('CLOSE'); this.TEST = t.s('TEST'); + this.REMOVE = t.s('REMOVE'); this.SUCCESSFUL_CREATION = resource => t.s('{{ resource }} successfully created', { resource: $filter('sanitize')(resource) }); this.deleteResource = { diff --git a/awx/ui/client/src/about/about.partial.html b/awx/ui/client/src/about/about.partial.html index 8f11c9eb97..5bd87f2f15 100644 --- a/awx/ui/client/src/about/about.partial.html +++ b/awx/ui/client/src/about/about.partial.html @@ -2,7 +2,7 @@
-
@@ -90,8 +90,11 @@
- diff --git a/awx/ui/client/src/access/add-rbac-user-team/rbac-user-team.controller.js b/awx/ui/client/src/access/add-rbac-user-team/rbac-user-team.controller.js index c0762dea36..dfffc7cfcd 100644 --- a/awx/ui/client/src/access/add-rbac-user-team/rbac-user-team.controller.js +++ b/awx/ui/client/src/access/add-rbac-user-team/rbac-user-team.controller.js @@ -11,13 +11,15 @@ * Controller for handling permissions adding */ -export default ['$scope', '$state', 'i18n', 'CreateSelect2', 'Rest', '$q', 'Wait', 'ProcessErrors', -function(scope, $state, i18n, CreateSelect2, Rest, $q, Wait, ProcessErrors) { +export default ['$scope', '$state', 'i18n', 'CreateSelect2', 'Rest', '$q', 'Wait', 'ProcessErrors', '$rootScope', +function(scope, $state, i18n, CreateSelect2, Rest, $q, Wait, ProcessErrors, rootScope) { init(); function init(){ + scope.appStrings = rootScope.appStrings; + let resources = ['job_templates', 'workflow_templates', 'projects', 'inventories', 'credentials', 'organizations']; // data model: diff --git a/awx/ui/client/src/access/add-rbac-user-team/rbac-user-team.partial.html b/awx/ui/client/src/access/add-rbac-user-team/rbac-user-team.partial.html index 177374d366..610db8bb81 100644 --- a/awx/ui/client/src/access/add-rbac-user-team/rbac-user-team.partial.html +++ b/awx/ui/client/src/access/add-rbac-user-team/rbac-user-team.partial.html @@ -14,7 +14,7 @@
-
diff --git a/awx/ui/client/src/activity-stream/streamDetailModal/streamDetailModal.partial.html b/awx/ui/client/src/activity-stream/streamDetailModal/streamDetailModal.partial.html index e3f83507f4..d81edd99d7 100644 --- a/awx/ui/client/src/activity-stream/streamDetailModal/streamDetailModal.partial.html +++ b/awx/ui/client/src/activity-stream/streamDetailModal/streamDetailModal.partial.html @@ -4,7 +4,9 @@ diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-disassociate.partial.html b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-disassociate.partial.html index cf22da701e..608b0d0dc9 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-disassociate.partial.html +++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-disassociate.partial.html @@ -15,7 +15,7 @@ diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html index 5f68d4dc51..e50707e6f6 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html +++ b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html @@ -15,7 +15,7 @@ diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-list.controller.js b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-list.controller.js index 9fdeb7d652..6c3b2b524a 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-list.controller.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-list.controller.js @@ -20,6 +20,7 @@ $scope.inventory_id = $stateParams.inventory_id; $scope.canAdhoc = inventoryData.summary_fields.user_capabilities.adhoc; $scope.canAdd = canAdd; + console.log($scope.appStrings); // Search init $scope.list = list; diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html b/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html index 52c29b9d82..fa3a435c05 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html +++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html @@ -14,7 +14,7 @@
-
diff --git a/awx/ui/client/src/organizations/list/organizations-list.partial.html b/awx/ui/client/src/organizations/list/organizations-list.partial.html index ff61befa28..f12fcc5024 100644 --- a/awx/ui/client/src/organizations/list/organizations-list.partial.html +++ b/awx/ui/client/src/organizations/list/organizations-list.partial.html @@ -17,6 +17,7 @@
@@ -25,7 +25,7 @@
- +
@@ -61,10 +61,10 @@
- -
diff --git a/awx/ui/client/src/scheduler/schedulerDatePicker.partial.html b/awx/ui/client/src/scheduler/schedulerDatePicker.partial.html index 728285096f..092c0c7645 100644 --- a/awx/ui/client/src/scheduler/schedulerDatePicker.partial.html +++ b/awx/ui/client/src/scheduler/schedulerDatePicker.partial.html @@ -1,5 +1,5 @@
- + {{ schedulerName || strings.get('state.EDIT_SCHEDULE') }}
-
diff --git a/awx/ui/client/src/shared/form-generator.js b/awx/ui/client/src/shared/form-generator.js index 18c5bf2eee..ac1c60bf2e 100644 --- a/awx/ui/client/src/shared/form-generator.js +++ b/awx/ui/client/src/shared/form-generator.js @@ -684,7 +684,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat html += (field.ngShow) ? this.attr(field, 'ngShow') : ""; html += ">\n"; html += (field.closeable === undefined || field.closeable === true) ? - "\n" : ""; + "\n" : ""; html += field.alertTxt; html += "
\n"; html += "\n"; @@ -784,7 +784,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat } if (field.clear) { - html += "`; @@ -1463,7 +1464,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat html += ""; } else { html += "
"; - html += "
\n"; } @@ -1817,7 +1818,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat if (collection.instructions) { html += "
\n"; - html += "\n"; + html += "\n"; html += "Hint: " + collection.instructions + "\n"; html += "
\n"; } @@ -1942,7 +1943,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat for (act in collection.fieldActions) { if (act !== 'columnClass') { fAction = collection.fieldActions[act]; - html += " diff --git a/awx/ui/client/src/shared/instance-groups-multiselect/instance-groups.partial.html b/awx/ui/client/src/shared/instance-groups-multiselect/instance-groups.partial.html index d26c726ed3..1876c9b9bd 100644 --- a/awx/ui/client/src/shared/instance-groups-multiselect/instance-groups.partial.html +++ b/awx/ui/client/src/shared/instance-groups-multiselect/instance-groups.partial.html @@ -1,6 +1,6 @@
- diff --git a/awx/ui/client/src/shared/list-generator/list-actions.partial.html b/awx/ui/client/src/shared/list-generator/list-actions.partial.html index f1dbb6f2d6..b64a57df08 100644 --- a/awx/ui/client/src/shared/list-generator/list-actions.partial.html +++ b/awx/ui/client/src/shared/list-generator/list-actions.partial.html @@ -56,13 +56,14 @@
\n"; } @@ -157,7 +157,7 @@ export default ['$compile', 'Attr', 'Icon', if (options.mode === 'edit' && list.editInstructions) { html += "
\n"; - html += "\n"; + html += "\n"; html += "Hint: " + list.editInstructions + "\n"; html += "
\n"; } @@ -491,7 +491,7 @@ export default ['$compile', 'Attr', 'Icon', if (options.mode === 'select' && (options.selectButton === undefined || options.selectButton)) { html += "
\n"; - html += " \n"; html += "
\n"; } diff --git a/awx/ui/client/src/shared/lookup/lookup-modal.partial.html b/awx/ui/client/src/shared/lookup/lookup-modal.partial.html index a33662d58d..6fbe7bb4c6 100644 --- a/awx/ui/client/src/shared/lookup/lookup-modal.partial.html +++ b/awx/ui/client/src/shared/lookup/lookup-modal.partial.html @@ -6,7 +6,7 @@
-
diff --git a/awx/ui/client/src/templates/job_templates/job-template.form.js b/awx/ui/client/src/templates/job_templates/job-template.form.js index 6f1f8cf025..eab7f422bf 100644 --- a/awx/ui/client/src/templates/job_templates/job-template.form.js +++ b/awx/ui/client/src/templates/job_templates/job-template.form.js @@ -437,6 +437,7 @@ function(NotificationsList, i18n) { class="input-group-btn input-group-prepend" > diff --git a/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential.partial.html b/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential.partial.html index a4b8512b0f..052c81f94f 100644 --- a/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential.partial.html +++ b/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential.partial.html @@ -1,6 +1,7 @@
@@ -31,7 +31,7 @@ {{strings.get('workflow_maker.UNSAVED_CHANGES_HEADER')}} @@ -58,7 +58,7 @@
{{strings.get('workflow_maker.TITLE')}} | {{ workflowJobTemplateObj.name }}
-
diff --git a/awx/ui/client/src/workflow-results/workflow-results.partial.html b/awx/ui/client/src/workflow-results/workflow-results.partial.html index d2c87893c1..3f04141068 100644 --- a/awx/ui/client/src/workflow-results/workflow-results.partial.html +++ b/awx/ui/client/src/workflow-results/workflow-results.partial.html @@ -23,6 +23,7 @@