--- a/ckanext/ga_report/templates/ga_report/site/index.html +++ b/ckanext/ga_report/templates/ga_report/site/index.html @@ -12,6 +12,7 @@ + @@ -37,15 +38,6 @@

Site Usage

${usage_nav('Site-wide')} - -
-
- - ${month_selector(c.month, c.months, c.day)} - - -
-
- +
- + - +
NameValueValue History
${name}${value}${value} ${','.join([y for x,y in graph])} @@ -101,35 +93,67 @@
${rickshaw_graph(c.browser_versions_graph,'browser-versions',mode='stack')}

Note: Where a browser has a large number of versions, these have been grouped together.

+
+ + ${month_selector(c.month, c.months, c.day)} +
${stat_table(c.browser_versions)}
${rickshaw_graph(c.browsers_graph,'browsers',mode='stack')} +
+ + ${month_selector(c.month, c.months, c.day)} +
${stat_table(c.browsers)}
${rickshaw_graph(c.os_graph,'os',mode='stack')} +
+ + ${month_selector(c.month, c.months, c.day)} +
${stat_table(c.os)}
${rickshaw_graph(c.os_versions_graph,'os_versions',mode='stack')} +
+ + ${month_selector(c.month, c.months, c.day)} +
${stat_table(c.os_versions)}

Number of visits that were referred from social networks

+
+ + ${month_selector(c.month, c.months, c.day)} +
${social_table(c.social_referrer_totals)}
${rickshaw_graph(c.social_networks_graph, 'social_networks',mode='stack')}

Percentage of visits that were referred from these social networks

+
+ + ${month_selector(c.month, c.months, c.day)} +
${stat_table(c.social_networks, 'Visits')}
${rickshaw_graph(c.languages_graph,'languages',mode='stack')} +
+ + ${month_selector(c.month, c.months, c.day)} +
${stat_table(c.languages)}
${rickshaw_graph(c.country_graph,'country',mode='stack')} +
+ + ${month_selector(c.month, c.months, c.day)} +
${stat_table(c.country)}
@@ -142,7 +166,13 @@ $(function() { CKAN.GA_Reports.bind_sparklines(); CKAN.GA_Reports.bind_sidebar(); - $(window).trigger('hashchange'); + CKAN.GA_Reports.bind_month_selector(); + if (!window.location.hash) { + window.location.hash='totals'; + } + else { + $(window).trigger('hashchange'); + } });