--- a/ckanext/ga_report/templates/ga_report/ga_util.html +++ b/ckanext/ga_report/templates/ga_report/ga_util.html @@ -14,7 +14,7 @@ </select> -<table py:def="social_table(items, with_source=False)" class="table table-condensed table-bordered table-striped"> +<table py:def="social_table(items, with_source=False)" class="ga-reports-table table table-condensed table-bordered table-striped"> <tr> <th>Name</th> <th py:if="with_source">Source</th> @@ -24,57 +24,36 @@ <tr> <td><a href="${url}">${name}</a></td> <td py:if="with_source">${source}</td> - <td>${count}</td> + <td class="td-numeric">${count}</td> </tr> </py:for> </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) { - object['color'] = palette.color(); - }); - var graph = new Rickshaw.Graph( { - element: document.querySelector("#chart_$id"), - renderer: 'line', - series: series - }); - var x_axis = new Rickshaw.Graph.Axis.Time( { graph: graph } ); - var y_axis = new Rickshaw.Graph.Axis.Y( { - graph: graph, - orientation: 'left', - tickFormat: Rickshaw.Fixtures.Number.formatKMBT, - element: document.getElementById('y_axis_$id'), - } ); - var legend = new Rickshaw.Graph.Legend( { - element: document.querySelector('#legend_$id'), - graph: graph - } ); - graph.render(); + var items = $items_json; + if (items.length==0) { return; } + CKAN.GA_Reports.render_rickshaw('$id', items, '$mode', '$colorscheme'); }); </script> </div> </div> -<table py:def="stat_table(items, title='Views')" class="table table-condensed table-bordered table-striped"> +<table py:def="stat_table(items, title='Views')" class="ga-reports-table table table-condensed table-bordered table-striped"> <tr> <th>Name</th> - <th>% ${title}</th> + <th class="td-numeric">% ${title}</th> </tr> <py:for each="name, value in items"> <tr> <td>${name}</td> - <td>${value}</td> + <td class="td-numeric">${value}</td> </tr> </py:for> </table> @@ -84,12 +63,13 @@ <div id="minornavigation-bg-left"> <div id="minornavigation-bg-right"> <ul class="nav nav-pills"> - <li py:attrs="{'class': 'active' if active_name=='Site-wide' else None}"><a py:attrs="{'class': 'active' if active_name=='Site-wide' else None}" href="${h.url_for(controller='ckanext.ga_report.controller:GaReport',action='index')}"><img src="/images/icons/page_white.png" height="16px" width="16px" alt="None" class="inline-icon "/> Site-wide</a></li> + <?python querystring='?month='+c.month if c.month else '' ?> + <li py:attrs="{'class': 'active' if active_name=='Site-wide' else None}"><a py:attrs="{'class': 'active' if active_name=='Site-wide' else None}" href="${h.url_for(controller='ckanext.ga_report.controller:GaReport',action='index')}${querystring}"><img src="/images/icons/page_white.png" height="16px" width="16px" alt="None" class="inline-icon "/> Site-wide</a></li> <li py:attrs="{'class': 'active' if active_name=='Publishers' else None}"> - <a py:attrs="{'class': 'active' if active_name=='Publishers' else None}" href="${h.url_for(controller='ckanext.ga_report.controller:GaDatasetReport',action='publishers')}"><img src="/images/icons/page_white.png" height="16px" width="16px" alt="None" class="inline-icon "/> Publishers</a> + <a py:attrs="{'class': 'active' if active_name=='Publishers' else None}" href="${h.url_for(controller='ckanext.ga_report.controller:GaDatasetReport',action='publishers')}${querystring}"><img src="/images/icons/page_white.png" height="16px" width="16px" alt="None" class="inline-icon "/> Publishers</a> </li> <li py:attrs="{'class': 'active' if active_name=='Datasets' else None}"> - <a py:attrs="{'class': 'active' if active_name=='Datasets' else None}" href="${h.url_for(controller='ckanext.ga_report.controller:GaDatasetReport',action='read')}"><img src="/images/icons/page_white.png" height="16px" width="16px" alt="None" class="inline-icon "/> Datasets</a> + <a py:attrs="{'class': 'active' if active_name=='Datasets' else None}" href="${h.url_for(controller='ckanext.ga_report.controller:GaDatasetReport',action='read')}${querystring}"><img src="/images/icons/page_white.png" height="16px" width="16px" alt="None" class="inline-icon "/> Datasets</a> </li> </ul> </div>