diff --git a/public/app/features/all.js b/public/app/features/all.js
index d4436c9deaa..e3c9f92b531 100644
--- a/public/app/features/all.js
+++ b/public/app/features/all.js
@@ -1,5 +1,6 @@
define([
'./panellinks/module',
+ './sidemenu/sidemenu',
'./dashlinks/module',
'./annotations/annotations_srv',
'./templating/templateSrv',
diff --git a/public/app/features/dashboard/timepicker/timepicker.ts b/public/app/features/dashboard/timepicker/timepicker.ts
index c8d319a12f2..59d2e62e7ae 100644
--- a/public/app/features/dashboard/timepicker/timepicker.ts
+++ b/public/app/features/dashboard/timepicker/timepicker.ts
@@ -144,7 +144,6 @@ export class TimePickerCtrl {
}
export function settingsDirective() {
- 'use strict';
return {
restrict: 'E',
templateUrl: 'app/features/dashboard/timepicker/settings.html',
@@ -158,7 +157,6 @@ export function settingsDirective() {
}
export function timePickerDirective() {
- 'use strict';
return {
restrict: 'E',
templateUrl: 'app/features/dashboard/timepicker/timepicker.html',
diff --git a/public/app/features/sidemenu/sidemenu.html b/public/app/features/sidemenu/sidemenu.html
new file mode 100644
index 00000000000..49431683db6
--- /dev/null
+++ b/public/app/features/sidemenu/sidemenu.html
@@ -0,0 +1,66 @@
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
diff --git a/public/app/features/sidemenu/sidemenu.ts b/public/app/features/sidemenu/sidemenu.ts
new file mode 100644
index 00000000000..0d2b32ddf38
--- /dev/null
+++ b/public/app/features/sidemenu/sidemenu.ts
@@ -0,0 +1,146 @@
+///
+
+import config from 'app/core/config';
+import store from 'app/core/store';
+import _ from 'lodash';
+import angular from 'angular';
+import $ from 'jquery';
+
+class SideMenuCtrl {
+ isSignedIn: boolean;
+ showSignout: boolean;
+ user: any;
+ mainLinks: any;
+ orgMenu: any;
+ systemSection: any;
+ grafanaVersion: any;
+ appSubUrl: string;
+
+ constructor(private $scope, private $location, private contextSrv, private backendSrv) {
+ this.isSignedIn = contextSrv.isSignedIn;
+ this.user = contextSrv.user;
+ this.appSubUrl = config.appSubUrl;
+ this.showSignout = this.contextSrv.isSignedIn && !config['authProxyEnabled'];
+ this.updateMenu();
+ this.$scope.$on('$routeChangeSuccess', () => this.updateMenu());
+ }
+
+ getUrl(url) {
+ return config.appSubUrl + url;
+ }
+
+ setupMainNav() {
+ this.mainLinks = config.bootData.mainNavLinks.map(item => {
+ return {text: item.text, icon: item.icon, img: item.img, url: this.getUrl(item.url)};
+ });
+ }
+
+ openUserDropdown() {
+ this.orgMenu = [
+ {section: 'You', cssClass: 'dropdown-menu-title'},
+ {text: 'Profile', url: this.getUrl('/profile')},
+ ];
+
+ if (this.contextSrv.hasRole('Admin')) {
+ this.orgMenu.push({section: this.user.orgName, cssClass: 'dropdown-menu-title'});
+ this.orgMenu.push({
+ text: "Settings",
+ url: this.getUrl("/org"),
+ });
+ this.orgMenu.push({
+ text: "Users",
+ url: this.getUrl("/org/users"),
+ });
+ this.orgMenu.push({
+ text: "API Keys",
+ url: this.getUrl("/org/apikeys"),
+ });
+ }
+
+ this.orgMenu.push({cssClass: "divider"});
+
+ if (config.allowOrgCreate) {
+ this.orgMenu.push({text: "New organization", icon: "fa fa-fw fa-plus", url: this.getUrl('/org/new')});
+ }
+
+ this.backendSrv.get('/api/user/orgs').then(orgs => {
+ orgs.forEach(org => {
+ if (org.orgId === this.contextSrv.user.orgId) {
+ return;
+ }
+
+ this.orgMenu.push({
+ text: "Switch to " + org.name,
+ icon: "fa fa-fw fa-random",
+ click: () => {
+ this.switchOrg(org.orgId);
+ }
+ });
+ });
+
+ this.orgMenu.push({cssClass: "divider"});
+
+ if (this.contextSrv.isGrafanaAdmin) {
+ this.orgMenu.push({text: "Server admin", url: this.getUrl("/admin/settings")});
+ }
+ if (this.isSignedIn) {
+ this.orgMenu.push({text: "Sign out", url: this.getUrl("/logout"), target: "_self"});
+ }
+ });
+ }
+
+ switchOrg(orgId) {
+ this.backendSrv.post('/api/user/using/' + orgId).then(() => {
+ window.location.href = window.location.href;
+ });
+ };
+
+ setupAdminNav() {
+ this.systemSection = true;
+ this.grafanaVersion = config.buildInfo.version;
+
+ this.mainLinks.push({
+ text: "System info",
+ icon: "fa fa-fw fa-info",
+ href: this.getUrl("/admin/settings"),
+ });
+
+ this.mainLinks.push({
+ text: "Global Users",
+ icon: "fa fa-fw fa-user",
+ href: this.getUrl("/admin/users"),
+ });
+
+ this.mainLinks.push({
+ text: "Global Orgs",
+ icon: "fa fa-fw fa-users",
+ href: this.getUrl("/admin/orgs"),
+ });
+ }
+
+ updateMenu() {
+ this.systemSection = false;
+ this.mainLinks = [];
+ this.orgMenu = [];
+
+ var currentPath = this.$location.path();
+ if (currentPath.indexOf('/admin') === 0) {
+ this.setupAdminNav();
+ } else {
+ this.setupMainNav();
+ }
+ };
+}
+
+function sideMenuDirective() {
+ return {
+ restrict: 'E',
+ templateUrl: 'app/features/sidemenu/sidemenu.html',
+ controller: SideMenuCtrl,
+ bindToController: true,
+ controllerAs: 'ctrl',
+ scope: {},
+ };
+}
+
+angular.module('grafana.directives').directive('sidemenu', sideMenuDirective);
diff --git a/public/app/partials/sidemenu.html b/public/app/partials/sidemenu.html
deleted file mode 100644
index 24ec4905d0a..00000000000
--- a/public/app/partials/sidemenu.html
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-