diff --git a/.gitmodules b/.gitmodules index fc0f27c32f..359068f303 100644 --- a/.gitmodules +++ b/.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 diff --git a/README.md b/README.md index 7a8110db2d..ffa91c33fc 100644 --- a/README.md +++ b/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` diff --git a/content/images/valid-rss-rogers.png b/content/images/valid-rss-rogers.png new file mode 100644 index 0000000000..8ce6d122ee Binary files /dev/null and b/content/images/valid-rss-rogers.png differ diff --git a/content/pages/about.en.md b/content/pages/about.en.md index 804bb91a46..418103d0ad 100644 --- a/content/pages/about.en.md +++ b/content/pages/about.en.md @@ -26,3 +26,8 @@ In addition to the above web services *varia* hosts a server for the federated c IM observatory score + +## 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). + +[Valid RSS] diff --git a/content/pages/about.nl.md b/content/pages/about.nl.md index 507faeb5ab..c81fcbecf1 100644 --- a/content/pages/about.nl.md +++ b/content/pages/about.nl.md @@ -26,3 +26,8 @@ Naast de bovenstaande webdiensten host *varia* ook een server voor het gefederee IM observatory score + +## 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). + +[Valid RSS] diff --git a/content/sounduncloud.en.md b/content/sounduncloud.en.md index 0fad23bc7a..37772f8e60 100644 --- a/content/sounduncloud.en.md +++ b/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 diff --git a/pelicanconf.py b/pelicanconf.py index 19956133d2..f18e536681 100644 --- a/pelicanconf.py +++ b/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'] -PLUGINS = ['extract_toc', 'i18n_subsites', 'summary'] # 'events' disabled for now +PLUGIN_PATHS = ['./plugins', './plugins-custom'] +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 -} \ No newline at end of file +} diff --git a/plugins-custom/events_ics b/plugins-custom/events_ics new file mode 160000 index 0000000000..539841521a --- /dev/null +++ b/plugins-custom/events_ics @@ -0,0 +1 @@ +Subproject commit 539841521a88d012cc49dc165aa3f5b5efbf8b65