diff --git a/LICENSE-Feather.md b/LICENSE-Feather.md deleted file mode 100644 index 1f4f433..0000000 --- a/LICENSE-Feather.md +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2013-2023 Cole Bemis - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/README.md b/README.md index 679f3c3..8983dd8 100644 --- a/README.md +++ b/README.md @@ -8,9 +8,7 @@ See the live demo (of the default configuration) here: https://pawroman.github.io/zola-theme-terminimal/ -Tested with Zola v0.19.2. - -Please note that earlier (and older) versions might not work because of breaking changes across Zola versions. +Tested with Zola v0.17.2. Please note that earlier versions might not work because of breaking changes across Zola versions. #### Fork disclaimer @@ -355,11 +353,11 @@ This theme supports RSS feeds. To enable RSS you need to set those 3 configuration settings to valid values: ```toml -generate_feeds = true +generate_feed = true author = "yourself@email.com" # Use `rss.xml` for RSS feeds and `atom.xml` for ATOM. -feed_filenames = ["rss.xml", "atom.xml"] +feed_filename = "atom.xml" ``` Note that `author` is also required as part of the RSS spec. diff --git a/config.toml b/config.toml index 4135faf..4c89822 100644 --- a/config.toml +++ b/config.toml @@ -6,10 +6,10 @@ title = "Zola Terminimal theme" compile_sass = true # The theme supports feeds (RSS and ATOM) -generate_feeds = true +generate_feed = true # Use `rss.xml` for RSS feeds and `atom.xml` for ATOM. -feed_filenames = ["rss.xml", "atom.xml"] +feed_filename = "atom.xml" # Optional: enable tags taxonomies = [ diff --git a/templates/index.html b/templates/index.html index fd07b4c..8b67c98 100644 --- a/templates/index.html +++ b/templates/index.html @@ -13,18 +13,14 @@ {%- block open_graph %}{{ head_macros::open_graph(config=config) }}{% endblock open_graph -%} - {%- if config.generate_feeds %} - {%- for feed in config.feed_filenames %} - {%- if feed is containing('atom') %} - - {%- endif %} - - {%- if feed is containing('rss') %} - - {%- endif %} - - {%- endfor %} - {%- endif -%} + {%- if config.generate_feed %} + {%- if "rss" in config.feed_filename %} + {% set feed_type = 'rss+xml' %} + {%- else %} + {% set feed_type = 'atom+xml' %} + {% endif -%} + + {% endif -%} {%- if config.extra.favicon %} diff --git a/templates/macros/menu.html b/templates/macros/menu.html index 5d128e5..246ab51 100644 --- a/templates/macros/menu.html +++ b/templates/macros/menu.html @@ -49,16 +49,14 @@ {%- endif %} {%- if is_rss -%} - {%- if config.generate_feeds %} - {%- for feed in config.feed_filenames %} - {%- if feed is containing('rss') %} - - {% endif -%} - {%- if feed is containing('atom') %} - - {% endif -%} - {% endfor -%} + {%- if config.generate_feed %} + {%- if config.feed_filename == "rss.xml" %} + {% set feed_type = 'rss+xml' %} + {%- else %} + {% set feed_type = 'atom+xml' %} + {% endif -%} + diff --git a/templates/macros/post.html b/templates/macros/post.html index 5ea20d1..c8627c9 100644 --- a/templates/macros/post.html +++ b/templates/macros/post.html @@ -33,33 +33,31 @@ {% macro earlier_later(page) %} - {%- if config.extra.enable_post_view_navigation %} - {%- if page.lower or page.higher %} -