--- a/ckanext/ga_report/templates/ga_report/site/index.html
+++ b/ckanext/ga_report/templates/ga_report/site/index.html
@@ -7,36 +7,37 @@
Site usage
+
+
+
+
+
+
+
+
+
+
-
- Site-wide
-
- Note: this data does not include API calls and some values have been rounded up to 2 decimal places. Where there are a large number of browser versions they have been grouped together.
-
-
Download
- Download as CSV
+ Download as CSV
+
Site Usage
- ${usage_nav('Site-wide', None)}
+ ${usage_nav('Site-wide')}
@@ -78,63 +79,82 @@
Name
Value
+ History
-
+
${name}
${value}
+
+
+ ${','.join([y for x,y in graph])}
+
+
+ ${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.
${stat_table(c.browser_versions)}
+ ${rickshaw_graph(c.browsers_graph,'browsers',mode='stack')}
${stat_table(c.browsers)}
+ ${rickshaw_graph(c.os_graph,'os',mode='stack')}
${stat_table(c.os)}
+ ${rickshaw_graph(c.os_versions_graph,'os_versions',mode='stack')}
${stat_table(c.os_versions)}
-
Number of visits to urls referred from social networks
+
Number of visits that were referred from social networks
${social_table(c.social_referrer_totals)}
-
Percentage of visits referred from these social networks
-
+ ${rickshaw_graph(c.social_networks_graph, 'social_networks',mode='stack')}
+
Percentage of visits that were referred from these social networks
${stat_table(c.social_networks, 'Visits')}
+ ${rickshaw_graph(c.languages_graph,'languages',mode='stack')}
${stat_table(c.languages)}
+ ${rickshaw_graph(c.country_graph,'country',mode='stack')}
${stat_table(c.country)}
+
+
+
-
-
-
-
-
-
+
+
+
-
-
-
-
Number of visits to urls referred from social networks
+Number of visits that were referred from social networks
${social_table(c.social_referrer_totals)}