Merge branch 'master' of https://git.vvvvvvaria.org/varia/varia.website

2018-02-01 15:50:52 +01:00 · 2018-02-01 15:50:52 +01:00 · ea0f13adfd
commit ea0f13adfd
parent 59b9a8f407 c24c753480
29 changed files with 62 additions and 62 deletions
--- a/4
+++ b/4
@ -4,7 +4,7 @@ PELICANOPTS=

 BASEDIR=$(CURDIR)
 INPUTDIR=$(BASEDIR)/content
-OUTPUTDIR=/var/www/html/
+OUTPUTDIR=$(BASEDIR)/output
 CONFFILE=$(BASEDIR)/pelicanconf.py
 PUBLISHCONF=$(BASEDIR)/publishconf.py

@ -97,7 +97,7 @@ stopserver:
 	@echo 'Stopped Pelican and SimpleHTTPServer processes running in background.'

 publish:
-	$(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(PUBLISHCONF) $(PELICANOPTS)
+	$(PELICAN) $(INPUTDIR) -o /var/www/html/ -s $(PUBLISHCONF) $(PELICANOPTS)

 ssh_upload: publish
 	scp -P $(SSH_PORT) -r $(OUTPUTDIR)/* $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)
--- a/content/Extratonaliteit.md
+++ b/content/Extratonaliteit.md
@ -3,8 +3,8 @@ Date: 2018-02-16
 Category: event
 Slug: extratonality NL
 lang: nl
-event_start: 2018-02-16 20:00
-event_duration: 3h
+event-start: 2018-02-16 20:00
+event-duration: 3h

 ![extratonality](/images/Extra.jpg)

@ -14,4 +14,4 @@ Datum: Vrijdag 16 Februari
 Deuren: 20:00
 Begin: 20:30

-Entree: Donatie
+Entree: Donatie
--- a/content/Extratonality.md
+++ b/content/Extratonality.md
@ -3,8 +3,8 @@ Date: 2018-02-16
 Category: event
 Slug: extratonality
 lang: en
-event_start: 2018-02-16 20:00
-event_duration: 3h
+event-start: 2018-02-16 20:00
+event-duration: 3h

 ![extratonality](/images/Extra.jpg)

@ -12,4 +12,4 @@ In a time where problems are designed to be solutions, and industrialised rubbis

 Date: Friday 16 February
 Doors: 20:00
-Start: 20:30
+Start: 20:30
--- a/content/Nieuwjaarsborrel.en.md
+++ b/content/Nieuwjaarsborrel.en.md
@ -3,8 +3,8 @@ Date: 2018-01-19
 Category: event 
 Slug: nieuwjaarsborrel
 lang: en
-event_start: 2018-01-19 18:00 
-event_duration: 5h 
+event-start: 2018-01-19 18:00 
+event-duration: 5h 

 ![robomop](/images/nieuwjaarsborrel.png)

--- a/content/Nieuwjaarsborrel.md
+++ b/content/Nieuwjaarsborrel.md
@ -3,8 +3,8 @@ Date: 2018-01-19
 Category: event
 Slug: nieuwjaarsborrel
 lang: nl
-event_start: 2018-01-19 18:00
-event_duration: 5h
+event-start: 2018-01-19 17:00
+event-duration: 5h

 ![robomop](/images/nieuwjaarsborrel.png)

--- a/content/ccc-screening.en.md
+++ b/content/ccc-screening.en.md
@ -3,8 +3,8 @@ Date: 2017-12-15
 Category: event
 Slug: ccc-screening
 lang: en
-event_start: 2017-12-27 11:00
-event_end: 2017-12-30 18:15
+event-start: 2017-12-27 11:00
+event-end: 2017-12-30 18:15

 ![34c3 logo](/images/ccc-2017.jpg)

--- a/content/ccc-screening.nl.md
+++ b/content/ccc-screening.nl.md
@ -3,8 +3,8 @@ Date: 2017-12-15
 Category: event
 Slug: ccc-screening
 lang: nl
-event_start: 2017-12-27 11:00
-event_end: 2017-12-30 18:15
+event-start: 2017-12-27 11:00
+event-end: 2017-12-30 18:15

 ![34c3 logo](/images/ccc-2017.jpg)

--- a/content/hbsc-cal-1.en.md
+++ b/content/hbsc-cal-1.en.md
@ -3,8 +3,8 @@ Date: 2017-11-09
 Category: gathering
 Slug: hbsc-cal-1-en
 lang: en
-event_start: 2017-11-16 19:00
-event_duration: 3h
+event-start: 2017-11-16 19:00
+event-duration: 3h

 ![map preview](/images/cal.png)

--- a/content/hbsc-cal-1.nl.md
+++ b/content/hbsc-cal-1.nl.md
@ -3,8 +3,8 @@ Date: 2017-11-09
 Category: gathering
 Slug: hbsc-cal-1-nl
 lang: nl
-event_start: 2017-11-16 19:00
-event_duration: 3h
+event-start: 2017-11-16 19:00
+event-duration: 3h

 ![map preview](/images/cal.png)

--- a/content/hbsc-cal-2.en.md
+++ b/content/hbsc-cal-2.en.md
@ -3,8 +3,8 @@ Date: 2017-11-22
 Category: gathering
 Slug: hbsc-cal-2-en
 lang: en
-event_start: 2017-11-30 19:00
-event_duration: 3h
+event-start: 2017-11-30 19:00
+event-duration: 3h

 ![map preview](/images/cal2.png)

--- a/content/hbsc-cal-2.nl.md
+++ b/content/hbsc-cal-2.nl.md
@ -3,8 +3,8 @@ Date: 2017-11-22
 Category: gathering
 Slug: hbsc-cal-2-nl
 lang: nl
-event_start: 2017-11-30 19:00
-event_duration: 3h
+event-start: 2017-11-30 19:00
+event-duration: 3h

 ![map preview](/images/cal2.png)

--- a/content/inox.en.md
+++ b/content/inox.en.md
@ -3,8 +3,8 @@ Date: 2017-11-26
 Category: event
 Slug: inox-kapell
 lang: en
-event_start: 2017-12-16 19:00
-event_duration:4h
+event-start: 2017-12-16 19:00
+event-duration:4h

 ![Inox Kapell](/images/insekt.jpg )

--- a/content/inox.nl.md
+++ b/content/inox.nl.md
@ -3,8 +3,8 @@ Date: 2017-11-26
 Category: event
 Slug: inox-kapell
 lang: nl
-event_start: 2017-12-16 19:00
-event_duration:4h
+event-start: 2017-12-16 19:00
+event-duration:4h


 ![Inox Kapell](/images/insekt.jpg)
--- a/content/relearn.en.md
+++ b/content/relearn.en.md
@ -3,9 +3,9 @@ Date: 2017-08-29
 Category: projects
 Slug: relearn
 lang: en
-event_start: 2017-08-29 10:00
-event_end: 2017-09-02 19:30
-event_duration: 8h
+event-start: 2017-08-29 10:00
+event-end: 2017-09-02 19:30
+event-duration: 8h

 ![test image](/images/pg.jpg)

--- a/content/relearn.nl.md
+++ b/content/relearn.nl.md
@ -3,9 +3,9 @@ Date: 2017-08-29
 Category: projects
 Slug: relearn
 lang: nl
-event_start: 2017-08-29 10:00
-event_end: 2017-09-02 19:30
-event_duration: 8h
+event-start: 2017-08-29 10:00
+event-end: 2017-09-02 19:30
+event-duration: 8h

 ![relearn](/images/pg.jpg)

--- a/content/samenscholing.en.md
+++ b/content/samenscholing.en.md
@ -4,8 +4,8 @@ Category: project
 Slug: samenscholing
 lang: en
 Status: draft
-event_start: 2017-12-31 19:30
-event_duration: 3h
+event-start: 2017-12-31 19:30
+event-duration: 3h

 ![test image](/images/schoolbells.jpg)

--- a/content/samenscholing.nl.md
+++ b/content/samenscholing.nl.md
@ -4,8 +4,8 @@ Category: projects
 Slug: samenscholing
 lang: nl
 Status: draft
-event_start: 2017-12-31 19:30
-event_duration: 3h
+event-start: 2017-12-31 19:30
+event-duration: 3h

 ![test image](/images/schoolbells.jpg)

--- a/content/sdr-workshop.en.md
+++ b/content/sdr-workshop.en.md
@ -4,8 +4,8 @@ Category: curriculum
 Slug: sdr-intro
 lang: en
 Status: draft
-event_start: 2017-12-31 12:00
-event_duration:4h
+event-start: 2017-12-31 12:00
+event-duration:4h

 ![This is not an SDR](/images/radio.jpg)

--- a/content/sounduncloud.en.md
+++ b/content/sounduncloud.en.md
@ -2,8 +2,8 @@ Title: Sounduncloud: A Rogue Archiving Workshop
 Category: curriculum
 Slug: sounduncloud
 lang: en
-event_start: 2017-12-01 12:00
-event_duration:6h
+event-start: 2017-12-01 12:00
+event-duration:6h
 status: draft

 ![Offline listening for days!](/images/offline_listening.png)
--- a/content/sounduncloud.nl.md
+++ b/content/sounduncloud.nl.md
@ -2,8 +2,8 @@ Title: Sounduncloud: A Rogue Archiving Workshop
 Category: curriculum
 Slug: sounduncloud
 lang: nl
-event_start: 2017-12-01 12:00
-event_duration: 6h
+event-start: 2017-12-01 12:00
+event-duration: 6h
 status: draft

 ![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,8 +3,8 @@ Date: 2017-10-29
 Category: screening
 Slug: the-secret-life-season-1
 lang: en
-event_start: 2017-11-05 19:30
-event_duration:3h
+event-start: 2017-11-05 19:30
+event-duration:3h

 ![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,8 +3,8 @@ Date: 2017-10-29
 Category: event
 Slug: the-secret-life-seizoen-1
 lang: nl
-event_start: 2017-11-05 19:30
-event_duration:3h
+event-start: 2017-11-05 19:30
+event-duration:3h

 ![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
@ -3,8 +3,8 @@ Date: 2017-11-12
 Category: screening
 Slug: the-secret-life-2
 lang: en
-event_start: 2017-11-19 16:30
-event_duration: 4h
+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,8 +3,8 @@ Date: 2017-11-12
 Category: screening
 Slug: the-secret-life-2
 lang: nl
-event_start: 2017-11-19 16:30
-event_duration: 4h
+event-start: 2017-11-19 16:30
+event-duration: 4h

 ![folding chains](/images/fire.gif)

--- a/content/the-secret-life-seizoen-3.en.2.md
+++ b/content/the-secret-life-seizoen-3.en.2.md
@ -3,8 +3,8 @@ Date: 2017-12-15
 Category: screening
 Slug: the-secret-life-screening-3.2
 lang: en
-event_start: 2017-12-20 19:30
-event_duration: 3h
+event-start: 2017-12-20 19:30
+event-duration: 3h

 ![word processor robot](/images/word_processor_robot.gif)

--- a/content/the-secret-life-seizoen-3.en.md
+++ b/content/the-secret-life-seizoen-3.en.md
@ -3,8 +3,8 @@ Date: 2017-11-23
 Category: screening
 Slug: the-secret-life-screening-3
 lang: en
-event_start: 2017-12-10 19:30
-event_duration: 3h
+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.2.md
+++ b/content/the-secret-life-seizoen-3.nl.2.md
@ -3,8 +3,8 @@ Date: 2017-12-15
 Category: event
 Slug: the-secret-life-3.2
 lang: nl
-event_start: 2017-12-20 19:30
-event_duration: 3h
+event-start: 2017-12-20 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
@ -3,8 +3,8 @@ Date: 2017-11-23
 Category: event
 Slug: the-secret-life-3
 lang: nl
-event_start: 2017-12-10 19:30
-event_duration: 3h
+event-start: 2017-12-10 19:30
+event-duration: 3h

 ![word processor robot](/images/word_processor_robot.gif )

--- a/pelicanconf.py
+++ b/pelicanconf.py
@ -57,9 +57,9 @@ I18N_SUBSITES = {
 }	

 PLUGIN_EVENTS = {
-	'ics_calendars': ['event.ics', 'curriculum.ics'],
+	'ics_calendars': ['events.ics', 'curriculum.ics'],
 	'default_location' : '',
-	'calendar_per_category': True
+	'calendar_per_category': False
 }

 DATEISH_PROPERTIES = ['event_start', 'event_end']