gitphp 0.2.9.1 :: ckanext-ga-report.git/commitdiff

Show next to title the publisher on the /dataset page, or All datasets if no publisher

3 files changed: (show all)
ckanext/ga_report/public/scripts/ckanext_ga_reports.js
ckanext/ga_report/templates/ga_report/publisher/read.html
ckanext/ga_report/templates/ga_report/site/index.html

file:a/ckanext/ga_report/public/scripts/ckanext_ga_reports.js -> file:b/ckanext/ga_report/public/scripts/ckanext_ga_reports.js

var CKAN = CKAN \|\| {};	var CKAN = CKAN \|\| {};
CKAN.GA_Reports = {};	CKAN.GA_Reports = {};

CKAN.GA_Reports.render_rickshaw = function( css_name, data, mode, colorscheme ) {	CKAN.GA_Reports.render_rickshaw = function( css_name, data, mode, colorscheme ) {
var graphLegends = $('#graph-legend-container');	var graphLegends = $('#graph-legend-container');

function renderError(alertClass,alertText,legendText) {	function renderError(alertClass,alertText,legendText) {
$("#chart_"+css_name)	$("#chart_"+css_name)
.html( '<div class="alert '+alertClass+'">'+alertText+'</div>')	.html( '<div class="alert '+alertClass+'">'+alertText+'</div>')
.closest('.rickshaw_chart_container').css('height',50);	.closest('.rickshaw_chart_container').css('height',50);
var myLegend = $('<div id="legend_'+css_name+'"/>')	var myLegend = $('<div id="legend_'+css_name+'"/>')
.html(legendText)	.html(legendText)
.appendTo(graphLegends);	.appendTo(graphLegends);
}	}

if (!Modernizr.svg) {	if (!Modernizr.svg) {
renderError('','Your browser does not support vector graphics. No graphs can be rendered.','(Graph cannot be rendered)');	renderError('','Your browser does not support vector graphics. No graphs can be rendered.','(Graph cannot be rendered)');
return;	return;
}	}
if (data.length==0) {	if (data.length==0) {
renderError('alert-info','There is not enough data to render a graph.','(No graph available)');	renderError('alert-info','There is not enough data to render a graph.','(No graph available)');
return	return
}	}
var myLegend = $('<div id="legend_'+css_name+'"/>').appendTo(graphLegends);	var myLegend = $('<div id="legend_'+css_name+'"/>').appendTo(graphLegends);

var palette = new Rickshaw.Color.Palette( { scheme: colorscheme } );	var palette = new Rickshaw.Color.Palette( { scheme: colorscheme } );
$.each(data, function(i, object) {	$.each(data, function(i, object) {
object['color'] = palette.color();	object['color'] = palette.color();
});	});
// Rickshaw renders the legend in reverse order...	// Rickshaw renders the legend in reverse order...
data.reverse();	data.reverse();

var graphElement = document.querySelector("#chart_"+css_name);	var graphElement = document.querySelector("#chart_"+css_name);

var graph = new Rickshaw.Graph( {	var graph = new Rickshaw.Graph( {
element: document.querySelector("#chart_"+css_name),	element: document.querySelector("#chart_"+css_name),
renderer: mode,	renderer: mode,
series: data ,	series: data ,
height: 328	height: 328
});	});
var x_axis = new Rickshaw.Graph.Axis.Time( {	var x_axis = new Rickshaw.Graph.Axis.Time( {
graph: graph	graph: graph
} );	} );
var y_axis = new Rickshaw.Graph.Axis.Y( {	var y_axis = new Rickshaw.Graph.Axis.Y( {
graph: graph,	graph: graph,
orientation: 'left',	orientation: 'left',
tickFormat: Rickshaw.Fixtures.Number.formatKMBT,	tickFormat: Rickshaw.Fixtures.Number.formatKMBT,
element: document.getElementById('y_axis_'+css_name)	element: document.getElementById('y_axis_'+css_name)
} );	} );
var legend = new Rickshaw.Graph.Legend( {	var legend = new Rickshaw.Graph.Legend( {
element: document.querySelector('#legend_'+css_name),	element: document.querySelector('#legend_'+css_name),
graph: graph	graph: graph
} );	} );
var shelving = new Rickshaw.Graph.Behavior.Series.Toggle( {	var shelving = new Rickshaw.Graph.Behavior.Series.Toggle( {
graph: graph,	graph: graph,
legend: legend	legend: legend
} );	} );
myLegend.prepend('<div class="instructions">Click on a series below to isolate its graph:</div>');	myLegend.prepend('<div class="instructions">Click on a series below to isolate its graph:</div>');
graph.render();	graph.render();
};	};

