diff --git a/publichealth/home/migrations/0022_auto_20180516_1515.py b/publichealth/home/migrations/0022_auto_20180525_1520.py similarity index 59% rename from publichealth/home/migrations/0022_auto_20180516_1515.py rename to publichealth/home/migrations/0022_auto_20180525_1520.py index 618593a..9e8cf65 100644 --- a/publichealth/home/migrations/0022_auto_20180516_1515.py +++ b/publichealth/home/migrations/0022_auto_20180525_1520.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11.13 on 2018-05-16 13:15 +# Generated by Django 1.11.13 on 2018-05-25 13:20 from __future__ import unicode_literals from django.db import migrations, models @@ -23,7 +23,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='articleindexpage', name='title_en', - field=models.CharField(default='', max_length=255), + field=models.CharField(blank=True, default='', max_length=255), ), migrations.AddField( model_name='articlepage', @@ -38,6 +38,26 @@ class Migration(migrations.Migration): migrations.AddField( model_name='articlepage', name='title_en', + field=models.CharField(blank=True, default='', max_length=255), + ), + migrations.AddField( + model_name='contact', + name='title_en', field=models.CharField(default='', max_length=255), ), + migrations.AddField( + model_name='homepage', + name='body_en', + field=wagtail.wagtailcore.fields.RichTextField(blank=True, default=''), + ), + migrations.AddField( + model_name='homepage', + name='infos_en', + field=wagtail.wagtailcore.fields.StreamField((('info', wagtail.wagtailcore.blocks.StructBlock((('title', wagtail.wagtailcore.blocks.CharBlock(required=True)), ('photo', wagtail.wagtailimages.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.wagtailcore.blocks.RichTextBlock(required=True)), ('action', wagtail.wagtailcore.blocks.CharBlock(required=False)), ('url', wagtail.wagtailcore.blocks.URLBlock(required=False))))),), blank=True, null=True), + ), + migrations.AddField( + model_name='homepage', + name='intro_en', + field=wagtail.wagtailcore.fields.RichTextField(blank=True, default=''), + ), ] diff --git a/publichealth/settings/dev.py b/publichealth/settings/dev.py index e855f5d..2a8d532 100644 --- a/publichealth/settings/dev.py +++ b/publichealth/settings/dev.py @@ -8,6 +8,9 @@ TEMPLATES[0]['OPTIONS']['debug'] = True # SECURITY WARNING: keep the secret key used in production secret! SECRET_KEY = 'CHANGEME!!!' +# SECURITY WARNING: CAREFUL! your dev site is open to the world +ALLOWED_HOSTS = ['*'] + INTERNAL_IPS = ('127.0.0.1', '10.0.2.2') BASE_URL = 'http://localhost:8000' diff --git a/publichealth/static/css/sphc.css b/publichealth/static/css/sphc.css new file mode 100644 index 0000000..9a91247 --- /dev/null +++ b/publichealth/static/css/sphc.css @@ -0,0 +1,12 @@ +#footer { display: none; } + +.navbar-brand span, .navbar-brand img { display:none; } +a.navbar-brand { + height: 64px; + padding-right: 62px; + background: url('/static/images/ssph-logo.jpg') center right no-repeat; + background-size: auto 75%; +} +.navbar-brand:after { + content: 'Swiss Public Health Conference'; +} diff --git a/publichealth/static/images/ssph-logo.jpg b/publichealth/static/images/ssph-logo.jpg new file mode 100644 index 0000000..2382882 Binary files /dev/null and b/publichealth/static/images/ssph-logo.jpg differ diff --git a/publichealth/templates/footer.html b/publichealth/templates/footer.html index 3bcb9e2..897d730 100644 --- a/publichealth/templates/footer.html +++ b/publichealth/templates/footer.html @@ -1,4 +1,4 @@ -{% load wagtailcore_tags navigation information %} +{% load static wagtailcore_tags navigation information %} {% get_site_root as site_root %} @@ -32,3 +32,7 @@ + +{% if site_root.slug == "sphc" %} + +{% endif %}