diff --git a/demo/data/toolbar.json b/demo/data/toolbar.json index 94985eb0ba..719a356d0c 100644 --- a/demo/data/toolbar.json +++ b/demo/data/toolbar.json @@ -4,6 +4,7 @@ "id": "middleware_server_policy_choice", "type": "buttonSelect", "img": "middleware_server_policy_choice.png", + "color": "blue", "imgdis": "middleware_server_policy_choice.png", "icon": "fa fa-shield fa-lg", "name": "middleware_server_policy_choice", @@ -20,6 +21,7 @@ "id": "middleware_server_policy_choice__middleware_server_tag", "type": "button", "img": "middleware_server_tag.png", + "color": "#900000", "imgdis": "middleware_server_tag.png", "icon": "pficon pficon-edit fa-lg", "name": "middleware_server_policy_choice__middleware_server_tag", @@ -39,6 +41,7 @@ "id": "download_choice__download_csv", "type": "button", "img": "download_csv.png", + "color": "#009000", "imgdis": "download_csv.png", "icon": "fa fa-file-text-o fa-lg", "name": "download_choice__download_csv", @@ -108,6 +111,22 @@ "url_parms": "main_div" } ] + }, + { + "id": "middleware_server_power_choice", + "type": "button", + "color": "#0000F0", + "img": "middleware_server_power_choice.png", + "imgdis": "middleware_server_power_choice.png", + "icon": "fa fa-power-off fa-lg", + "name": "middleware_server_power_choice", + "hidden": false, + "pressed": null, + "onwhen": "1+", + "data": null, + "enabled": true, + "title": "Power", + "text": "Power" } ], [ diff --git a/src/toolbar/components/toolbar-menu/toolbar-button.html b/src/toolbar/components/toolbar-menu/toolbar-button.html index 823b18272a..5a4e40e9cd 100644 --- a/src/toolbar/components/toolbar-menu/toolbar-button.html +++ b/src/toolbar/components/toolbar-menu/toolbar-button.html @@ -13,8 +13,13 @@ ng-class="{active: toolbarButton.selected, disabled: !toolbarButton.enabled}" ng-hide="toolbarButton.hidden" ng-click="onItemClick({item: toolbarButton, $event: $event})"> - - + + diff --git a/src/toolbar/components/toolbar-menu/toolbar-list.html b/src/toolbar/components/toolbar-menu/toolbar-list.html index 57d06e834b..6aec84fb19 100644 --- a/src/toolbar/components/toolbar-menu/toolbar-list.html +++ b/src/toolbar/components/toolbar-menu/toolbar-list.html @@ -1,7 +1,10 @@
@@ -25,8 +28,8 @@ data-prompt="{{item.prompt}}" data-popup="{{item.popup}}" data-url="{{item.url}}"> - - + + diff --git a/src/toolbar/components/toolbar-menu/toolbar-view.html b/src/toolbar/components/toolbar-menu/toolbar-view.html index 55ac76178e..b8ece38cfd 100644 --- a/src/toolbar/components/toolbar-menu/toolbar-view.html +++ b/src/toolbar/components/toolbar-menu/toolbar-view.html @@ -10,6 +10,6 @@ data-popup="{{item.popup}}" ng-click="vm.onItemClick({item: item, $event: $event})" name="{{item.name}}"> - +
diff --git a/src/toolbar/components/toolbar-menu/toolbarComponent.spec.ts b/src/toolbar/components/toolbar-menu/toolbarComponent.spec.ts index f8e99232ce..c6d1d5f306 100644 --- a/src/toolbar/components/toolbar-menu/toolbarComponent.spec.ts +++ b/src/toolbar/components/toolbar-menu/toolbarComponent.spec.ts @@ -95,7 +95,7 @@ describe('Toolbar test', () => { it('creates toolbar', () => { const dropdownToggle: any = angular.element(compiledElement[0].querySelectorAll('button:not(.uib-dropdown-toggle)')); - expect(dropdownToggle.length).toBe(1); + expect(dropdownToggle.length).toBe(2); expect(compiledElement.find('miq-toolbar-list').length).toBe(3); }); });