Skip to content

GitLab

Commit c2e6e685 authored by Daniel W Bond's avatar Daniel W Bond
Browse files

Merge branch 'tracking' into 'master' 

Tracking

to close issue #12

See merge request !3
parents 07f11596 675e14ae
Show whitespace changes
Inline Side-by-side
roomlist/settings/config.py.template
View file @ c2e6e685
...@@ -10,3 +10,10 @@ TEMPLATE_DEBUG = True ...@@ -10,3 +10,10 @@ TEMPLATE_DEBUG = True
# the domains this application will be deployed on, e.g. which # the domains this application will be deployed on, e.g. which
# domains this app should listen to requests from. # domains this app should listen to requests from.
ALLOWED_HOSTS = ['127.0.0.1'] 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'
roomlist/settings/settings.py
View file @ c2e6e685
...@@ -52,6 +52,9 @@ DEBUG = config.DEBUG ...@@ -52,6 +52,9 @@ DEBUG = config.DEBUG
TEMPLATE_DEBUG = config.TEMPLATE_DEBUG TEMPLATE_DEBUG = config.TEMPLATE_DEBUG
ALLOWED_HOSTS = config.ALLOWED_HOSTS ALLOWED_HOSTS = config.ALLOWED_HOSTS
PIWIK_DOMAIN_PATH = config.PIWIK_DOMAIN_PATH
PIWIK_SITE_ID = config.PIWIK_SITE_ID
# Application definition # Application definition
INSTALLED_APPS = ( INSTALLED_APPS = (
...@@ -70,6 +73,7 @@ INSTALLED_APPS = ( ...@@ -70,6 +73,7 @@ INSTALLED_APPS = (
# packages # packages
'crispy_forms', 'crispy_forms',
'django_gravatar', 'django_gravatar',
'analytical',
'allauth', 'allauth',
'allauth.account', 'allauth.account',
'allauth.socialaccount', 'allauth.socialaccount',
......
roomlist/templates/layouts/base.html
View file @ c2e6e685
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
</head> </head>
<body> <body>
{% load piwik %}
<div id="wrap" style="display: flex;"> <div id="wrap" style="display: flex;">
{% include 'layouts/navbar.html' %} {% include 'layouts/navbar.html' %}
<div id="contentcontain" class="container"> <div id="contentcontain" class="container">
...@@ -23,6 +24,7 @@ ...@@ -23,6 +24,7 @@
<div id="footer"> <div id="footer">
{% include 'layouts/footer.html' %} {% include 'layouts/footer.html' %}
</div> </div>
{% piwik %}
</body> </body>
</html> </html>
roomlist/templates/privacy.html
View file @ c2e6e685
...@@ -74,12 +74,7 @@ SRCT Roomlist &bull; Privacy Policy ...@@ -74,12 +74,7 @@ SRCT Roomlist &bull; Privacy Policy
</p> </p>
</div> </div>
<div class="col-lg-6"> <div class="col-lg-6">
<h2>Can I opt out?</h2> <h2>What happens to my information?</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>
<p> <p>
Any interaction you make with this site can be removed at your discretion. 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 Please see your account settings page to limit your visibility to other
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment