IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

ux: merge branch navbarv2, new navbar with dashboard search available on all pages, closes #6475

Browse Source
This commit is contained in:
Torkel Ödegaard
2017-06-02 14:00:42 +02:00
parent 1bdf82dca3
commit e9d5e037e8
73 changed files with 929 additions and 550 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/app/features/org/change_password_ctrl.js
View File

@@ -7,11 +7,12 @@ function (angular, config) {
var module = angular.module('grafana.controllers');
module.controller('ChangePasswordCtrl', function($scope, backendSrv, $location) {
module.controller('ChangePasswordCtrl', function($scope, backendSrv, $location, navModelSrv) {
$scope.command = {};
$scope.authProxyEnabled = config.authProxyEnabled;
$scope.ldapEnabled = config.ldapEnabled;
$scope.navModel = navModelSrv.getProfileNav();
$scope.changePassword = function() {
if (!$scope.userForm.$valid) { return; }

3
public/app/features/org/newOrgCtrl.js
View File

@@ -7,8 +7,9 @@ function (angular, config) {
var module = angular.module('grafana.controllers');
module.controller('NewOrgCtrl', function($scope, $http, backendSrv) {
module.controller('NewOrgCtrl', function($scope, $http, backendSrv, navModelSrv) {
$scope.navModel = navModelSrv.getOrgNav(0);
$scope.newOrg = {name: ''};
$scope.createOrg = function() {

3
public/app/features/org/orgApiKeysCtrl.js
View File

@@ -6,8 +6,9 @@ function (angular) {
var module = angular.module('grafana.controllers');
module.controller('OrgApiKeysCtrl', function($scope, $http, backendSrv) {
module.controller('OrgApiKeysCtrl', function($scope, $http, backendSrv, navModelSrv) {
$scope.navModel = navModelSrv.getOrgNav(0);
$scope.roleTypes = ['Viewer', 'Editor', 'Admin'];
$scope.token = { role: 'Viewer' };

3
public/app/features/org/orgDetailsCtrl.js
View File

@@ -6,10 +6,11 @@ function (angular) {
var module = angular.module('grafana.controllers');
module.controller('OrgDetailsCtrl', function($scope, $http, backendSrv, contextSrv) {
module.controller('OrgDetailsCtrl', function($scope, $http, backendSrv, contextSrv, navModelSrv) {
$scope.init = function() {
$scope.getOrgInfo();
$scope.navModel = navModelSrv.getOrgNav(0);
};
$scope.getOrgInfo = function() {

4
public/app/features/org/org_users_ctrl.ts
View File

@@ -11,13 +11,15 @@ export class OrgUsersCtrl {
pendingInvites: any;
editor: any;
showInviteUI: boolean;
navModel: any;
/** @ngInject */
constructor(private $scope, private $http, private backendSrv) {
constructor(private $scope, private $http, private backendSrv, navModelSrv) {
this.user = {
loginOrEmail: '',
role: 'Viewer',
};
this.navModel = navModelSrv.getOrgNav(0);
this.get();
this.editor = { index: 0 };

3
public/app/features/org/partials/change_password.html
View File

@@ -1,5 +1,4 @@
<navbar icon="icon-gf icon-gf-users" title="Profile" title-url="profile">
</navbar>
<navbar model="navModel"></navbar>
<div class="page-container">
<div class="page-header">

3
public/app/features/org/partials/newOrg.html
View File

@@ -1,5 +1,4 @@
<navbar title="Organization" icon="icon-gf icon-gf-users">
</navbar>
<navbar model="navModel"></navbar>
<div class="page-container" ng-form="playlistEditForm">
<div class="page-header">

3
public/app/features/org/partials/orgApiKeys.html
View File

@@ -1,5 +1,4 @@
<navbar icon="icon-gf icon-gf-users" title="Organization" title-url="org">
</navbar>
<navbar model="navModel"></navbar>
<div class="page-container">
<div class="page-header">

3
public/app/features/org/partials/orgDetails.html
View File

@@ -1,5 +1,4 @@
<navbar icon="icon-gf icon-gf-users" title="Organization" title-url="org">
</navbar>
<navbar model="navModel"></navbar>
<div class="page-container">
<div class="page-header">

3
public/app/features/org/partials/orgUsers.html
View File

@@ -1,5 +1,4 @@
<navbar icon="icon-gf icon-gf-users" title="Organization Users" title-url="org/users">
</navbar>
<navbar model="ctrl.navModel"></navbar>
<div class="page-container">
<div class="page-header">

5
public/app/features/org/partials/profile.html
View File

@@ -1,9 +1,8 @@
<navbar icon="icon-gf icon-gf-users" title="Profile" title-url="profile">
</navbar>
<navbar model="ctrl.navModel"></navbar>
<div class="page-container">
<div class="page-header">
<h1>Profile</h1>
<h1>User Profile</h1>
</div>
<form name="ctrl.userForm" class="gf-form-group">

4
public/app/features/org/profile_ctrl.ts
View File

@@ -11,11 +11,13 @@ export class ProfileCtrl {
userForm: any;
showOrgsList = false;
readonlyLoginFields = config.disableLoginForm;
navModel: any;
/** @ngInject **/
constructor(private backendSrv, private contextSrv, private $location) {
constructor(private backendSrv, private contextSrv, private $location, navModelSrv) {
this.getUser();
this.getUserOrgs();
this.navModel = navModelSrv.getProfileNav();
}
getUser() {