
--- ringfairy.toml | 2 +- websites.json | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ringfairy.toml b/ringfairy.toml index c35a12d..ff10f33 100644 --- a/ringfairy.toml +++ b/ringfairy.toml @@ -4,7 +4,7 @@ ring_description = "A small web of Unix-y personal sites." ring_owner = "Daniel Fichtinger" ring_owner_site = "https://ficd.sh" -filepath_list = "./websites.json" # Website list; should be a JSON file with 'name', 'url', etc +filepath_list = ["./websites.json"] # Website list; should be a JSON file with 'name', 'url', etc path_output = "./webring" # Generated files will be saved in this folder. path_assets = "./data/assets" # All contents of the asset folder will be copied directly into the output directory path_templates = "./data/templates" # The folder containing HTML templates to use, ie, anything with {{ tags }} diff --git a/websites.json b/websites.json index 19d3cab..602f113 100644 --- a/websites.json +++ b/websites.json @@ -51,6 +51,7 @@ "slug": "micahkepe", "about": "An assortment of my ramblings and random adventures.", "url": "https://micahkepe.com/blog/", - "owner": "Micah Kepe" + "owner": "Micah Kepe", + "atom": "https://micahkepe.com/blog/atom.xml" } ] -- 2.50.1

--- templates/index.jinja | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/index.jinja b/templates/index.jinja index b76d02b..6dfafe5 100644 --- a/templates/index.jinja +++ b/templates/index.jinja @@ -28,10 +28,10 @@ {% for site in sites %} <tr> <td>{{loop.index}}</td> - <td>{{site["name"]}}</td> - <td><a href="{{site['url']}}">{{site["url"]}}</a> {% if site["rss"] %}<a href="{{site['rss']}}">[rss]</a>{% endif %}</td> - <td>{{site["about"]}}</td> - <td>{{site["owner"]}}</td> + <td>{{site.name}}</td> + <td><a href="{{site.url}}">{{site.url}}</a> {% if site.rss %}<a href="{{site.rss}}">[rss]</a>{% endif %}{% if site.atom %}<a href="{{site.atom}}">[atom]</a>{% endif %}</td> + <td>{{site.about}}</td> + <td>{{site.owner}}</td> </tr> {% endfor %} </table> @@ -51,7 +51,7 @@ >faq</a>.<br><br> <code>$ shring blogs | head -n5 </code><br> {% for blog in most_recent %} - <a href="{{ blog['channel_link'] }}">{{ blog["channel_title"] }}</a>: <a href="{{ blog['link'] }}"> {{ blog["title"] }} </a> - {{ blog["pub_date"] }} + <a href="{{ blog['channel_link'] }}">{{ blog.channel_title }}</a>: <a href="{{ blog['link'] }}"> {{ blog.title }} </a> - {{ blog.pub_date }} <br> {% endfor %} </p> -- 2.50.1

Hey, I'm a tad confused because there are two commits both called "fix ringfairy not building", but the diffs are different. Should I apply them both, or is this one (that I'm replying to right now) a revised version of the same patch?
participants (2)
-
Daniel Fichtinger
-
Zunda