From a7a8ea307718dd9ca1c855e1bb64c8a8847b44a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Wed, 28 Jan 2015 11:39:22 +0100
Subject: [PATCH] added admin settings view

---
 src/app/features/admin/adminSettingsCtrl.js   | 18 ++++++++++++++++++
 src/app/features/admin/partials/settings.html | 11 +++++++++++
 src/app/features/all.js                       |  1 +
 src/app/routes/backend/all.js                 |  4 ++++
 4 files changed, 34 insertions(+)
 create mode 100644 src/app/features/admin/adminSettingsCtrl.js
 create mode 100644 src/app/features/admin/partials/settings.html

diff --git a/src/app/features/admin/adminSettingsCtrl.js b/src/app/features/admin/adminSettingsCtrl.js
new file mode 100644
index 00000000000..736e5ce55d2
--- /dev/null
+++ b/src/app/features/admin/adminSettingsCtrl.js
@@ -0,0 +1,18 @@
+define([
+  'angular',
+],
+function (angular) {
+  'use strict';
+
+  var module = angular.module('grafana.controllers');
+
+  module.controller('AdminSettingsCtrl', function($scope) {
+
+    $scope.init = function() {
+
+    };
+
+    $scope.init();
+
+  });
+});
diff --git a/src/app/features/admin/partials/settings.html b/src/app/features/admin/partials/settings.html
new file mode 100644
index 00000000000..bea1f5fd4c7
--- /dev/null
+++ b/src/app/features/admin/partials/settings.html
@@ -0,0 +1,11 @@
+<div ng-include="'app/partials/navbar.html'" ng-init="pageTitle='Admin > Settings'"></div>
+
+<div class="dashboard-edit-view" style="min-height: 500px">
+	<div class="dashboard-editor-body">
+		<div class="editor-row row">
+			<div class="section span6">
+
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/src/app/features/all.js b/src/app/features/all.js
index de8e1ac3a32..263c3acecb8 100644
--- a/src/app/features/all.js
+++ b/src/app/features/all.js
@@ -14,5 +14,6 @@ define([
   './account/importCtrl',
   './account/accountCtrl',
   './admin/adminUsersCtrl',
+  './admin/adminSettingsCtrl',
   './grafanaDatasource/datasource',
 ], function () {});
diff --git a/src/app/routes/backend/all.js b/src/app/routes/backend/all.js
index f97ca90ba04..be10fbbdfe6 100644
--- a/src/app/routes/backend/all.js
+++ b/src/app/routes/backend/all.js
@@ -54,6 +54,10 @@ define([
         templateUrl: 'app/features/profile/partials/profile.html',
         controller : 'ProfileCtrl',
       })
+      .when('/admin/settings', {
+        templateUrl: 'app/features/admin/partials/settings.html',
+        controller : 'AdminSettingsCtrl',
+      })
       .when('/admin/users', {
         templateUrl: 'app/features/admin/partials/users.html',
         controller : 'AdminUsersCtrl',