From 31b017a4290ed4b19c19a473016b457f5a8d5d49 Mon Sep 17 00:00:00 2001 From: Vin Date: Sun, 8 Feb 2015 18:32:58 +0800 Subject: [PATCH 1/3] Fix rss link in --- _config.yml | 2 +- layout/_partials/head.swig | 7 +++++-- layout/_partials/header.swig | 12 ++---------- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/_config.yml b/_config.yml index c508ff01a..58654452c 100755 --- a/_config.yml +++ b/_config.yml @@ -31,7 +31,7 @@ since: 2015 # Creative Commons 4.0 International License. # http://creativecommons.org/ # Available: by | by-nc | by-nc-nd | by-nc-sa | by-nd | by-sa | zero -creative_commons: +creative_commons: diff --git a/layout/_partials/head.swig b/layout/_partials/head.swig index 3f6149186..183435a7d 100644 --- a/layout/_partials/head.swig +++ b/layout/_partials/head.swig @@ -1,3 +1,7 @@ +{% if theme.rss !== false and config.feed and config.feed.path %} + {% set theme.rss = config.root + config.feed.path %} +{% endif %} + @@ -13,8 +17,7 @@ {% endif %} {% if theme.rss %} - + {% endif %} {% if theme.favicon %} diff --git a/layout/_partials/header.swig b/layout/_partials/header.swig index 8618dc504..2f585acec 100644 --- a/layout/_partials/header.swig +++ b/layout/_partials/header.swig @@ -1,11 +1,3 @@ -{% if theme.rss !== false %} - {% if theme.rss %} - {% set feed_uri = theme.rss %} - {% elif config.feed and config.feed.path %} - {% set feed_uri = config.root + config.feed.path %} - {% endif %} -{% endif %} -

{% endfor %} - {% if feed_uri %} + {% if theme.rss %}
  • - +
    RSS     From 0878c7980a3e96b67c913c478fccf53665a61609 Mon Sep 17 00:00:00 2001 From: Vin Date: Sun, 8 Feb 2015 19:34:00 +0800 Subject: [PATCH 2/3] update --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index 58654452c..c508ff01a 100755 --- a/_config.yml +++ b/_config.yml @@ -31,7 +31,7 @@ since: 2015 # Creative Commons 4.0 International License. # http://creativecommons.org/ # Available: by | by-nc | by-nc-nd | by-nc-sa | by-nd | by-sa | zero -creative_commons: +creative_commons: From 487ac8ac53239b4addb9190cebdb6cc1e6932b85 Mon Sep 17 00:00:00 2001 From: Vin Date: Sun, 8 Feb 2015 19:53:25 +0800 Subject: [PATCH 3/3] Fix rss link in --- layout/_partials/head.swig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layout/_partials/head.swig b/layout/_partials/head.swig index 183435a7d..8f2d3b43b 100644 --- a/layout/_partials/head.swig +++ b/layout/_partials/head.swig @@ -1,4 +1,4 @@ -{% if theme.rss !== false and config.feed and config.feed.path %} +{% if theme.rss == '' and config.feed and config.feed.path %} {% set theme.rss = config.root + config.feed.path %} {% endif %}