Merge branch 'develop' into feature/bg2

static/cookielaw/banner.html

@@ -0,0 +1,11 @@
+{% load i18n %}
+
+<div id="CookielawBanner">
+    <div class="container">
+        <h6>{% trans "COOKIE_INFO_HEADER" %}</h6>
+        <p>
+            <a class="btn btn-primary pull-right" href="javascript:Cookielaw.createCookielawCookie();">{% trans "COOKIE_INFO_OK" %}</a>
+            {% trans "COOKIE_INFO_PARA" %}
+        </p>
+    </div>
+</div>

static/cookielaw/css/cookielaw.css

@@ -8,7 +8,7 @@
 }
 
 #CookielawBanner #CookielawCross {
-    background: url('../img/close.png') no-repeat 0 0;
+    background: url('/static/img/close.png') no-repeat 0 0;
     cursor: pointer;
     display: block;
     position: absolute;