diff --git a/content/en/hbsc-cal-1.md b/content/en/hbsc-cal-1.md new file mode 100644 index 0000000000..5b4fc487d8 --- /dev/null +++ b/content/en/hbsc-cal-1.md @@ -0,0 +1,11 @@ +Title: homebrewserver.club, calendars session 1 +Date: 2017-11-16 +Category: gathering +Slug: hbsc-cal-en-1 +lang: en +start: 16 November, 19:00 +status: draft + +![map preview](/images/cal.png) + +A first gathering around self-hosted calendars. diff --git a/content/en/opening.md b/content/en/opening.md index fbeee76b0b..de5908ce43 100644 --- a/content/en/opening.md +++ b/content/en/opening.md @@ -1,10 +1,11 @@ Title: Opening Space -Date: 2017-11-01 +Date: 2017-11-03 Category: event Slug: opening-space lang: en event-start:2017-11-03 20:00 event-duration:4h +start: 3 November, 20:00 ![map preview](/images/de_varia.jpg) diff --git a/content/en/sounduncloud.md b/content/en/sounduncloud.md index 725ac400fc..05d629b5aa 100644 --- a/content/en/sounduncloud.md +++ b/content/en/sounduncloud.md @@ -1,9 +1,10 @@ Title: Sounduncloud: A Rogue Archiving Workshop -Date: 2017-10-01 +Date: 2017-11-25 Category: curriculum Slug: sounduncloud lang: en curriculum: True +start: 25 November, 12:00 ![Offline listening for days!](/images/offline_listening.png) diff --git a/content/en/the-secret-life-en.md b/content/en/the-secret-life-en-1.md similarity index 74% rename from content/en/the-secret-life-en.md rename to content/en/the-secret-life-en-1.md index 85a001e39b..03ec8a5a45 100644 --- a/content/en/the-secret-life-en.md +++ b/content/en/the-secret-life-en-1.md @@ -1,12 +1,15 @@ -Title: Screening: The Secret Life Of Machines -Date: 2017-10-06 +Title: Screening: The Secret Life Of Machines, season 1 +Date: 2017-11-05 Category: screening -Slug: the-secret-life-screening +Slug: the-secret-life-screening-1 lang: en +start: 5 November, 19:30 ![folding chains](/images/secret_life_chain.gif) -Technology is everywhere, sometimes it hides its face underneath a mask of everydayness, but we can only guess what goes on in our vacuum cleaner, telephone or copy machine. When were these inventions introduced into our lives and how can we keep control over them? These questions, and many more, are answered by 'The Secret Life Of Machines'. In this cultseries from the BBC, which was produced between 1988 and 1993 engineer, cartoonist and writer Tim Hunkin and inventor Rex Garrod dissect the workings and history of a everyday appliance in each episode. During the next few weeks varia, center of everyday technology will screen the entire series during a couple of public screenings.##dates +Technology is everywhere, sometimes it hides its face underneath a mask of everydayness, but we can only guess what goes on in our vacuum cleaner, telephone or copy machine. When were these inventions introduced into our lives and how can we keep control over them? These questions, and many more, are answered by 'The Secret Life Of Machines'. In this cultseries from the BBC, which was produced between 1988 and 1993 engineer, cartoonist and writer Tim Hunkin and inventor Rex Garrod dissect the workings and history of a everyday appliance in each episode. During the next few weeks varia, center of everyday technology will screen the entire series during a couple of public screenings. + +##dates **5 November**: season 1 - household appliances (vacuum cleaner, sewing machine, central heating, washing machine, refrigiator and television) @@ -15,8 +18,9 @@ Technology is everywhere, sometimes it hides its face underneath a mask of every * Start: 20:00 * End: 23:00 +**19 November**: season 2 - outdoor appliances -**19 November**: season 2 - outdoor appliances (car, internal combustion engine, quartz watch, telephone, radio and videorecorder) +(car, internal combustion engine, quartz watch, telephone, radio and videorecorder) * Door: 16:30 * Start: 17:00 diff --git a/content/en/the-secret-life-en-2.md b/content/en/the-secret-life-en-2.md new file mode 100644 index 0000000000..2de84bd8f7 --- /dev/null +++ b/content/en/the-secret-life-en-2.md @@ -0,0 +1,20 @@ +Title: Screening: The Secret Life Of Machines, season 2 +Date: 2017-11-19 +Category: screening +Slug: the-secret-life-screening-2 +lang: en +start: 19 November, 16:30 + +![folding chains](/images/fire.gif) + +Technology is everywhere, sometimes it hides its face underneath a mask of everydayness, but we can only guess what goes on in our vacuum cleaner, telephone or copy machine. When were these inventions introduced into our lives and how can we keep control over them? These questions, and many more, are answered by 'The Secret Life Of Machines'. In this cultseries from the BBC, which was produced between 1988 and 1993 engineer, cartoonist and writer Tim Hunkin and inventor Rex Garrod dissect the workings and history of a everyday appliance in each episode. During the next few weeks varia, center of everyday technology will screen the entire series during a couple of public screenings. + +**19 November**: season 2 - outdoor appliances + +(car, internal combustion engine, quartz watch, telephone, radio and videorecorder) + +* Door: 16:30 +* Start: 17:00 +* End: 20:00 + +Price: Donation diff --git a/content/en/the-secret-life-en-3.md b/content/en/the-secret-life-en-3.md new file mode 100644 index 0000000000..b3a6c701bc --- /dev/null +++ b/content/en/the-secret-life-en-3.md @@ -0,0 +1,20 @@ +Title: Screening: The Secret Life Of Machines, season 3 +Date: 2017-11-19 +Category: screening +Slug: the-secret-life-screening-3 +lang: en +start: ???, 19:30 +status: draft + +![folding chains](/images/secret_life_chain.gif) + +Technology is everywhere, sometimes it hides its face underneath a mask of everydayness, but we can only guess what goes on in our vacuum cleaner, telephone or copy machine. When were these inventions introduced into our lives and how can we keep control over them? These questions, and many more, are answered by 'The Secret Life Of Machines'. In this cultseries from the BBC, which was produced between 1988 and 1993 engineer, cartoonist and writer Tim Hunkin and inventor Rex Garrod dissect the workings and history of a everyday appliance in each episode. During the next few weeks varia, center of everyday technology will screen the entire series during a couple of public screenings. + +##dates +**???**: season 3 + +* Door: 19:30 +* Start: 20:00 +* End: 23:00 + +Price: Donation diff --git a/content/hbsc-cal-1.md b/content/hbsc-cal-1.md new file mode 100644 index 0000000000..aab7d3c62f --- /dev/null +++ b/content/hbsc-cal-1.md @@ -0,0 +1,11 @@ +Title: homebrewserver.club, kalenders sessie 1 +Date: 2017-11-16 +Category: gathering +Slug: hbsc-cal-1 +lang: nl +start: 16 November, 19:00 +status: draft + +![map preview](/images/cal.png) + +Een eerste ontmoeting rondom zelf-gehoste kalenders. diff --git a/content/images/cal.png b/content/images/cal.png new file mode 100644 index 0000000000..33016da9a4 Binary files /dev/null and b/content/images/cal.png differ diff --git a/content/images/fire.gif b/content/images/fire.gif index b9cc59d08e..430bbdd885 100644 Binary files a/content/images/fire.gif and b/content/images/fire.gif differ diff --git a/content/opening.md b/content/opening.md index f87e31a153..43d02d8fe3 100644 --- a/content/opening.md +++ b/content/opening.md @@ -1,8 +1,9 @@ Title: Opening Ruimte -Date: 2017-11-01 +Date: 2017-11-03 Category: event Slug: opening-ruimte lang: nl +start: 3 November, 20:00 event-start:2017-11-03 20:00 event-duration:4h diff --git a/content/pages/events_list.md b/content/pages/events_list.md new file mode 100644 index 0000000000..6445d63318 --- /dev/null +++ b/content/pages/events_list.md @@ -0,0 +1,4 @@ +Title:event list +Slug: events-list +template: events_list +lang: nl diff --git a/content/sounduncloud.md b/content/sounduncloud.md index 86afd0fec0..9d57c13cc6 100644 --- a/content/sounduncloud.md +++ b/content/sounduncloud.md @@ -1,11 +1,9 @@ Title: Sounduncloud: A Rogue Archiving Workshop -Date: 2017-10-01 +Date: 2017-11-25 Category: curriculum Slug: sounduncloud lang: nl -event-start:2017-11-15 12:00 -event-duration:4h -location: Gouwstraat 3, Rotterdam +start: 25 November, 12:00 ![Offline listening for days!](/images/offline_listening.png) diff --git a/content/the-secret-life.md b/content/the-secret-life-seizoen-1.md similarity index 90% rename from content/the-secret-life.md rename to content/the-secret-life-seizoen-1.md index d13bf0d9a0..9991f22df0 100644 --- a/content/the-secret-life.md +++ b/content/the-secret-life-seizoen-1.md @@ -1,8 +1,9 @@ -Title: The Secret Life Of Machine screenings -Date: 2017-10-06 +Title: The Secret Life Of Machine screenings, seizoen 1 +Date: 2017-11-05 Category: event -Slug: the-secret-life +Slug: the-secret-life-1 lang: nl +start: 5 November, 19:30 ![folding chains](/images/secret_life_chain.gif) diff --git a/content/the-secret-life-seizoen-2.md b/content/the-secret-life-seizoen-2.md new file mode 100644 index 0000000000..adb55999ed --- /dev/null +++ b/content/the-secret-life-seizoen-2.md @@ -0,0 +1,18 @@ +Title: The Secret Life Of Machine screenings, seizoen 2 +Date: 2017-11-19 +Category: event +Slug: the-secret-life-2 +lang: nl +start: 19 November, 16:30 + +![folding chains](/images/fire.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. + +**19 november**: seizoen 2 - apparatuur buiten de deur (auto, verbrandingsmotor, quartz horloge, telefoon, radio en videorecorder) + +* Door: 16:30 +* Start: 17:00 +* End: 20:00 + +Prijs: donatie diff --git a/content/the-secret-life-seizoen-3.md b/content/the-secret-life-seizoen-3.md new file mode 100644 index 0000000000..c4ba1bd124 --- /dev/null +++ b/content/the-secret-life-seizoen-3.md @@ -0,0 +1,27 @@ +Title: The Secret Life Of Machine screenings, seizoen 3 +Date: 2017-11-01 +Category: event +Slug: the-secret-life-3 +lang: nl +start: 19 November, 16:30 +status: draft + +![folding chains](/images/secret_life_chain.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 +**5 november**: seizoen 1 - huishoudelijke apparatuur (stofzuiger, naaimachine, centrale verwarming, wasmachine, vriezer en televisie) + +* Aanvang: 19:30 +* Start: 20:00 +* Eind 23:00 + + +**19 november**: seizoen 2 - apparatuur buiten de deur (auto, verbrandingsmotor, quartz horloge, telefoon, radio en videorecorder) + +* Door: 16:30 +* Start: 17:00 +* End: 20:00 + +Prijs: donatie diff --git a/themes/cetcat/templates/article.html b/themes/cetcat/templates/article.html index 241b97db53..e3e8a134dc 100644 --- a/themes/cetcat/templates/article.html +++ b/themes/cetcat/templates/article.html @@ -21,7 +21,6 @@
{{ article.title }} -
@@ -29,25 +28,24 @@
- +
+ + {% if article.start %} + {% if url == '/en'%} + When? {{ article.start }} + {% else %} + Wanneer? {{ article.start }} + {% endif %} + {% endif %} + +
{% if article.category %}
→ {{ article.category }}
- {% endif %} {% if article.tags %} -
- Tags: {% for tag in article.tags %} - - - {% endfor %} -
{% endif %} - -
{% endblock %} diff --git a/themes/cetcat/templates/events_list.html b/themes/cetcat/templates/events_list.html new file mode 100644 index 0000000000..ac0184ce61 --- /dev/null +++ b/themes/cetcat/templates/events_list.html @@ -0,0 +1,36 @@ + +{% extends "base.html" %} + +{% block title %} Events list - {{ SITENAME }}{% endblock %} + +{% block content %} + + {% if events_list %} + + {% endif %} + +{% endblock %} diff --git a/themes/cetcat/templates/index.html b/themes/cetcat/templates/index.html index 44275e8ceb..38c67ab361 100644 --- a/themes/cetcat/templates/index.html +++ b/themes/cetcat/templates/index.html @@ -12,12 +12,30 @@
{{ article.title }}
-
{{ article.summary }} read more
+
{{ article.summary }} + + + {% if DEFAULT_LANG == 'en' %} + read more + {% elif DEFAULT_LANG == 'nl' %} + lees meer + {% endif %} + + +
- +
+ + {% if article.start %} + {% if DEFAULT_LANG == 'en'%} + When? {{ article.start }} + {% elif DEFAULT_LANG == 'nl' %} + Wanneer? {{ article.start }} + {% endif %} + {% endif %} + +
{% if article.category %}