moparisthebest/android.moparisthebest.org
1
0
Fork 0
mirror of https://github.com/moparisthebest/android.moparisthebest.org synced 2024-10-31 23:35:00 -04:00
Code Issues Releases Wiki Activity

Merge branch '2.1' into site-2.1

Browse Source
This commit is contained in:
Brandon Mathis 2012-05-22 11:29:15 -05:00
commit 61a4169593
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.themes/classic/source/_includes/article.html
View File

@ -12,7 +12,7 @@
<div class="entry-content">{{ content }}</div> <div class="entry-content">{{ content }}</div>
{% if index %} {% if index %}
<footer> <footer>
{% if site.disqus_short_name and page.comments != false and site.disqus_show_comment_count == true %} {% if site.disqus_short_name and page.comments != false and post.comments != false and site.disqus_show_comment_count == true %}
<p><a class="comments-link" href="{% if index %}{{ permalink }}{% endif %}#disqus_thread">View comments &raquo;</a></p> <p><a class="comments-link" href="{% if index %}{{ permalink }}{% endif %}#disqus_thread">View comments &raquo;</a></p>
{% endif %} {% endif %}
{% if excerpted != 'false' %} {% if excerpted != 'false' %}

12
plugins/render_partial.rb
View File

@ -58,7 +58,17 @@ module Jekyll
else else
partial = Liquid::Template.parse(contents) partial = Liquid::Template.parse(contents)
context.stack do context.stack do
partial.render(context) contents = partial.render(context)
site = context.registers[:site]
ext = File.extname(@file)
converter = site.converters.find { |c| c.matches(ext) }
if converter.nil?
contents
else
converter.convert(contents)
end
end end
end end
end end