Skip to content

Commit f17f28e

Browse files
Merge pull request ManageIQ#535 from AllenBW/ate-templates-explorer-sass
PT#140251613 Templates-explorer observes applicable sass
2 parents bdf13f8 + afa9cd2 commit f17f28e

File tree

4 files changed

+22
-18
lines changed

4 files changed

+22
-18
lines changed

client/app/services/service-explorer/service-explorer.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
tooltip-append-to-body="true"
111111
tooltip-popup-delay="1000"
112112
tooltip-placement="bottom-left">
113-
<strong translate>Created</strong>&nbsp;
113+
<strong translate>Created</strong>
114114
<div>
115115
{{ item.created_at | date : 'short' }}
116116
</div>

client/app/templates/template-explorer.component.js

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* eslint camelcase: "off" */
1+
import '../../assets/sass/_explorer.sass';
22
import templateUrl from './template-explorer.html';
33

44
export const TemplateExplorerComponent = {
@@ -69,13 +69,15 @@ function ComponentController(ListView, TemplatesService, EventNotifications, $st
6969
onCheckBoxChange: selectionChange,
7070
};
7171
}
72+
7273
function getSortConfig() {
7374
return {
7475
direction: 'asc',
7576
field: 'name',
7677
sortOptions: 'alpha',
7778
};
7879
}
80+
7981
function getToolbarConfig() {
8082
const sortOrderFields = getSortFields();
8183
const sortConfig = {
@@ -117,8 +119,7 @@ function ComponentController(ListView, TemplatesService, EventNotifications, $st
117119
}
118120

119121
function getMenuActions() {
120-
const menuActions = [
121-
];
122+
const menuActions = [];
122123

123124
return menuActions;
124125
}
@@ -130,10 +131,12 @@ function ComponentController(ListView, TemplatesService, EventNotifications, $st
130131

131132
resolveTemplates(vm.limit, 0);
132133
}
134+
133135
function filterChange(filters) {
134136
vm.filters = filters;
135137
resolveTemplates(vm.limit, 0);
136138
}
139+
137140
function resolveTemplates(limit, offset, refresh) {
138141
if (!refresh) {
139142
vm.loading = true;
@@ -174,7 +177,7 @@ function ComponentController(ListView, TemplatesService, EventNotifications, $st
174177

175178
template.selected = false;
176179

177-
vm.selectedItemsList.some(function (selectedItem) {
180+
vm.selectedItemsList.some(function(selectedItem) {
178181
if (selectedItem.id === template.id) {
179182
if (angular.isDefined(selectedItem.selected) && selectedItem.selected) {
180183
template.selected = true;
@@ -194,7 +197,7 @@ function ComponentController(ListView, TemplatesService, EventNotifications, $st
194197
}
195198

196199
function selectionChange(_item) {
197-
vm.selectedItemsList = vm.templatesList.filter(function (service) {
200+
vm.selectedItemsList = vm.templatesList.filter(function(service) {
198201
return service.selected;
199202
});
200203
}
@@ -214,6 +217,7 @@ function ComponentController(ListView, TemplatesService, EventNotifications, $st
214217
function pollTemplates() {
215218
resolveTemplates(vm.limit, vm.offset, true);
216219
}
220+
217221
function addTemplate() {
218222
$state.go("templates.editor");
219223
}

client/app/templates/template-explorer.html

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</custom-dropdown>
1919
</actions>
2020
</div>
21-
<div class="list-view-container section-container paged-container service-explorer-list">
21+
<div class="list-view-container section-container paged-container explorer-list">
2222
<loading status="vm.loading"></loading>
2323
<div ng-if="!vm.loading"
2424
pf-list-view id="templatesList"
@@ -44,14 +44,20 @@
4444
</span>
4545
</div>
4646
<div class="col-lg-1 col-md-2 col-sm-4 col-xs-4">
47-
<span class="no-wrap">
47+
<span>
4848
<span class="label label-success" ng-if="item.orderable === true" translate>Available</span>
4949
</span>
5050
</div>
5151
<div class="col-lg-3 col-md-2 hidden-sm hidden-xs">
52-
<span class="no-wrap">
53-
<strong translate>Updated</strong> {{item.updated_at}}
54-
</span>
52+
<div class="list-view-stacked-item" uib-tooltip="Updated: {{item.updated_at | date : 'short'}}"
53+
tooltip-append-to-body="true"
54+
tooltip-popup-delay="1000"
55+
tooltip-placement="bottom-left">
56+
<strong translate>Updated</strong>
57+
<div>
58+
{{ item.updated_at | date : 'short' }}
59+
</div>
60+
</div>
5561
</div>
5662
</div>
5763
</div>

yarn.lock

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,6 @@ [email protected], accepts@~1.3.3:
2525
mime-types "~2.1.11"
2626
negotiator "0.6.1"
2727

28-
ace-code-editor@^1.2.3:
29-
version "1.2.3"
30-
resolved "https://registry.yarnpkg.com/ace-code-editor/-/ace-code-editor-1.2.3.tgz#a65a533879d6e0f9fdb5e712d2ee46b2079a51de"
31-
dependencies:
32-
mime "1.2.x"
33-
3428
acorn-dynamic-import@^2.0.0:
3529
version "2.0.1"
3630
resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-2.0.1.tgz#23f671eb6e650dab277fef477c321b1178a8cca2"
@@ -1040,7 +1034,7 @@ brace-expansion@^1.0.0:
10401034
balanced-match "^0.4.1"
10411035
concat-map "0.0.1"
10421036

1043-
brace@^0.9.1:
1037+
10441038
version "0.9.1"
10451039
resolved "https://registry.yarnpkg.com/brace/-/brace-0.9.1.tgz#19dcbae2faec9a9920a0452ec64d8d84df45e7b6"
10461040
dependencies:

0 commit comments

Comments
 (0)