--- a/ckanext/ga_report/templates/ga_report/publisher/read.html +++ b/ckanext/ga_report/templates/ga_report/publisher/read.html @@ -21,10 +21,10 @@ <py:match path="breadcrumbs"> - <li><a href="/data/site-usage">Site Analytics</a></li> + <li><a href="/site-usage">Site Analytics</a></li> <py:if test="c.publisher"> - <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><a href="/site-usage/publisher">Publishers</a></li> + <li py:if="c.publisher"><a href="/site-usage/publisher/${c.publisher.name}">${c.publisher.title}</a></li> </py:if> <py:if test="not c.publisher"> <li><a href="${request.url}">Usage By Dataset</a></li> @@ -36,21 +36,14 @@ <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> </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="col-md-4"> - <div class="whitebox"> - <strong>Graph Legend</strong> - <div id="graph-legend-container"> - <div style="display: none;" id="legend_none">(No graph is loaded)</div> - </div> - </div> - </div> <div class="col-md-8"> <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"> ${rickshaw_graph(c.graph_data,'dataset-downloads',debug=True)} </py:if> @@ -92,7 +85,7 @@ ${h.link_to(package.title or package.name, h.url_for(controller='package', action='read', id=package.name))} </td> <td class="td-numeric">${views}</td> - <td class="td-numeric">${downloads}</td> + <td class="td-numeric">${downloads}</td> </tr> </py:for> </table> @@ -102,7 +95,7 @@ </div> - <xi:include href="../../layout.html" /> + <xi:include href="../site/layout.html" /> </html>