From 4b413f5b3317f0586c707ffe06d39670be895707 Mon Sep 17 00:00:00 2001 From: "mb@mb" Date: Thu, 1 Feb 2018 15:46:02 +0100 Subject: [PATCH] changing the output dir in makefile --- Makefile | 4 ++-- content/Extratonaliteit.md | 6 +++--- content/Extratonality.md | 6 +++--- content/Nieuwjaarsborrel.en.md | 4 ++-- content/Nieuwjaarsborrel.md | 4 ++-- content/ccc-screening.en.md | 4 ++-- content/ccc-screening.nl.md | 4 ++-- content/hbsc-cal-1.en.md | 4 ++-- content/hbsc-cal-1.nl.md | 4 ++-- content/hbsc-cal-2.en.md | 4 ++-- content/hbsc-cal-2.nl.md | 4 ++-- content/inox.en.md | 4 ++-- content/inox.nl.md | 4 ++-- content/relearn.en.md | 6 +++--- content/relearn.nl.md | 6 +++--- content/samenscholing.en.md | 4 ++-- content/samenscholing.nl.md | 4 ++-- content/sdr-workshop.en.md | 4 ++-- content/sounduncloud.en.md | 4 ++-- content/sounduncloud.nl.md | 4 ++-- content/the-secret-life-seizoen-1.en.md | 4 ++-- content/the-secret-life-seizoen-1.nl.md | 4 ++-- content/the-secret-life-seizoen-2.en.md | 4 ++-- content/the-secret-life-seizoen-2.nl.md | 4 ++-- content/the-secret-life-seizoen-3.en.2.md | 4 ++-- content/the-secret-life-seizoen-3.en.md | 4 ++-- content/the-secret-life-seizoen-3.nl.2.md | 4 ++-- content/the-secret-life-seizoen-3.nl.md | 4 ++-- pelicanconf.py | 4 ++-- plugins-custom | 2 +- 30 files changed, 63 insertions(+), 63 deletions(-) diff --git a/Makefile b/Makefile index 953f5627c1..5762c00e9d 100644 --- a/Makefile +++ b/Makefile @@ -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) diff --git a/content/Extratonaliteit.md b/content/Extratonaliteit.md index fa6fbdfa3f..c9f3ec7108 100644 --- 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 \ No newline at end of file +Entree: Donatie diff --git a/content/Extratonality.md b/content/Extratonality.md index b22daba720..4337ff1b64 100644 --- 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 \ No newline at end of file +Start: 20:30 diff --git a/content/Nieuwjaarsborrel.en.md b/content/Nieuwjaarsborrel.en.md index b8ed7e1908..7d67eb875f 100644 --- 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) diff --git a/content/Nieuwjaarsborrel.md b/content/Nieuwjaarsborrel.md index 6bec22b426..8974d7589c 100644 --- 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) diff --git a/content/ccc-screening.en.md b/content/ccc-screening.en.md index 0db9db037a..32580514cd 100644 --- 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) diff --git a/content/ccc-screening.nl.md b/content/ccc-screening.nl.md index c2f433c178..7dbd65f8fd 100644 --- 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) diff --git a/content/hbsc-cal-1.en.md b/content/hbsc-cal-1.en.md index 07be3d96cb..1c7f4dfea9 100644 --- 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) diff --git a/content/hbsc-cal-1.nl.md b/content/hbsc-cal-1.nl.md index 084fcf850b..4f60865e6c 100644 --- 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) diff --git a/content/hbsc-cal-2.en.md b/content/hbsc-cal-2.en.md index 96b85ca487..f5a91af35c 100644 --- 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) diff --git a/content/hbsc-cal-2.nl.md b/content/hbsc-cal-2.nl.md index e3924eb647..5e5437ac04 100644 --- 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) diff --git a/content/inox.en.md b/content/inox.en.md index 66208b8dbd..7a53b8511f 100644 --- 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 ) diff --git a/content/inox.nl.md b/content/inox.nl.md index 6bbe37027b..78b6dab9f4 100644 --- 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) diff --git a/content/relearn.en.md b/content/relearn.en.md index 31ee846db2..93d9842e89 100644 --- 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) diff --git a/content/relearn.nl.md b/content/relearn.nl.md index fdfe1872c4..b5b1ea0023 100644 --- 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) diff --git a/content/samenscholing.en.md b/content/samenscholing.en.md index c3f8777c3b..82948f56d5 100644 --- 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) diff --git a/content/samenscholing.nl.md b/content/samenscholing.nl.md index 22b055edaa..56ab01e2b3 100644 --- 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) diff --git a/content/sdr-workshop.en.md b/content/sdr-workshop.en.md index 26c294fc92..1f2b9995ba 100644 --- 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) diff --git a/content/sounduncloud.en.md b/content/sounduncloud.en.md index 37772f8e60..64e7ab97a0 100644 --- 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) diff --git a/content/sounduncloud.nl.md b/content/sounduncloud.nl.md index c5efe9b275..5bdd72f2e1 100644 --- 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) diff --git a/content/the-secret-life-seizoen-1.en.md b/content/the-secret-life-seizoen-1.en.md index a2fd964a59..eaad65c312 100644 --- 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) diff --git a/content/the-secret-life-seizoen-1.nl.md b/content/the-secret-life-seizoen-1.nl.md index 377398a780..6210d8e0cc 100644 --- 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) diff --git a/content/the-secret-life-seizoen-2.en.md b/content/the-secret-life-seizoen-2.en.md index 7447a6237c..26ec48a81e 100644 --- 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) diff --git a/content/the-secret-life-seizoen-2.nl.md b/content/the-secret-life-seizoen-2.nl.md index b4210bd778..0b933c131d 100644 --- 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) diff --git a/content/the-secret-life-seizoen-3.en.2.md b/content/the-secret-life-seizoen-3.en.2.md index 6c63f2dfff..076378789c 100644 --- 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) diff --git a/content/the-secret-life-seizoen-3.en.md b/content/the-secret-life-seizoen-3.en.md index c2d832d81d..d9b4790d98 100644 --- 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) diff --git a/content/the-secret-life-seizoen-3.nl.2.md b/content/the-secret-life-seizoen-3.nl.2.md index 6b5032d76e..08cb4e4eb6 100644 --- 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 ) diff --git a/content/the-secret-life-seizoen-3.nl.md b/content/the-secret-life-seizoen-3.nl.md index ffdd648d7b..9376c4e6ec 100644 --- 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 ) diff --git a/pelicanconf.py b/pelicanconf.py index 237fea4509..23e37a72a8 100644 --- a/pelicanconf.py +++ b/pelicanconf.py @@ -57,7 +57,7 @@ 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 } diff --git a/plugins-custom b/plugins-custom index 1cbfe0e6b3..466d35a876 160000 --- a/plugins-custom +++ b/plugins-custom @@ -1 +1 @@ -Subproject commit 1cbfe0e6b31f0155f6294f052cbe110c6c0fb2c3 +Subproject commit 466d35a876bceae4b8a3429b0121703ba8366067