From 942a02e5ad865629c0f0940707d0cfbdde565b84 Mon Sep 17 00:00:00 2001 From: "mb@mb" Date: Fri, 27 Oct 2017 10:22:26 +0200 Subject: [PATCH] few changes before publishing the website --- content/en/homebrewserver.club-en.md | 2 +- content/en/relearn-en.md | 2 +- content/en/samenscholing-en.md | 1 + content/en/sdr-workshop-en.md | 10 +++++++++- content/en/sounduncloud.md | 6 +++--- content/en/the-secret-life-en.md | 18 ++++++++++++------ content/homebrewserver.club.md | 2 +- content/pages/about-en.md | 2 +- content/pages/about-nl.md | 2 +- content/pages/curriculum-en.md | 2 +- content/pages/curriculum-nl.md | 2 +- content/pages/header-en.md | 2 +- content/pages/header-nl.md | 2 +- content/pages/membership-en.md | 2 +- content/pages/membership-nl.md | 2 +- content/pages/project-en.md | 7 +++++++ content/pages/project-nl.md | 7 +++++++ content/pages/projects.md | 16 ---------------- content/relearn.md | 2 +- content/samenscholing.md | 3 ++- content/sdr-workshop.md | 6 +++--- content/the-secret-life.md | 16 ++++++++++------ pelicanconf.py | 2 +- themes/cetcat/templates/category.html | 3 +++ 24 files changed, 70 insertions(+), 49 deletions(-) create mode 100644 content/pages/project-en.md create mode 100644 content/pages/project-nl.md delete mode 100644 content/pages/projects.md diff --git a/content/en/homebrewserver.club-en.md b/content/en/homebrewserver.club-en.md index 39f0cbeab..250f5246f 100644 --- a/content/en/homebrewserver.club-en.md +++ b/content/en/homebrewserver.club-en.md @@ -1,6 +1,6 @@ Title: homebrewserver.club Date: 2017-09-14 -Category: anouncement +Category: projects Slug: homebrewserver.club lang: en curriculum: False diff --git a/content/en/relearn-en.md b/content/en/relearn-en.md index 7d4eca366..ec3acca29 100644 --- a/content/en/relearn-en.md +++ b/content/en/relearn-en.md @@ -1,6 +1,6 @@ Title: Relearn Rotterdam Date: 2017-08-29 -Category: project +Category: projects Slug: relearn lang: en diff --git a/content/en/samenscholing-en.md b/content/en/samenscholing-en.md index d15e161c0..a8726ddbe 100644 --- a/content/en/samenscholing-en.md +++ b/content/en/samenscholing-en.md @@ -3,6 +3,7 @@ Date: 2017-09-12 Category: project Slug: samenscholing lang: en +Status: draft ![test image](/images/schoolbells.jpg) diff --git a/content/en/sdr-workshop-en.md b/content/en/sdr-workshop-en.md index e9850dfe4..672fdc9be 100644 --- a/content/en/sdr-workshop-en.md +++ b/content/en/sdr-workshop-en.md @@ -7,4 +7,12 @@ curriculum: True ![This is not an SDR](/images/radio.jpg) -Thee air that surrounds us is filled with signals ranging from cell phone packets, commercial radio stations, wireless internet modems, airplane tracking signals, satellite broadcasts and many more... The advent of Software-Defined Radio (SDR) has made it much easier and cheaper to learn how to receive these signals and use them for a variety of projects. This course will introduce participants to this relatively new set of open source tools known as Software Defined Radio. The course held weekly on Tuesday evenings from 20:00 to 22:00 strarting on the 16th of November. It held by Dennis de Bel and Roel Roscam Abbing it costs 80 euros. SDR Hardware is included in the course fee. +Thee air that surrounds us is filled with signals ranging from cell phone packets, commercial radio stations, wireless internet modems, airplane tracking signals, satellite broadcasts and many more... + +The advent of Software-Defined Radio (SDR) has made it much easier and cheaper to learn how to receive these signals and use them for a variety of projects. This course will introduce participants to this relatively new set of open source tools known as Software Defined Radio. + +The workshop is hosted by Dennis de Bel (PD0WND) and Roel Roscam Abbing. SDR Hardware is included in the course fee. + +* The course will be held weekly on Tuesday evenings. Depending on the interest, we aim to start in December. + +* Costs are 80 euros pp. (SDR hardware are included). diff --git a/content/en/sounduncloud.md b/content/en/sounduncloud.md index 20f420709..725ac400f 100644 --- a/content/en/sounduncloud.md +++ b/content/en/sounduncloud.md @@ -9,6 +9,6 @@ curriculum: True Soundcloud has narrowly avoided bankruptcy. The online platform where mixes are shared and genres such as 'soundcloud rap' emerged is in dire straits. In this short workshop we will look at rogue archival practices, help you download all your mixes and saved collcetions using Free Software tools and finally make and publish a mixtape together. -Dates: november 25th -Max participants: 15 -Costs: 35 euro +* Dates: November 25th +* Max participants: 15 +* Costs: 35 euro diff --git a/content/en/the-secret-life-en.md b/content/en/the-secret-life-en.md index e4670d670..64290023e 100644 --- a/content/en/the-secret-life-en.md +++ b/content/en/the-secret-life-en.md @@ -9,13 +9,19 @@ lang: en Technology is everywhere, sometimes it hides its face underneath a mask of everydayness, but we can only guess what lies behind ourvacuum 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. For three weeks in a row our center of everyday technology will screen a full season of the show on sunday night. This is followed by our own series of media archeology in which speakers will dissect contemporary machines in a manner quite akin to the series, only live. ##dates -5 november: season 1 - household appliances (vacuum cleaner, sewing machine, central heating, washing machine, refrigiator and television) +**5 November**: season 1 - household appliances -12 november: season 2 - outdoor appliances (car, internal combustion engine, quartz watch, telephone, radio and videorecorder) +(vacuum cleaner, sewing machine, central heating, washing machine, refrigiator and television) -17 november: season 3 - office appliances (elevator, word processor, electric light, copy machine, fax machine and the office) +* Door: 19:30 +* Start: 20:00 +* End: 23:00 + + +**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 -Door: 19:30 -Start: 20:00 -End: 23:00 Price: Donation diff --git a/content/homebrewserver.club.md b/content/homebrewserver.club.md index e12ca26c2..c871ff973 100644 --- a/content/homebrewserver.club.md +++ b/content/homebrewserver.club.md @@ -1,6 +1,6 @@ Title: homebrewserver.club Date: 2017-09-14 -Category: aankondiging +Category: projects Slug: homebrewserver.club lang: nl diff --git a/content/pages/about-en.md b/content/pages/about-en.md index b2c9d0c25..e60312370 100644 --- a/content/pages/about-en.md +++ b/content/pages/about-en.md @@ -5,7 +5,7 @@ Slug: about lang: en # initiative -*Also* is a Rotterdam based initiative that collects, conducts and instigates research and projects relating to the emerging developments in everyday technology. We aim to provide an environment where questions can be asked, opinions can be stated, projects can be developed and research can be conducted, both collectively and individually. Our goal is to become a hub for exchange and a source for resilience, within the city and beyond. +*varia* is a collective space in Rotterdam focussing on work with, about and through technology. # space Gouwstraat 3
diff --git a/content/pages/about-nl.md b/content/pages/about-nl.md index e96e252e2..d4c67674f 100644 --- a/content/pages/about-nl.md +++ b/content/pages/about-nl.md @@ -5,7 +5,7 @@ Slug: about lang: nl # initiatief -*Also* is een Rotterdamse initiatief dat werkt aan, met en door technologie. Gezamenlijk en individueel initiëren en verzamelen wij onderzoek naar nieuwe tendensen, organiseren collectieve leermomenten en ontwikkelen nieuwe projecten. Ons doel is om een sociale infrastructuur te creëren waar ruimte is voor vragen, meningen, ingrepen, hulp en actie. Wij willen een plek voor uitwisseling zijn, een stem in debatten bieden en een bron van weerbaarheid vormen. +*varia* is een collectieve ruimte in Rotterdam waar aandacht is voor werk aan, met en door technologie. # ruimte Gouwstraat 3
diff --git a/content/pages/curriculum-en.md b/content/pages/curriculum-en.md index 85d025197..c753fb6d4 100644 --- a/content/pages/curriculum-en.md +++ b/content/pages/curriculum-en.md @@ -4,4 +4,4 @@ Category: curriculum Slug: curriculum lang: en -Throughout the year we host a curriculum of a variety of workshops and masterclasses. These differ from introductory courses on technical subjects to advanced and in-depth workshops. +Throughout the year we host a curriculum of a variety of workshops and masterclasses. These differ from introductory courses on technical subjects to advanced and in-depth workshops. diff --git a/content/pages/curriculum-nl.md b/content/pages/curriculum-nl.md index 564c71c99..02ebc4653 100644 --- a/content/pages/curriculum-nl.md +++ b/content/pages/curriculum-nl.md @@ -4,4 +4,4 @@ Category: curriculum Slug: curriculum lang: nl -(nog vertalen) + diff --git a/content/pages/header-en.md b/content/pages/header-en.md index f30f63f85..2c60b75a7 100644 --- a/content/pages/header-en.md +++ b/content/pages/header-en.md @@ -4,5 +4,5 @@ Category: about Slug: header lang: en -*Also* is a Rotterdam based initiative is focused on working [with, about and through technology](/en/category/project.html). At its core the initiative aims to be a [social infrastructure](/en/pages/about.html) from which to collaboratively facillitate [critical understandings](/en/category/curriculum.html) on the technologies that surround us. The initiative is a [membership-based organisation](/en/pages/membership.html) striving to become a space for questions, opinions, modifications, help and action. Keep an eye on the agenda for [upcoming events](/en/). +*varia* is a Rotterdam based initiative is focused on working [with, about and through technology](/en/category/projects.html). At its core the initiative aims to be a [social infrastructure](/en/pages/about.html) from which to collaboratively facillitate [critical understandings](/en/category/curriculum.html) on the technologies that surround us. The initiative is a membership-based organisation striving to become a space for questions, opinions, modifications, help and action. Keep an eye on the agenda for [upcoming events](/en/). diff --git a/content/pages/header-nl.md b/content/pages/header-nl.md index e8bb0ade1..7448eaf78 100644 --- a/content/pages/header-nl.md +++ b/content/pages/header-nl.md @@ -4,6 +4,6 @@ Category: about Slug: header lang: nl -*Also* is een collectief initiatief met een ruimte in Rotterdam dat zich richt op werk [aan, met en door technologie](/category/project.html). In de kern wil dit initiatief een [sociale infrastructuur](/pages/about.html) vormen van waaruit men gezamelijk [een kritische relatie](/category/curriculum.html) tot de technologie van alledag aangaat. Op basis van [een lidmaatschapsmodel](/pages/membership.html) wil ze een ruimte bieden voor vragen, meningen, ingrepen, hulp en actie. Houd de agenda in de gaten voor [aankomende evenementen](/). +*varia* is een collectief initiatief met een ruimte in Rotterdam dat zich richt op werk [aan, met en door technologie](/category/projects.html). In de kern wil dit initiatief een [sociale infrastructuur](/pages/about.html) vormen van waaruit men gezamelijk [een kritische relatie](/category/curriculum.html) tot de technologie van alledag aangaat. Op basis van een lidmaatschapsmodel wil ze een ruimte bieden voor vragen, meningen, ingrepen, hulp en actie. Houd de agenda in de gaten voor [aankomende evenementen](/). diff --git a/content/pages/membership-en.md b/content/pages/membership-en.md index 89d7f288e..7983e9a64 100644 --- a/content/pages/membership-en.md +++ b/content/pages/membership-en.md @@ -4,7 +4,7 @@ Category: about Slug: membership lang: en -*Also* will function on a membership basis: each member can initiate or organize a weekly, monthly or spontaneous session around a shared topic of interest. By creating an open space to initiate, a changing flow of meetings will be organized and being available for participation to other members. +*varia* will function on a membership basis: each member can initiate or organize a weekly, monthly or spontaneous session around a shared topic of interest. By creating an open space to initiate, a changing flow of meetings will be organized and being available for participation to other members. The space at the Gouwstraat functions as a working and meeting place where members meet during organized events or accidental encounters, and where non-members are welcome to join. diff --git a/content/pages/membership-nl.md b/content/pages/membership-nl.md index bf199aec1..f774f4e4e 100644 --- a/content/pages/membership-nl.md +++ b/content/pages/membership-nl.md @@ -4,7 +4,7 @@ Category: about Slug: membership lang: nl -*Also* werkt met een ledenmodel. Deze vorm biedt de mogelijkheid om leden te binden aan de organisatie en deze uit te breiden. Deze leden betalen een maandelijkse vaste bijdrage en kunnen in ruil daarvoor deelnemen aan de activiteiten die worden georganiseerd. Hierdoor kunnen binnen de vereniging verschillende interessegroepen ontstaan. Naast de mogelijkheid van het organiseren van zulke clubavonden, thematische sessies of bijeenkomsten heeft *Also* een vast publiek programma dat gericht is op een breder netwerk. +**varia** werkt met een ledenmodel. Deze vorm biedt de mogelijkheid om leden te binden aan de organisatie en deze uit te breiden. Deze leden betalen een maandelijkse vaste bijdrage en kunnen in ruil daarvoor deelnemen aan de activiteiten die worden georganiseerd. Hierdoor kunnen binnen de vereniging verschillende interessegroepen ontstaan. Naast de mogelijkheid van het organiseren van zulke clubavonden, thematische sessies of bijeenkomsten heeft *Varia* een vast publiek programma dat gericht is op een breder netwerk. De ruimte aan de Gouwstraat functioneert als een werk- en ontmoetingsplek, waar leden elkaar ontmoeten tijdens georganiseerde evenementen of spontane ontmoetingen en niet-leden welkom zijn om aan te sluiten en lid te worden. diff --git a/content/pages/project-en.md b/content/pages/project-en.md new file mode 100644 index 000000000..82c78e825 --- /dev/null +++ b/content/pages/project-en.md @@ -0,0 +1,7 @@ +Title: projects +Date: 2017-10-09 +Category: +Slug: projects +lang: en + +Current and previous projects diff --git a/content/pages/project-nl.md b/content/pages/project-nl.md new file mode 100644 index 000000000..2ce5b2abf --- /dev/null +++ b/content/pages/project-nl.md @@ -0,0 +1,7 @@ +Title: projects +Date: 2017-10-09 +Category: +Slug: projects +lang: nl + +Huidige en afgeronde projecten diff --git a/content/pages/projects.md b/content/pages/projects.md deleted file mode 100644 index 4d748206d..000000000 --- a/content/pages/projects.md +++ /dev/null @@ -1,16 +0,0 @@ -Title: projects -Date: 2017-04-09 -Category: about -Tags: things, we, do or did -Slug: projects - -Projects we initiated: - -De Samenscholing ----- -De Samenscholing is a MMMOOC, a 'massive multiplayer massive online open course'. A collective approach to individualistic educational models. Participants collectively study a MOOC. The first meeting is about discussing between students what MOOC they will follow. Afterwards there are meetings on a weekly basis to study the material. - -Relearn ----- -[Relearn](http://relearn.be/2017/) Relearn is a collective learning experiment with as many teachers as it has participants. It is motivated by the possibility to displace parameters of/for research, studying and learning. ʬ facilitated the 2017 edition in Rotterdam. - diff --git a/content/relearn.md b/content/relearn.md index e0ba425b4..ce0971ce3 100644 --- a/content/relearn.md +++ b/content/relearn.md @@ -1,6 +1,6 @@ Title: Relearn Rotterdam Date: 2017-08-29 -Category: project +Category: projects Slug: relearn lang: nl featured_image: ![relearn](/images/pg.jpg) diff --git a/content/samenscholing.md b/content/samenscholing.md index 52c1ce5b6..411f20867 100644 --- a/content/samenscholing.md +++ b/content/samenscholing.md @@ -1,8 +1,9 @@ Title: De Samenscholing: Een collectieve kijk op Moocs en leren Date: 2017-09-12 -Category: project +Category: projects Slug: samenscholing lang: nl +Status: draft ![test image](/images/schoolbells.jpg) diff --git a/content/sdr-workshop.md b/content/sdr-workshop.md index 7c9c5263f..398f61ca4 100644 --- a/content/sdr-workshop.md +++ b/content/sdr-workshop.md @@ -16,9 +16,9 @@ Met de komst van Software-Defined Radio (SDR - software gestuurde radio) is het Gedurende deze workshop nemen deelnemers kennis van SDR, de hardware, de software en hoe simpele maar effectieve antennes te ontwerpen voor de ontvangst van deze signalen. -De cursus wordt aangeboden door Dennis de Bel en Roel Roscam Abbing. +De cursus wordt aangeboden door Dennis de Bel (PD0WND) en Roel Roscam Abbing. -* De cursus vangt 21 november aan wordt gedurende 4 weken wekelijks op dinsdagavond gegeven. +* De cursus wordt gedurende 4 weken wekelijks op dinsdagavond gegeven. Afhankelijk van de interesse, beginnen we begin december. -* Kosten 80 euro pp (SDR hardware inbegrepen bij cursus) +* Kosten 80 euro pp. (SDR hardware inbegrepen bij cursus). diff --git a/content/the-secret-life.md b/content/the-secret-life.md index d8bc4971e..b67ac1d54 100644 --- a/content/the-secret-life.md +++ b/content/the-secret-life.md @@ -10,13 +10,17 @@ Technologie is overal, al dan niet verscholen onder een masker van alledaagsheid ##data -5 november: seizoen 1 - huishoudelijke apparatuur (stofzuiger, naaimachine, centrale verwarming, wasmachine, vriezer en televisie) +**5 november**: seizoen 1 - huishoudelijke apparatuur (stofzuiger, naaimachine, centrale verwarming, wasmachine, vriezer en televisie) -12 november: seizoen 2 - apparatuur buiten de deur (auto, verbrandingsmotor, quartz horloge, telefoon, radio en videorecorder) +* Aanvang: 19:30 +* Start: 20:00 +* Eind 23:00 -19 november: seizoen 3 - kantoorapparatuur (lift, word processor, elektrisch licht, kopieerapparaat, faxmachine en het kantoor) -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/pelicanconf.py b/pelicanconf.py index 73925ff84..5beaf94f9 100644 --- a/pelicanconf.py +++ b/pelicanconf.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals AUTHOR = u'team' -SITENAME = u'Also' +SITENAME = u'varia' SITEURL = '' PATH = 'content' diff --git a/themes/cetcat/templates/category.html b/themes/cetcat/templates/category.html index 536ecb13a..e937d831e 100644 --- a/themes/cetcat/templates/category.html +++ b/themes/cetcat/templates/category.html @@ -5,6 +5,9 @@ {% if p.slug == category %}
{{ p.content }}
{% endif %} + {% if p.slug == projects %} +
{{ p.content }}
+ {% endif %} {% endfor %} {% endblock %}