From 07e926d70daa4122168bd287c4499cd3cbc431dc Mon Sep 17 00:00:00 2001 From: "mb@mb" Date: Thu, 1 Feb 2018 11:35:17 +0100 Subject: [PATCH 01/14] a small edit to test the rss feed --- content/sounduncloud.en.md | 1 - 1 file changed, 1 deletion(-) 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 From 46e5b96e5c5e7ac4cfd46cd2e5f6bc3008053028 Mon Sep 17 00:00:00 2001 From: "mb@mb" Date: Thu, 1 Feb 2018 11:42:07 +0100 Subject: [PATCH 02/14] changing the settings to make the rss feed word again --- pelicanconf.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pelicanconf.py b/pelicanconf.py index 19956133d2..9ac9dec139 100644 --- a/pelicanconf.py +++ b/pelicanconf.py @@ -4,6 +4,7 @@ from __future__ import unicode_literals AUTHOR = u'Varia' SITENAME = u'Varia' +SITEURL = '' 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 From d56c1205ce59201496175366debb55b58e474ce3 Mon Sep 17 00:00:00 2001 From: "mb@mb" Date: Thu, 1 Feb 2018 11:45:31 +0100 Subject: [PATCH 03/14] adding a SITEURL to make the rss feed work again --- pelicanconf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pelicanconf.py b/pelicanconf.py index 9ac9dec139..724d8971ee 100644 --- a/pelicanconf.py +++ b/pelicanconf.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals AUTHOR = u'Varia' SITENAME = u'Varia' -SITEURL = '' +SITEURL = 'https://varia.zone/' PATH = 'content' From 094f11f8970be62ec0dbb9c00b0c293a152638b2 Mon Sep 17 00:00:00 2001 From: "mb@mb" Date: Thu, 1 Feb 2018 11:57:12 +0100 Subject: [PATCH 04/14] added a RSS validator banner to the about page --- content/pages/about.en.md | 5 +++++ content/pages/about.nl.md | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/content/pages/about.en.md b/content/pages/about.en.md index 804bb91a46..5f77044dad 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/feeds/all-en.rss.xml). + +[Valid RSS] diff --git a/content/pages/about.nl.md b/content/pages/about.nl.md index 507faeb5ab..6c181c509d 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/feeds/all-en.rss.xml). + +[Valid RSS] From b4d6995b8dc68ede038c6bb149fabf97f524d199 Mon Sep 17 00:00:00 2001 From: "mb@mb" Date: Thu, 1 Feb 2018 11:58:33 +0100 Subject: [PATCH 05/14] added a RSS validator banner to the about page --- content/images/valid-rss-rogers.png | Bin 0 -> 3712 bytes content/pages/about.en.md | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 content/images/valid-rss-rogers.png diff --git a/content/images/valid-rss-rogers.png b/content/images/valid-rss-rogers.png new file mode 100644 index 0000000000000000000000000000000000000000..8ce6d122ee5410b5a8b94f6f3328e7cffbef4daf GIT binary patch literal 3712 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 eZeLdq`u_mwbPF{$%i)v&0000[Valid RSS] +[Valid RSS] From eb7054092a9755a16130cf8abb6da92e91245ca1 Mon Sep 17 00:00:00 2001 From: "mb@mb" Date: Thu, 1 Feb 2018 11:59:05 +0100 Subject: [PATCH 06/14] added a RSS validator banner to the about page --- content/pages/about.nl.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/pages/about.nl.md b/content/pages/about.nl.md index 6c181c509d..20f701f6bb 100644 --- a/content/pages/about.nl.md +++ b/content/pages/about.nl.md @@ -30,4 +30,4 @@ Naast de bovenstaande webdiensten host *varia* ook een server voor het gefederee ## 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/feeds/all-en.rss.xml). -[Valid RSS] +[Valid RSS] From bbd8cda21655bb51804a0f3d2fbfb8d5410cd248 Mon Sep 17 00:00:00 2001 From: "mb@mb" Date: Thu, 1 Feb 2018 12:00:31 +0100 Subject: [PATCH 07/14] added a RSS validator banner to the about page --- content/pages/about.en.md | 2 +- content/pages/about.nl.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/content/pages/about.en.md b/content/pages/about.en.md index 94fa6ba514..418103d0ad 100644 --- a/content/pages/about.en.md +++ b/content/pages/about.en.md @@ -28,6 +28,6 @@ In addition to the above web services *varia* hosts a server for the federated c ## RSS -Subscribe to our RSS feeds, available in [Dutch](http://varia.zone/feeds/all-nl.rss.xml) and [English](http://varia.zone/feeds/all-en.rss.xml). +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 20f701f6bb..c81fcbecf1 100644 --- a/content/pages/about.nl.md +++ b/content/pages/about.nl.md @@ -28,6 +28,6 @@ Naast de bovenstaande webdiensten host *varia* ook een server voor het gefederee ## 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/feeds/all-en.rss.xml). +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] From 2ca06da3af8cf2d78e544442627bd549c2e95a39 Mon Sep 17 00:00:00 2001 From: "mb@mb" Date: Thu, 1 Feb 2018 12:32:50 +0100 Subject: [PATCH 08/14] adding the event-ics custom plugin as a submodule --- .gitmodules | 3 +++ custom-plugins/events-ics | 1 + 2 files changed, 4 insertions(+) create mode 160000 custom-plugins/events-ics diff --git a/.gitmodules b/.gitmodules index fc0f27c32f..077317f38f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "plugins"] path = plugins url = https://github.com/getpelican/pelican-plugins.git +[submodule "custom-plugins/events-ics"] + path = custom-plugins/events-ics + url = https://git.vvvvvvaria.org/rra/events-ics.git diff --git a/custom-plugins/events-ics b/custom-plugins/events-ics new file mode 160000 index 0000000000..829142893c --- /dev/null +++ b/custom-plugins/events-ics @@ -0,0 +1 @@ +Subproject commit 829142893c6f73ed25ec294baa00b493f55fe31b From 95d0a8fd08832c2535a5d60b4994c8db14e731ad Mon Sep 17 00:00:00 2001 From: "mb@mb" Date: Thu, 1 Feb 2018 12:35:47 +0100 Subject: [PATCH 09/14] adding the event-ics custom plugin as a submodule --- pelicanconf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pelicanconf.py b/pelicanconf.py index 724d8971ee..4f324e2758 100644 --- a/pelicanconf.py +++ b/pelicanconf.py @@ -29,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'] From 7276d5b7eb4150832f4eb7cfc4ca95e331e3e522 Mon Sep 17 00:00:00 2001 From: "mb@mb" Date: Thu, 1 Feb 2018 12:54:51 +0100 Subject: [PATCH 10/14] re-connected the events-ics plugin as a submodule --- .gitmodules | 4 ++-- custom-plugins/events-ics | 1 - pelicanconf.py | 2 +- plugins-custom/events-ics | 1 + 4 files changed, 4 insertions(+), 4 deletions(-) delete mode 160000 custom-plugins/events-ics create mode 160000 plugins-custom/events-ics diff --git a/.gitmodules b/.gitmodules index 077317f38f..35b3c057ad 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "plugins"] path = plugins url = https://github.com/getpelican/pelican-plugins.git -[submodule "custom-plugins/events-ics"] - path = custom-plugins/events-ics +[submodule "plugins-custom/events-ics"] + path = plugins-custom/events-ics url = https://git.vvvvvvaria.org/rra/events-ics.git diff --git a/custom-plugins/events-ics b/custom-plugins/events-ics deleted file mode 160000 index 829142893c..0000000000 --- a/custom-plugins/events-ics +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 829142893c6f73ed25ec294baa00b493f55fe31b diff --git a/pelicanconf.py b/pelicanconf.py index 4f324e2758..819ac0919c 100644 --- a/pelicanconf.py +++ b/pelicanconf.py @@ -29,7 +29,7 @@ AUTHOR_FEED_RSS = None DEFAULT_PAGINATION = 25 # Uncomment following line if you want document-relative URLs when developing -PLUGIN_PATHS = ['./plugins','./plugins-custom'] +PLUGIN_PATHS = ['./plugins', './plugins-custom'] PLUGINS = ['extract_toc', 'i18n_subsites', 'summary', 'events-ics'] MD_EXTENSIONS = ['codehilite','extra','toc'] 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 From 39c0fa84ae05190bc81bba755dbc00da7a9c6250 Mon Sep 17 00:00:00 2001 From: "mb@mb" Date: Thu, 1 Feb 2018 13:04:22 +0100 Subject: [PATCH 11/14] updated the readme with submodule update instructions --- README.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/README.md b/README.md index 7a8110db2d..d6d8f9466b 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,21 @@ 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` From 86d7faf050b1d6edac73c0d42b4c8647f1d59d95 Mon Sep 17 00:00:00 2001 From: Gitea Date: Thu, 1 Feb 2018 13:06:58 +0100 Subject: [PATCH 12/14] minor config edit --- pelicanconf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pelicanconf.py b/pelicanconf.py index 819ac0919c..237fea4509 100644 --- a/pelicanconf.py +++ b/pelicanconf.py @@ -60,4 +60,4 @@ PLUGIN_EVENTS = { 'ics_calendars': ['event.ics', 'curriculum.ics'], 'default_location' : '', 'calendar_per_category': True -} \ No newline at end of file +} From c7ccff5f13a7e28a8a54c4c373adcade11225b67 Mon Sep 17 00:00:00 2001 From: "mb@mb" Date: Thu, 1 Feb 2018 13:16:47 +0100 Subject: [PATCH 13/14] changing the submodule name to events_ics --- .gitmodules | 3 +++ pelicanconf.py | 2 +- plugins-custom/{events-ics => events_ics} | 0 3 files changed, 4 insertions(+), 1 deletion(-) rename plugins-custom/{events-ics => events_ics} (100%) diff --git a/.gitmodules b/.gitmodules index 35b3c057ad..359068f303 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [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/pelicanconf.py b/pelicanconf.py index 237fea4509..f18e536681 100644 --- a/pelicanconf.py +++ b/pelicanconf.py @@ -30,7 +30,7 @@ DEFAULT_PAGINATION = 25 # Uncomment following line if you want document-relative URLs when developing PLUGIN_PATHS = ['./plugins', './plugins-custom'] -PLUGINS = ['extract_toc', 'i18n_subsites', 'summary', 'events-ics'] +PLUGINS = ['extract_toc', 'i18n_subsites', 'summary', 'events_ics'] MD_EXTENSIONS = ['codehilite','extra','toc'] STATIC_PATHS = ['extra/favicon.ico', 'images', 'pdfs'] diff --git a/plugins-custom/events-ics b/plugins-custom/events_ics similarity index 100% rename from plugins-custom/events-ics rename to plugins-custom/events_ics From 2b7680ce4d78a491f8902c6776354bd2bb005dc8 Mon Sep 17 00:00:00 2001 From: "mb@mb" Date: Thu, 1 Feb 2018 13:18:46 +0100 Subject: [PATCH 14/14] testing the calender plugin --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index d6d8f9466b..ffa91c33fc 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,7 @@ To update these submodules within your (already) cloned repository, first init t 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`