CKAN.GA_Reports.bind_sparklines = function() {	CKAN.GA_Reports.bind_sparklines = function() {
/*	/*
* Bind to the 'totals' tab being on screen, when the	* Bind to the 'totals' tab being on screen, when the
* Sparkline graphs should be drawn.	* Sparkline graphs should be drawn.
* Note that they cannot be drawn sooner.	* Note that they cannot be drawn sooner.
*/	*/
var created = false;	var created = false;
$('a[href="#totals"]').on(	$('a[href="#totals"]').on(
'shown',	'shown',
function() {	function() {
if (!created) {	if (!created) {
var sparkOptions = {	var sparkOptions = {
enableTagOptions: true,	enableTagOptions: true,
type: 'line',	type: 'line',
width: 100,	width: 100,
height: 26,	height: 26,
chartRangeMin: 0,	chartRangeMin: 0,
spotColor: '',	spotColor: '',
maxSpotColor: '',	maxSpotColor: '',
minSpotColor: '',	minSpotColor: '',
highlightSpotColor: '#000000',	highlightSpotColor: '#000000',
lineColor: '#3F8E6D',	lineColor: '#3F8E6D',
fillColor: '#B7E66B'	fillColor: '#B7E66B'
};	};
$('.sparkline').sparkline('html',sparkOptions);	$('.sparkline').sparkline('html',sparkOptions);
created = true;	created = true;
}	}
$.sparkline_display_visible();	$.sparkline_display_visible();
}	}
);	);
};	};

CKAN.GA_Reports.bind_sidebar = function() {	CKAN.GA_Reports.bind_sidebar = function() {
/*	/*
* Bind to changes in the tab behaviour:	* Bind to changes in the tab behaviour:
* Show the correct rickshaw graph in the sidebar.	* Show the correct rickshaw graph in the sidebar.
* Not to be called before all graphs load.	* Not to be called before all graphs load.
*/	*/
$('a[data-toggle="hashtab"]').on(	$('a[data-toggle="tab"]').on(
'shown',	'shown',
function(e) {	function(e) {
var href = $(e.target).attr('href');	var href = $(e.target).attr('href');
var pane = $(href);	var pane = $(href);
if (!pane.length) { console.err('bad href',href); return; }	if (!pane.length) { console.err('bad href',href); return; }
var legend_name = "none";	var legend_name = "none";
var graph = pane.find('.rickshaw_chart');	var graph = pane.find('.rickshaw_chart');
if (graph.length) {	if (graph.length) {
legend_name = graph.attr('id').replace('chart_','');	legend_name = graph.attr('id').replace('chart_','');
}	}
legend_name = '#legend_'+legend_name;	legend_name = '#legend_'+legend_name;
$('#graph-legend-container > *').hide();	$('#graph-legend-container > *').hide();
$('#graph-legend-container .instructions').show();	$('#graph-legend-container .instructions').show();
$(legend_name).show();	$(legend_name).show();
}	}
);	);
/* The first tab might already have been shown */	/* The first tab might already have been shown */
$('li.active > a[data-toggle="hashtab"]').trigger('shown');	$('li.active > a[data-toggle="tab"]').trigger('shown');
};	};

CKAN.GA_Reports.bind_month_selector = function() {	CKAN.GA_Reports.bind_month_selector = function() {
var handler = function(e) {	var handler = function(e) {
var target = $(e.delegateTarget);	var target = $(e.delegateTarget);
var form = target.closest('form');	var form = target.closest('form');
var url = form.attr('action')+'?month='+target.val()+window.location.hash;	var url = form.attr('action')+'?month='+target.val()+window.location.hash;
window.location = url;	window.location = url;
};	};
var selectors = $('select[name="month"]');	var selectors = $('select[name="month"]');
assert(selectors.length>0);	assert(selectors.length>0);
selectors.bind('change', handler);	selectors.bind('change', handler);
};	};

file:a/ckanext/ga_report/templates/ga_report/publisher/read.html -> file:b/ckanext/ga_report/templates/ga_report/publisher/read.html

