diff --git a/config/plugins/visualizations/charts/static/charts/histogram/config.js b/config/plugins/visualizations/charts/static/charts/histogram/config.js index 8adedc3ad41..2a33f14f657 100644 --- a/config/plugins/visualizations/charts/static/charts/histogram/config.js +++ b/config/plugins/visualizations/charts/static/charts/histogram/config.js @@ -9,8 +9,17 @@ return $.extend(true, {}, nvd3_config, { } }, settings : { + x_axis_label : { + init : 'Breaks' + }, + y_axis_label : { + init : 'Density' + }, + y_axis_tick : { + init : '.3' + }, separator_custom : { - title : 'Histogram settings', + title : 'Advanced', type : 'separator' }, bin_size : { diff --git a/config/plugins/visualizations/charts/static/library/ui-table-form.js b/config/plugins/visualizations/charts/static/library/ui-table-form.js index 3d647e91803..a4fa1d89d26 100644 --- a/config/plugins/visualizations/charts/static/library/ui-table-form.js +++ b/config/plugins/visualizations/charts/static/library/ui-table-form.js @@ -8,17 +8,23 @@ var View = Backbone.View.extend( // initialize initialize: function(options) { // ui elements + this.table_title = new Ui.Label({title: options.title}); this.table = new Table({content: options.content}); // create element var $view = $('
'); - $view.append(Utils.wrap((new Ui.Label({title: options.title})).$el)); + $view.append(Utils.wrap(this.table_title.$el)); $view.append(Utils.wrap(this.table.$el)); // add element this.setElement($view); }, + // title + title: function(new_title) { + this.table_title.title(new_title); + }, + // update update: function(settings, model) { // reset table diff --git a/config/plugins/visualizations/charts/static/library/ui.js b/config/plugins/visualizations/charts/static/library/ui.js index df89ae68ec8..805f95d00f5 100644 --- a/config/plugins/visualizations/charts/static/library/ui.js +++ b/config/plugins/visualizations/charts/static/library/ui.js @@ -18,6 +18,11 @@ var Label = Backbone.View.extend( this.setElement(this._template(this.options)); }, + // title + title: function(new_title) { + this.$el.find('b').html(new_title); + }, + // template _template: function(options) { return ''; diff --git a/config/plugins/visualizations/charts/static/views/settings.js b/config/plugins/visualizations/charts/static/views/settings.js index ada0f25cef2..c5ae01a4fca 100644 --- a/config/plugins/visualizations/charts/static/views/settings.js +++ b/config/plugins/visualizations/charts/static/views/settings.js @@ -40,9 +40,13 @@ return Backbone.View.extend( if (!chart_type) { return; } + // get settings + var chart_definition = this.app.types.get(chart_type); + + // set title + this.form.title(chart_definition.title + ':'); // update table form model - var chart_definition = this.app.types.get(chart_type); this.form.update(chart_definition.settings, this.chart.settings); } });