aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules2
-rw-r--r--pelican-bootstrap3/templates/base.html23
2 files changed, 17 insertions, 8 deletions
diff --git a/.gitmodules b/.gitmodules
index ebbb6d2..a710d9c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -72,7 +72,7 @@
url = https://github.com/porterjamesj/crowsfoot.git
[submodule "elegant"]
path = elegant
- url = https://github.com/talha131/pelican-elegant.git
+ url = https://github.com/Pelican-Elegant/elegant.git
[submodule "niu-x2"]
path = niu-x2
url = https://github.com/wilbur-ma/niu-x2.git
diff --git a/pelican-bootstrap3/templates/base.html b/pelican-bootstrap3/templates/base.html
index c80d84b..af2f0f9 100644
--- a/pelican-bootstrap3/templates/base.html
+++ b/pelican-bootstrap3/templates/base.html
@@ -94,15 +94,24 @@
title="{{ SITENAME }} RSS Feed"/>
{% endif %}
- {% if tag and TAG_FEED_ATOM %}
- <link href="{{ SITEURL }}/{{ TAG_FEED_ATOM|format(tag.slug) }}" type="application/atom+xml" rel="alternate"
+ {%- if tag and TAG_FEED_ATOM %}
+ {%- if '%s' not in TAG_FEED_ATOM %}
+ {%- set tag_feed_atom = TAG_FEED_ATOM.format(slug=tag.slug) %}
+ {%- else %}
+ {%- set tag_feed_atom = TAG_FEED_ATOM.format(tag.slug) %}
+ {%- endif %}
+ <link href="{{ SITEURL }}/{{ tag_feed_atom }}" type="application/atom+xml" rel="alternate"
title="{{ SITENAME }} {{ tag }} ATOM Feed"/>
- {% endif %}
-
- {% if category and CATEGORY_FEED_ATOM %}
- <link href="{{ SITEURL }}/{{ CATEGORY_FEED_ATOM|format(category.slug) }}" type="application/atom+xml" rel="alternate"
+ {%- endif %}
+ {%- if category and CATEGORY_FEED_ATOM %}
+ {%- if '%s' not in CATEGORY_FEED_ATOM %}
+ {%- set category_feed_atom = CATEGORY_FEED_ATOM.format(slug=category.slug) %}
+ {%- else %}
+ {%- set category_feed_atom = CATEGORY_FEED_ATOM.format(category.slug) %}
+ {%- endif %}
+ <link href="{{ SITEURL }}/{{ category_feed_atom }}" type="application/atom+xml" rel="alternate"
title="{{ SITENAME }} {{ category }} ATOM Feed"/>
- {% endif %}
+ {%- endif %}
</head>
<body>