<html xmlns:py="http://genshi.edgewall.org/"	<html xmlns:py="http://genshi.edgewall.org/"
xmlns:i18n="http://genshi.edgewall.org/i18n"	xmlns:i18n="http://genshi.edgewall.org/i18n"
xmlns:xi="http://www.w3.org/2001/XInclude"	xmlns:xi="http://www.w3.org/2001/XInclude"
py:strip="">	py:strip="">

<xi:include href="../ga_util.html" />	<xi:include href="../ga_util.html" />

<py:def function="page_title">Usage by Dataset</py:def>	<py:def function="page_title">Usage by Dataset</py:def>

<py:def function="optional_head">	<py:def function="optional_head">
<link rel="stylesheet" type="text/css" href="/scripts/vendor/rickshaw.min.css"/>	<link rel="stylesheet" type="text/css" href="/scripts/vendor/rickshaw.min.css"/>
<link rel="stylesheet" type="text/css" href="/css/ga_report.css?1"/>	<link rel="stylesheet" type="text/css" href="/css/ga_report.css?1"/>
<script type="text/javascript" src="/scripts/modernizr-2.6.2.custom.js"></script>	<script type="text/javascript" src="/scripts/modernizr-2.6.2.custom.js"></script>
<script type="text/javascript" src="/scripts/ckanext_ga_reports.js?1"></script>	<script type="text/javascript" src="/scripts/ckanext_ga_reports.js?1"></script>
<script type="text/javascript" src="/scripts/vendor/jquery.sparkline.modified.js"></script>	<script type="text/javascript" src="/scripts/vendor/jquery.sparkline.modified.js"></script>
<script type="text/javascript" src="/scripts/rickshaw_ie7_shim.js"></script>	<script type="text/javascript" src="/scripts/rickshaw_ie7_shim.js"></script>
<script type="text/javascript" src="/scripts/vendor/d3.v2.js"></script>	<script type="text/javascript" src="/scripts/vendor/d3.v2.js"></script>
<script type="text/javascript" src="/scripts/vendor/d3.layout.min.js"></script>	<script type="text/javascript" src="/scripts/vendor/d3.layout.min.js"></script>
<script type="text/javascript" src="/scripts/vendor/rickshaw.min.js"></script>	<script type="text/javascript" src="/scripts/vendor/rickshaw.min.js"></script>
</py:def>	</py:def>


<py:match path="breadcrumbs">	<py:match path="breadcrumbs">
<li><a href="/data/site-usage">Site Analytics</a></li>	<li><a href="/data/site-usage">Site Analytics</a></li>
<py:if test="c.publisher">	<py:if test="c.publisher">
<li><a href="/data/site-usage/publisher">Publishers</a></li>	<li><a href="/data/site-usage/publisher">Publishers</a></li>
<li py:if="c.publisher"><a href="/data/site-usage/publisher/${c.publisher.name}">${c.publisher.title}</a></li>	<li py:if="c.publisher"><a href="/data/site-usage/publisher/${c.publisher.name}">${c.publisher.title}</a></li>
</py:if>	</py:if>
<py:if test="not c.publisher">	<py:if test="not c.publisher">
<li><a href="${request.url}">Usage By Dataset</a></li>	<li><a href="${request.url}">Usage By Dataset</a></li>
</py:if>	</py:if>
</py:match>	</py:match>

<div py:match="content">	<div py:match="content">

<py:with vars="download_link=h.url_for(controller='ckanext.ga_report.controller:GaDatasetReport',action='dataset_csv',id=c.publisher_name or 'all',month=c.month or 'all')">	<py:with vars="download_link=h.url_for(controller='ckanext.ga_report.controller:GaDatasetReport',action='dataset_csv',id=c.publisher_name or 'all',month=c.month or 'all')">
<a class="btn button btn-primary btn-sm pull-right" href="${download_link}"><i class="icon-download"></i>  Download as CSV</a>	<a class="btn button btn-primary btn-sm pull-right" href="${download_link}"><i class="icon-download"></i>  Download as CSV</a>
</py:with>	</py:with>
<h1>Site Usage</h1>	<h1>Site Usage
	<small py:if="c.publisher">${c.publisher.title}</small>
	<small py:if="not c.publisher">All datasets</small>
	</h1>

