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

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

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

<select name="month" py:def="month_selector(current_month, months, day)">	<select name="month" py:def="month_selector(current_month, months, day)">
<option value='' py:attrs="{'selected': 'selected' if not current_month else None}">All months</option>	<option value='' py:attrs="{'selected': 'selected' if not current_month else None}">All months</option>
<py:for each="i, (val,desc) in enumerate(months)">	<py:for each="i, (val,desc) in enumerate(months)">
<option value='${val}' py:attrs="{'selected': 'selected' if current_month == val else None}">${desc}<py:if test="i == 0 and day"> (up to ${day})</py:if></option>	<option value='${val}' py:attrs="{'selected': 'selected' if current_month == val else None}">${desc}<py:if test="i == 0 and day"> (up to ${day})</py:if></option>
</py:for>	</py:for>
</select>	</select>


<table py:def="social_table(items, with_source=False)" class="ga-reports-table 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>	<tr>
<th>Name</th>	<th>Name</th>
<th py:if="with_source">Source</th>	<th py:if="with_source">Source</th>
<th>Visits</th>	<th>Visits</th>
</tr>	</tr>
<py:for each="name, url, source, count in items">	<py:for each="name, url, source, count in items">
<tr>	<tr>
<td><a href="${url}">${name}</a></td>	<td><a href="${url}">${name}</a></td>
<td py:if="with_source">${source}</td>	<td py:if="with_source">${source}</td>
<td class="td-numeric">${count}</td>	<td class="td-numeric">${count}</td>
</tr>	</tr>
</py:for>	</py:for>
</table>	</table>


<div py:def="rickshaw_graph(items_json,id,mode='line',colorscheme='munin')">	<div py:def="rickshaw_graph(items_json,id,mode='line',colorscheme='munin')">
<div id="chart_container_$id" class="rickshaw_chart_container">	<div id="chart_container_$id" class="rickshaw_chart_container">
<div id="y_axis_$id" class="rickshaw_y_axis"></div>	<div id="y_axis_$id" class="rickshaw_y_axis"></div>
<div id="chart_$id" class="rickshaw_chart"></div>	<div id="chart_$id" class="rickshaw_chart"></div>
<script type="text/javascript">	<script type="text/javascript">
$(function() {	$(function() {
var items = $items_json;	var items = $items_json;
if (items.length==0) { return; }	if (items.length==0) { return; }
CKAN.GA_Reports.render_rickshaw('$id', items, '$mode', '$colorscheme');	CKAN.GA_Reports.render_rickshaw('$id', items, '$mode', '$colorscheme');
});	});
</script>	</script>
</div>	</div>
</div>	</div>


<table py:def="stat_table(items, title='Views')" class="ga-reports-table 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>	<tr>
<th>Name</th>	<th>Name</th>
<th class="td-numeric">% ${title}</th>	<th class="td-numeric">% ${title}</th>
</tr>	</tr>
<py:for each="name, value in items">	<py:for each="name, value in items">
<tr>	<tr>
<td>${name}</td>	<td>${name}</td>
<td class="td-numeric">${value}</td>	<td class="td-numeric">${value}</td>
</tr>	</tr>
</py:for>	</py:for>
</table>	</table>


