date:20160620

[3/9] incubator-airflow git commit: [AIRFLOW-6] Remove dependency on Highcharts

2016-06-20 Thread bolke

http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/0a460081/airflow/www/static/nv.d3.css
--
diff --git a/airflow/www/static/nv.d3.css b/airflow/www/static/nv.d3.css
new file mode 100644
index 000..cae8348
--- /dev/null
+++ b/airflow/www/static/nv.d3.css
@@ -0,0 +1,769 @@
+
+/
+ * HTML CSS
+ */
+
+
+.chartWrap {
+  margin: 0;
+  padding: 0;
+  overflow: hidden;
+}
+
+/
+  Box shadow and border radius styling
+*/
+.nvtooltip.with-3d-shadow, .with-3d-shadow .nvtooltip {
+  -moz-box-shadow: 0 5px 10px rgba(0,0,0,.2);
+  -webkit-box-shadow: 0 5px 10px rgba(0,0,0,.2);
+  box-shadow: 0 5px 10px rgba(0,0,0,.2);
+
+  -webkit-border-radius: 6px;
+  -moz-border-radius: 6px;
+  border-radius: 6px;
+}
+
+/
+ * TOOLTIP CSS
+ */
+
+.nvtooltip {
+  position: absolute;
+  background-color: rgba(255,255,255,1.0);
+  padding: 1px;
+  border: 1px solid rgba(0,0,0,.2);
+  z-index: 1;
+
+  font-family: Arial;
+  font-size: 13px;
+  text-align: left;
+  pointer-events: none;
+
+  white-space: nowrap;
+
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+
+/*Give tooltips that old fade in transition by
+putting a "with-transitions" class on the container div.
+*/
+.nvtooltip.with-transitions, .with-transitions .nvtooltip {
+  transition: opacity 250ms linear;
+  -moz-transition: opacity 250ms linear;
+  -webkit-transition: opacity 250ms linear;
+
+  transition-delay: 250ms;
+  -moz-transition-delay: 250ms;
+  -webkit-transition-delay: 250ms;
+}
+
+.nvtooltip.x-nvtooltip,
+.nvtooltip.y-nvtooltip {
+  padding: 8px;
+}
+
+.nvtooltip h3 {
+  margin: 0;
+  padding: 4px 14px;
+  line-height: 18px;
+  font-weight: normal;
+  background-color: rgba(247,247,247,0.75);
+  text-align: center;
+
+  border-bottom: 1px solid #ebebeb;
+
+  -webkit-border-radius: 5px 5px 0 0;
+  -moz-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+
+.nvtooltip p {
+  margin: 0;
+  padding: 5px 14px;
+  text-align: center;
+}
+
+.nvtooltip span {
+  display: inline-block;
+  margin: 2px 0;
+}
+
+.nvtooltip table {
+  margin: 6px;
+  border-spacing:0;
+}
+
+
+.nvtooltip table td {
+  padding: 2px 9px 2px 0;
+  vertical-align: middle;
+}
+
+.nvtooltip table td.key {
+  font-weight:normal;
+}
+.nvtooltip table td.value {
+  text-align: right;
+  font-weight: bold;
+}
+
+.nvtooltip table tr.highlight td {
+  padding: 1px 9px 1px 0;
+  border-bottom-style: solid;
+  border-bottom-width: 1px;
+  border-top-style: solid;
+  border-top-width: 1px;
+}
+
+.nvtooltip table td.legend-color-guide div {
+  width: 8px;
+  height: 8px;
+  vertical-align: middle;
+}
+
+.nvtooltip .footer {
+  padding: 3px;
+  text-align: center;
+}
+
+
+.nvtooltip-pending-removal {
+  position: absolute;
+  pointer-events: none;
+}
+
+
+/
+ * SVG CSS
+ */
+
+
+svg {
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+  /* Trying to get SVG to act like a greedy block in all browsers */
+  display: block;
+  width:100%;
+  height:100%;
+}
+
+
+svg text {
+  font: normal 12px Arial;
+}
+
+svg .title {
+ font: bold 14px Arial;
+}
+
+.nvd3 .nv-background {
+  fill: white;
+  fill-opacity: 0;
+  /*
+  pointer-events: none;
+  */
+}
+
+.nvd3.nv-noData {
+  font-size: 18px;
+  font-weight: bold;
+}
+
+
+/**
+*  Brush
+*/
+
+.nv-brush .extent {
+  fill-opacity: .125;
+  shape-rendering: crispEdges;
+}
+
+
+
+/**
+*  Legend
+*/
+
+.nvd3 .nv-legend .nv-series {
+  cursor: pointer;
+}
+
+.nvd3 .nv-legend .disabled circle {
+  fill-opacity: 0;
+}
+
+
+
+/**
+*  Axes
+*/
+.nvd3 .nv-axis {
+  pointer-events:none;
+}
+
+.nvd3 .nv-axis path {
+  fill: none;
+  stroke: #000;
+  stroke-opacity: .75;
+  shape-rendering: crispEdges;
+}
+
+.nvd3 .nv-axis path.domain {
+  stroke-opacity: .75;
+}
+
+.nvd3 .nv-axis.nv-x path.domain {
+  stroke-opacity: 0;
+}
+
+.nvd3 .nv-axis line {
+  fill: none;
+  stroke: #e5e5e5;
+  shape-rendering: crispEdges;
+}
+
+.nvd3 .nv-axis .zero line,
+/*this selector may not be necessary*/ .nvd3 .nv-axis line.zero {
+  stroke-opacity: .75;
+}
+
+.nvd3 .nv-axis .nv-axisMaxMin text {
+  font-weight: bold;
+}
+
+.nvd3 .x  .nv-axis .nv-axisMaxMin text,
+.nvd3 .x2 .nv-axis .nv-axisMaxMin text,
+.nvd3 .x3 .nv-axis .nv-axisMaxMin text {
+  text-anchor: middle
+}
+
+
+
+/**
+*  Brush
+*/
+
+.nv-brush .resize path {
+  fill: #eee;
+  stroke: #666;
+}
+
+
+
+/**
+*  Bars
+*/
+
+.nvd3 .nv-bars .negative rect {
+zfill: brown;
+}
+
+.nvd3 .nv-bars rect {
+  zfill: steelblue;
+  fill-opacity: .75;
+
+  transition: fill-opacity 250ms linear;
+  -moz-transition: fill-opacity 250ms linear;
+  -webkit-transition: fill-opacity 250ms linear;
+}
+
+.nvd3

[6/9] incubator-airflow git commit: [AIRFLOW-6] Remove dependency on Highcharts

2016-06-20 Thread bolke

http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/0a460081/airflow/www/static/d3.v3.min.js
--
diff --git a/airflow/www/static/d3.v3.min.js b/airflow/www/static/d3.v3.min.js
index 88550ae..77615c0 100644
--- a/airflow/www/static/d3.v3.min.js
+++ b/airflow/www/static/d3.v3.min.js
@@ -1,5 +1,5 @@
-!function(){function n(n,t){return t>n?-1:n>t?1:n>=t?0:0/0}function 
t(n){return null!=n&&!isNaN(n)}function 
e(n){return{left:function(t,e,r,u){for(arguments.length<3&&(r=0),arguments.length<4&&(u=t.length);u>r;){var
 i=r+u>>>1;n(t[i],e)<0?r=i+1:u=i}return 
r},right:function(t,e,r,u){for(arguments.length<3&&(r=0),arguments.length<4&&(u=t.length);u>r;){var
 i=r+u>>>1;n(t[i],e)>0?u=i:r=i+1}return r}}}function r(n){return 
n.length}function u(n){for(var t=1;n*t%1;)t*=10;return t}function 
i(n,t){try{for(var e in 
t)Object.defineProperty(n.prototype,e,{value:t[e],enumerable:!1})}catch(r){n.prototype=t}}function
 o(){}function a(n){return ia+n in this}function c(n){return n=ia+n,n in 
this& this[n]}function s(){var n=[];return 
this.forEach(function(t){n.push(t)}),n}function l(){var n=0;for(var t in 
this)t.charCodeAt(0)===oa&&++n;return n}function f(){for(var n in 
this)if(n.charCodeAt(0)===oa)return!1;return!0}function h(){}function 
g(n,t,e){return function(){var r=e.apply(t,arguments);retu
 rn r===t?n:r}}function p(n,t){if(t in n)return 
t;t=t.charAt(0).toUpperCase()+t.substring(1);for(var 
e=0,r=aa.length;r>e;++e){var u=aa[e]+t;if(u in n)return u}}function 
v(){}function d(){}function m(n){function t(){for(var 
t,r=e,u=-1,i=r.length;++ue;e++)for(var 
u,i=n[e],o=0,a=i.length;a>o;o++)(u=i[o])&(u,o,e);return n}function 
U(n){return sa(n,da),n}function j(n){var t,e;return function(r,u,i){var 
o,a=n[i].update,c=a.length;for(i!=e&&(e=i,t=0),u>=t&&(t=u+1);!(o=a[t])&&++t

[9/9] incubator-airflow git commit: Merge branch 'highcharts_to_d3'

2016-06-20 Thread bolke

Merge branch 'highcharts_to_d3'


Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/004272b1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/004272b1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/004272b1

Branch: refs/heads/master
Commit: 004272b1513bedc5e399e439b9391b73a9b86268
Parents: 7c0f837 0a46008
Author: Bolke de Bruin 
Authored: Mon Jun 20 15:37:10 2016 +0200
Committer: Bolke de Bruin 
Committed: Mon Jun 20 15:37:10 2016 +0200

--
 `|  2347 
 airflow/bin/airflow  |13 +
 airflow/executors/base_executor.py   |14 +
 airflow/executors/celery_executor.py |14 +
 airflow/hooks/__init__.py| 2 +-
 airflow/hooks/dbapi_hook.py  | 1 -
 airflow/hooks/jdbc_hook.py   | 3 +-
 airflow/hooks/oracle_hook.py | 1 +
 airflow/www/app.py   | 4 +-
 airflow/www/blueprints.py| 6 -
 airflow/www/static/d3.tip.v0.6.3.js  |   280 +
 airflow/www/static/d3.v3.min.js  |10 +-
 airflow/www/static/gantt-chart-d3v2.js   |   247 +
 airflow/www/static/gantt.css |38 +
 airflow/www/static/highcharts-more.js|53 -
 airflow/www/static/highcharts.js |   308 -
 airflow/www/static/nv.d3.css |   769 ++
 airflow/www/static/nv.d3.js  | 14241 
 airflow/www/static/nvd3.tar.gz   |   Bin 0 -> 328377 bytes
 airflow/www/templates/airflow/chart.html |37 +-
 airflow/www/templates/airflow/dag.html   | 4 +-
 airflow/www/templates/airflow/gantt.html |86 +-
 airflow/www/templates/airflow/highchart.html |   183 -
 airflow/www/templates/airflow/nvd3.html  |   175 +
 airflow/www/utils.py |11 +-
 airflow/www/views.py |   352 +-
 setup.py |23 +-
 tests/core.py|19 -
 28 files changed, 18315 insertions(+), 926 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/004272b1/tests/core.py
--

[1/9] incubator-airflow git commit: [AIRFLOW-6] Remove dependency on Highcharts

2016-06-20 Thread bolke

Repository: incubator-airflow
Updated Branches:
  refs/heads/master 7c0f8373f -> 004272b15


http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/0a460081/airflow/www/templates/airflow/chart.html
--
diff --git a/airflow/www/templates/airflow/chart.html 
b/airflow/www/templates/airflow/chart.html
index 1901af5..91b8be1 100644
--- a/airflow/www/templates/airflow/chart.html
+++ b/airflow/www/templates/airflow/chart.html
@@ -21,54 +21,21 @@
 
 
 
-
+{{ chart |safe }}
 
 {% endblock %}
 
 {% block tail %}
 {{ super() }}
-
-
-
 
   // We blur task_ids in demo mode
 $( document ).ready(function() {
-  if ("{{ demo_mode }}" == "True") {
-  d3.select("svg")
-.append("filter")
-.attr("id", "blur-effect-1")
-.append("feGaussianBlur")
-.attr("stdDeviation", 3);
-  d3.selectAll("g.highcharts-legend-item text").style("filter", 
"url(#blur-effect-1)");
-  }
-  $('#uncheck').click(function(){
-  chart = Highcharts.charts[0];
-  $(chart.series).each(function(){
-  this.setVisible(false, false);
-  });
-  chart.redraw();
-  });
-  $('#check').click(function(){
-  chart = Highcharts.charts[0];
-  $(chart.series).each(function(){
-  this.setVisible(true, false);
-  });
-  chart.redraw();
-  });
 });
 
 
-
-  {% line_chart data with height=height library=chart_options%}
-  
-Hide all series
-Show all series
-  
-
+
 
-
   
-  
 
 {% endblock %}

http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/0a460081/airflow/www/templates/airflow/dag.html
--
diff --git a/airflow/www/templates/airflow/dag.html 
b/airflow/www/templates/airflow/dag.html
index 22b312e..89ce2d6 100644
--- a/airflow/www/templates/airflow/dag.html
+++ b/airflow/www/templates/airflow/dag.html
@@ -4,8 +4,8 @@
 {% block title %}Airflow - DAG {{ dag.dag_id }}{% endblock %}
 
 {% block head_css %}
-  {{ super() }}
   {{ lib.form_css() }}
+  {{ super() }}
 {% endblock %}
 
 {% block body %}
@@ -186,8 +186,8 @@