Merge pull request #107 from brainstorm/master

Solves issue #94 with disqus comments being enabled by default globally
This commit is contained in:
Michael Rose 2014-12-27 16:50:53 -05:00
commit 674697a1e3
2 changed files with 3 additions and 3 deletions

View file

@ -58,6 +58,6 @@
</script>
{% endif %}
{% if page.comments %}
{% if page.comments or site.comments %}
{% include disqus_comments.html %}
{% endif %}

View file

@ -35,13 +35,13 @@
<span class="author vcard">By <span class="fn">{{ author.name }}</span></span>
<span class="entry-date date published"><time datetime="{{ page.date | date_to_xmlschema }}"><i class="fa fa-calendar-o"></i> {{ page.date | date: "%B %d, %Y" }}</time></span>
{% if page.modified %}<span class="entry-date date modified"><time datetime="{{ page.modified }}"><i class="fa fa-pencil"></i> {{ page.modified | date: "%B %d, %Y" }}</time></span>{% endif %}
{% if site.owner.disqus-shortname and page.comments == true %}<span class="entry-comments"><i class="fa fa-comment-o"></i> <a href="#disqus_thread">Comment</a></span>{% endif %}
{% if (site.owner.disqus-shortname and page.comments) or site.comments %}<span class="entry-comments"><i class="fa fa-comment-o"></i> <a href="#disqus_thread">Comment</a></span>{% endif %}
{% if page.share %}{% include social-share.html %}{% endif %}
{% if page.ads == true %}{% include ad-sidebar.html %}<!-- /.google-ads -->{% endif %}
</footer>
<div class="entry-content">
{{ content }}
{% if site.owner.disqus-shortname and page.comments == true %}<div id="disqus_thread"></div><!-- /#disqus_thread -->{% endif %}
{% if (site.owner.disqus-shortname and page.comments) or site.comments %}<div id="disqus_thread"></div><!-- /#disqus_thread -->{% endif %}
</div><!-- /.entry-content -->
</div><!-- /.entry-wrapper -->
<nav class="pagination" role="navigation">