<div py:def="usage_nav(active_name)">	<div py:def="usage_nav(active_name)">
<span class="subheading">	<span class="subheading">
<img src="/images/arrow-down-right.png" />	<img src="/images/arrow-down-right.png" />
<a class="${if_(active_name=='Site-wide','active')}" href="${h.url_for(controller='ckanext.ga_report.controller:GaReport',action='index')}${if_(c.month,'?month='+c.month)}">Site-wide</a>	<a class="${if_(active_name=='Site-wide','active')}" href="${h.url_for(controller='ckanext.ga_report.controller:GaReport',action='index')}${if_(c.month,'?month='+c.month)}">Site-wide</a>
<span class="divider">\|</span>	<span class="divider">\|</span>
<a class="${if_(active_name=='Publishers','active')}" href="${h.url_for(controller='ckanext.ga_report.controller:GaDatasetReport',action='publishers')}${if_(c.month,'?month='+c.month)}">Publishers</a>	<a class="${if_(active_name=='Publishers','active')}" href="${h.url_for(controller='ckanext.ga_report.controller:GaDatasetReport',action='publishers')}${if_(c.month,'?month='+c.month)}">Publishers</a>
<span class="divider">\|</span>	<span class="divider">\|</span>
<a class="${if_(active_name=='Datasets','active')}" href="${h.url_for(controller='ckanext.ga_report.controller:GaDatasetReport',action='read')}${if_(c.month,'?month='+c.month)}">Datasets</a>	<a class="${if_(active_name=='Datasets','active')}" href="${h.url_for(controller='ckanext.ga_report.controller:GaDatasetReport',action='read')}${if_(c.month,'?month='+c.month)}">Datasets</a>
</span>	</span>
</div>	</div>

	<div py:def="ga_sidebar(download_link)">
	<div class="boxed">
	<div class="widget-container widget_text">
	<h4>Download</h4>
	<p><center>
	<a class="btn button btn-primary" href="${download_link}">Download as CSV</a></center>
	</p>
	</div>
	<div class="widget-container widget_text">
	<h4>Graph Legend</h4>
	<div id="graph-legend-container">
	<div id="legend_none">(No graph loaded)</div>
	</div>
	</div>
	<div class="widget-container widget_text">
	<h4>Notes</h4>
	<ul>
	<li>"Views" is the number of times a page was loaded in users' browsers.</li>
	<li>"Downloads" is the number of times a user has clicked to download either an original or cached resource for a particular dataset. Download information is only available from 2nd December 2012; 'No data' is shown for records before that date.</li>
	<li>These usage statistics are confined to users with javascript enabled, which excludes web crawlers and API calls.</li>
	<li>The results are not shown when the number of views/visits is tiny. Where these relate to site pages, results are available in full in the CSV download. Where these relate to users' web browser information, results are not disclosed, for privacy reasons.</li>
	</ul>
	</div>
	</div>
	</div>


</html>	</html>

file:a/ckanext/ga_report/templates/ga_report/notes.html (deleted)

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

<li class="widget-container boxed widget_text">
<h4>Notes</h4>
<ul>
<li>"Views" is the number of times a page was loaded in users' browsers.</li>
<li>"Downloads" is the number of times a user has clicked to download either an original or cached resource for a particular dataset. Download information is only available from 2nd December 2012; 'No data' is shown for records before that date.</li>
<li>These usage statistics are confined to users with javascript enabled, which excludes web crawlers and API calls.</li>
<li>The results are not shown when the number of views/visits is tiny. Where these relate to site pages, results are available in full in the CSV download. Where these relate to users' web browser information, results are not disclosed, for privacy reasons.</li>
</ul>
</li>
</html>

file:a/ckanext/ga_report/templates/ga_report/publisher/index.html -> file:b/ckanext/ga_report/templates/ga_report/publisher/index.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 Publisher</py:def>	<py:def function="page_title">Usage by Publisher</py:def>

<py:def function="content_class"><!----></py:def>

<py:match path="primarysidebar">	<py:match path="primarysidebar">
<li class="widget-container boxed widget_text">	${ga_sidebar(download_link=h.url_for(controller='ckanext.ga_report.controller:GaDatasetReport',action='publisher_csv',month=c.month or 'all'))}
<h4>Download</h4>
<p><center>
<a class="btn button btn-primary" href="${h.url_for(controller='ckanext.ga_report.controller:GaDatasetReport',action='publisher_csv',month=c.month or 'all')}">Download as CSV</a></center>
</p>
</li>
<li class="widget-container boxed widget_text">
<h4>Graph Legend</h4>
<div id="graph-legend-container">
</div>
</li>
<xi:include href="../notes.html" />
</py:match>	</py:match>

<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/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>

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

<h1>Site Usage ${usage_nav('Publishers')}</h1>	<h1>Site Usage ${usage_nav('Publishers')}</h1>

<div class="boxed">	<div class="boxed">

${rickshaw_graph(c.top_publishers_graph,'publishers')}	${rickshaw_graph(c.top_publishers_graph,'publishers')}
<form class="form-inline" action="${h.url_for(controller='ckanext.ga_report.controller:GaDatasetReport',action='publishers')}" method="get">	<form class="form-inline" action="${h.url_for(controller='ckanext.ga_report.controller:GaDatasetReport',action='publishers')}" method="get">
<div class="controls">	<div class="controls">
<label>Show stats table for:</label>	<label>Show stats table for:</label>
${month_selector(c.month, c.months, c.day)}	${month_selector(c.month, c.months, c.day)}
</div>	</div>
</form>	</form>

