diff --git a/.doit.db.db b/.doit.db.db index b7b97d8..2962212 100644 Binary files a/.doit.db.db and b/.doit.db.db differ diff --git a/conf.py b/conf.py index 56760dc..1afdd52 100644 --- a/conf.py +++ b/conf.py @@ -32,6 +32,7 @@ XMPP_URL = 'xmpp:educatic-general@conference.txs.es' MASTODON_URL = 'https://txs.es/@EDUCATIC' PEERTUBE_URL = 'https://tuvideo.encanarias.info/accounts/educatic' GIT_URL = 'https://git.txs.es/EDUCATIC' +RSS_URL = 'https://eventos.txs.es/feed/rss/collection/EDUCATIC' # Nikola is multilingual! # @@ -1488,6 +1489,7 @@ GLOBAL_CONTEXT = { 'MASTODON_URL': MASTODON_URL, 'PEERTUBE_URL': PEERTUBE_URL, 'GIT_URL': GIT_URL, + 'RSS_URL': RSS_URL, 'BANNER_URL': '/images/aprendiendo3.jpg', } diff --git a/files/assets/img/rss.svg b/files/assets/img/rss.svg new file mode 100644 index 0000000..4ac07d3 --- /dev/null +++ b/files/assets/img/rss.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/pages/contact.md b/pages/contact.md index 5c60fb6..a45dc3f 100644 --- a/pages/contact.md +++ b/pages/contact.md @@ -26,3 +26,9 @@ * Repositorio de vídeos [^2]: [PeerTube]({{% url 'peertube' %}})   PeerTube: [{{% url 'peertube' account=True %}}]({{% url 'peertube' %}}) + +* Canal RSS Eventos [^3]: +[^3]: Para que puedas estar al tanto de que {{% doc %}}eventos organizamos{{% /doc %}} en {{% blog_title %}}, sin la necesidad de acudir periódicamente a esta web, el método recomendado es usar los *[feeds RSS](https://eventos.txs.es/export)* + + [RSS]({{% url 'rss' %}})   RSS: [{{% url 'rss' delprt=True %}}]({{% url 'rss' %}}) + diff --git a/pages/events.md b/pages/events.md index 75b85b5..7ef7ad9 100644 --- a/pages/events.md +++ b/pages/events.md @@ -22,7 +22,10 @@ {{% /tabpannel %}} - Si quieres organizar un evento con nosotros {{% doc %}}contáctanos {{% /doc %}}. + +Para que puedas estar al tanto de los nuevos eventos que organizamos, sin la necesidad de acudir periódicamente a esta web, puedes {{% doc %}}subscribirte a nuestro Canal RSS de Eventos o seguirnos en nuestras redes sociales{{% /doc %}}. + +Si quieres organizar un evento con nosotros {{% doc %}}contáctanos {{% /doc %}}. diff --git a/shortcodes/url.tmpl b/shortcodes/url.tmpl index dc79355..edef46f 100644 --- a/shortcodes/url.tmpl +++ b/shortcodes/url.tmpl @@ -7,7 +7,7 @@ Usage: {{% url [suffix=] [delprt=] [account=] %}} -where is one of 'email', 'xmpp', 'mastodon' or 'peertube', corresponding to GLOBAL_CONTEXT variable of EMAIL_URL, XMPP_URL, MASTODON_URL, PEERTUBE_URL and GIT_URL respectively, sufix variable allow to add a suffix to the URL, if delprt parameter is True then remove protocol from URL, if account parameter is True then return the user account +where is one of 'email', 'xmpp', 'mastodon', 'peertube' or 'rss', corresponding to GLOBAL_CONTEXT variable of EMAIL_URL, XMPP_URL, MASTODON_URL, PEERTUBE_URL, GIT_URL and RSS_URL respectively, sufix variable allow to add a suffix to the URL, if delprt parameter is True then remove protocol from URL, if account parameter is True then return the user account Example: {{% url 'mastodon' %}} will show the content of MASTODON_URL defined in GLOBAL_CONTEXT of config.py @@ -71,6 +71,8 @@ where is one of 'email', 'xmpp', 'mastodon' or 'peertube', corresponding <% url = PEERTUBE_URL + s %> % elif _args[0] == 'git': <% url = GIT_URL + s %> +% elif _args[0] == 'rss': + <% url = RSS_URL + s %> % else: Unknown % endif