diff --git a/panoramix/assets/html/dashboard.html b/panoramix/assets/html/dashboard.html index 7a3b7d02699..f394e9298b1 100644 --- a/panoramix/assets/html/dashboard.html +++ b/panoramix/assets/html/dashboard.html @@ -2,7 +2,7 @@ {% block head_css %} {{ super() }} - + diff --git a/panoramix/assets/javascripts/dashboard.js b/panoramix/assets/javascripts/dashboard.js index 7e68577f41d..6d57c03e99a 100644 --- a/panoramix/assets/javascripts/dashboard.js +++ b/panoramix/assets/javascripts/dashboard.js @@ -9,7 +9,8 @@ require('brace/mode/css'); require('brace/theme/crimson_editor'); require('select2'); -require('./../node_modules/gridster/dist/jquery.gridster.min.js'); +require('../node_modules/gridster/dist/jquery.gridster.min.js'); +require('../node_modules/gridster/dist/jquery.gridster.min.js'); var dashboard; diff --git a/panoramix/assets/javascripts/explore.js b/panoramix/assets/javascripts/explore.js index 5b679b12604..18080b5365b 100644 --- a/panoramix/assets/javascripts/explore.js +++ b/panoramix/assets/javascripts/explore.js @@ -11,12 +11,13 @@ var d3 = require('d3'); require('bootstrap'); require('jquery-ui'); require('select2'); -require('../vendor/bootstrap-toggle/bootstrap-toggle.min.js'); +require('../node_modules/bootstrap-toggle/js/bootstrap-toggle.min.js'); require('../vendor/select2.sortable.js'); // css require('../vendor/pygments.css'); -require('../vendor/bootstrap-toggle/bootstrap-toggle.min.css'); +require('../node_modules/bootstrap-toggle/css/bootstrap-toggle.min.css'); + function initExploreView() { function druidify(){ diff --git a/panoramix/assets/package.json b/panoramix/assets/package.json index 6596847757e..3ecbe80793e 100644 --- a/panoramix/assets/package.json +++ b/panoramix/assets/package.json @@ -39,6 +39,7 @@ "babel-preset-react": "^6.3.13", "bootstrap": "^3.3.6", "bootstrap-datepicker": "^1.6.0", + "bootstrap-toggle": "^2.2.1", "brace": "^0.7.0", "d3": "^3.5.14", "d3-cloud": "^1.2.1", @@ -53,6 +54,7 @@ "imports-loader": "^0.6.5", "jquery": "^2.2.1", "jquery-ui": "^1.10.5", + "nvd3": "1.8.2", "react": "^0.14.7", "react-bootstrap": "^0.28.3", "react-dom": "^0.14.7", diff --git a/panoramix/assets/vendor/bootstrap-toggle/bootstrap-toggle.min.css b/panoramix/assets/vendor/bootstrap-toggle/bootstrap-toggle.min.css deleted file mode 100644 index 0d42ed09cda..00000000000 --- a/panoramix/assets/vendor/bootstrap-toggle/bootstrap-toggle.min.css +++ /dev/null @@ -1,28 +0,0 @@ -/*! ======================================================================== - * Bootstrap Toggle: bootstrap-toggle.css v2.2.0 - * http://www.bootstraptoggle.com - * ======================================================================== - * Copyright 2014 Min Hur, The New York Times Company - * Licensed under MIT - * ======================================================================== */ -.checkbox label .toggle,.checkbox-inline .toggle{margin-left:-20px;margin-right:5px} -.toggle{position:relative;overflow:hidden} -.toggle input[type=checkbox]{display:none} -.toggle-group{position:absolute;width:200%;top:0;bottom:0;left:0;transition:left .35s;-webkit-transition:left .35s;-moz-user-select:none;-webkit-user-select:none} -.toggle.off .toggle-group{left:-100%} -.toggle-on{position:absolute;top:0;bottom:0;left:0;right:50%;margin:0;border:0;border-radius:0} -.toggle-off{position:absolute;top:0;bottom:0;left:50%;right:0;margin:0;border:0;border-radius:0} -.toggle-handle{position:relative;margin:0 auto;padding-top:0;padding-bottom:0;height:100%;width:0;border-width:0 1px} -.toggle.btn{min-width:59px;min-height:34px} -.toggle-on.btn{padding-right:24px} -.toggle-off.btn{padding-left:24px} -.toggle.btn-lg{min-width:79px;min-height:45px} -.toggle-on.btn-lg{padding-right:31px} -.toggle-off.btn-lg{padding-left:31px} -.toggle-handle.btn-lg{width:40px} -.toggle.btn-sm{min-width:50px;min-height:30px} -.toggle-on.btn-sm{padding-right:20px} -.toggle-off.btn-sm{padding-left:20px} -.toggle.btn-xs{min-width:35px;min-height:22px} -.toggle-on.btn-xs{padding-right:12px} -.toggle-off.btn-xs{padding-left:12px} \ No newline at end of file diff --git a/panoramix/assets/vendor/bootstrap-toggle/bootstrap-toggle.min.js b/panoramix/assets/vendor/bootstrap-toggle/bootstrap-toggle.min.js deleted file mode 100644 index 37113200bff..00000000000 --- a/panoramix/assets/vendor/bootstrap-toggle/bootstrap-toggle.min.js +++ /dev/null @@ -1,9 +0,0 @@ -/*! ======================================================================== - * Bootstrap Toggle: bootstrap-toggle.js v2.2.0 - * http://www.bootstraptoggle.com - * ======================================================================== - * Copyright 2014 Min Hur, The New York Times Company - * Licensed under MIT - * ======================================================================== */ -+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.toggle"),f="object"==typeof b&&b;e||d.data("bs.toggle",e=new c(this,f)),"string"==typeof b&&e[b]&&e[b]()})}var c=function(b,c){this.$element=a(b),this.options=a.extend({},this.defaults(),c),this.render()};c.VERSION="2.2.0",c.DEFAULTS={on:"On",off:"Off",onstyle:"primary",offstyle:"default",size:"normal",style:"",width:null,height:null},c.prototype.defaults=function(){return{on:this.$element.attr("data-on")||c.DEFAULTS.on,off:this.$element.attr("data-off")||c.DEFAULTS.off,onstyle:this.$element.attr("data-onstyle")||c.DEFAULTS.onstyle,offstyle:this.$element.attr("data-offstyle")||c.DEFAULTS.offstyle,size:this.$element.attr("data-size")||c.DEFAULTS.size,style:this.$element.attr("data-style")||c.DEFAULTS.style,width:this.$element.attr("data-width")||c.DEFAULTS.width,height:this.$element.attr("data-height")||c.DEFAULTS.height}},c.prototype.render=function(){this._onstyle="btn-"+this.options.onstyle,this._offstyle="btn-"+this.options.offstyle;var b="large"===this.options.size?"btn-lg":"small"===this.options.size?"btn-sm":"mini"===this.options.size?"btn-xs":"",c=a('