Added Puput, updated Django

publichealth/home/models.py

@@ -41,6 +41,7 @@ class ArticleIndexPage(Page):
         context['articles'] = articles
         return context
 
+    subpage_types = ['home.ArticlePage']
     class Meta:
         verbose_name = "Rubrik"
 
@@ -181,4 +182,7 @@ class HomePage(Page):
         # Update template context
         context = super(HomePage, self).get_context(request)
         context['featured'] = featured
-        return context
+        return context
+
+    class Meta:
+        verbose_name = "Frontpage"

publichealth/settings/base.py

@@ -10,17 +10,14 @@ For the full list of settings and their values, see
 https://docs.djangoproject.com/en/1.8/ref/settings/
 """
 
+# See https://docs.djangoproject.com/en/1.8/howto/deployment/checklist/
+
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 import os
 
 PROJECT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 BASE_DIR = os.path.dirname(PROJECT_DIR)
 
-
-# Quick-start development settings - unsuitable for production
-# See https://docs.djangoproject.com/en/1.8/howto/deployment/checklist/
-
-
 # Application definition
 
 INSTALLED_APPS = [
@@ -30,6 +27,7 @@ INSTALLED_APPS = [
 
     'wagtail.contrib.wagtailsearchpromotions',
     'wagtail.contrib.wagtailroutablepage',
+    'wagtail.contrib.wagtailsitemaps',
     'wagtail.wagtailforms',
     'wagtail.wagtailredirects',
     'wagtail.wagtailembeds',
@@ -45,6 +43,7 @@ INSTALLED_APPS = [
     'modelcluster',
     'compressor',
     'taggit',
+    'puput',
 
     'django.contrib.admin',
     'django.contrib.auth',
@@ -192,3 +191,7 @@ WAGTAILSEARCH_BACKENDS = {
 # Wagtail settings
 
 WAGTAIL_SITE_NAME = "Public Health Schweiz"
+
+# Puput settings
+
+PUPUT_AS_PLUGIN = True

publichealth/urls.py

@@ -6,18 +6,19 @@ from django.conf.urls.i18n import i18n_patterns
 from wagtail.wagtailadmin import urls as wagtailadmin_urls
 from wagtail.wagtaildocs import urls as wagtaildocs_urls
 from wagtail.wagtailcore import urls as wagtail_urls
+from puput import urls as puput_urls
 
 from publichealth.search import views as search_views
 
 
 urlpatterns = [
+    url(r'', include(puput_urls)),
     url(r'^django-admin/', include(admin.site.urls)),
 
     url(r'^admin/', include(wagtailadmin_urls)),
     url(r'^documents/', include(wagtaildocs_urls)),
 
     url(r'^search/$', search_views.search, name='search'),
-
 ]
 
 

requirements.txt

@@ -1,8 +1,9 @@
-Django==1.10.5
-psycopg2==2.6.2
+wagtail==1.9
+puput==0.8
+Django==1.10.6
+psycopg2==2.7.1
 elasticsearch==5.2.0
 django-redis==4.7.0
-wagtail==1.9
 django-libsass==0.7
 libsass==0.12.3
 Pillow==4.0.0