From 074ef7ce4ebda984d48ab09861110841899ec775 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Thu, 4 May 2017 15:51:45 +0200 Subject: [PATCH] WIP: add open/closed folders icons for dash search If browsing, then show open folder icon. If searching, show the closed folder icon --- public/app/core/components/search/search.html | 2 +- public/app/core/components/search/search.ts | 2 ++ public/sass/components/_search.scss | 6 +++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/public/app/core/components/search/search.html b/public/app/core/components/search/search.html index 671f8834ef6..87aa2b5b9f7 100644 --- a/public/app/core/components/search/search.html +++ b/public/app/core/components/search/search.html @@ -57,7 +57,7 @@
No dashboards matching your query were found.
- diff --git a/public/app/core/components/search/search.ts b/public/app/core/components/search/search.ts index 3af474ef687..9a957bf3110 100644 --- a/public/app/core/components/search/search.ts +++ b/public/app/core/components/search/search.ts @@ -20,6 +20,7 @@ export class SearchCtrl { ignoreClose: any; // triggers fade animation class openCompleted: boolean; + searchMode = 'browse'; /** @ngInject */ constructor(private $scope, private $location, private $timeout, private backendSrv, private contextSrv, private $rootScope) { @@ -105,6 +106,7 @@ export class SearchCtrl { var localSearchId = this.currentSearchId; this.query.browseMode = this.queryHasNoFilters(); + this.searchMode = this.queryHasNoFilters() ? 'browse': 'search'; return this.backendSrv.search(this.query).then((results) => { if (localSearchId < this.currentSearchId) { return; } diff --git a/public/sass/components/_search.scss b/public/sass/components/_search.scss index 42527b185b6..21272b70ea0 100644 --- a/public/sass/components/_search.scss +++ b/public/sass/components/_search.scss @@ -146,10 +146,14 @@ content: "\f015"; } -.search-item-dash-folder > .search-result-link > .search-result-icon::before { +.search-item-dash-folder.search-results-browse-mode > .search-result-link > .search-result-icon::before { content: "\f07c"; } +.search-item-dash-folder.search-results-search-mode > .search-result-link > .search-result-icon::before { + content: "\f07b"; +} + .search-button-row { padding: $spacer*2; display: flex;