diff --git a/LICENSE-Feather.md b/LICENSE-Feather.md new file mode 100644 index 0000000..1f4f433 --- /dev/null +++ b/LICENSE-Feather.md @@ -0,0 +1,21 @@ +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 8983dd8..679f3c3 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,9 @@ See the live demo (of the default configuration) here: https://pawroman.github.io/zola-theme-terminimal/ -Tested with Zola v0.17.2. Please note that earlier versions might not work because of breaking changes across Zola versions. +Tested with Zola v0.19.2. + +Please note that earlier (and older) versions might not work because of breaking changes across Zola versions. #### Fork disclaimer @@ -353,11 +355,11 @@ This theme supports RSS feeds. To enable RSS you need to set those 3 configuration settings to valid values: ```toml -generate_feed = true +generate_feeds = true author = "yourself@email.com" # Use `rss.xml` for RSS feeds and `atom.xml` for ATOM. -feed_filename = "atom.xml" +feed_filenames = ["rss.xml", "atom.xml"] ``` Note that `author` is also required as part of the RSS spec. diff --git a/config.toml b/config.toml index 4c89822..4135faf 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_feed = true +generate_feeds = true # Use `rss.xml` for RSS feeds and `atom.xml` for ATOM. -feed_filename = "atom.xml" +feed_filenames = ["rss.xml", "atom.xml"] # Optional: enable tags taxonomies = [ diff --git a/templates/index.html b/templates/index.html index 8b67c98..fd07b4c 100644 --- a/templates/index.html +++ b/templates/index.html @@ -13,14 +13,18 @@ {%- block open_graph %}{{ head_macros::open_graph(config=config) }}{% endblock open_graph -%} - {%- 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.generate_feeds %} + {%- for feed in config.feed_filenames %} + {%- if feed is containing('atom') %} + + {%- endif %} + + {%- if feed is containing('rss') %} + + {%- endif %} + + {%- endfor %} + {%- endif -%} {%- if config.extra.favicon %} diff --git a/templates/macros/menu.html b/templates/macros/menu.html index 246ab51..5d128e5 100644 --- a/templates/macros/menu.html +++ b/templates/macros/menu.html @@ -49,14 +49,16 @@ {%- endif %} {%- if is_rss -%} - {%- if config.generate_feed %} - {%- if config.feed_filename == "rss.xml" %} - {% set feed_type = 'rss+xml' %} - {%- else %} - {% set feed_type = 'atom+xml' %} - {% endif -%} + {%- if config.generate_feeds %} + {%- for feed in config.feed_filenames %} + {%- if feed is containing('rss') %} + + {% endif -%} + {%- if feed is containing('atom') %} + + {% endif -%} + {% endfor -%} - diff --git a/templates/macros/post.html b/templates/macros/post.html index c8627c9..5ea20d1 100644 --- a/templates/macros/post.html +++ b/templates/macros/post.html @@ -33,31 +33,33 @@ {% macro earlier_later(page) %} - {%- if config.extra.enable_post_view_navigation and page.lower or page.higher %} -