From 2140daf11e79c9ee4ec26fbd53c933d26bb26200 Mon Sep 17 00:00:00 2001 From: Marliana Lara Date: Wed, 2 May 2018 15:55:23 -0400 Subject: [PATCH] Fix add button display property and add tooltips * Add tooltips to list add buttons of instance groups, instances, and applications. --- awx/ui/client/features/applications/applications.strings.js | 4 ++++ .../features/applications/list-applications.controller.js | 4 ++++ .../features/applications/list-applications.view.html | 2 ++ awx/ui/client/lib/theme/_global.less | 2 +- .../client/src/instance-groups/instance-groups.strings.js | 5 +++++ .../instance-groups/instances/instances-list.partial.html | 2 ++ .../src/instance-groups/instances/instances.controller.js | 4 ++++ .../instance-groups/list/instance-groups-list.controller.js | 4 ++++ .../instance-groups/list/instance-groups-list.partial.html | 2 ++ awx/ui/test/e2e/objects/inventories.js | 6 +++--- 10 files changed, 31 insertions(+), 4 deletions(-) diff --git a/awx/ui/client/features/applications/applications.strings.js b/awx/ui/client/features/applications/applications.strings.js index 0194efbf42..8dfcf521a2 100644 --- a/awx/ui/client/features/applications/applications.strings.js +++ b/awx/ui/client/features/applications/applications.strings.js @@ -16,6 +16,10 @@ function ApplicationsStrings (BaseString) { USERS: t.s('Tokens') }; + ns.tooltips = { + ADD: t.s('Create a new Application') + }; + ns.add = { PANEL_TITLE: t.s('NEW APPLICATION') }; diff --git a/awx/ui/client/features/applications/list-applications.controller.js b/awx/ui/client/features/applications/list-applications.controller.js index fd67589a08..8a6ad5a8bf 100644 --- a/awx/ui/client/features/applications/list-applications.controller.js +++ b/awx/ui/client/features/applications/list-applications.controller.js @@ -38,6 +38,10 @@ function ListApplicationsController ( vm.applicationsCount = dataset.count; }); + vm.tooltips = { + add: strings.get('tooltips.ADD') + }; + vm.getModified = app => { const modified = _.get(app, 'modified'); diff --git a/awx/ui/client/features/applications/list-applications.view.html b/awx/ui/client/features/applications/list-applications.view.html index 1dd96b2dc1..c1ab24bd75 100644 --- a/awx/ui/client/features/applications/list-applications.view.html +++ b/awx/ui/client/features/applications/list-applications.view.html @@ -24,6 +24,8 @@ ui-sref="applications.add" class="at-Button--add" id="button-add" + aw-tool-tip="{{vm.tooltips.add}}" + data-placement="top" aria-haspopup="true" aria-expanded="false"> diff --git a/awx/ui/client/lib/theme/_global.less b/awx/ui/client/lib/theme/_global.less index a06e58dfb3..01690ab2dd 100644 --- a/awx/ui/client/lib/theme/_global.less +++ b/awx/ui/client/lib/theme/_global.less @@ -24,7 +24,7 @@ font-size: 20px; } border: none; - display: flex; + display: inline-flex; margin-left: @at-space-4x; &[aria-expanded="true"] { diff --git a/awx/ui/client/src/instance-groups/instance-groups.strings.js b/awx/ui/client/src/instance-groups/instance-groups.strings.js index ee4c992b75..e21ff78396 100644 --- a/awx/ui/client/src/instance-groups/instance-groups.strings.js +++ b/awx/ui/client/src/instance-groups/instance-groups.strings.js @@ -19,6 +19,11 @@ function InstanceGroupsStrings (BaseString) { JOBS: t.s('JOBS') }; + ns.tooltips = { + ADD_INSTANCE_GROUP: t.s('Create a new Instance Group'), + ASSOCIATE_INSTANCES: t.s('Associate an existing Instance') + }; + ns.instance = { PANEL_TITLE: t.s('SELECT INSTANCE') }; diff --git a/awx/ui/client/src/instance-groups/instances/instances-list.partial.html b/awx/ui/client/src/instance-groups/instances/instances-list.partial.html index 512b74f867..01868ef35d 100644 --- a/awx/ui/client/src/instance-groups/instances/instances-list.partial.html +++ b/awx/ui/client/src/instance-groups/instances/instances-list.partial.html @@ -29,6 +29,8 @@ class="at-Button--add" id="button-add" ng-show="vm.isSuperuser" + aw-tool-tip="{{vm.tooltips.add}}" + data-placement="top" aria-expanded="false">
diff --git a/awx/ui/client/src/instance-groups/instances/instances.controller.js b/awx/ui/client/src/instance-groups/instances/instances.controller.js index 87281efae1..e81f9c106e 100644 --- a/awx/ui/client/src/instance-groups/instances/instances.controller.js +++ b/awx/ui/client/src/instance-groups/instances/instances.controller.js @@ -48,6 +48,10 @@ function InstancesController ($scope, $state, $http, models, Instance, strings, } }; + vm.tooltips = { + add: strings.get('tooltips.ASSOCIATE_INSTANCES') + }; + vm.rowAction = { toggle: { _disabled: !vm.isSuperuser diff --git a/awx/ui/client/src/instance-groups/list/instance-groups-list.controller.js b/awx/ui/client/src/instance-groups/list/instance-groups-list.controller.js index b3eccaffab..8568919616 100644 --- a/awx/ui/client/src/instance-groups/list/instance-groups-list.controller.js +++ b/awx/ui/client/src/instance-groups/list/instance-groups-list.controller.js @@ -33,6 +33,10 @@ export default ['$scope', '$filter', '$state', 'Alert', 'resolvedModels', 'Datas vm.activeId = parseInt($state.params.instance_group_id); }); + vm.tooltips = { + add: strings.get('tooltips.ADD_INSTANCE_GROUP') + }; + vm.rowAction = { trash: instance_group => { return vm.isSuperuser && instance_group.name !== 'tower'; diff --git a/awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html b/awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html index 2fa0440c1e..5aa48b1f29 100644 --- a/awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html +++ b/awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html @@ -25,6 +25,8 @@ class="at-Button--add" id="button-add" ng-show="vm.isSuperuser" + aw-tool-tip="{{vm.tooltips.add}}" + data-placement="top" aria-haspopup="true" aria-expanded="false"> diff --git a/awx/ui/test/e2e/objects/inventories.js b/awx/ui/test/e2e/objects/inventories.js index 0fc95f4360..dd60b80164 100644 --- a/awx/ui/test/e2e/objects/inventories.js +++ b/awx/ui/test/e2e/objects/inventories.js @@ -121,9 +121,9 @@ module.exports = { return this.navigate(); }, selectAdd (name) { - this.api.waitForElementVisible('button[id="button-add"]'); - this.expect.element('button[id="button-add"]').enabled; - this.api.click('button[id="button-add"]'); + this.api.waitForElementVisible('#button-add'); + this.expect.element('#button-add').enabled; + this.api.click('#button-add'); this.api.useXpath(); this.api.waitForElementVisible(`.//a[normalize-space(text())="${name}"]`);