Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add different feed providers #379

Closed
wants to merge 4 commits into from
Closed

Add different feed providers #379

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fe9206c
Add different feed providers
gabor-meszaros Jun 25, 2016
34c78ed
Make the feed provider more flexible
gabor-meszaros Jun 26, 2016
b4729f6
Merge remote-tracking branch 'upstream/master'
gabor-meszaros Jul 26, 2016
9e1fb22
Eliminate name conflict with jekyll-feed plugin
gabor-meszaros Jul 26, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions _config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@ comments:
num_posts : # 5 (default)
colorscheme : # "light" (default), "dark"
feed:
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Testing this I hit an error. Maybe change feed to atom_feed since I believe the previous name was conflicting with the jekyll-feed plugin.

Also if you could squash all the commits into 1 with rebase that would make things cleaner when I merge the pull request in.

Thanks!

provider : # false (default), "feedburner"
feedburner:
name : # e.g. "name_of_my_feed" which leads to "http://feeds.feedburner.com/name_of_my_feed"
path : # blank (default) uses feed.xml

# SEO Related
google_site_verification :
Expand Down
7 changes: 1 addition & 6 deletions _includes/footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,7 @@
{% if site.author.bitbucket %}
<li><a href="http://bitbucket.org/{{ site.author.bitbucket }}"><i class="fa fa-fw fa-bitbucket" aria-hidden="true"></i> Bitbucket</a></li>
{% endif %}
{% capture feed_url %}{{ base_path }}/feed.xml{% endcapture %}
{% case site.feed.provider %}
{% when "feedburner" %}
{% capture feed_url %}http://feeds.feedburner.com/{{ site.feed.feedburner.name }}{% endcapture %}
{% endcase %}
<li><a href="{{ feed_url }}"><i class="fa fa-fw fa-rss-square" aria-hidden="true"></i> {{ site.data.ui-text[site.locale].feed_label }}</a></li>
<li><a href="{% if site.feed.path %}{{ site.feed.path }}{% else %}{{ base_path }}/feed.xml{% endif %}"><i class="fa fa-fw fa-rss-square" aria-hidden="true"></i> {{ site.data.ui-text[site.locale].feed_label }}</a></li>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change variable name from feed to atom_feed to avoid conflicting with jekyll-feed plugin.

</ul>
</div>

Expand Down