+
+ {main.icon && }
+ {main.img && 
}
+
+
+
+ );
+ }
+
+ render() {
+ return (
+
+
+ {main.text}
+ {main.subTitle &&{main.subTitle}
}
+ {main.subType && (
+
+
+ {main.subType.text}
+
+ )}
+
+
+ );
+ }
+}
diff --git a/public/app/core/components/grafana_app.ts b/public/app/core/components/grafana_app.ts
index d13c6a6a00e..c60c8a20a4c 100644
--- a/public/app/core/components/grafana_app.ts
+++ b/public/app/core/components/grafana_app.ts
@@ -85,6 +85,16 @@ export function grafanaAppDirective(playlistSrv, contextSrv, $timeout, $rootScop
}
});
+ let sidemenuOpenSmallBreakpoint = scope.contextSrv.sidemenuSmallBreakpoint;
+ body.toggleClass('sidemenu-open--xs', sidemenuOpenSmallBreakpoint);
+
+ scope.$watch('contextSrv.sidemenuSmallBreakpoint', newVal => {
+ if (sidemenuOpenSmallBreakpoint !== scope.contextSrv.sidemenuSmallBreakpoint) {
+ sidemenuOpenSmallBreakpoint = scope.contextSrv.sidemenuSmallBreakpoint;
+ body.toggleClass('sidemenu-open--xs', scope.contextSrv.sidemenuSmallBreakpoint);
+ }
+ });
+
// tooltip removal fix
// manage page classes
var pageClass;
diff --git a/public/app/core/components/navbar/navbar.html b/public/app/core/components/navbar/navbar.html
index aafd806e47d..6d611692efc 100644
--- a/public/app/core/components/navbar/navbar.html
+++ b/public/app/core/components/navbar/navbar.html
@@ -1,13 +1,11 @@
+
+
+ {this.renderHeaderTitle(this.props.model.main)}
+ {this.props.model.main.children &&
+
-
-
-
-
-
+
diff --git a/public/app/core/components/navbar/navbar.ts b/public/app/core/components/navbar/navbar.ts
index b41ea4a70ef..54f39eaa889 100644
--- a/public/app/core/components/navbar/navbar.ts
+++ b/public/app/core/components/navbar/navbar.ts
@@ -39,10 +39,10 @@ export function pageH1() {
return {
restrict: 'E',
template: `
-
-
- ![]()
- {{model.node.text}}
+
+
+ ![]()
+ {{model.header.text}}
`,
scope: {
diff --git a/public/app/core/components/scroll/scroll.ts b/public/app/core/components/scroll/scroll.ts
index 19e66f40c48..54c84e2df11 100644
--- a/public/app/core/components/scroll/scroll.ts
+++ b/public/app/core/components/scroll/scroll.ts
@@ -8,6 +8,14 @@ export function geminiScrollbar() {
let scrollbar = new PerfectScrollbar(elem[0]);
+ scope.$on('$routeChangeSuccess', () => {
+ elem[0].scrollTop = 0;
+ });
+
+ scope.$on('$routeUpdate', () => {
+ elem[0].scrollTop = 0;
+ });
+
scope.$on('$destroy', () => {
scrollbar.destroy();
});
diff --git a/public/app/core/components/search/search.html b/public/app/core/components/search/search.html
index dff9cc6947a..811e21bc64a 100644
--- a/public/app/core/components/search/search.html
+++ b/public/app/core/components/search/search.html
@@ -15,84 +15,74 @@
ng-blur="ctrl.searchInputBlur()"
/>
-
-
-
+
diff --git a/public/app/core/components/search/search.ts b/public/app/core/components/search/search.ts
index c7ac381c7ce..728b6a3ee18 100644
--- a/public/app/core/components/search/search.ts
+++ b/public/app/core/components/search/search.ts
@@ -9,16 +9,18 @@ export class SearchCtrl {
selectedIndex: number;
results: any;
currentSearchId: number;
- tagsMode: boolean;
showImport: boolean;
dismiss: any;
ignoreClose: any;
isLoading: boolean;
+ initialFolderFilterTitle: string;
/** @ngInject */
constructor($scope, private $location, private $timeout, private searchSrv: SearchSrv, $rootScope) {
$rootScope.onAppEvent('show-dash-search', this.openSearch.bind(this), $scope);
$rootScope.onAppEvent('hide-dash-search', this.closeSearch.bind(this), $scope);
+
+ this.initialFolderFilterTitle = "All";
}
closeSearch() {
@@ -44,14 +46,6 @@ export class SearchCtrl {
this.query.starred = true;
}
- if (payload && payload.tagsMode) {
- return this.$timeout(() => {
- this.ignoreClose = false;
- this.giveSearchFocus = this.giveSearchFocus + 1;
- this.getTags();
- }, 100);
- }
-
this.$timeout(() => {
this.ignoreClose = false;
this.giveSearchFocus = this.giveSearchFocus + 1;
@@ -70,14 +64,6 @@ export class SearchCtrl {
this.moveSelection(-1);
}
if (evt.keyCode === 13) {
- if (this.tagsMode) {
- var tag = this.results[this.selectedIndex];
- if (tag) {
- this.filterByTag(tag.term, null);
- }
- return;
- }
-
var selectedDash = this.results[this.selectedIndex];
if (selectedDash) {
this.$location.search({});
@@ -93,7 +79,6 @@ export class SearchCtrl {
}
searchDashboards() {
- this.tagsMode = false;
this.currentSearchId = this.currentSearchId + 1;
var localSearchId = this.currentSearchId;
@@ -129,12 +114,8 @@ export class SearchCtrl {
getTags() {
return this.searchSrv.getDashboardTags().then((results) => {
- this.tagsMode = !this.tagsMode;
this.results = results;
this.giveSearchFocus = this.giveSearchFocus + 1;
- if ( !this.tagsMode ) {
- this.search();
- }
});
}
diff --git a/public/app/core/components/sidemenu/sidemenu.html b/public/app/core/components/sidemenu/sidemenu.html
index 2869562c5b1..b47b7fc8265 100644
--- a/public/app/core/components/sidemenu/sidemenu.html
+++ b/public/app/core/components/sidemenu/sidemenu.html
@@ -2,6 +2,12 @@
+
+
+
-
-
+
+ No dashboards matching your query were found.
-
-
+ No dashboards matching your query were found.
+
+
+
+ {{::section.title}}
+
+
+
-
+
-
-
- {{::section.title}}
-
-
-
-
-
-
+
+ {{::item.title}}
+
+ {{::item.folderTitle}}
+
+
+
+
+ 
dashboards on Grafana.com
-
+
+
+
+
+ 
+
+
+
+
+
+