From a0cee3530921a613f3891ed41c676a35d3896cf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Wed, 8 Jan 2014 07:42:17 +0100
Subject: [PATCH] small fixes

---
 src/app/components/require.config.js   | 2 +-
 src/app/dashboards/blank.json          | 3 ++-
 src/app/panels/graphite/module.html    | 2 +-
 src/app/services/graphite/gfunc.js     | 7 +++++++
 src/vendor/bootstrap/less/grafana.less | 2 +-
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/app/components/require.config.js b/src/app/components/require.config.js
index 324ef48d6df..15bc2b297bd 100644
--- a/src/app/components/require.config.js
+++ b/src/app/components/require.config.js
@@ -5,7 +5,7 @@ require.config({
   baseUrl: 'app',
   // urlArgs: 'r=@REV@',
   paths: {
-    config:                   '../config.dev',
+    config:                   '../config',
     settings:                 'components/settings',
     kbn:                      'components/kbn',
 
diff --git a/src/app/dashboards/blank.json b/src/app/dashboards/blank.json
index 41e29ce04b3..aebc2bf751d 100644
--- a/src/app/dashboards/blank.json
+++ b/src/app/dashboards/blank.json
@@ -11,5 +11,6 @@
   },
   "rows": [],
   "editable": true,
-  "failover": false
+  "failover": false,
+  "panel_hints": true
 }
\ No newline at end of file
diff --git a/src/app/panels/graphite/module.html b/src/app/panels/graphite/module.html
index 92aa7e2bafc..4dd9c61bf04 100644
--- a/src/app/panels/graphite/module.html
+++ b/src/app/panels/graphite/module.html
@@ -1,7 +1,7 @@
 <div  ng-controller='graphite'
       ng-init="init()"
       style="min-height:{{panel.height || row.height}}"
-      ng-class='{"panel-fullscreen": fullscreen}'>
+      ng-class="{'panel-fullscreen': fullscreen}">
 
   <style>
     .histogram-legend {
diff --git a/src/app/services/graphite/gfunc.js b/src/app/services/graphite/gfunc.js
index b76078ef233..bcfc2c7bba8 100644
--- a/src/app/services/graphite/gfunc.js
+++ b/src/app/services/graphite/gfunc.js
@@ -117,6 +117,13 @@ function (_) {
     defaultParams: ['1d']
   });
 
+  addFuncDef({
+    name: 'summarize',
+    category: categories.Transform,
+    params: [ { name: "interval", type: "string" }],
+    defaultParams: ['1h']
+  });
+
   _.each(categories, function(funcList, catName) {
     categories[catName] = _.sortBy(funcList, 'name');
   });
diff --git a/src/vendor/bootstrap/less/grafana.less b/src/vendor/bootstrap/less/grafana.less
index 1d9db6b72d9..e6f1367d2d8 100644
--- a/src/vendor/bootstrap/less/grafana.less
+++ b/src/vendor/bootstrap/less/grafana.less
@@ -122,7 +122,7 @@
 
 .panel-fullscreen {
   z-index: 1500;
-  display: block important;
+  display: block !important;
   position: fixed;
   left: 0px;
   right: 0px;