From 38609fb9640607d0429aa9861a67554a0b9971fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 27 Dec 2013 23:05:51 +0100 Subject: [PATCH] added more functions, and function categories --- src/app/controllers/graphiteTarget.js | 2 +- src/app/panels/graphite/editor.html | 16 ++-- src/app/panels/graphite/funcEditor.html | 60 +++++++-------- src/app/panels/graphite/module.html | 4 +- src/app/services/graphite/graphiteFuncs.js | 85 ++++++++++++++++++++-- src/css/bootstrap.dark.min.css | 2 +- src/vendor/bootstrap/less/grafana.less | 3 +- 7 files changed, 121 insertions(+), 51 deletions(-) diff --git a/src/app/controllers/graphiteTarget.js b/src/app/controllers/graphiteTarget.js index 747d430c5f1..03f960fd006 100644 --- a/src/app/controllers/graphiteTarget.js +++ b/src/app/controllers/graphiteTarget.js @@ -13,7 +13,7 @@ function (angular, _, config, graphiteFuncs, Parser) { module.controller('GraphiteTargetCtrl', function($scope, $http) { $scope.init = function() { - $scope.funcDefs = graphiteFuncs.getDefList(); + $scope.funcCategories = graphiteFuncs.getCategories(); parseTarget(); }; diff --git a/src/app/panels/graphite/editor.html b/src/app/panels/graphite/editor.html index 64ff63424ec..13dfdde9cfd 100644 --- a/src/app/panels/graphite/editor.html +++ b/src/app/panels/graphite/editor.html @@ -89,7 +89,7 @@ {{func.text}} - diff --git a/src/app/panels/graphite/funcEditor.html b/src/app/panels/graphite/funcEditor.html index 65244ed3d84..802c0ea8b4b 100644 --- a/src/app/panels/graphite/funcEditor.html +++ b/src/app/panels/graphite/funcEditor.html @@ -1,56 +1,52 @@
-
+
- - - - - +
+
+ +
+
+ + ng-options="f for f in param.options"> + +
+
-
diff --git a/src/app/panels/graphite/module.html b/src/app/panels/graphite/module.html index 93209f0e82b..be73f05f249 100644 --- a/src/app/panels/graphite/module.html +++ b/src/app/panels/graphite/module.html @@ -1,9 +1,7 @@
+ ng-class='{"panel-fullscreen": showFullscreen}'>