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 @@
- + Remove - | - - Disable - - | + |  Help - | + |  Close
-
+
- - - - - +
+
+ +
+
+ + 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}'>