--- a/ckanext/ga_report/templates/ga_report/ga_util.html +++ b/ckanext/ga_report/templates/ga_report/ga_util.html @@ -30,23 +30,23 @@ </table> -<div py:def="rickshaw_graph(items_json,id)"> +<div py:def="rickshaw_graph(items_json,id,mode='line',colorscheme='munin')"> <div id="chart_container_$id" class="rickshaw_chart_container"> <div id="y_axis_$id" class="rickshaw_y_axis"></div> <div id="chart_$id" class="rickshaw_chart"></div> <div id="legend_$id" class="rickshaw_legend"></div> <script type="text/javascript"> $(function() { - var series = ${items_json}; - Rickshaw.Series.zeroFill(series); - var palette = new Rickshaw.Color.Palette( { scheme: 'spectrum2001' } ); - $.each(series, function(i, object) { + var all_series = ${items_json}; + var palette = new Rickshaw.Color.Palette( { scheme: '$colorscheme' } ); + $.each(all_series, function(i, object) { object['color'] = palette.color(); }); var graph = new Rickshaw.Graph( { element: document.querySelector("#chart_$id"), - renderer: 'line', - series: series + renderer: '$mode', + series: all_series , + height: 328 }); var x_axis = new Rickshaw.Graph.Axis.Time( { graph: graph } ); var y_axis = new Rickshaw.Graph.Axis.Y( {