english link url is working again!

7 years ago · 85b043eaa6
15 changed files with 38 additions and 22 deletions
--- 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)

--- 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)
--- 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)

--- 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
--- 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)

--- 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)

--- 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)

--- 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)

--- 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)

--- 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)

--- 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)

--- 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)

--- 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
+}
--- a/themes/cetcat/templates/article.html
+++ b/themes/cetcat/templates/article.html
@ -43,7 +43,7 @@
 		{% if article.translations %}
 			<div id="article-translation">
 			{% for translation in article.translations %}
-				→ <a href="{{ SITEURL }}/{{ translation.url }}">{{ translation.lang }}</a>
+				translation → <a href="{{ SITEURL }}/{{ translation.url }}">{{ translation.lang }}</a>
 			{% endfor %}
 			</div>
 		{% endif %}
--- a/themes/cetcat/templates/index.html
+++ b/themes/cetcat/templates/index.html
@ -10,10 +10,10 @@
 {% for article in articles_page.object_list %}
 	<article class="hentry">
 		<div class="article-info">
-			<span class="entry-title"><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></span>
+			<span class="entry-title"><a href="{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></span>
 			<div class="event-details">
-				{% if article.start %}
-					{{ article.start }}
+				{% if article.event_start %}
+					{{ article.event_start }}
 				{% endif %}
 			</div>
 		</div>