Skip to content

Commit

Permalink
Merge pull request mmistakes#107 from brainstorm/master
Browse files Browse the repository at this point in the history
Solves issue mmistakes#94 with disqus comments being enabled by default globally
  • Loading branch information
mmistakes committed Dec 27, 2014
2 parents 1807bea + 8018758 commit 674697a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion _includes/scripts.html
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,6 @@
</script>
{% endif %}

{% if page.comments %}
{% if page.comments or site.comments %}
{% include disqus_comments.html %}
{% endif %}
4 changes: 2 additions & 2 deletions _layouts/post.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ <h1 class="entry-title">{% if page.headline %}{{ page.headline }}{% else %}{{ pa
<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">
Expand Down

0 comments on commit 674697a

Please sign in to comment.