Skip to content

Commit

Permalink
Bug fix
Browse files Browse the repository at this point in the history
Tendrl-bug-id: Tendrl#728 Tendrl#740
  • Loading branch information
a2batic committed Nov 10, 2017
1 parent 0b129c4 commit 18ea6e4
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
10 changes: 9 additions & 1 deletion src/modules/events/event-list/event-list.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,20 @@ <h1>No Events Detected.</h1>
</center>
<div ng-if="eventListCntrl.isDataLoading" class="spinner spinner-lg"></div>
<div class="flex-table list-group list-view-pf list-view-pf-view event-list-table" ng-show="!eventListCntrl.isDataLoading && eventListCntrl.eventList.length !== 0">
<div class="ft-row list-group-item ">
<div class="ft-column">
<div class="bold-text">Description</div>
</div>
<div class="ft-column">
<div class="bold-text">Timestamp</div>
</div>
</div>
<div class="ft-row list-group-item " ng-repeat="event in eventListCntrl.filteredEventList = (eventListCntrl.eventList | orderBy: ['-timeStamp'])">
<div class="ft-column">
<div class="event-desc" uib-tooltip="{{ event.message }}" tooltip-placement="auto">{{event.message || "NA"}}</div>
</div>
<div class="ft-column">
<p>{{event.timeStamp| date: 'dd MMM yyyy HH:mm:ss'}}</p>
<div>{{event.timeStamp| date: 'dd MMM yyyy HH:mm:ss'}}</div>
</div>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/modules/events/event-list/event-list.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@


.event-list-table {
height: 65vh;
max-height: 65vh;
overflow: auto;

.list-group-item {
padding: 25px 0;
padding: 15px 0;

.event-desc {
white-space: nowrap;
Expand Down
2 changes: 1 addition & 1 deletion src/modules/volumes/volume-list/volume-list.html
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ <h1>No Volumes Detected</h1>
<div class="flex-table list-group list-view-pf list-view-pf-view" ng-show="!volumeCntrl.isDataLoading">
<div class="ft-row list-group-item " ng-repeat="volume in volumeCntrl.filteredVolumeList=(volumeCntrl.volumeList | filter: volumeCntrl.searchBy | orderBy : volumeCntrl.ascOrder + volumeCntrl.orderBy)">
<div class="ft-column ft-icon">
<i ng-class="{'fa fa-stop-circle-o': (volume.status.toLowerCase() === 'stopped'), 'pficon pficon-ok': (volume.status.toLowerCase() ==='started'), 'fa fa-podcast': (volume.status.toLowerCase() === 'created')}" uib-tooltip-html="'{{volume.status}}'" tooltip-placement="auto bottom-left"></i>
<i ng-class="{'fa fa-stop-circle-o': (volume.status.toLowerCase() === 'stopped'), 'pficon pficon-ok': (volume.status.toLowerCase() ==='started'), 'fa fa-arrow-circle-o-up': (volume.status.toLowerCase() === 'created')}" uib-tooltip-html="'{{volume.status}}'" tooltip-placement="auto bottom-left"></i>
</div>
<div class="ft-column volume-name bold-text" list-view-pf-additional-info-item-stacked>
<div class="bold-text" uib-tooltip-html="'{{volume.name}}'" tooltip-placement="auto bottom-left">{{volume.name}}</div>
Expand Down

0 comments on commit 18ea6e4

Please sign in to comment.