From 85b043eaa614e9f57dddcdc4c01d3b4b9ae3d404 Mon Sep 17 00:00:00 2001 From: "mb@mb" Date: Tue, 28 Nov 2017 19:37:21 +0100 Subject: [PATCH] english link url is working again! --- content/hbsc-cal-1.en.md | 2 ++ content/inox.nl.md | 5 +++-- content/sdr-workshop.en.md | 4 +++- content/sdr-workshop.nl.md | 2 +- content/sounduncloud.en.md | 3 ++- content/sounduncloud.nl.md | 3 ++- content/the-secret-life-seizoen-1.en.md | 3 ++- content/the-secret-life-seizoen-1.nl.md | 3 ++- content/the-secret-life-seizoen-2.en.md | 2 ++ content/the-secret-life-seizoen-2.nl.md | 3 ++- content/the-secret-life-seizoen-3.en.md | 3 ++- content/the-secret-life-seizoen-3.nl.md | 6 +++--- pelicanconf.py | 13 ++++++++----- themes/cetcat/templates/article.html | 2 +- themes/cetcat/templates/index.html | 6 +++--- 15 files changed, 38 insertions(+), 22 deletions(-) diff --git a/content/hbsc-cal-1.en.md b/content/hbsc-cal-1.en.md index 49f31381e4..0a0207ee35 100644 --- a/content/hbsc-cal-1.en.md +++ b/content/hbsc-cal-1.en.md @@ -4,6 +4,8 @@ Category: gathering Slug: hbsc-cal-1-en lang: en start: Thursday 16 November, 19:00 +event_start: 2017-11-05 19:30 +event_duration:4h ![map preview](/images/cal.png) diff --git a/content/inox.nl.md b/content/inox.nl.md index 0bddd54912..dbb76a8cca 100644 --- a/content/inox.nl.md +++ b/content/inox.nl.md @@ -1,9 +1,10 @@ Title: Soep & Woorden - Inox Kapell -Date: 2017-12-16 Category: event Slug: inox-kapell lang: nl -start: zaterdag 16 december, 19:00 +start: vrijdag 16 december +event_start: 2017-12-16 19:00 +event_duration:4h ![Inox Kapell](/images/insekt.jpg) diff --git a/content/sdr-workshop.en.md b/content/sdr-workshop.en.md index 672fdc9bee..26c294fc92 100644 --- a/content/sdr-workshop.en.md +++ b/content/sdr-workshop.en.md @@ -3,7 +3,9 @@ Date: 2017-09-09 Category: curriculum Slug: sdr-intro lang: en -curriculum: True +Status: draft +event_start: 2017-12-31 12:00 +event_duration:4h ![This is not an SDR](/images/radio.jpg) diff --git a/content/sdr-workshop.nl.md b/content/sdr-workshop.nl.md index 398f61ca44..7a65622966 100644 --- a/content/sdr-workshop.nl.md +++ b/content/sdr-workshop.nl.md @@ -3,7 +3,7 @@ Date: 2017-09-09 Category: curriculum Slug: sdr-intro lang: nl -curriculum: True +status: draft event-start:2017-11-21 19:30 event-duration:2h event-recurring: weekly until 2017-12-15 diff --git a/content/sounduncloud.en.md b/content/sounduncloud.en.md index fccd2d08f0..65b6d6eaca 100644 --- a/content/sounduncloud.en.md +++ b/content/sounduncloud.en.md @@ -4,7 +4,8 @@ Category: curriculum Slug: sounduncloud lang: en curriculum: True -start: Friday 1 December +event_start: 2017-12-01 12:00 +event_duration:6h ![Offline listening for days!](/images/offline_listening.png) diff --git a/content/sounduncloud.nl.md b/content/sounduncloud.nl.md index 68a8473be5..9f84dc5bc1 100644 --- a/content/sounduncloud.nl.md +++ b/content/sounduncloud.nl.md @@ -3,7 +3,8 @@ Date: 2017-12-01 Category: curriculum Slug: sounduncloud lang: nl -start: vrijdag 1 december +event_start: 2017-12-01 12:00 +event_duration: 6h ![Offline listening for days!](/images/offline_listening.png) diff --git a/content/the-secret-life-seizoen-1.en.md b/content/the-secret-life-seizoen-1.en.md index 007f860bd9..21799b5221 100644 --- a/content/the-secret-life-seizoen-1.en.md +++ b/content/the-secret-life-seizoen-1.en.md @@ -3,7 +3,8 @@ Date: 2017-11-05 Category: screening Slug: the-secret-life-season-1 lang: en -start: Sunday 5 November, 19:30 +event_start: 2017-11-05 19:30 +event_duration:4h ![folding chains](/images/secret_life_chain.gif) diff --git a/content/the-secret-life-seizoen-1.nl.md b/content/the-secret-life-seizoen-1.nl.md index 29e0067980..ccb1854056 100644 --- a/content/the-secret-life-seizoen-1.nl.md +++ b/content/the-secret-life-seizoen-1.nl.md @@ -3,7 +3,8 @@ Date: 2017-11-05 Category: event Slug: the-secret-life-seizoen-1 lang: nl -start: zondag 5 november, 19:30 +event_start: 2017-11-05 19:30 +event_duration:4h ![folding chains](/images/secret_life_chain.gif) diff --git a/content/the-secret-life-seizoen-2.en.md b/content/the-secret-life-seizoen-2.en.md index 7bd9836182..6f3b791e24 100644 --- a/content/the-secret-life-seizoen-2.en.md +++ b/content/the-secret-life-seizoen-2.en.md @@ -4,6 +4,8 @@ Category: screening Slug: the-secret-life-screening-2 lang: en start: Sunday 19 November, 16:30 +event_start: 2017-11-19 16:30 +event_duration: 4h ![folding chains](/images/fire.gif) diff --git a/content/the-secret-life-seizoen-2.nl.md b/content/the-secret-life-seizoen-2.nl.md index 42455cf32d..0cc4ce21a4 100644 --- a/content/the-secret-life-seizoen-2.nl.md +++ b/content/the-secret-life-seizoen-2.nl.md @@ -3,7 +3,8 @@ Date: 2017-11-19 Category: event Slug: the-secret-life-2 lang: nl -start: zondag 19 november, 16:30 +event_start: 2017-11-19 16:30 +event_duration:4h ![folding chains](/images/fire.gif) diff --git a/content/the-secret-life-seizoen-3.en.md b/content/the-secret-life-seizoen-3.en.md index d946b9483b..bb398c3745 100644 --- a/content/the-secret-life-seizoen-3.en.md +++ b/content/the-secret-life-seizoen-3.en.md @@ -3,7 +3,8 @@ Date: 2017-12-10 Category: screening Slug: the-secret-life-screening-3 lang: en -start: Sunday 10 December, 19:30 +event_start: 2017-12-10 19:30 +event_duration: 3h ![word processor robot](/images/word_processor_robot.gif) diff --git a/content/the-secret-life-seizoen-3.nl.md b/content/the-secret-life-seizoen-3.nl.md index 7d18e57715..ca1da42b83 100644 --- a/content/the-secret-life-seizoen-3.nl.md +++ b/content/the-secret-life-seizoen-3.nl.md @@ -1,14 +1,14 @@ Title: The Secret Life Of Machine screenings, seizoen 3 -Date: 2017-12-10 Category: event Slug: the-secret-life-3 lang: nl -start: zondag 10 december, 19:30 - +event_start: 2017-12-10 19:30 +event_duration: 3h ![word processor robot](/images/word_processor_robot.gif ) Technologie is overal, al dan niet verscholen achter een masker van alledaagsheid, maar wat steekt er eigenlijk achter de stofzuiger, de telefoon en het kopieerapparaat? Wanneer deden deze machines hun intrede in onze levens en hoe houden we ze in bedwang? Al deze vragen en meer worden beantwoord door 'the secret life of machines'. In deze cultserie van de BBC (1988-1993) ontleedt ingenieur, cartoonist en schrijver Tim Hunkin samen met uitvinder Rex Garrod iedere aflevering de geschiedenis en werking van een alledaags apparaat. In de komende weken zal er bij varia, het centrum voor alledaagse technologie enkele keren een compleet seizoen van deze show te zien zijn. + ##data **10 december**: seizoen 3 - kantoorapparatuur (lift, tekstverwerker, elektrisch licht, kopieerapparaat, faxmachine en het kantoor) diff --git a/pelicanconf.py b/pelicanconf.py index a03938a02a..e6d9840964 100644 --- a/pelicanconf.py +++ b/pelicanconf.py @@ -10,6 +10,8 @@ PATH = 'content' TIMEZONE = 'Europe/Amsterdam' DEFAULT_LANG = u'nl' +DEFAULT_DATE = u'fs' +USE_FOLDER_AS_CATEGORY = True # Feed generation is usually not desired when developing FEED_DOMAIN = 'varia.zone/feeds/' @@ -27,8 +29,7 @@ DEFAULT_PAGINATION = 25 # Uncomment following line if you want document-relative URLs when developing PLUGIN_PATHS = ['./plugins'] -PLUGINS = ['extract_toc', 'i18n_subsites', 'summary'] -# PLUGINS = ['extract_toc', 'i18n_subsites', 'events', 'summary'] +PLUGINS = ['extract_toc', 'i18n_subsites', 'events', 'summary'] MD_EXTENSIONS = ['codehilite','extra','toc'] STATIC_PATHS = ['extra/favicon.ico', 'images', 'pdfs'] @@ -54,6 +55,8 @@ I18N_SUBSITES = { } } -PLUGIN_EVENTS={ - 'ics_fname':'calendar.ics' -} +PLUGIN_EVENTS = { + 'ics_calendars': ['event.ics', 'curriculum.ics'], + 'default_location' : '', + 'calendar_per_category': True +} \ No newline at end of file diff --git a/themes/cetcat/templates/article.html b/themes/cetcat/templates/article.html index 944d181a71..9171318484 100644 --- a/themes/cetcat/templates/article.html +++ b/themes/cetcat/templates/article.html @@ -43,7 +43,7 @@ {% if article.translations %}
{% for translation in article.translations %} - → {{ translation.lang }} + translation → {{ translation.lang }} {% endfor %}
{% endif %} diff --git a/themes/cetcat/templates/index.html b/themes/cetcat/templates/index.html index db904694cd..2f9d01d0ff 100644 --- a/themes/cetcat/templates/index.html +++ b/themes/cetcat/templates/index.html @@ -10,10 +10,10 @@ {% for article in articles_page.object_list %}
- {{ article.title }} + {{ article.title }}
- {% if article.start %} - {{ article.start }} + {% if article.event_start %} + {{ article.event_start }} {% endif %}