--- a/ckanext/ga_report/templates/ga_report/site/index.html +++ b/ckanext/ga_report/templates/ga_report/site/index.html @@ -6,6 +6,8 @@ <xi:include href="../ga_util.html" /> <py:def function="page_title">Site usage</py:def> + + <py:def function="content_class"><!----></py:def> <py:def function="optional_head"> <link rel="stylesheet" type="text/css" href="/scripts/vendor/rickshaw.min.css"/> @@ -19,26 +21,13 @@ </py:def> <py:match path="primarysidebar"> - <li class="widget-container boxed widget_text"> - <h4>Download</h4> - <p><center> - <a class="btn button btn-primary" href="${h.url_for(controller='ckanext.ga_report.controller:GaReport',action='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 id="legend_none">(No graph loaded)</div> - </div> - </li> - <xi:include href="../notes.html" /> - + ${ga_sidebar(download_link=h.url_for(controller='ckanext.ga_report.controller:GaReport',action='csv',month=c.month or 'all'))} </py:match> <div py:match="content"> - <h1>Site Usage</h1> - ${usage_nav('Site-wide')} + <h1>Site Usage ${usage_nav('Site-wide')}</h1> + <div class="boxed"> <div class="tabbable"> <ul class="nav nav-tabs"> <li class="active"><a href="#totals" data-toggle="hashtab">Totals</a></li> @@ -162,6 +151,7 @@ </div> </div> </div> + </div> </div>