sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'develop' into feature/restapi

Browse Source
This commit is contained in:
Sander Roosendaal
2016-12-21 13:23:28 +01:00
parent cd151a7267 2e4a5c0621
commit 24c166a5d3
5 changed files with 50 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rowers/templates/base.html
View File

@@ -1,11 +1,12 @@
{% load cookielaw_tags %}
{% load analytical %}
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
<html lang="en">
<head>
<script src="/static/cookielaw/js/cookielaw.js"></script>
{% analytical_head_top %}
<link rel="stylesheet" href="/static/css/bokeh-0.12.3.min.css" type="text/css" />
<link rel="stylesheet" href="/static/css/bokeh-widgets-0.12.3.min.css" type="text/css" />
<link rel="shortcut icon" href="/static/img/myicon.png" />
<link rel="shortcut icon" href="/static/img/favicon.ico" />
@@ -16,11 +17,12 @@
<link rel="stylesheet" href="/static/css/text.css" />
<link rel="stylesheet" href="/static/css/960_12_col.css" />
<link rel="stylesheet" href="/static/css/rowsandall.css" />
<link rel="stylesheet" href="static/css/cookiecuttr.css" />
{% block meta %} {% endblock %}
{% analytical_head_bottom %}
</head>
<body>
{% analytical_body_top %}
{% analytical_body_top %}
<div class="container_12">
<div id="logo" class="grid_2">
{% if user.rower.rowerplan == 'pro' %}
@@ -180,6 +182,7 @@
</div>
{% endblock %}
</div>
{% cookielaw_banner %}
</div>
<!-- end container -->
{% analytical_body_bottom %}

1
rowsandall_app/settings.py
View File

@@ -52,6 +52,7 @@ INSTALLED_APPS = [
'oauth2_provider',
'corsheaders',
'analytical',
'cookielaw'
]
AUTHENTICATION_BACKENDS = (

19
static/cookielaw/css/cookielaw.css Normal file
View File

@@ -0,0 +1,19 @@
#CookielawBanner {
background: #fff;
padding: 15px 0;
}
#CookielawBanner .container {
position: relative;
}
#CookielawBanner #CookielawCross {
background: url('../img/close.png') no-repeat 0 0;
cursor: pointer;
display: block;
position: absolute;
top: 0;
right: 0;
width: 15px;
height: 15px;
}

BIN
static/cookielaw/img/close.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 190 B

25
static/cookielaw/js/cookielaw.js Normal file
View File

@@ -0,0 +1,25 @@
var Cookielaw = {
createCookie: function (name, value, days) {
var date = new Date(),
expires = '';
if (days) {
date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
expires = "; expires=" + date.toGMTString();
} else {
expires = "";
}
document.cookie = name + "=" + value + expires + "; path=/";
},
createCookielawCookie: function () {
this.createCookie('cookielaw_accepted', '1', 10 * 365);
if (typeof (window.jQuery) === 'function') {
jQuery('#CookielawBanner').slideUp();
} else {
document.getElementById('CookielawBanner').style.display = 'none';
}
}
};