commit 73a9c8858bebff1a11bcfd9176253ca0e1d29644 parent 595c19e2e75c43cd32eeddc10cbe37ed0af1cf87 Author: Yuval Langer <yuval.langer@gmail.com> Date: Sat, 8 Jan 2022 21:36:46 +0200 Add theme to Makefile and actually fix the slug things. https://stackoverflow.com/questions/54047848/pelican-not-all-arguments-converted-during-string-formatting Diffstat:
| M | Makefile | | | 5 | ++--- |
| M | themes/fixed-simple/templates/base.html | | | 8 | ++++---- |
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile @@ -1,6 +1,6 @@ PY?=python3 PELICAN?=pelican -PELICANOPTS= +PELICANOPTS=--theme-path themes/fixed-simple BASEDIR=$(CURDIR) INPUTDIR=$(BASEDIR)/content @@ -83,4 +83,4 @@ rsync_upload: publish rsync -e "ssh -p $(SSH_PORT)" -P -rvzc --cvs-exclude --delete $(OUTPUTDIR)/ $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR) -.PHONY: html help clean regenerate serve serve-global devserver stopserver publish ssh_upload rsync_upload -\ No newline at end of file +.PHONY: html help clean regenerate serve serve-global devserver stopserver publish ssh_upload rsync_upload diff --git a/themes/fixed-simple/templates/base.html b/themes/fixed-simple/templates/base.html @@ -17,16 +17,16 @@ <link href="{{ FEED_DOMAIN }}/{% if FEED_RSS_URL %}{{ FEED_RSS_URL }}{% else %}{{ FEED_RSS }}{% endif %}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" /> {% endif %} {% if CATEGORY_FEED_ATOM and category %} - <link href="{{ FEED_DOMAIN }}/{% if CATEGORY_FEED_ATOM_URL %}{{ CATEGORY_FEED_ATOM_URL.format(category.slug) }}{% else %}{{ CATEGORY_FEED_ATOM.format(category.slug) }}{% endif %}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Categories Atom Feed" /> + <link href="{{ FEED_DOMAIN }}/{% if CATEGORY_FEED_ATOM_URL %}{{ CATEGORY_FEED_ATOM_URL.format(slug="category.slug") }}{% else %}{{ CATEGORY_FEED_ATOM.format(slug="category.slug") }}{% endif %}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Categories Atom Feed" /> {% endif %} {% if CATEGORY_FEED_RSS and category %} - <link href="{{ FEED_DOMAIN }}/{% if CATEGORY_FEED_RSS_URL %}{{ CATEGORY_FEED_RSS_URL.format(category.slug) }}{% else %}{{ CATEGORY_FEED_RSS.format(category.slug) }}{% endif %}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Categories RSS Feed" /> + <link href="{{ FEED_DOMAIN }}/{% if CATEGORY_FEED_RSS_URL %}{{ CATEGORY_FEED_RSS_URL.format(slug="category.slug") }}{% else %}{{ CATEGORY_FEED_RSS.format(slug="category.slug") }}{% endif %}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Categories RSS Feed" /> {% endif %} {% if TAG_FEED_ATOM and tag %} - <link href="{{ FEED_DOMAIN }}/{% if TAG_FEED_ATOM_URL %}{{ TAG_FEED_ATOM_URL.format(tag.slug) }}{% else %}{{ TAG_FEED_ATOM.format(tag.slug) }}{% endif %}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Tags Atom Feed" /> + <link href="{{ FEED_DOMAIN }}/{% if TAG_FEED_ATOM_URL %}{{ TAG_FEED_ATOM_URL.format(slug="tag.slug") }}{% else %}{{ TAG_FEED_ATOM.format(slug="tag.slug") }}{% endif %}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Tags Atom Feed" /> {% endif %} {% if TAG_FEED_RSS and tag %} - <link href="{{ FEED_DOMAIN }}/{% if TAG_FEED_RSS_URL %}{{ TAG_FEED_RSS_URL.format(tag.slug) }}{% else %}{{ TAG_FEED_RSS.format(tag.slug) }}{% endif %}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Tags RSS Feed" /> + <link href="{{ FEED_DOMAIN }}/{% if TAG_FEED_RSS_URL %}{{ TAG_FEED_RSS_URL.format(slug="tag.slug") }}{% else %}{{ TAG_FEED_RSS.format(slug="tag.slug") }}{% endif %}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Tags RSS Feed" /> {% endif %} {% endblock head %} </head>