diff --git a/awx/ui/client/installing.template.ejs b/awx/ui/client/installing.template.ejs index 432c42b48b..2e80ad629c 100644 --- a/awx/ui/client/installing.template.ejs +++ b/awx/ui/client/installing.template.ejs @@ -22,7 +22,13 @@
- + is Upgrading diff --git a/awx/ui/client/lib/components/layout/layout.partial.html b/awx/ui/client/lib/components/layout/layout.partial.html index d48c607abc..78e1155a8f 100644 --- a/awx/ui/client/lib/components/layout/layout.partial.html +++ b/awx/ui/client/lib/components/layout/layout.partial.html @@ -2,7 +2,7 @@
diff --git a/awx/ui/client/lib/services/base-string.service.js b/awx/ui/client/lib/services/base-string.service.js index 3e7b3b7cd7..4ff6151f58 100644 --- a/awx/ui/client/lib/services/base-string.service.js +++ b/awx/ui/client/lib/services/base-string.service.js @@ -78,6 +78,12 @@ function BaseStringService (namespace) { this.TEST = t.s('TEST'); this.SUCCESSFUL_CREATION = resource => t.s('{{ resource }} successfully created', { resource: $filter('sanitize')(resource) }); + this.logos = { + AWX_LOGO: t.s('Ansible AWX Logo'), + TOWER_LOGO: t.s('Ansible Tower Logo'), + CUSTOM_LOGO: t.s('Custom Logo') + }; + this.deleteResource = { HEADER: t.s('Delete'), USED_BY: resourceType => t.s('The {{ resourceType }} is currently being used by other resources.', { resourceType }), diff --git a/awx/ui/client/src/about/about.partial.html b/awx/ui/client/src/about/about.partial.html index 8f11c9eb97..3a9f71f15f 100644 --- a/awx/ui/client/src/about/about.partial.html +++ b/awx/ui/client/src/about/about.partial.html @@ -19,7 +19,11 @@
- +

Ansible {{ ansible_version }} diff --git a/awx/ui/client/src/app.js b/awx/ui/client/src/app.js index 5ba84826d4..fe420ace1d 100644 --- a/awx/ui/client/src/app.js +++ b/awx/ui/client/src/app.js @@ -195,6 +195,7 @@ angular $rootScope.breadcrumb = {}; $rootScope.BRAND_NAME = AppStrings.get('BRAND_NAME'); $rootScope.tabTitle = `Ansible ${$rootScope.BRAND_NAME}`; + $rootScope.appStrings = AppStrings; $rootScope.$watch('$state.current.ncyBreadcrumbLabel', function(title) { title = (title) ? "| " + title : ""; document.title = `Ansible ${$rootScope.BRAND_NAME} ${title}`; diff --git a/awx/ui/client/src/inventories-hosts/inventories/insights/insights.partial.html b/awx/ui/client/src/inventories-hosts/inventories/insights/insights.partial.html index 0d696f1ede..6a90ef81bd 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/insights/insights.partial.html +++ b/awx/ui/client/src/inventories-hosts/inventories/insights/insights.partial.html @@ -68,14 +68,14 @@

- - - - + + + +
ISSUE: {{report.rule.description}}
{{report.rule.category}}
diff --git a/awx/ui/client/src/inventories-hosts/inventories/insights/insights.strings.js b/awx/ui/client/src/inventories-hosts/inventories/insights/insights.strings.js index 26055effa2..5b6ae0913d 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/insights/insights.strings.js +++ b/awx/ui/client/src/inventories-hosts/inventories/insights/insights.strings.js @@ -7,6 +7,13 @@ function InsightsStrings (BaseString) { ns.tooltips = { REFRESH_INSIGHTS: t.s('Refresh Insights'), }; + + ns.risks = { + CRITICAL_RISK: t.s('Critical Risk'), + HIGH_RISK: t.s('High Risk'), + MEDIUM_RISK: t.s('Medium Risk'), + LOW_RISK: t.s('Low Risk'), + }; } InsightsStrings.$inject = ['BaseStringService']; diff --git a/awx/ui/client/src/login/loginModal/loginModal.partial.html b/awx/ui/client/src/login/loginModal/loginModal.partial.html index aa1e5b686a..e3133f84c9 100644 --- a/awx/ui/client/src/login/loginModal/loginModal.partial.html +++ b/awx/ui/client/src/login/loginModal/loginModal.partial.html @@ -5,13 +5,19 @@
- - + ng-src="/static/assets/{{ customLogo }}" + ng-attr-aria-label="{{ BRAND_NAME === 'Tower' ? appStrings.get('logos.TOWER_LOGO') : appStrings.get('logos.AWX_LOGO') }}" + /> +