--- a/ckanext/ga_report/templates/ga_report/site/index.html +++ b/ckanext/ga_report/templates/ga_report/site/index.html @@ -9,114 +9,84 @@ <py:def function="optional_head"> <link rel="stylesheet" type="text/css" href="/scripts/vendor/rickshaw.min.css"/> + <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/ckanext_ga_reports.js?1"></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/vendor/d3.v2.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> - <style type="text/css"> - .table-condensed td.sparkline-cell { - padding: 1px 0 0 0; - width: 108px; - text-align: center; - } - .chart_container { - position: relative; - height: 300px; - margin: 0 auto 20px auto; - } - .chart { - position: absolute; - left: 40px; - width: 500px; - top: 0; - bottom: 0; - } - .legend { - position: absolute; - right: 0; - top: 0; - margin-left: 15px; - background: transparent; - max-width: 150px; - overflow: hidden; - } - .y_axis { - position: absolute; - top: 0; - bottom: 0; - width: 40px; - } - </style> </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> - <xi:include href="../notes.html" /> + <py:def function="sidebar"> + ${ga_sidebar(download_link=h.url_for(controller='ckanext.ga_report.controller:GaReport',action='csv',month=c.month or 'all'))} + </py:def> + + <py:match path="breadcrumbs"> + <li><a href="/data/site-usage">Site Analytics</a></li> + <li><a href="/data/site-usage">Site-wide</a></li> </py:match> + <div py:match="content"> - <h1>Site Usage</h1> - ${usage_nav('Site-wide')} - <form class="form-inline" action="${h.url_for(controller='ckanext.ga_report.controller:GaReport',action='index')}" method="get"> - <div class="controls"> + <h3 style='text-align:center;'> + Site-wide + <span style="color: #bbb;margin:10px;">|</span> + <a href="/data/site-usage/publisher">Publishers</a> + <span style="color: #bbb;margin:10px;">|</span> + <a href="/data/site-usage/dataset">Datasets</a> + </h3> - ${month_selector(c.month, c.months, c.day)} - - <input class="btn button btn-primary" type='submit' value="Update"/> - </div> - </form> - + <div class="boxed"> <div class="tabbable"> <ul class="nav nav-tabs"> - <li class="active"><a href="#totals" data-toggle="tab">Totals</a></li> + <li class="active"><a href="#totals" data-toggle="hashtab">Totals</a></li> <li class="dropdown"> - <a href="#browsers" class="dropdown-toggle" data-toggle="dropdown">Browsers + <a href="#" class="dropdown-toggle" data-toggle="dropdown">Browsers <b class="caret"></b></a> <ul class="dropdown-menu"> - <li><a href="#browsers_names" data-toggle="tab">Browsers</a></li> - <li><a href="#browsers_versions" data-toggle="tab">Versions</a></li> + <li><a href="#browsers_names" data-toggle="hashtab">Browsers</a></li> + <li><a href="#browsers_versions" data-toggle="hashtab">Versions</a></li> </ul> </li> <li class="dropdown"> - <a href="#browsers" class="dropdown-toggle" data-toggle="dropdown">Operating<br/>Systems + <a href="#" class="dropdown-toggle" data-toggle="dropdown">Operating Systems <b class="caret"></b></a> <ul class="dropdown-menu"> - <li><a href="#os" data-toggle="tab">Operating Systems</a></li> - <li><a href="#os_versions" data-toggle="tab">Versions</a></li> + <li><a href="#os" data-toggle="hashtab">Operating Systems</a></li> + <li><a href="#os_versions" data-toggle="hashtab">Versions</a></li> </ul> </li> <li class="dropdown"> - <a href="#browsers" class="dropdown-toggle" data-toggle="dropdown">Social Networks + <a href="#" class="dropdown-toggle" data-toggle="dropdown">Social <b class="caret"></b></a> <ul class="dropdown-menu"> - <li><a href="#social_networks" data-toggle="tab">All networks</a></li> - <li><a href="#social_referrals_totals" data-toggle="tab">Referral links</a></li> + <li><a href="#social_networks" data-toggle="hashtab">All networks</a></li> + <li><a href="#social_referrals_totals" data-toggle="hashtab">Referral links</a></li> </ul> </li> - - <li><a href="#social_networks" data-toggle="tab"></a></li> - <li><a href="#languages" data-toggle="tab">Languages</a></li> - <li><a href="#country" data-toggle="tab">Country</a></li> + <li><a href="#languages" data-toggle="hashtab">Languages</a></li> + <li><a href="#country" data-toggle="hashtab">Country</a></li> </ul> <div class="tab-content"> <div class="tab-pane active" id="totals"> - <table class="table table-condensed table-bordered table-striped"> + <form class="form-inline" action="${h.url_for(controller='ckanext.ga_report.controller:GaReport',action='index')}" method="get"> + <h4 class="ga-reports-heading">Show stats table for:</h4> + ${month_selector(c.month, c.months, c.day)} + </form> + <table class="ga-reports-table table table-condensed table-bordered table-striped"> <tr> <th>Name</th> - <th>Value</th> + <th class="td-numeric">Value</th> <th>History</th> </tr> <py:for each="name, value, graph in c.global_totals"> <tr> <td>${name}</td> - <td>${value}</td> + <td class="td-numeric">${value}</td> <td class="sparkline-cell"> <span class="sparkline" sparkTooltips="${','.join([x for x,y in graph])}"> ${','.join([y for x,y in graph])} @@ -127,67 +97,91 @@ </table> </div> <div class="tab-pane" id="browsers_versions"> - ${rickshaw_graph(c.browser_versions_graph,'browser-versions')} + ${rickshaw_graph(c.browser_versions_graph,'browser-versions',mode='stack')} + <hr/> <p>Note: Where a browser has a large number of versions, these have been grouped together.</p> + <form class="form-inline" action="${h.url_for(controller='ckanext.ga_report.controller:GaReport',action='index')}" method="get"> + <h4 class="ga-reports-heading">Show stats table for:</h4> + ${month_selector(c.month, c.months, c.day)} + </form> ${stat_table(c.browser_versions)} </div> <div class="tab-pane" id="browsers_names"> - ${rickshaw_graph(c.browsers_graph,'browsers')} + ${rickshaw_graph(c.browsers_graph,'browsers',mode='stack')} + <hr/> + <form class="form-inline" action="${h.url_for(controller='ckanext.ga_report.controller:GaReport',action='index')}" method="get"> + <h4 class="ga-reports-heading">Show stats table for:</h4> + ${month_selector(c.month, c.months, c.day)} + </form> ${stat_table(c.browsers)} </div> <div class="tab-pane" id="os"> - ${rickshaw_graph(c.os_graph,'os')} + ${rickshaw_graph(c.os_graph,'os',mode='stack')} + <hr/> + <form class="form-inline" action="${h.url_for(controller='ckanext.ga_report.controller:GaReport',action='index')}" method="get"> + <h4 class="ga-reports-heading">Show stats table for:</h4> + ${month_selector(c.month, c.months, c.day)} + </form> ${stat_table(c.os)} </div> <div class="tab-pane" id="os_versions"> - ${rickshaw_graph(c.os_versions_graph,'os_versions')} + ${rickshaw_graph(c.os_versions_graph,'os_versions',mode='stack')} + <hr/> + <form class="form-inline" action="${h.url_for(controller='ckanext.ga_report.controller:GaReport',action='index')}" method="get"> + <h4 class="ga-reports-heading">Show stats table for:</h4> + ${month_selector(c.month, c.months, c.day)} + </form> ${stat_table(c.os_versions)} </div> <div class="tab-pane" id="social_referrals_totals"> <p>Number of visits that were referred from social networks</p> + <form class="form-inline" action="${h.url_for(controller='ckanext.ga_report.controller:GaReport',action='index')}" method="get"> + <h4 class="ga-reports-heading">Show stats table for:</h4> + ${month_selector(c.month, c.months, c.day)} + </form> ${social_table(c.social_referrer_totals)} </div> <div class="tab-pane" id="social_networks"> - ${rickshaw_graph(c.social_networks_graph, 'social_networks')} + ${rickshaw_graph(c.social_networks_graph, 'social_networks',mode='stack')} + <hr/> <p>Percentage of visits that were referred from these social networks</p> + <form class="form-inline" action="${h.url_for(controller='ckanext.ga_report.controller:GaReport',action='index')}" method="get"> + <h4 class="ga-reports-heading">Show stats table for:</h4> + ${month_selector(c.month, c.months, c.day)} + </form> ${stat_table(c.social_networks, 'Visits')} </div> <div class="tab-pane" id="languages"> - ${rickshaw_graph(c.languages_graph,'languages')} + ${rickshaw_graph(c.languages_graph,'languages',mode='stack')} + <hr/> + <form class="form-inline" action="${h.url_for(controller='ckanext.ga_report.controller:GaReport',action='index')}" method="get"> + <h4 class="ga-reports-heading">Show stats table for:</h4> + ${month_selector(c.month, c.months, c.day)} + </form> ${stat_table(c.languages)} </div> <div class="tab-pane" id="country"> - ${rickshaw_graph(c.country_graph,'country')} + ${rickshaw_graph(c.country_graph,'country',mode='stack')} + <hr/> + <form class="form-inline" action="${h.url_for(controller='ckanext.ga_report.controller:GaReport',action='index')}" method="get"> + <h4 class="ga-reports-heading">Show stats table for:</h4> + ${month_selector(c.month, c.months, c.day)} + </form> ${stat_table(c.country)} </div> - - </div> </div> - - - + </div> </div> <py:def function="optional_footer"> <script type="text/javascript"> $(function() { - var sparkOptions = { - enableTagOptions: true, - type: 'line', - width: 100, - height: 26, - chartRangeMin: 0, - spotColor: '', - maxSpotColor: '', - minSpotColor: '', - highlightSpotColor: '000000', - lineColor: '3F8E6D', - fillColor: 'B7E66B' - }; - $('.sparkline').sparkline('html',sparkOptions); - }); + CKAN.GA_Reports.bind_sparklines(); + CKAN.GA_Reports.bind_sidebar(); + CKAN.GA_Reports.bind_month_selector(); + }); </script> </py:def>