From 2830f6917381f53a6e2e58ebf11dd8ce76e18044 Mon Sep 17 00:00:00 2001 From: erciccione Date: Fri, 19 Jun 2020 18:36:16 +0200 Subject: [PATCH] Improve RSS experience (install 'jekyll-feed' plugin) - Use 'jekyll-feed' plugin to manage RSS feed and remove existing feed.xml file - Add feed image in main blog tab ('All posts') The 'jekyll-feed' plugin makes possible for aggregators to automatically detect the existence of a feed (feed_meta tag in header) and creates a 'feed.atom' file containing the last 20 blog posts and locates it in the root directory. The structure is compatible with our current system, including the possibility to show a picture if it's included in the post (#1002). --- Gemfile | 1 + Gemfile.lock | 3 +++ _config.yml | 5 +++++ _data/lang/ar/footer-1.yml | 2 +- _data/lang/de/footer-1.yml | 2 +- _data/lang/en/footer-1.yml | 2 +- _data/lang/es/footer-1.yml | 2 +- _data/lang/fr/footer-1.yml | 2 +- _data/lang/it/footer-1.yml | 2 +- _data/lang/nl/footer-1.yml | 2 +- _data/lang/pl/footer-1.yml | 2 +- _data/lang/pt-br/footer-1.yml | 2 +- _data/lang/ru/footer-1.yml | 2 +- _data/lang/tr/footer-1.yml | 2 +- _data/lang/zh-cn/footer-1.yml | 2 +- _data/lang/zh-tw/footer-1.yml | 2 +- _includes/head.html | 3 +++ _layouts/blog_by_tag.html | 4 ++-- blog/index.html | 5 ++++- css/custom.css | 16 ++++++++++++++++ feed.xml | 27 --------------------------- img/feed.svg | 18 ++++++++++++++++++ 22 files changed, 65 insertions(+), 43 deletions(-) delete mode 100644 feed.xml create mode 100644 img/feed.svg diff --git a/Gemfile b/Gemfile index 205752b7..bebb7509 100644 --- a/Gemfile +++ b/Gemfile @@ -6,3 +6,4 @@ gem 'builder' gem 'rubysl-rexml' gem 'wdm', '>= 0.1.0' if Gem.win_platform? gem 'jekyll-multiple-languages-plugin' +gem 'jekyll-feed' diff --git a/Gemfile.lock b/Gemfile.lock index 6929ff41..aa006f5f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -28,6 +28,8 @@ GEM pathutil (~> 0.9) rouge (>= 1.7, < 4) safe_yaml (~> 1.0) + jekyll-feed (0.11.0) + jekyll (~> 3.3) jekyll-multiple-languages-plugin (1.5.1) jekyll (>= 2.0, < 4.0) jekyll-paginate (1.1.0) @@ -62,6 +64,7 @@ PLATFORMS DEPENDENCIES builder jekyll + jekyll-feed jekyll-multiple-languages-plugin jekyll-paginate rubysl-rexml diff --git a/_config.yml b/_config.yml index 932f7fd0..4318e9d0 100644 --- a/_config.yml +++ b/_config.yml @@ -22,6 +22,11 @@ paginate_path: blog/page:num/ plugins: - jekyll-paginate - jekyll-multiple-languages-plugin + - jekyll-feed + +feed: + path: feed.atom + posts_limit: 20 # jekyll-multiple-languages-plugin settings: languages: ["en", "es", "it", "pl", "fr", "ar", "ru", "de", "nl", "pt-br", "tr", "zh-cn", "zh-tw"] diff --git a/_data/lang/ar/footer-1.yml b/_data/lang/ar/footer-1.yml index 5dd54e68..4b84e93e 100644 --- a/_data/lang/ar/footer-1.yml +++ b/_data/lang/ar/footer-1.yml @@ -9,7 +9,7 @@ - name: دليل المستخدم url: resources/user-guides/ - name: RSS Feed - url: https://getmonero.org/feed.xml + url: feed.atom - title: IRC قنوات الدردشة subfolderitems: - name: مونيرو diff --git a/_data/lang/de/footer-1.yml b/_data/lang/de/footer-1.yml index 8d4ba1db..a5b5bae8 100644 --- a/_data/lang/de/footer-1.yml +++ b/_data/lang/de/footer-1.yml @@ -11,7 +11,7 @@ - name: Bibliothek url: library - name: RSS-Feed - url: https://getmonero.org/feed.xml + url: feed.atom - title: IRC-Channels subfolderitems: - name: monero diff --git a/_data/lang/en/footer-1.yml b/_data/lang/en/footer-1.yml index 79980261..1a129231 100644 --- a/_data/lang/en/footer-1.yml +++ b/_data/lang/en/footer-1.yml @@ -11,7 +11,7 @@ - name: Library url: library - name: RSS Feed - url: rss + url: feed.atom - title: IRC Channels subfolderitems: - name: monero diff --git a/_data/lang/es/footer-1.yml b/_data/lang/es/footer-1.yml index d2939549..06af6741 100644 --- a/_data/lang/es/footer-1.yml +++ b/_data/lang/es/footer-1.yml @@ -11,7 +11,7 @@ - name: Librería url: library - name: RSS Feed - url: https://getmonero.org/feed.xml + url: feed.atom - title: Canales IRC subfolderitems: - name: monero diff --git a/_data/lang/fr/footer-1.yml b/_data/lang/fr/footer-1.yml index 4968602a..cff985fb 100644 --- a/_data/lang/fr/footer-1.yml +++ b/_data/lang/fr/footer-1.yml @@ -11,7 +11,7 @@ - name: Librairie url: library - name: Flux RSS - url: https://getmonero.org/feed.xml + url: feed.atom - title: Canaux IRC subfolderitems: - name: monero diff --git a/_data/lang/it/footer-1.yml b/_data/lang/it/footer-1.yml index 0cfd356b..9ff085a6 100644 --- a/_data/lang/it/footer-1.yml +++ b/_data/lang/it/footer-1.yml @@ -11,7 +11,7 @@ - name: Libreria url: library - name: Feed RSS - url: https://getmonero.org/feed.xml + url: feed.atom - title: Chat IRC subfolderitems: - name: monero diff --git a/_data/lang/nl/footer-1.yml b/_data/lang/nl/footer-1.yml index bf23153c..09661255 100644 --- a/_data/lang/nl/footer-1.yml +++ b/_data/lang/nl/footer-1.yml @@ -11,7 +11,7 @@ - name: Bibliotheek url: library - name: RSS-kanaal - url: https://getmonero.org/feed.xml + url: feed.atom - title: IRC-kanalen subfolderitems: - name: monero diff --git a/_data/lang/pl/footer-1.yml b/_data/lang/pl/footer-1.yml index d2a92163..46d421c1 100644 --- a/_data/lang/pl/footer-1.yml +++ b/_data/lang/pl/footer-1.yml @@ -11,7 +11,7 @@ - name: Księgarnia url: library - name: Kanał RSS - url: https://getmonero.org/feed.xml + url: feed.atom - title: Kanały IRC subfolderitems: - name: monero diff --git a/_data/lang/pt-br/footer-1.yml b/_data/lang/pt-br/footer-1.yml index dfd48d1a..823736e4 100644 --- a/_data/lang/pt-br/footer-1.yml +++ b/_data/lang/pt-br/footer-1.yml @@ -11,7 +11,7 @@ - name: Biblioteca url: library - name: RSS Feed - url: https://getmonero.org/feed.xml + url: feed.atom - title: Canais no IRC subfolderitems: - name: monero diff --git a/_data/lang/ru/footer-1.yml b/_data/lang/ru/footer-1.yml index d034a3fc..b0921463 100644 --- a/_data/lang/ru/footer-1.yml +++ b/_data/lang/ru/footer-1.yml @@ -11,7 +11,7 @@ - name: Библиотека url: library - name: Канал RSS - url: https://getmonero.org/feed.xml + url: feed.atom - title: Каналы IRC subfolderitems: - name: monero diff --git a/_data/lang/tr/footer-1.yml b/_data/lang/tr/footer-1.yml index 32a82fc8..b7c66b36 100644 --- a/_data/lang/tr/footer-1.yml +++ b/_data/lang/tr/footer-1.yml @@ -11,7 +11,7 @@ - name: Kütüphane url: library - name: RSS Besleme - url: https://getmonero.org/feed.xml + url: feed.atom - title: IRC Kanalları subfolderitems: - name: monero diff --git a/_data/lang/zh-cn/footer-1.yml b/_data/lang/zh-cn/footer-1.yml index e0bd2c30..1a129231 100644 --- a/_data/lang/zh-cn/footer-1.yml +++ b/_data/lang/zh-cn/footer-1.yml @@ -11,7 +11,7 @@ - name: Library url: library - name: RSS Feed - url: https://getmonero.org/feed.xml + url: feed.atom - title: IRC Channels subfolderitems: - name: monero diff --git a/_data/lang/zh-tw/footer-1.yml b/_data/lang/zh-tw/footer-1.yml index 098a8030..b6d42e9a 100644 --- a/_data/lang/zh-tw/footer-1.yml +++ b/_data/lang/zh-tw/footer-1.yml @@ -11,7 +11,7 @@ - name: 圖書出版品 url: library - name: RSS 摘要 - url: https://getmonero.org/feed.xml + url: feed.atom - title: IRC 頻道 subfolderitems: - name: monero diff --git a/_includes/head.html b/_includes/head.html index 6882439a..62578d49 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -47,4 +47,7 @@ + + {% feed_meta %} + diff --git a/_layouts/blog_by_tag.html b/_layouts/blog_by_tag.html index cd4ae8a2..5a26a7d4 100644 --- a/_layouts/blog_by_tag.html +++ b/_layouts/blog_by_tag.html @@ -53,10 +53,10 @@ layout: custom {% else %}

