Merge branch 'tracking' into 'master'

Tracking to close issue #12 See merge request !3

Merge branch 'tracking' into 'master'
Tracking to close issue #12 See merge request !3
c2e6e685 · Daniel W Bond · 07f11596 · 675e14ae · c2e6e685 · c2e6e685
Commit c2e6e685 authored Feb 23, 2015 by Daniel W Bond
5 changed files
--- a/requirements.txt
+++ b/requirements.txt
 Django==1.7.3
 argparse==1.2.1
 django-allauth==0.19.0
+django-analytical==0.19.0
 django-autoslug==1.7.2
 django-braces==1.4.0
 django-crispy-forms==1.4.0

--- a/roomlist/settings/config.py.template
+++ b/roomlist/settings/config.py.template
@@ -10,3 +10,10 @@ TEMPLATE_DEBUG = True
 # the domains this application will be deployed on, e.g. which
 # domains this app should listen to requests from.
 ALLOWED_HOSTS = ['127.0.0.1']
+
+# configure piwik analytics
+# point to the piwik url
+PIWIK_DOMAIN_PATH = 'piwik.example.com'
+
+# set piwik server site id (piwik can track multiple websites)
+PIWIK_SITE_ID = '4'
--- a/roomlist/settings/settings.py
+++ b/roomlist/settings/settings.py
@@ -52,6 +52,9 @@ DEBUG = config.DEBUG
 TEMPLATE_DEBUG = config.TEMPLATE_DEBUG
 ALLOWED_HOSTS = config.ALLOWED_HOSTS

+PIWIK_DOMAIN_PATH = config.PIWIK_DOMAIN_PATH
+PIWIK_SITE_ID = config.PIWIK_SITE_ID
+
 # Application definition

 INSTALLED_APPS = (
@@ -70,6 +73,7 @@ INSTALLED_APPS = (
    # packages
    'crispy_forms',
    'django_gravatar',
+    'analytical',
    'allauth',
    'allauth.account',
    'allauth.socialaccount',

--- a/roomlist/templates/layouts/base.html
+++ b/roomlist/templates/layouts/base.html
@@ -14,6 +14,7 @@
 </head>

 <body>
+  {% load piwik %}
  <div id="wrap" style="display: flex;">
    {% include 'layouts/navbar.html' %}
    <div id="contentcontain" class="container">
@@ -23,6 +24,7 @@
  <div id="footer">
    {% include 'layouts/footer.html' %}
  </div>
+  {% piwik %}
 </body>

 </html>
--- a/roomlist/templates/privacy.html
+++ b/roomlist/templates/privacy.html
@@ -74,12 +74,7 @@ SRCT Roomlist &bull; Privacy Policy
    </p>
  </div>
  <div class="col-lg-6">
-    <h2>Can I opt out?</h2>
-    <p>
-      You may <a href="#">opt out</a> (or in) of
-      all future analytics. (Note: some sites won't give you this option, but
-      you can <a href="https://disconnect.me/">block their trackers</a>.)
-    </p>
+    <h2>What happens to my information?</h2>
    <p>
      Any interaction you make with this site can be removed at your discretion.
      Please see your account settings page to limit your visibility to other