<div class="row" style="background: #fff;">	<div class="row" style="background: #fff;">
<div class="col-md-4">	<div class="col-md-4">
<div class="whitebox">	<div class="whitebox">
<strong>Graph Legend</strong>	<strong>Graph Legend</strong>
<div id="graph-legend-container">	<div id="graph-legend-container">
<div style="display: none;" id="legend_none">(No graph is loaded)</div>	<div style="display: none;" id="legend_none">(No graph is loaded)</div>
</div>	</div>
</div>	</div>
</div>	</div>
<div class="col-md-8">	<div class="col-md-8">
<div class="whitebox">	<div class="whitebox">
<strong py:if="c.publisher">Datasets From <a href="${h.url_for(controller='ckanext.dgu.controllers.publisher:PublisherController',action='read',id=c.publisher.name)}">${c.publisher.title}</a></strong>
<strong py:if="not c.publisher">All Datasets</strong>
<py:if test="c.graph_data">	<py:if test="c.graph_data">
${rickshaw_graph(c.graph_data,'dataset-downloads',debug=True)}	${rickshaw_graph(c.graph_data,'dataset-downloads',debug=True)}
</py:if>	</py:if>
</div>	</div>
</div>	</div>
</div>	</div>
<hr/>	<hr/>
<py:if test="c.month">	<py:if test="c.month">
<h4>Statistics for ${h.month_option_title(c.month,c.months,c.day)}:</h4>	<h4>Statistics for ${h.month_option_title(c.month,c.months,c.day)}:</h4>
</py:if>	</py:if>
<py:if test="not c.month">	<py:if test="not c.month">
<h2>Statistics for all months</h2>	<h2>Statistics for all months</h2>
</py:if>	</py:if>
<form style="margin-bottom:10px;" class="form-inline" action="${h.url_for(controller='ckanext.ga_report.controller:GaDatasetReport',action='read')}" method="get">	<form style="margin-bottom:10px;" class="form-inline" action="${h.url_for(controller='ckanext.ga_report.controller:GaDatasetReport',action='read')}" method="get">
<div class="controls">	<div class="controls">

${month_selector(c.month, c.months, c.day)}	${month_selector(c.month, c.months, c.day)}

<select name="publisher">	<select name="publisher">
<option value='' py:attrs="{'selected': 'selected' if not c.publisher else None}">All publishers</option>	<option value='' py:attrs="{'selected': 'selected' if not c.publisher else None}">All publishers</option>
<py:for each="val,desc in c.publishers">	<py:for each="val,desc in c.publishers">
<option value='${val}' py:attrs="{'selected': 'selected' if c.publisher_name == val else None}">${desc}</option>	<option value='${val}' py:attrs="{'selected': 'selected' if c.publisher_name == val else None}">${desc}</option>
</py:for>	</py:for>
</select>	</select>
<input class="btn button btn-primary btn-xs" type='submit' value="Update"/>	<input class="btn button btn-primary btn-xs" type='submit' value="Update"/>
</div>	</div>
</form>	</form>
<div class="alert alert-info" py:if="not c.top_packages">No page views in this period.</div>	<div class="alert alert-info" py:if="not c.top_packages">No page views in this period.</div>
<py:if test="c.top_packages">	<py:if test="c.top_packages">
<table class="ga-reports-table table table-condensed table-bordered">	<table class="ga-reports-table table table-condensed table-bordered">
<tr>	<tr>
<th>Dataset</th>	<th>Dataset</th>
<th>Views</th>	<th>Views</th>
<th>Downloads</th>	<th>Downloads</th>
</tr>	</tr>
<py:for each="package, views, visits,downloads in c.top_packages">	<py:for each="package, views, visits,downloads in c.top_packages">
<tr>	<tr>
<td>	<td>
${h.link_to(package.title or package.name, h.url_for(controller='package', action='read', id=package.name))}	${h.link_to(package.title or package.name, h.url_for(controller='package', action='read', id=package.name))}
</td>	</td>
<td class="td-numeric">${views}</td>	<td class="td-numeric">${views}</td>
<td class="td-numeric">${downloads}</td>	<td class="td-numeric">${downloads}</td>
</tr>	</tr>
</py:for>	</py:for>
</table>	</table>
</py:if>	</py:if>

${ga_footer()}	${ga_footer()}

</div>	</div>

<xi:include href="../../layout.html" />	<xi:include href="../../layout.html" />
</html>	</html>

file:a/ckanext/ga_report/templates/ga_report/site/index.html -> file:b/ckanext/ga_report/templates/ga_report/site/index.html