{% t blog.meetinglogs %}

{% endif %} - + {% if site.tags[tag.slug] %} - {% for post in site.tags[tag.slug] %} + {% for post in site.tags[tag.slug] %}

{{ post.title }}

diff --git a/blog/index.html b/blog/index.html index f9a41d75..f2d91e43 100644 --- a/blog/index.html +++ b/blog/index.html @@ -39,7 +39,10 @@ title: titles.blogbytag

-

{% t blog.allposts %}

+
+ +

{% t blog.allposts %}

+
{% for post in paginator.posts %}

{{ post.title }}

diff --git a/css/custom.css b/css/custom.css index dbdea601..f1b7ce8b 100644 --- a/css/custom.css +++ b/css/custom.css @@ -3971,6 +3971,22 @@ h3#months { border-bottom: 2px solid #a1aabb; } +.info-block .feed h2 { + margin-top: 0; +} + +.feed span { + height: 30px; + width: 30px; + display: block; + padding-right: 1rem; +} + +.feed span.feed-pic { + background: url(../img/feed.svg) no-repeat; + float: right; +} + @media only screen and (max-width: 75rem) { .page-numbers { margin-top: 2rem; diff --git a/feed.xml b/feed.xml deleted file mode 100644 index 0c0b2970..00000000 --- a/feed.xml +++ /dev/null @@ -1,27 +0,0 @@ ---- ---- - - - - {{ site.name | xml_escape }} - {% if site.description %}{{ site.description | xml_escape }}{% endif %} - {{ site.url }} - - {% for post in site.posts limit:10 %} - - {{ post.title | xml_escape }} - {% if post.author.name %} - {{ post.author.name | xml_escape }} - {% endif %} - {% if post.summary %} - {{ post.summary | xml_escape }} - {% else %} - {{ post.content | xml_escape }} - {% endif %} - {{ post.date | date: "%a, %d %b %Y %H:%M:%S %z" }} - {{ site.url }}{{ post.url }} - {{ site.url }}{{ post.url }} - - {% endfor %} - - \ No newline at end of file diff --git a/img/feed.svg b/img/feed.svg new file mode 100644 index 00000000..cc313f2a --- /dev/null +++ b/img/feed.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + +