IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-15 19:22:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

ux: search progress

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-11-01 20:26:14 +01:00
parent b9d6c97147
commit f4d0e2caee
5 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/services/sqlstore/dashboard.go
View File

@ -202,7 +202,6 @@ func findDashboards(query *search.FindPersistedDashboardsQuery) ([]DashboardSear
dashboard.title, dashboard.title,
dashboard.slug, dashboard.slug,
dashboard_tag.term, dashboard_tag.term,
dashboard.is_folder,
dashboard.folder_id, dashboard.folder_id,
folder.slug as folder_slug, folder.slug as folder_slug,
folder.title as folder_title folder.title as folder_title

3
public/app/core/components/search/search.html
View File

@ -59,7 +59,8 @@
<a class="search-section__header pointer" ng-show="::section.title" ng-click="section.collapsed = !section.collapsed"> <a class="search-section__header pointer" ng-show="::section.title" ng-click="section.collapsed = !section.collapsed">
<i class="search-section__header__icon" ng-class="section.icon"></i> <i class="search-section__header__icon" ng-class="section.icon"></i>
<span class="search-section__header__text">{{::section.title}}</span> <span class="search-section__header__text">{{::section.title}}</span>
<i class="fa fa-minus search-section__header__toggle"></i> <i class="fa fa-minus search-section__header__toggle" ng-hide="section.collapsed"></i>
<i class="fa fa-plus search-section__header__toggle" ng-show="section.collapsed"></i>
</a> </a>
<div ng-if="!section.collapsed"> <div ng-if="!section.collapsed">

8
public/app/core/components/search/search.ts
View File

@ -132,9 +132,15 @@ export class SearchCtrl {
if (!section) { if (!section) {
section = { section = {
id: hit.folderId, id: hit.folderId,
title: hit.folderTitle, items: [], title: hit.folderTitle,
items: [],
icon: 'fa fa-folder-open' icon: 'fa fa-folder-open'
}; };
// handle root
if (!hit.folderId) {
section.title = "Dashboards";
section.icon = "fa fa-circle-o";
}
sections[hit.folderId] = section; sections[hit.folderId] = section;
} }

1
public/sass/components/_modals.scss
View File

@ -21,7 +21,6 @@
// Base modal // Base modal
.modal { .modal {
position: fixed; position: fixed;
overflow: hidden;
z-index: $zindex-modal; z-index: $zindex-modal;
width: 100%; width: 100%;
background-color: $panel-bg; background-color: $panel-bg;

15
public/sass/components/_search.scss
View File

@ -134,13 +134,13 @@
background-color: $tight-form-func-bg; background-color: $tight-form-func-bg;
} }
.fa-star, .fa-star-o { // .fa-star, .fa-star-o {
padding-left: 13px; // padding-left: 13px;
} // }
//
.fa-star { // .fa-star {
color: $orange; // color: $orange;
} // }
} }
.search-item__title { .search-item__title {
@ -154,6 +154,7 @@
padding: 5px; padding: 5px;
flex: 0 0 auto; flex: 0 0 auto;
font-size: 19px; font-size: 19px;
padding: 5px 2px 5px 10px;
} }
.search-item__tags { .search-item__tags {