Skip to content

Commit e901611

Browse files
Oleksii Orelashumilova
authored andcommitted
CHE-3392: add widget for displaying advanced filter
Signed-off-by: Oleksii Orel <oorel@redhat.com>
1 parent 9a1b5f0 commit e901611

36 files changed

Lines changed: 548 additions & 89 deletions

File tree

dashboard/bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"angular": "1.4.8",
1111
"angular-animate": "1.4.8",
1212
"angular-aria": "1.4.8",
13-
"angular-bootstrap": "0.13.0",
13+
"angular-bootstrap": "1.1.2",
1414
"angular-charts": "0.2.6",
1515
"angular-cookies": "1.4.8",
1616
"angular-dropdowns": "1.0.0",

dashboard/src/app/administration/docker-registry/docker-registry-list/docker-registry-list.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
<div flex-gt-xs="25">
7777
<span class="che-xs-header noselect" hide-gt-xs>Actions</span>
7878
<span class="che-list-actions">
79-
<div ng-click="dockerRegistryListController.showEditRegistryDialog($event, registry)" tooltip="Edit registry">
79+
<div ng-click="dockerRegistryListController.showEditRegistryDialog($event, registry)" uib-tooltip="Edit registry">
8080
<span class="material-design icon-ic_mode_edit_24px"></span>
8181
</div>
8282
</span>

dashboard/src/app/demo-components/demo-components.controller.ts

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*/
1111
'use strict';
1212

13-
enum Tab {Font, Panel, Selecter, Icons, Buttons, Input, List, Label_container, Stack_selector};
13+
enum Tab {Font, Panel, Selecter, Icons, Buttons, Input, List, Label_container, Stack_selector, Popover};
1414

1515
/**
1616
* This class is handling the controller for the demo of components
@@ -36,6 +36,8 @@ export class DemoComponentsController {
3636
number: number;
3737
numberIsChanged: number;
3838

39+
placement: any;
40+
3941
/**
4042
* Default constructor that is using resource
4143
* @ngInject for Dependency injection
@@ -49,7 +51,23 @@ export class DemoComponentsController {
4951
} else {
5052
this.selectedIndex = Tab.Font;
5153
}
52-
54+
this.placement = {
55+
options: [
56+
'top',
57+
'top-left',
58+
'top-right',
59+
'bottom',
60+
'bottom-left',
61+
'bottom-right',
62+
'left',
63+
'left-top',
64+
'left-bottom',
65+
'right',
66+
'right-top',
67+
'right-bottom'
68+
],
69+
selected: 'top'
70+
};
5371
this.init();
5472
}
5573

dashboard/src/app/demo-components/demo-components.html

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,8 @@ <h6>This is h6
182182
</textarea>
183183

184184
<p>Selected value of toggle is : {{demoComponentsController.selectedToggle}}</p>
185-
<che-toggle ng-init="demoComponentsController.selectedToggle='Public'" ng-model="demoComponentsController.selectedToggle">
185+
<che-toggle ng-init="demoComponentsController.selectedToggle='Public'"
186+
ng-model="demoComponentsController.selectedToggle">
186187
<che-toggle-button che-font-icon="fa fa-lock" che-title="Public"></che-toggle-button>
187188
<che-toggle-button che-font-icon="fa fa-unlock" che-title="Private"></che-toggle-button>
188189
</che-toggle>
@@ -369,12 +370,37 @@ <h6>This is h6
369370
<md-tab label="Stack Selector"
370371
md-on-select="demoComponentsController.onSelectTab(demoComponentsController.tab.Stack_selector)">
371372
<div layout="column">
372-
<che-label-container che-label-name="{{createProjectCtrl.workspaces.length ? 'Select Workspace' : 'Select Stack'}}"
373-
che-label-description="{{createProjectCtrl.workspaces.length ? 'Select existing workspace or create it from stack' : 'Select stack'}}, recipe or image used to define your environment runtime. Workspace environments are used to build and run your project.">
373+
<che-label-container
374+
che-label-name="{{createProjectCtrl.workspaces.length ? 'Select Workspace' : 'Select Stack'}}"
375+
che-label-description="{{createProjectCtrl.workspaces.length ? 'Select existing workspace or create it from stack' : 'Select stack'}}, recipe or image used to define your environment runtime. Workspace environments are used to build and run your project.">
374376
<stack-selector></stack-selector>
375377
</che-label-container>
376378
</div>
377379
</md-tab>
378-
380+
<md-tab label="Popover"
381+
md-on-select="demoComponentsController.onSelectTab(demoComponentsController.tab.Popover)">
382+
<textarea demo-source-render>
383+
<!-- toggle-button-popover -->
384+
<toggle-button-popover button-title="PopupTags"
385+
button-value="isOpen"
386+
button-font-icon="fa fa-sliders">
387+
<che-stack-library-filter stack-tags="['tag1', 'tag2', 'tag3', 'tag4']"
388+
selected-tags="selectedTags">
389+
</che-stack-library-filter>
390+
</toggle-button-popover>
391+
<button class="btn btn-default" ng-click="isOpen = !isOpen">Change popover state</button>
392+
</textarea>
393+
<p>
394+
<label><h4>Popover placement</h4></label>
395+
<select class="form-control" ng-model="demoComponentsController.placement.selected"
396+
ng-options="options as options for options in demoComponentsController.placement.options"></select>
397+
</p>
398+
<textarea demo-source-render>
399+
<!-- html-popover-placement -->
400+
<button popover-placement="{{demoComponentsController.placement.selected}}"
401+
uib-popover-html="'<b>HTML!!!</b>, <i>inline</i>'"
402+
class="btn btn-default">HTML Popover (inline)</button>
403+
</textarea>
404+
</md-tab>
379405
</md-tabs>
380406
</md-content>
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
11
.demo-components
22
md-tab-content
33
padding 20px
4+
button[uib-popover-html], toggle-button-popover
5+
margin-left 210px
6+
margin-bottom 20px
7+
outline none !important
8+
& + button
9+
margin-left 70px
10+
outline none !important

dashboard/src/app/factories/list-factories/factory-item/factory-item.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
class="che-list-item-name"
4040
ng-click="factoryItemController.redirectToFactoryDetails();">
4141
<span class="che-xs-header noselect" hide-gt-xs>Factory</span>
42-
<span tooltip="Created: {{factoryItemController.factory.creator.created | amDateFormat:'dddd, MMMM Do, YYYY'}}"
42+
<span uib-tooltip="Created: {{factoryItemController.factory.creator.created | amDateFormat:'dddd, MMMM Do, YYYY'}}"
4343
class="che-hover">{{factoryItemController.factory.name ? factoryItemController.factory.name : factoryItemController.getFactoryLinks()[0]}}</span>
4444
</div>
4545
<div flex-gt-xs="60" ng-click="factoryItemController.redirectToFactoryDetails();">
@@ -49,7 +49,7 @@
4949
<div flex-gt-xs="15">
5050
<span class="che-xs-header noselect" hide-gt-xs>Actions</span>
5151
<span class="che-list-actions">
52-
<a tooltip="Open in IDE" ng-href="#/load-factory/{{factoryItemController.factory.id}}">
52+
<a uib-tooltip="Open in IDE" ng-href="#/load-factory/{{factoryItemController.factory.id}}">
5353
<span class="fa fa-chevron-circle-right factory-action"></span>
5454
</a>
5555
</span>

dashboard/src/app/index.module.ts

100644100755
File mode changed.

dashboard/src/app/projects/list-projects/project-item/project-item.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<div flex-gt-xs="20">
4444
<span class="che-xs-header noselect" hide-gt-xs>Actions</span>
4545
<span class="che-list-actions">
46-
<a tooltip="Open in IDE" ng-href="#/ide/{{projectItemCtrl.workspace.namespace}}/{{projectItemCtrl.workspace.config.name}}">
46+
<a uib-tooltip="Open in IDE" ng-href="#/ide/{{projectItemCtrl.workspace.namespace}}/{{projectItemCtrl.workspace.config.name}}">
4747
<span class="fa fa-chevron-circle-right"></span>
4848
</a>
4949
</span>

dashboard/src/app/stacks/list-stacks/stack-item/stack-item.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@
5151
class="stack-item-actions">
5252
<span class="che-xs-header noselect" hide-gt-xs>Actions</span>
5353
<span class="che-list-actions">
54-
<a tooltip="Delete Stack" ng-disabled="stackItemController.stack.creator !== stackItemController.userId"
54+
<a uib-tooltip="Delete Stack" ng-disabled="stackItemController.stack.creator !== stackItemController.userId"
5555
ng-click="stackItemController.onDelete(stackItemController.stack);">
5656
<span class="fa fa-trash-o"></span>
5757
</a>
58-
<a tooltip="Duplicate stack" ng-click="stackItemController.onDuplicate(stackItemController.stack);">
58+
<a uib-tooltip="Duplicate stack" ng-click="stackItemController.onDuplicate(stackItemController.stack);">
5959
<span class="fa fa-copy"></span>
6060
</a>
6161
</span>

dashboard/src/app/stacks/stack-details/list-components/list-components.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
<div flex="10">
7676
<div class="che-list-actions"
7777
ng-click="listComponentsController.showEditDialog($event,listComponentsController.components.indexOf(component))">
78-
<i class="fa fa-pencil" tooltip="Edit"></i>
78+
<i class="fa fa-pencil" uib-tooltip="Edit"></i>
7979
</div>
8080
</div>
8181
</div>

0 commit comments

Comments
 (0)