Merge pull request getpelican#272 from agarstang/bug/aboutwilson/hard…

…codedfeeds Fix hard-coded feeds and feed urls in aboutwilson/templates/base.html
tomriddle1234 · Nov 15, 2014 · 4115670 · 4115670
2 parents 148a9d9 + ca7ebe6
commit 4115670
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/aboutwilson/templates/base.html b/aboutwilson/templates/base.html
@@ -48,7 +48,12 @@ <h4>Navigation</h4>
 							<li><a href="{{ SITEURL }}/{{ page.url }}"><i class="fa fa-{{ page.title }} "></i> {{page.title}}</a></li>
 							{% endfor %}
 							{% endif %}
-							<li><a href="{{ SITEURL }}/feeds/rss.xml"><i class="fa fa-rss "></i> rss</a></li>
+							{% if FEED_ALL_ATOM %}
+							<li><a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" type="application/atom+xml"><i class="fa fa-rss "></i> atom</a></li>
+							{% endif %}
+							{% if FEED_ALL_RSS %}
+							<li><a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}" type="application/rss+xml"><i class="fa fa-rss "></i> rss</a></li>
+							{% endif %}
 						</ul>
 					</div>
 					<div class="col-md-3">
@@ -107,6 +112,6 @@ <h4>Links</h4>
 });
 </script>
 {% include "analytics.html" %}
-{% include "github.html" %} 
+{% include "github.html" %}
 </body>
 </html>