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

.gitmodules

@@ -1,3 +1,9 @@
 [submodule "plugins"]
 	path = plugins
 	url = https://github.com/getpelican/pelican-plugins.git
+[submodule "plugins-custom/events-ics"]
+	path = plugins-custom/events-ics
+	url = https://git.vvvvvvaria.org/rra/events-ics.git
+[submodule "plugins-custom/events_ics"]
+	path = plugins-custom/events_ics
+	url = https://git.vvvvvvaria.org/rra/events_ics.git

README.md

@@ -8,6 +8,22 @@ The folder 'plugins' is linked to the Pelican project '[pelican-plugins](https:/
 
 `git clone https://git.vvvvvvaria.org/varia/varia.manual.git --recurse-submodules`
 
+## Update submodules
+
+We are currently using two submodules:
+
+* plugins ([https://github.com/getpelican/pelican-plugins](https://github.com/getpelican/pelican-plugins))
+* plugins-custom/events-ics ([https://git.vvvvvvaria.org/rra/events-ics](https://git.vvvvvvaria.org/rra/events-ics)) 
+
+To update these submodules within your (already) cloned repository, first init the submodule, and then update it:
+
+    cd /path/to/submodule
+
+    git submodule init
+
+    git submodule update
+
+
 ## Posting Content
 We're using a platform called pelican to generate static websites. The main way to add content to the website is by making 'posts' in the folder `content`
 

content/pages/about.en.md

@@ -26,3 +26,8 @@ In addition to the above web services *varia* hosts a server for the federated c
 <a href='https://check.messaging.one/result.php?domain=vvvvvvaria.org&amp;type=client'>
   <img src='https://check.messaging.one/badge.php?domain=vvvvvvaria.org' alt='IM observatory score' />
 </a>
+
+## RSS
+Subscribe to our RSS feeds, available in [Dutch](http://varia.zone/feeds/all-nl.rss.xml) and [English](http://varia.zone/en/feeds/all-en.rss.xml). 
+
+<a href="https://validator.w3.org/feed/check.cgi?url=http%3A//varia.zone/feeds/all-nl.rss.xml"><img src="/images/valid-rss-rogers.png" alt="[Valid RSS]" title="Validate my RSS feed" /></a>

content/pages/about.nl.md

@@ -26,3 +26,8 @@ Naast de bovenstaande webdiensten host *varia* ook een server voor het gefederee
 <a href='https://check.messaging.one/result.php?domain=vvvvvvaria.org&amp;type=client'>
   <img src='https://check.messaging.one/badge.php?domain=vvvvvvaria.org' alt='IM observatory score' />
 </a>
+
+## RSS
+Volg de updates op deze site door je te abonneren op onze RSS feeds. Er zijn twee feeds beschikbaar: [Nederlands](http://varia.zone/feeds/all-nl.rss.xml) en [Engels](http://varia.zone/en/feeds/all-en.rss.xml). 
+
+<a href="https://validator.w3.org/feed/check.cgi?url=http%3A//varia.zone/feeds/all-nl.rss.xml"><img src="/images/valid-rss-rogers.png" alt="[Valid RSS]" title="Validate my RSS feed" /></a>

content/sounduncloud.en.md

@@ -2,7 +2,6 @@ Title: Sounduncloud: A Rogue Archiving Workshop
 Category: curriculum
 Slug: sounduncloud
 lang: en
-curriculum: True
 event_start: 2017-12-01 12:00
 event_duration:6h
 status: draft

pelicanconf.py

@@ -4,6 +4,7 @@ from __future__ import unicode_literals
 
 AUTHOR = u'Varia'
 SITENAME = u'Varia'
+SITEURL = 'https://varia.zone/'
 
 PATH = 'content'
 
@@ -14,7 +15,7 @@ DEFAULT_DATE = 'fs'
 USE_FOLDER_AS_CATEGORY = True
 
 # Feed generation is usually not desired when developing
-FEED_DOMAIN = 'varia.zone/feeds/'
+FEED_DOMAIN = SITEURL
 FEED_ALL_RSS = 'feeds/all.rss.xml'
 TRANSLATION_FEED_RSS = 'feeds/all-%s.rss.xml'
 RSS_FEED_SUMMARY_ONLY = False
@@ -28,8 +29,8 @@ AUTHOR_FEED_RSS = None
 DEFAULT_PAGINATION = 25
 
 # Uncomment following line if you want document-relative URLs when developing
-PLUGIN_PATHS = ['./plugins']
+PLUGIN_PATHS = ['./plugins', './plugins-custom']
-PLUGINS = ['extract_toc', 'i18n_subsites', 'summary'] # 'events' disabled for now
+PLUGINS = ['extract_toc', 'i18n_subsites', 'summary', 'events_ics'] 
 MD_EXTENSIONS = ['codehilite','extra','toc']
 
 STATIC_PATHS = ['extra/favicon.ico', 'images', 'pdfs']
@@ -59,4 +60,4 @@ PLUGIN_EVENTS = {
 	'ics_calendars': ['event.ics', 'curriculum.ics'],
 	'default_location' : '',
 	'calendar_per_category': True
-}
+}

plugins-custom/events_ics

@@ -0,0 +1 @@
+Subproject commit 539841521a88d012cc49dc165aa3f5b5efbf8b65