Merge branch 'develop'

* develop:
  Small edit to Disqus include if statement
This commit is contained in:
Michael Rose 2013-07-18 22:28:27 -04:00
commit aa6ed3dbee
2 changed files with 3 additions and 3 deletions

View file

@ -18,4 +18,4 @@
})(); })();
</script> </script>
{% endif %} {% endif %}
{% if site.disqus_shortname and page.comments != false %}{% include disqus_comments.html %}{% endif %} {% if site.disqus_shortname and page.comments %}{% include disqus_comments.html %}{% endif %}

View file

@ -25,12 +25,12 @@
<span class="author vcard" itemprop="author" itemscope itemtype="http://schema.org/Person">By <span itemprop="name" class="fn"><a href="{{ site.url }}/about" title="About {{ site.owner.name }}" itemprop="url">{{ site.owner.name }}</a></span></span> <span class="author vcard" itemprop="author" itemscope itemtype="http://schema.org/Person">By <span itemprop="name" class="fn"><a href="{{ site.url }}/about" title="About {{ site.owner.name }}" itemprop="url">{{ site.owner.name }}</a></span></span>
<span class="entry-date date published"><time datetime="{{ page.date | date_to_xmlschema }}" itemprop="datePublished"><i class="icon-calendar-empty"></i> {{ page.date | date: "%B %d, %Y" }}</time></span> <span class="entry-date date published"><time datetime="{{ page.date | date_to_xmlschema }}" itemprop="datePublished"><i class="icon-calendar-empty"></i> {{ page.date | date: "%B %d, %Y" }}</time></span>
{% if page.modified %}<span class="entry-date date modified"><time datetime="{{ page.modified }}" itemprop="dateModified"><i class="icon-pencil"></i> {{ page.modified | date: "%B %d, %Y" }}</time></span>{% endif %} {% if page.modified %}<span class="entry-date date modified"><time datetime="{{ page.modified }}" itemprop="dateModified"><i class="icon-pencil"></i> {{ page.modified | date: "%B %d, %Y" }}</time></span>{% endif %}
{% if site.disqus_shortname and page.comments != false %}<span class="entry-comments"><i class="icon-comment-alt"></i> <a href="#disqus_thread">Comment</a></span>{% endif %} {% if site.disqus_shortname and page.comments %}<span class="entry-comments"><i class="icon-comment-alt"></i> <a href="#disqus_thread">Comment</a></span>{% endif %}
<span><a href="{{ site.url }}{{ page.url }}" rel="bookmark" title="{{ page.title }}"><i class="icon-link"></i> Permalink</a></span> <span><a href="{{ site.url }}{{ page.url }}" rel="bookmark" title="{{ page.title }}"><i class="icon-link"></i> Permalink</a></span>
</footer> </footer>
<div class="entry-content"> <div class="entry-content">
{{ content }} {{ content }}
{% if site.disqus_shortname and page.comments != false %}<div id="disqus_thread"></div><!-- /#disqus_thread -->{% endif %} {% if site.disqus_shortname and page.comments %}<div id="disqus_thread"></div><!-- /#disqus_thread -->{% endif %}
</div><!-- /.entry-content --> </div><!-- /.entry-content -->
</div><!-- /.entry-wrapper --> </div><!-- /.entry-wrapper -->
<nav class="pagination" role="navigation"> <nav class="pagination" role="navigation">