Merge branch 'master' of github.com:loleg/public-health-ch
This commit is contained in:
commit
d8a7b307f3
|
|
@ -44,6 +44,10 @@ server {
|
|||
add_header Cache-Control "public";
|
||||
}
|
||||
|
||||
# Disable English home page (for now)
|
||||
location ^/en$ { return 301 $scheme://$host/de/; }
|
||||
location ^/privacy$ { return 301 $scheme://$host/de/privacy; }
|
||||
|
||||
location / {
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
|
|
|
|||
|
|
@ -24,9 +24,39 @@ server {
|
|||
}
|
||||
}
|
||||
|
||||
# TODO: parameterize
|
||||
# Conference site
|
||||
server {
|
||||
listen 80;
|
||||
server_name sphc.ch;
|
||||
return 301 $scheme://sph17.organizers-congress.org;
|
||||
server_name ph-gamma-kzql0g21.datalets.ch;
|
||||
|
||||
client_max_body_size 16M;
|
||||
|
||||
gzip on;
|
||||
gzip_types text/plain text/css application/x-javascript image/svg+xml;
|
||||
gzip_comp_level 1;
|
||||
gzip_disable msie6;
|
||||
gzip_http_version 1.0;
|
||||
gzip_proxied any;
|
||||
gzip_vary on;
|
||||
|
||||
location /static/ {
|
||||
return 301 $scheme://public-health.ch$request_uri;
|
||||
}
|
||||
location /static/CACHE/ {
|
||||
return 301 $scheme://public-health.ch$request_uri;
|
||||
}
|
||||
location /favicon.ico {
|
||||
return 301 $scheme://public-health.ch$request_uri;
|
||||
}
|
||||
location /media/images {
|
||||
return 301 $scheme://public-health.ch$request_uri;
|
||||
}
|
||||
|
||||
location / {
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header Host $http_host;
|
||||
proxy_redirect off;
|
||||
proxy_pass http://wagtail-site;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@
|
|||
"dependencies": {
|
||||
"bootstrap-sass": "bootstrap-sass-official#^3.3.7",
|
||||
"slick-carousel": "^1.4.1",
|
||||
"slick-lightbox": "^0.2.10"
|
||||
"slick-lightbox": "^0.2.10",
|
||||
"cookieconsent": "cookieconsent2#^3.0.6"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
"bower": "latest"
|
||||
},
|
||||
"devDependencies": {
|
||||
"grunt": "^1.0.1",
|
||||
"grunt": "^1.0.2",
|
||||
"grunt-bg-shell": "^2.3.3",
|
||||
"grunt-bowercopy": "^1.2.4",
|
||||
"grunt-browser-sync": "^2.2.0",
|
||||
"grunt-contrib-imagemin": "^1.0.1",
|
||||
"grunt-contrib-imagemin": "^2.0.1",
|
||||
"grunt-contrib-sass": "^1.0.0",
|
||||
"grunt-contrib-watch": "^1.0.0"
|
||||
"grunt-contrib-watch": "^1.1.0"
|
||||
},
|
||||
"scripts": {
|
||||
"test": "echo \"Error: no test specified\" && exit 1"
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
@import 'paper/variables';
|
||||
@import '../libs/bootstrap-sass/assets/stylesheets/bootstrap';
|
||||
@import '../libs/cookieconsent/build/cookieconsent.min.css';
|
||||
@import 'paper/bootswatch';
|
||||
|
||||
// Modules
|
||||
|
|
|
|||
|
|
@ -18,6 +18,11 @@ footer#footer {
|
|||
color: white;
|
||||
text-align: center;
|
||||
font-size: 70%;
|
||||
|
||||
a {
|
||||
color: lighten($brand-secondary, 25%);
|
||||
font-weight: 600;
|
||||
}
|
||||
}
|
||||
|
||||
article footer .btn {
|
||||
|
|
|
|||
|
|
@ -2,11 +2,30 @@
|
|||
|
||||
.navbar-brand span, .navbar-brand img { display:none; }
|
||||
a.navbar-brand {
|
||||
height: 64px;
|
||||
height: 60px;
|
||||
padding-right: 62px;
|
||||
background: url('/static/images/ssph-logo.jpg') center right no-repeat;
|
||||
background-size: auto 75%;
|
||||
overflow: hidden;
|
||||
}
|
||||
.navbar-brand:after {
|
||||
content: 'Swiss Public Health Conference';
|
||||
}
|
||||
|
||||
#carousel-banner .carousel-caption > * { display: none; }
|
||||
#carousel-banner .carousel-caption {
|
||||
width: 13em;
|
||||
background: rgba(0,0,50,0.4);
|
||||
border: 6px solid white;
|
||||
font-size: 155%;
|
||||
padding: 1em 1em;
|
||||
left: 50%;
|
||||
margin-left: -6.5em;
|
||||
bottom: 2em;
|
||||
}
|
||||
#carousel-banner .carousel-caption:before {
|
||||
content: 'SPHC 2018'; display: block;
|
||||
}
|
||||
#carousel-banner .carousel-caption:after {
|
||||
content: 'Better Health Faster';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -68,6 +68,32 @@ $(document).ready(function() {
|
|||
nextArrow: '<span class="arrow right glyphicon glyphicon-chevron-right" aria-hidden="true">Next</span>',
|
||||
});
|
||||
|
||||
// Cookie notice via insites.com
|
||||
var langbase = $('.language-nav a.active').text().toLowerCase();
|
||||
window.cookieconsent.initialise({
|
||||
"palette": {
|
||||
"popup": {
|
||||
"background": "#edeff5",
|
||||
"text": "#838391"
|
||||
},
|
||||
"button": {
|
||||
"background": "#4b81e8"
|
||||
}
|
||||
},
|
||||
"theme": "edgeless",
|
||||
"content": {
|
||||
"message": langbase == 'fr' ?
|
||||
"Ce site Web utilise des cookies pour vous permettre une utilisation optimale de notre site Web."
|
||||
: "Diese Website verwendet Cookies, um Ihnen eine optimale Nutzung unserer Website zu ermöglichen.",
|
||||
"dismiss": langbase == 'fr' ?
|
||||
"D'accord"
|
||||
: "Zustimmen",
|
||||
"link": langbase == 'fr' ?
|
||||
"Pour plus d'informations"
|
||||
: "Weitere informationen",
|
||||
"href": "/" + langbase + "/privacy/"
|
||||
}
|
||||
});
|
||||
|
||||
// Pastel colors on live news
|
||||
// $('.feedpage-body .panel').each(function() {
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@
|
|||
<link rel="stylesheet" type="text/x-scss" href="{% static 'css/main.scss' %}">
|
||||
{% endcompress %}
|
||||
|
||||
<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
|
||||
<!--[if lt IE 9]>
|
||||
<script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
|
||||
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
|
||||
|
|
@ -34,6 +33,7 @@
|
|||
<script src="{% static 'libs/bootstrap-sass/assets/javascripts/bootstrap.min.js' %}"></script>
|
||||
<script src="{% static 'libs/slick-carousel/slick/slick.min.js' %}"></script>
|
||||
<script src="{% static 'libs/slick-lightbox/dist/slick-lightbox.js' %}"></script>
|
||||
<script src="{% static 'libs/cookieconsent/build/cookieconsent.min.js' %}"></script>
|
||||
{% endblock %}
|
||||
|
||||
{% compress js %}
|
||||
|
|
|
|||
|
|
@ -30,7 +30,9 @@
|
|||
</footer>
|
||||
|
||||
<div class="copyright">
|
||||
© 2017 Public Health Schweiz
|
||||
© 2018 Public Health Schweiz
|
||||
• <a href="/privacy/">Privacy Terms</a>
|
||||
• Code by <a href="https://madewithwagtail.org/developers/dataletsch/" target="_blank">Datalets</a>
|
||||
</div>
|
||||
|
||||
{% if site_root.slug == "sphc" %}
|
||||
|
|
|
|||
Loading…
Reference in New Issue