From 3a27b610d5f2146169ce17e3469d80a8953b331b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Mon, 12 Jan 2015 13:42:16 +0100
Subject: [PATCH] Added all unit formats to new unit selector, #1331

---
 src/app/components/kbn.js            | 19 ++++++++++++++++++-
 src/app/panels/graph/axisEditor.html |  6 +++---
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/app/components/kbn.js b/src/app/components/kbn.js
index 2885d3806b3..80a2b976f6e 100644
--- a/src/app/components/kbn.js
+++ b/src/app/components/kbn.js
@@ -492,6 +492,7 @@ function($, _, moment) {
         submenu: [
           {text: 'none' , value: 'none'},
           {text: 'short', value: 'short'},
+          {text: 'percent', value: 'percent'},
         ]
       },
       {
@@ -500,16 +501,32 @@ function($, _, moment) {
           {text: 'nanoseconds (ns)' , value: 'ns'},
           {text: 'microseconds (µs)', value: 'µs'},
           {text: 'milliseconds (ms)', value: 'ms'},
+          {text: 'seconds (s)', value: 's'},
         ]
       },
       {
         text: 'data',
         submenu: [
-          {text: 'bit', value: 'bit'},
+          {text: 'bits', value: 'bits'},
           {text: 'bytes', value: 'bytes'},
           {text: 'kilobytes', value: 'kbytes'},
         ]
       },
+      {
+        text: 'data rate',
+        submenu: [
+          {text: 'bits/sec', value: 'bps'},
+          {text: 'bytes/sec', value: 'Bps'},
+        ]
+      },
+      {
+        text: 'energy',
+        submenu: [
+          {text: 'watt', value: 'watt'},
+          {text: 'joule', value: 'joule'},
+          {text: 'eV', value: 'ev'},
+        ]
+      },
     ];
   };
 
diff --git a/src/app/panels/graph/axisEditor.html b/src/app/panels/graph/axisEditor.html
index e9ac2e5a325..90e3f5c9a68 100644
--- a/src/app/panels/graph/axisEditor.html
+++ b/src/app/panels/graph/axisEditor.html
@@ -10,7 +10,7 @@
 					<li class="grafana-target-segment">
 						Unit
 					</li>
-					<li class="dropdown" style="width: 150px;"
+					<li class="dropdown" style="width: 140px;"
 						ng-model="panel.y_formats[0]"
 						dropdown-typeahead="unitFormats"
 						dropdown-typeahead-on-select="setUnitFormat(0, $subItem)">
@@ -47,7 +47,7 @@
 					<li class="grafana-target-segment">
 						Unit
 					</li>
-					<li class="dropdown" style="width: 150px"
+					<li class="dropdown" style="width: 140px"
 						ng-model="panel.y_formats[1]"
 						dropdown-typeahead="unitFormats"
 						dropdown-typeahead-on-select="setUnitFormat(1, $subItem)">
@@ -104,7 +104,7 @@
 					<input type="text" class="input-small grafana-target-segment-input">
 				</li>
 				<li class="grafana-target-segment">
-					<spectrum-picker ng-model="panel.grid.threshold1Color" ng-change="render()" ></spectrum-picker>
+					<spectrum-picker ng-model="panel.grid.threshold2Color" ng-change="render()" ></spectrum-picker>
 				</li>
 				<li class="grafana-target-segment">
 					Line mode