diff --git a/content/images/pluz.jpg b/content/images/pluz.jpg
index 8a9620f33..2155b8d93 100644
Binary files a/content/images/pluz.jpg and b/content/images/pluz.jpg differ
diff --git a/pelicanconf.py b/pelicanconf.py
index 3793da583..97bae4fb0 100644
--- a/pelicanconf.py
+++ b/pelicanconf.py
@@ -30,7 +30,7 @@ DEFAULT_PAGINATION = 25
# Uncomment following line if you want document-relative URLs when developing
PLUGIN_PATHS = ['./pelican-plugins', './plugins-custom']
-PLUGINS = ['dateish', 'extract_toc', 'i18n_subsites', 'summary', 'events-ics','complex_footnotes', 'stream']
+PLUGINS = ['dateish', 'extract_toc', 'i18n_subsites', 'summary', 'events-ics','complex_footnotes', 'stream', 'thumbnailer']
MD_EXTENSIONS = ['codehilite','extra','toc']
STATIC_PATHS = ['extra/favicon.ico', 'images', 'pdfs', 'stream']
@@ -55,12 +55,21 @@ I18N_SUBSITES = {
'locale':'nl.UTF-8'
}
}
+
+#Options for plugins
+
+#Our custom events plugin
PLUGIN_EVENTS = {
'ics_calendars': ['events.ics', 'curriculum.ics'],
'default_location' : '',
'calendar_per_category': False
}
+#Dateish plugin settings
DATEISH_PROPERTIES = ['event_start', 'event_end']
-
+#Thumbnailer plugin settings
+IMAGE_PATH ="images"
+THUMBNAIL_KEEP_NAME = True
+THUMBNAIL_DIR ="images"
+THUMBNAIL_SIZES = {'thumb':'200x?', 'thumb2x':'400x?'}
\ No newline at end of file
diff --git a/themes/varia/templates/article.html b/themes/varia/templates/article.html
index e68022f0e..f8a61fc2e 100644
--- a/themes/varia/templates/article.html
+++ b/themes/varia/templates/article.html
@@ -30,9 +30,16 @@
{% if article.event_start %}
@@ -50,7 +57,13 @@
{% if article.translations %}
{% for translation in article.translations %}
-
{{ translation.lang }}
+ {% if translation.lang == 'nl' %}
+
Lees dit artikel in het Nederlands
+ {% endif %}
+
+ {% if translation.lang == 'en' %}
+
Read this article in English
+ {% endif %}
{% endfor %}
{% endif %}
diff --git a/themes/varia/templates/index.html b/themes/varia/templates/index.html
index 68c79e345..65b0e7a09 100644
--- a/themes/varia/templates/index.html
+++ b/themes/varia/templates/index.html
@@ -5,75 +5,82 @@
{% for p in pages %}
{% if p.title == 'header' %}
- {{ p.content }}
-
+ {{ p.content }}
+
{% endif %}
{% endfor %}
{% block content_title %}
{% endblock %}
{% if articles_page.has_other_pages() %}
- {% include 'pagination.html' %}
+ {% include 'pagination.html' %}
{% endif %}
{% for article in articles_page.object_list %}
- {% if article.category %}
+ {% if article.category %}
{% if article.event_start %}
{% set event_status = '' %}
+ {% set thumb_size = '/thumb' %}
{% if article.event_start < article.date.now() %}
{% set event_status = ' past' %}
{% endif %}
{% if article.event_start >= article.date.now() %}
{% set event_status = ' current' %}
+ {% set thumb_size = '/thumb2x' %}
{% endif %}
{% endif %}
-
- {% endif %}
-
-
{{ article.title }}
- {% if article.event_start %}
+
+ {% endif %}
+
+
{{ article.title }}
+ {% if article.event_start %}
{{ article.event_start | strftime('%d %B %Y') }}
- {% set past = '' %}
+
{% endif %}
-
- {% if article.featured_image %}
-
-
-
- {% endif %}
-
-
- {{ article.summary }}
-
- {% if DEFAULT_LANG == 'en' %}
- read more
- {% elif DEFAULT_LANG == 'nl' %}
- lees meer
- {% endif %}
-
-
-
-
- {% if article.category %}
-
- {% endif %} {% if article.tags %}
-
- {% endif %}
-
-
+
+
+
+ {{ article.summary }}
+
+ {% if DEFAULT_LANG == 'en' %}
+ read more
+ {% elif DEFAULT_LANG == 'nl' %}
+ lees meer
+ {% endif %}
+
+
+
+
+ {% if article.category %}
+
+ {% endif %} {% if article.tags %}
+
+ {% endif %}
+
+
{% endfor %}
diff --git a/themes/varia/templates/syndication.html b/themes/varia/templates/syndication.html
index c1cff3f3e..cf662817f 100644
--- a/themes/varia/templates/syndication.html
+++ b/themes/varia/templates/syndication.html
@@ -15,7 +15,7 @@ serves as the default image for posts whose featured_image is not set. #}
{% if article %}
-
+
{% if article.date %}
@@ -26,7 +26,10 @@ serves as the default image for posts whose featured_image is not set. #}
{% endif %}
-
+
+
+
+
{% if article.featured_image %}
{% if I18N_SUBSITES %}
{% for lang, url in I18N_SUBSITES.items() %}