Gitlab is now using https://gitlab.lcsb.uni.lu as it's primary address. Please update your bookmarks. FAQ.

Commit 5cd50800 authored by Jacek Lebioda's avatar Jacek Lebioda
Browse files

Merge branch 'update-banner' into 'latest'

Update banner

See merge request core-services/jekyll-theme-lcsb-default!48
parents 56058148 88784edb
......@@ -85,13 +85,13 @@ kramdown:
# GDPR banner settings
banner_title: >-
This website uses cookies
This website needs some cookies and similar means to function.
banner_text: >-
If you permit us, we will use those means to collect data on your visits for aggregated statistics to improve our service.
banner_accept_text: >-
Accept
Accept cookies for aggregated statistics
banner_refuse_text: >-
Decline
No thanks, only technically necessary cookies
banner_more_text: >-
More information
cookies_expire: 180 # days
......@@ -105,3 +105,4 @@ only_necessary_text: >-
path_policy: privacy-policy
logo_policy: /assets/banners/r3-logo.svg
timeout_hidebanner: 500 # milliseconds
cookieDomain: '*' # track visitors across all subdomains of a given domain; set to * to ignore
......@@ -13,8 +13,6 @@
<div class="banner-buttons">
<a class="btn lap-accept">{{ site.banner_accept_text }}</a>
<a class="btn lap-refuse">{{ site.banner_refuse_text }}</a>
<div class="banner-buttons-more">
<a class="btn lap-cookies-more" href="{{ site.path_policy | relative_url }} ">{{ site.banner_more_text }}</a>
</div>
<a class="btn lap-cookies-more" href="{{ site.path_policy | relative_url }}">{{ site.banner_more_text }}</a>
</div>
</div>
\ No newline at end of file
......@@ -24,6 +24,7 @@
settings.cookieName = "{{ site.cookieName }}";
settings.bots = /bot|crawler|spider|crawling/i;
settings.timeout_hidebanner = "{{ site.timeout_hidebanner }}";
settings.cookieDomain = "{{ site.cookieDomain }}";
</script>
<script src="{{ '/assets/js/jquery.min.js' | relative_url }}"></script>
<script src="{{ '/assets/js/gdpr.js' | relative_url }}"></script>
......
......@@ -10,6 +10,7 @@
border-top: 1px solid #198cdc;
width: 100%;
display: none;
/* hidden by default */
}
......@@ -54,13 +55,6 @@
left: 100%;
}
#lap-cookies-banner .banner-buttons .banner-buttons-more {
position: relative;
left: 55%;
top: -28px;
width: 20%;
}
#lap-cookies-banner .banner-buttons .lap-accept,
#lap-cookies-banner .banner-buttons .lap-refuse,
#lap-cookies-banner .banner-buttons .lap-cookies-more,
......@@ -103,6 +97,8 @@
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
margin-right: 10px;
margin-bottom: 10px;
}
// Small component to show a Material Design style input toggle
......@@ -195,18 +191,29 @@ label.input-toggle {
}
@media(max-width: 500px) {
#lap-cookies-banner {
position: fixed;
bottom: 0;
background-color: #fff;
padding-top: 1em;
padding-bottom: 1em;
z-index: 1000;
left: 0;
text-align: center;
border-top: 1px solid #198cdc;
width: 100%;
display: none;
height: 280px;
overflow: auto;
/* hidden by default */
}
#lap-cookies-banner .banner-intro {
width: 60%;
position: relative;
left: 20%;
text-align: left;
}
#lap-cookies-banner .banner-buttons .banner-buttons-more {
position: relative;
left: 25%;
top: 10px;
width: 50%;
}
}
@media(max-width: 1100px) {
......@@ -222,12 +229,6 @@ label.input-toggle {
height: 60px;
margin-bottom: 10px;
}
#lap-cookies-banner .banner-buttons .banner-buttons-more {
position: relative;
left: 25%;
top: 10px;
width: 50%;
}
}
@media(max-width: 1600px) {
......@@ -242,17 +243,9 @@ label.input-toggle {
/* ultra-wide screen */
@media(min-width: 2400px) {
#lap-cookies-banner .banner-intro {
position: relative;
text-align: left;
max-width: 800px;
left: 35%;
}
#lap-cookies-banner .banner-buttons .banner-buttons-more {
position: relative;
left: 50%;
top: -28px;
width: 20%;
}
}
\ No newline at end of file
......@@ -15,6 +15,11 @@ function loadMatomo() {
_paq.push(['trackPageView']);
_paq.push(['setIgnoreClasses', ['no-tracking', 'colorbox']]);
_paq.push(['enableLinkTracking']);
// set the cookie domain an
if(!(settings.cookieDomain == "*")) {
_paq.push(["setCookieDomain", settings.cookieDomain]);
}
var d = document,
g = d.createElement('script'),
s = d.getElementsByTagName('script')[0];
......
......@@ -3,5 +3,5 @@
# Note: keep the format of NUMBER.NUMBER.NUMBER (where NUMBER is [0-9]+);
# Otherwise Gitlab-CI could fail to detect the version (see .gitlab-ci.yml) and auto-tag the job
module Theme
VERSION = "0.4.0"
VERSION = "0.4.1"
end
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