IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-12-02 05:29:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

feat(playlist): changes tag result into a list

Browse Source
This commit is contained in:
bergquist 2016-02-22 16:45:14 +01:00
parent fc62af6b3a
commit 31ea5f550f
2 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
public/app/features/playlist/partials/playlist.html
View File

@ -26,7 +26,6 @@
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="playlist-search-containerwrapper"> <div class="playlist-search-containerwrapper">
<div class="max-width-32"> <div class="max-width-32">
<h5 class="page-headering playlist-column-header">Available</h5> <h5 class="page-headering playlist-column-header">Available</h5>
@ -40,7 +39,9 @@
<table class="grafana-options-table playlist-available-list"> <table class="grafana-options-table playlist-available-list">
<tr ng-repeat="playlistItem in ctrl.filteredDashboards"> <tr ng-repeat="playlistItem in ctrl.filteredDashboards">
<td> <td>
<i class="icon-gf icon-gf-dashboard"></i>&nbsp;&nbsp;{{playlistItem.title}} <i class="icon-gf icon-gf-dashboard"></i>
&nbsp;&nbsp;{{playlistItem.title}}
<i class="fa fa-star" ng-show="playlistItem.isStarred"></i>
</td> </td>
<td class="add-dashboard"> <td class="add-dashboard">
<button class="btn btn-inverse btn-mini pull-right" ng-click="ctrl.addPlaylistItem(playlistItem)"> <button class="btn btn-inverse btn-mini pull-right" ng-click="ctrl.addPlaylistItem(playlistItem)">
@ -52,14 +53,23 @@
</table> </table>
</div> </div>
<div class="playlist-search-results-container" ng-if="ctrl.filteredTags.length > 0;"> <div class="playlist-search-results-container" ng-if="ctrl.filteredTags.length > 0;">
<div ng-repeat="tag in ctrl.filteredTags" class="pointer tag-result-container" <table class="grafana-options-table playlist-available-list">
ng-click="ctrl.addTagPlaylistItem(tag, $event)"> <tr ng-repeat="tag in ctrl.filteredTags">
<a class="search-result-tag label label-tag" tag-color-from-name="tag.term"> <td>
<i class="fa fa-tag"></i> <a class="search-result-tag label label-tag" tag-color-from-name="tag.term">
<span>{{tag.term}} &nbsp;({{tag.count}})</span> <i class="fa fa-tag"></i>
</a> <span>{{tag.term}} &nbsp;({{tag.count}})</span>
</div> </a>
</div> </td>
<td class="add-dashboard">
<button class="btn btn-inverse btn-mini pull-right" ng-click="ctrl.addPlaylistItem(playlistItem)">
<i class="fa fa-plus"></i>
Add to playlist
</button>
</td>
</tr>
</table>
</div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">

10
public/sass/pages/_playlist.scss
View File

@ -27,6 +27,7 @@
margin-bottom: 15px; margin-bottom: 15px;
} }
.playlist-search-field-wrapper { .playlist-search-field-wrapper {
input { input {
width: 100%; width: 100%;
@ -109,6 +110,10 @@
.add-dashboard { .add-dashboard {
text-align: center; text-align: center;
} }
.fa-star {
color: $orange;
}
} }
.playlist-column-header { .playlist-column-header {
@ -120,8 +125,3 @@
.selected-playlistitem-settings { .selected-playlistitem-settings {
text-align: right; text-align: right;
} }
.tag-result-container {
width: 160px;
float: left;
}