<table class="ga-reports-table table table-condensed table-bordered table-striped">	<table class="ga-reports-table table table-condensed table-bordered table-striped">
<tr>	<tr>
<th>Publisher</th>	<th>Publisher</th>
<th class="td-numeric">Dataset Views</th>	<th class="td-numeric">Dataset Views</th>
</tr>	</tr>
<py:for each="publisher, views, visits in c.top_publishers">	<py:for each="publisher, views, visits in c.top_publishers">
<tr>	<tr>
<td>	<td>
${h.link_to(publisher.title, h.url_for(controller='ckanext.ga_report.controller:GaDatasetReport', action='read_publisher', id=publisher.name) + (("?month=" + c.month) if c.month else ''))}	${h.link_to(publisher.title, h.url_for(controller='ckanext.ga_report.controller:GaDatasetReport', action='read_publisher', id=publisher.name) + (("?month=" + c.month) if c.month else ''))}
</td>	</td>
<td class="td-numeric">${views}</td>	<td class="td-numeric">${views}</td>
</tr>	</tr>
</py:for>	</py:for>
</table>	</table>
</div><!--/boxed-->	</div><!--/boxed-->
</div><!--/content-->	</div><!--/content-->

<py:def function="optional_footer">	<py:def function="optional_footer">
<script type="text/javascript">	<script type="text/javascript">
$(function() {	$(function() {
CKAN.GA_Reports.bind_month_selector();	CKAN.GA_Reports.bind_month_selector();
});	});
</script>	</script>
</py:def>	</py:def>
<xi:include href="../../layout.html" />	<xi:include href="../../layout.html" />

</html>	</html>

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="content_class"><!----></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/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="primarysidebar">	<py:match path="primarysidebar">
<li class="widget-container boxed widget_text">	${ga_sidebar(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'))}
<h4>Download</h4>
<p><center>
<a class="btn button btn-primary" href="${h.url_for(controller='ckanext.ga_report.controller:GaDatasetReport',action='dataset_csv',id=c.publisher_name or 'all',month=c.month or 'all')}">Download as CSV</a></center>
</p>
</li>
<li class="widget-container boxed widget_text">
<h4>Graph Legend</h4>
<div id="graph-legend-container">
</div>
</li>
<xi:include href="../notes.html" />
</py:match>	</py:match>


<div py:match="content">	<div py:match="content">
<h1>Site Usage ${usage_nav('Datasets')}</h1>	<h1>Site Usage ${usage_nav('Datasets')}</h1>

<div class="boxed">	<div class="boxed">
<h3 py:if="c.publisher"><a href="${h.url_for(controller='ckanext.dgu.controllers.publisher:PublisherController',action='read',id=c.publisher.name)}">${c.publisher.title}</a></h3>	<h3 py:if="c.publisher"><a href="${h.url_for(controller='ckanext.dgu.controllers.publisher:PublisherController',action='read',id=c.publisher.name)}">${c.publisher.title}</a></h3>

<p py:if="not c.top_packages">No page views in this period</p>	<p py:if="not c.top_packages">No page views in this period</p>

<py:if test="c.top_packages">	<py:if test="c.top_packages">
${rickshaw_graph(c.graph_data,'dataset-downloads',debug=True)}	${rickshaw_graph(c.graph_data,'dataset-downloads',debug=True)}
</py:if>	</py:if>
<form class="form-inline" action="${h.url_for(controller='ckanext.ga_report.controller:GaDatasetReport',action='read')}" method="get">	<form 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" type='submit' value="Update"/>	<input class="btn button btn-primary" type='submit' value="Update"/>
</div>	</div>
</form>	</form>
<py:if test="c.top_packages">	<py:if test="c.top_packages">
<table class="ga-reports-table table table-condensed table-bordered table-striped">	<table class="ga-reports-table table table-condensed table-bordered table-striped">
<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>

</div>	</div>

</div>	</div>

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