From 4d241eb79a2003f3b719d0504de1ec2bd753ce97 Mon Sep 17 00:00:00 2001 From: Aysam Guerler Date: Fri, 30 May 2014 21:42:28 -0400 Subject: [PATCH] Updated UI elements and styles, added zoomable charts --- .../visualizations/charts/static/app.css | 27 + .../visualizations/charts/static/app.js | 16 + .../visualizations/charts/static/build-app.js | 2 +- .../charts/static/charts/heatmap/config.js | 195 ----- .../charts/heatmap/heatmap-parameters.js | 52 -- .../static/charts/heatmap/heatmap-plugin.js | 740 ------------------ .../charts/static/charts/heatmap/wrapper.js | 86 -- .../static/charts/highcharts/bar/config.js | 20 + .../{nvd3_bar => highcharts/bar}/logo.png | Bin .../static/charts/highcharts/bar/wrapper.js | 21 + .../highcharts/bar_horizontal/config.js | 24 + .../bar_horizontal}/logo.png | Bin .../highcharts/bar_horizontal/wrapper.js | 25 + .../bar_horizontal_stacked/config.js | 24 + .../bar_horizontal_stacked}/logo.png | Bin .../bar_horizontal_stacked/wrapper.js | 26 + .../charts/highcharts/bar_stacked/config.js | 19 + .../bar_stacked}/logo.png | Bin .../charts/highcharts/bar_stacked/wrapper.js | 26 + .../boxplot}/config.js | 7 +- .../boxplot}/logo.png | Bin .../boxplot}/wrapper.js | 61 +- .../static/charts/highcharts/common/config.js | 216 +++++ .../highcharts/common/highcharts-config.js | 114 +++ .../charts/highcharts/common/wrapper.js | 97 +++ .../charts/highcharts/heatmap/config.js | 24 + .../charts/{ => highcharts}/heatmap/logo.png | Bin .../charts/highcharts/heatmap/wrapper.js | 26 + .../charts/highcharts/histogram/config.js | 29 + .../histogram}/logo.png | Bin .../charts/highcharts/histogram/wrapper.js | 34 + .../highcharts/histogram_discrete/config.js | 29 + .../histogram_discrete}/logo.png | Bin .../highcharts/histogram_discrete/wrapper.js | 49 ++ .../static/charts/highcharts/line/config.js | 20 + .../{nvd3_line => highcharts/line}/logo.png | Bin .../static/charts/highcharts/line/wrapper.js | 25 + .../static/charts/highcharts/pie/config.js | 115 +++ .../{nvd3_pie => highcharts/pie}/logo.png | Bin .../static/charts/highcharts/pie/wrapper.js | 22 + .../charts/highcharts/scatter/config.js | 18 + .../scatter}/logo.png | Bin .../charts/highcharts/scatter/wrapper.js | 22 + .../charts/highcharts/stackedarea/config.js | 20 + .../stackedarea}/logo.png | Bin .../charts/highcharts/stackedarea/wrapper.js | 25 + .../charts/static/charts/nvd3/bar/config.js | 19 + .../charts/static/charts/nvd3/bar/logo.png | Bin 0 -> 7073 bytes .../charts/{nvd3_bar => nvd3/bar}/wrapper.js | 2 +- .../bar_horizontal}/config.js | 11 +- .../charts/nvd3/bar_horizontal/logo.png | Bin 0 -> 6020 bytes .../bar_horizontal}/wrapper.js | 2 +- .../bar_horizontal_stacked}/config.js | 5 +- .../nvd3/bar_horizontal_stacked/logo.png | Bin 0 -> 5294 bytes .../bar_horizontal_stacked}/wrapper.js | 2 +- .../bar_stacked}/config.js | 5 +- .../static/charts/nvd3/bar_stacked/logo.png | Bin 0 -> 6061 bytes .../bar_stacked}/wrapper.js | 2 +- .../static/charts/nvd3/{ => common}/config.js | 0 .../nvd3/{nvd3.js => common/wrapper.js} | 0 .../histogram}/config.js | 5 +- .../static/charts/nvd3/histogram/logo.png | Bin 0 -> 7073 bytes .../histogram}/wrapper.js | 2 +- .../histogram_discrete}/config.js | 2 +- .../charts/nvd3/histogram_discrete/logo.png | Bin 0 -> 7073 bytes .../histogram_discrete}/wrapper.js | 2 +- .../charts/{nvd3_line => nvd3/line}/config.js | 5 +- .../charts/static/charts/nvd3/line/logo.png | Bin 0 -> 8401 bytes .../{nvd3_line => nvd3/line}/wrapper.js | 2 +- .../line_focus}/config.js | 5 +- .../line_focus}/logo.png | Bin .../line_focus}/wrapper.js | 2 +- .../charts/{nvd3_pie => nvd3/pie}/config.js | 9 +- .../charts/static/charts/nvd3/pie/logo.png | Bin 0 -> 9448 bytes .../charts/{nvd3_pie => nvd3/pie}/wrapper.js | 0 .../static/charts/nvd3/scatter/config.js | 18 + .../static/charts/nvd3/scatter/logo.png | Bin 0 -> 5379 bytes .../{nvd3_scatter => nvd3/scatter}/wrapper.js | 2 +- .../stackedarea}/config.js | 5 +- .../stackedarea}/logo.png | Bin .../stackedarea}/wrapper.js | 2 +- .../stackedarea_full}/config.js | 5 +- .../charts/nvd3/stackedarea_full/logo.png | Bin 0 -> 6378 bytes .../stackedarea_full}/wrapper.js | 2 +- .../stackedarea_stream}/config.js | 5 +- .../stackedarea_stream}/logo.png | Bin .../stackedarea_stream}/wrapper.js | 2 +- .../charts/static/charts/nvd3_bar/config.js | 18 - .../static/charts/nvd3_scatter/config.js | 16 - .../charts/static/charts/types.js | 80 +- .../charts/static/library/deferred.js | 4 +- .../charts/static/library/storage.js | 19 + .../charts/static/library/ui-select.js | 2 +- .../charts/static/library/ui.js | 253 +++--- .../charts/static/models/chart.js | 1 + .../charts/static/models/config.js | 4 +- .../plugins/highcharts/highcharts-more.js | 90 +-- .../static/plugins/highcharts/highcharts.js | 592 +++++++------- .../charts/static/views/editor.js | 3 - .../charts/static/views/group.js | 58 +- .../charts/static/views/settings.js | 4 +- .../charts/static/views/types.js | 5 +- .../charts/static/views/viewer.js | 1 + .../charts/static/views/viewport.js | 4 +- static/scripts/mvc/ui/ui-popover.js | 2 +- static/scripts/mvc/ui/ui-portlet.js | 50 +- static/scripts/mvc/upload/upload-ftp.js | 2 +- static/scripts/packed/mvc/data.js | 2 +- static/scripts/packed/mvc/dataset/hda-base.js | 2 +- static/scripts/packed/mvc/ui/ui-frames.js | 2 +- static/scripts/packed/mvc/ui/ui-popover.js | 2 +- static/scripts/packed/mvc/ui/ui-portlet.js | 2 +- .../scripts/packed/mvc/upload/upload-ftp.js | 2 +- static/scripts/packed/viz/visualization.js | 2 +- static/style/blue/base.css | 18 +- static/style/src/less/ui.less | 67 +- 116 files changed, 1905 insertions(+), 1781 deletions(-) delete mode 100644 config/plugins/visualizations/charts/static/charts/heatmap/config.js delete mode 100644 config/plugins/visualizations/charts/static/charts/heatmap/heatmap-parameters.js delete mode 100644 config/plugins/visualizations/charts/static/charts/heatmap/heatmap-plugin.js delete mode 100644 config/plugins/visualizations/charts/static/charts/heatmap/wrapper.js create mode 100644 config/plugins/visualizations/charts/static/charts/highcharts/bar/config.js rename config/plugins/visualizations/charts/static/charts/{nvd3_bar => highcharts/bar}/logo.png (100%) create mode 100644 config/plugins/visualizations/charts/static/charts/highcharts/bar/wrapper.js create mode 100644 config/plugins/visualizations/charts/static/charts/highcharts/bar_horizontal/config.js rename config/plugins/visualizations/charts/static/charts/{nvd3_bar_horizontal => highcharts/bar_horizontal}/logo.png (100%) create mode 100644 config/plugins/visualizations/charts/static/charts/highcharts/bar_horizontal/wrapper.js create mode 100644 config/plugins/visualizations/charts/static/charts/highcharts/bar_horizontal_stacked/config.js rename config/plugins/visualizations/charts/static/charts/{nvd3_bar_horizontal_stacked => highcharts/bar_horizontal_stacked}/logo.png (100%) create mode 100644 config/plugins/visualizations/charts/static/charts/highcharts/bar_horizontal_stacked/wrapper.js create mode 100644 config/plugins/visualizations/charts/static/charts/highcharts/bar_stacked/config.js rename config/plugins/visualizations/charts/static/charts/{nvd3_bar_stacked => highcharts/bar_stacked}/logo.png (100%) create mode 100644 config/plugins/visualizations/charts/static/charts/highcharts/bar_stacked/wrapper.js rename config/plugins/visualizations/charts/static/charts/{highcharts_boxplot => highcharts/boxplot}/config.js (90%) rename config/plugins/visualizations/charts/static/charts/{highcharts_boxplot => highcharts/boxplot}/logo.png (100%) rename config/plugins/visualizations/charts/static/charts/{highcharts_boxplot => highcharts/boxplot}/wrapper.js (64%) create mode 100644 config/plugins/visualizations/charts/static/charts/highcharts/common/config.js create mode 100644 config/plugins/visualizations/charts/static/charts/highcharts/common/highcharts-config.js create mode 100644 config/plugins/visualizations/charts/static/charts/highcharts/common/wrapper.js create mode 100644 config/plugins/visualizations/charts/static/charts/highcharts/heatmap/config.js rename config/plugins/visualizations/charts/static/charts/{ => highcharts}/heatmap/logo.png (100%) create mode 100644 config/plugins/visualizations/charts/static/charts/highcharts/heatmap/wrapper.js create mode 100644 config/plugins/visualizations/charts/static/charts/highcharts/histogram/config.js rename config/plugins/visualizations/charts/static/charts/{nvd3_histogram => highcharts/histogram}/logo.png (100%) create mode 100644 config/plugins/visualizations/charts/static/charts/highcharts/histogram/wrapper.js create mode 100644 config/plugins/visualizations/charts/static/charts/highcharts/histogram_discrete/config.js rename config/plugins/visualizations/charts/static/charts/{nvd3_histogram_discrete => highcharts/histogram_discrete}/logo.png (100%) create mode 100644 config/plugins/visualizations/charts/static/charts/highcharts/histogram_discrete/wrapper.js create mode 100644 config/plugins/visualizations/charts/static/charts/highcharts/line/config.js rename config/plugins/visualizations/charts/static/charts/{nvd3_line => highcharts/line}/logo.png (100%) create mode 100644 config/plugins/visualizations/charts/static/charts/highcharts/line/wrapper.js create mode 100644 config/plugins/visualizations/charts/static/charts/highcharts/pie/config.js rename config/plugins/visualizations/charts/static/charts/{nvd3_pie => highcharts/pie}/logo.png (100%) create mode 100644 config/plugins/visualizations/charts/static/charts/highcharts/pie/wrapper.js create mode 100644 config/plugins/visualizations/charts/static/charts/highcharts/scatter/config.js rename config/plugins/visualizations/charts/static/charts/{nvd3_scatter => highcharts/scatter}/logo.png (100%) create mode 100644 config/plugins/visualizations/charts/static/charts/highcharts/scatter/wrapper.js create mode 100644 config/plugins/visualizations/charts/static/charts/highcharts/stackedarea/config.js rename config/plugins/visualizations/charts/static/charts/{nvd3_stackedarea => highcharts/stackedarea}/logo.png (100%) create mode 100644 config/plugins/visualizations/charts/static/charts/highcharts/stackedarea/wrapper.js create mode 100644 config/plugins/visualizations/charts/static/charts/nvd3/bar/config.js create mode 100644 config/plugins/visualizations/charts/static/charts/nvd3/bar/logo.png rename config/plugins/visualizations/charts/static/charts/{nvd3_bar => nvd3/bar}/wrapper.js (87%) rename config/plugins/visualizations/charts/static/charts/{nvd3_bar_horizontal => nvd3/bar_horizontal}/config.js (51%) create mode 100644 config/plugins/visualizations/charts/static/charts/nvd3/bar_horizontal/logo.png rename config/plugins/visualizations/charts/static/charts/{nvd3_bar_horizontal => nvd3/bar_horizontal}/wrapper.js (87%) rename config/plugins/visualizations/charts/static/charts/{nvd3_bar_horizontal_stacked => nvd3/bar_horizontal_stacked}/config.js (64%) create mode 100644 config/plugins/visualizations/charts/static/charts/nvd3/bar_horizontal_stacked/logo.png rename config/plugins/visualizations/charts/static/charts/{nvd3_bar_horizontal_stacked => nvd3/bar_horizontal_stacked}/wrapper.js (89%) rename config/plugins/visualizations/charts/static/charts/{nvd3_bar_stacked => nvd3/bar_stacked}/config.js (53%) create mode 100644 config/plugins/visualizations/charts/static/charts/nvd3/bar_stacked/logo.png rename config/plugins/visualizations/charts/static/charts/{nvd3_bar_stacked => nvd3/bar_stacked}/wrapper.js (88%) rename config/plugins/visualizations/charts/static/charts/nvd3/{ => common}/config.js (100%) rename config/plugins/visualizations/charts/static/charts/nvd3/{nvd3.js => common/wrapper.js} (100%) rename config/plugins/visualizations/charts/static/charts/{nvd3_histogram => nvd3/histogram}/config.js (78%) create mode 100644 config/plugins/visualizations/charts/static/charts/nvd3/histogram/logo.png rename config/plugins/visualizations/charts/static/charts/{nvd3_histogram => nvd3/histogram}/wrapper.js (93%) rename config/plugins/visualizations/charts/static/charts/{nvd3_histogram_discrete => nvd3/histogram_discrete}/config.js (89%) create mode 100644 config/plugins/visualizations/charts/static/charts/nvd3/histogram_discrete/logo.png rename config/plugins/visualizations/charts/static/charts/{nvd3_histogram_discrete => nvd3/histogram_discrete}/wrapper.js (95%) rename config/plugins/visualizations/charts/static/charts/{nvd3_line => nvd3/line}/config.js (52%) create mode 100644 config/plugins/visualizations/charts/static/charts/nvd3/line/logo.png rename config/plugins/visualizations/charts/static/charts/{nvd3_line => nvd3/line}/wrapper.js (87%) rename config/plugins/visualizations/charts/static/charts/{nvd3_line_focus => nvd3/line_focus}/config.js (52%) rename config/plugins/visualizations/charts/static/charts/{nvd3_line_focus => nvd3/line_focus}/logo.png (100%) rename config/plugins/visualizations/charts/static/charts/{nvd3_line_focus => nvd3/line_focus}/wrapper.js (87%) rename config/plugins/visualizations/charts/static/charts/{nvd3_pie => nvd3/pie}/config.js (96%) create mode 100644 config/plugins/visualizations/charts/static/charts/nvd3/pie/logo.png rename config/plugins/visualizations/charts/static/charts/{nvd3_pie => nvd3/pie}/wrapper.js (100%) create mode 100644 config/plugins/visualizations/charts/static/charts/nvd3/scatter/config.js create mode 100644 config/plugins/visualizations/charts/static/charts/nvd3/scatter/logo.png rename config/plugins/visualizations/charts/static/charts/{nvd3_scatter => nvd3/scatter}/wrapper.js (90%) rename config/plugins/visualizations/charts/static/charts/{nvd3_stackedarea => nvd3/stackedarea}/config.js (52%) rename config/plugins/visualizations/charts/static/charts/{nvd3_stackedarea_full => nvd3/stackedarea}/logo.png (100%) rename config/plugins/visualizations/charts/static/charts/{nvd3_stackedarea => nvd3/stackedarea}/wrapper.js (91%) rename config/plugins/visualizations/charts/static/charts/{nvd3_stackedarea_full => nvd3/stackedarea_full}/config.js (52%) create mode 100644 config/plugins/visualizations/charts/static/charts/nvd3/stackedarea_full/logo.png rename config/plugins/visualizations/charts/static/charts/{nvd3_stackedarea_full => nvd3/stackedarea_full}/wrapper.js (91%) rename config/plugins/visualizations/charts/static/charts/{nvd3_stackedarea_stream => nvd3/stackedarea_stream}/config.js (52%) rename config/plugins/visualizations/charts/static/charts/{nvd3_stackedarea_stream => nvd3/stackedarea_stream}/logo.png (100%) rename config/plugins/visualizations/charts/static/charts/{nvd3_stackedarea_stream => nvd3/stackedarea_stream}/wrapper.js (91%) delete mode 100644 config/plugins/visualizations/charts/static/charts/nvd3_bar/config.js delete mode 100644 config/plugins/visualizations/charts/static/charts/nvd3_scatter/config.js diff --git a/config/plugins/visualizations/charts/static/app.css b/config/plugins/visualizations/charts/static/app.css index e5acf62f404..53749198d45 100644 --- a/config/plugins/visualizations/charts/static/app.css +++ b/config/plugins/visualizations/charts/static/app.css @@ -1,3 +1,30 @@ +.ui-label { + font-weight: bold; +} +.ui-message { + padding: 2px 2px 2px 10px; +} + +.ui-icon { + font-size: 1.2em; +} + +.ui-button-icon { + margin-right: 5px; +} + +.ui-button-icon .button { + margin-right: 5px; + margin-left: 5px; +} + +.ui-button-icon .title { + position: relative; + font-size: 0.8em; + font-weight: normal; + top: -1px; +} + .charts-grid .item { padding: 5px; margin: 5px; diff --git a/config/plugins/visualizations/charts/static/app.js b/config/plugins/visualizations/charts/static/app.js index 1edfee691ec..96b289d3aaf 100644 --- a/config/plugins/visualizations/charts/static/app.js +++ b/config/plugins/visualizations/charts/static/app.js @@ -86,6 +86,22 @@ return Backbone.View.extend( } }, + // get root path + chartPath: function(chart_type) { + // create path from id + var path = chart_type.split(/_(.+)/); + + // check path + if (path.length >= 2) { + // return path + return path[0] + '/' + path[1]; + } else { + // log status + console.debug('FAILED App:chartPath() - Invalid format: ' + chart_type); + } + return undefined; + }, + // execute command execute: function(options) { }, diff --git a/config/plugins/visualizations/charts/static/build-app.js b/config/plugins/visualizations/charts/static/build-app.js index 6583b8006c5..f17f5e8e146 100644 --- a/config/plugins/visualizations/charts/static/build-app.js +++ b/config/plugins/visualizations/charts/static/build-app.js @@ -3,4 +3,4 @@ // (c) 2009-2013 Jeremy Ashkenas, DocumentCloud Inc. // Underscore may be freely distributed under the MIT license. -define("mvc/ui/ui-modal",[],function(){var e=Backbone.View.extend({elMain:"body",optionsDefault:{title:"ui-modal",body:"",backdrop:!0,height:null,width:null,closing_events:!1,closing_callback:null},buttonList:{},initialize:function(e){e&&this._create(e)},show:function(e){this.initialize(e),this.options.height?(this.$body.css("height",this.options.height),this.$body.css("overflow","hidden")):this.$body.css("max-height",$(window).height()/2),this.options.width&&this.$dialog.css("width",this.options.width),this.visible?this.$el.show():this.$el.fadeIn("fast"),this.visible=!0},hide:function(){this.visible=!1,this.$el.fadeOut("fast"),this.options.closing_callback&&this.options.closing_callback()},enableButton:function(e){var t=this.buttonList[e];this.$buttons.find("#"+t).prop("disabled",!1)},disableButton:function(e){var t=this.buttonList[e];this.$buttons.find("#"+t).prop("disabled",!0)},showButton:function(e){var t=this.buttonList[e];this.$buttons.find("#"+t).show()},hideButton:function(e){var t=this.buttonList[e];this.$buttons.find("#"+t).hide()},getButton:function(e){var t=this.buttonList[e];return this.$buttons.find("#"+t)},scrollTop:function(){return this.$body.scrollTop()},_create:function(e){var t=this;this.options=_.defaults(e,this.optionsDefault),this.options.body=="progress"&&(this.options.body=$('
')),this.$el&&(this.$el.remove(),$(document).off("keyup.ui-modal")),this.setElement(this._template(this.options.title)),this.$dialog=this.$el.find(".modal-dialog"),this.$body=this.$el.find(".modal-body"),this.$footer=this.$el.find(".modal-footer"),this.$buttons=this.$el.find(".buttons"),this.$backdrop=this.$el.find(".modal-backdrop"),this.$body.html(this.options.body),this.options.backdrop||this.$backdrop.removeClass("in");if(this.options.buttons){this.buttonList={};var n=0;$.each(this.options.buttons,function(e,r){var i="button-"+n++;t.$buttons.append($('').text(e).click(r)).append(" "),t.buttonList[e]=i})}else this.$footer.hide();$(this.elMain).append($(this.el)),this.options.closing_events&&($(document).on("keyup.ui-modal",function(e){e.keyCode==27&&t.hide()}),this.$el.find(".modal-backdrop").on("click",function(){t.hide()}))},_template:function(e){return'