From a06c85e0bd2a3e5657b94a0767e5e56d06365c69 Mon Sep 17 00:00:00 2001
From: jsm-oxa <jeremy.smadja@oxalide.com>
Date: Wed, 12 Jun 2013 12:26:40 +0200
Subject: [PATCH 1/2] add yAxis percent scale

---
 panels/histogram/editor.html | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/panels/histogram/editor.html b/panels/histogram/editor.html
index 53cb0c849fd8f..ce5fd919d0f4a 100644
--- a/panels/histogram/editor.html
+++ b/panels/histogram/editor.html
@@ -65,28 +65,33 @@ <h5>Chart Options</h5>
       <select class="input-mini" ng-model="panel.linewidth" ng-options="f for f in [0,1,2,3,4,5,6,7,8,9,10]"></select>
     </div>
   </div> 
-  <div class="row-fluid">  
+  <div class="row-fluid">
     <div class="span2">
-      <label class="small">Time correction</label> 
+      <label class="small">Time correction</label>
       <select ng-model="panel.timezone" class='input-small' ng-options="f for f in ['browser','utc']"></select>
     </div>
     <div class="span1"> <label class="small">Selectable</label><input type="checkbox" ng-model="panel.interactive" ng-checked="panel.interactive"></div>
-    <div class="span2"> 
+    <div class="span2">
       <label class="small">Zoom Links</label><input type="checkbox" ng-model="panel.zoomlinks" ng-checked="panel.zoomlinks" />
     </div>
-    <div class="span2"> 
-      <label class="small">Auto-interval</label><input type="checkbox" ng-model="panel.auto_int" ng-checked="panel.auto_int" />
+    <div class="span2">
+      <label class="small">yAxis Percent</label><input type="checkbox" ng-model="panel.ypercent" ng-checked="panel.ypercent" />
+    </div>
+  </div>
+  <div class="row-fluid">
+    <div class="span2">
+      <label class="small">xAxis Auto-interval</label><input type="checkbox" ng-model="panel.auto_int" ng-checked="panel.auto_int" />
     </div>
-    <div class="span2" ng-show='panel.auto_int'> 
+    <div class="span2" ng-show='panel.auto_int'>
       <label class="small">Resolution</label><input type="number" class='input-mini' ng-model="panel.resolution" ng-change='set_refresh(true)'/>
     </div>
-    <div class="span3" ng-show='panel.auto_int'> 
+    <div class="span2" ng-show='panel.auto_int'>
       <label class="small">Shoot for this many data points, rounding to sane intervals</label>
     </div>
-    <div class="span2" ng-hide='panel.auto_int'> 
+    <div class="span2" ng-hide='panel.auto_int'>
       <label class="small">Interval</label><input type="text" class='input-mini' ng-model="panel.interval" ng-change='set_refresh(true)'/>
     </div>
-    <div class="span3" ng-hide='panel.auto_int'> 
+    <div class="span2" ng-hide='panel.auto_int'>
       <label class="small">Use Elasticsearch date math format (eg 1m, 5m, 1d, 2w, 1y)</label>
     </div>
   </div>

From fd729d3ea02b702e5b567f59f325069c77f5eb26 Mon Sep 17 00:00:00 2001
From: jsm-oxa <jeremy.smadja@oxalide.com>
Date: Wed, 12 Jun 2013 13:28:05 +0300
Subject: [PATCH 2/2] add yAxis percent scale

---
 panels/histogram/module.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/panels/histogram/module.js b/panels/histogram/module.js
index 8e3ee76c9757d..b2bb7d4c1d787 100644
--- a/panels/histogram/module.js
+++ b/panels/histogram/module.js
@@ -308,7 +308,7 @@ angular.module('kibana.histogram', [])
               yaxis: { 
                 show: scope.panel['y-axis'], 
                 min: 0, 
-                max: scope.panel.percentage && scope.panel.stack ? 100 : null, 
+                max: scope.panel.ypercent ? 100 : (scope.panel.percentage && scope.panel.stack ? 100 : null), 
                 color: "#c8c8c8" 
               },
               xaxis: {
@@ -393,4 +393,4 @@ angular.module('kibana.histogram', [])
       });
     }
   };
-})
\ No newline at end of file
+})