Merge branch 'master' into develop

This commit is contained in:
Michael Rose 2013-06-04 14:21:22 -04:00
commit ed416643bb
4 changed files with 17 additions and 7 deletions

View file

@ -32,7 +32,7 @@
{% for post in site.categories.articles limit:5 %} {% for post in site.categories.articles limit:5 %}
<article itemscope itemtype="http://schema.org/BlogPosting" itemprop="blogPost"> <article itemscope itemtype="http://schema.org/BlogPosting" itemprop="blogPost">
<h2 itemprop="headline"><a href="{{ site.url }}{{ post.url }}" rel="bookmark" title="{{ post.title }}">{{ post.title }}</a></h2> <h2 itemprop="headline"><a href="{{ site.url }}{{ post.url }}" rel="bookmark" title="{{ post.title }}">{{ post.title }}</a></h2>
<p itemprop="text">{% if page.description %}{{ page.description }}{% else %}{{ page.content | strip_html | strip_newlines | truncate: 120 }}{% endif %}</p> <p itemprop="text">{% if post.description %}{{ post.description }}{% else %}{{ post.content | strip_html | strip_newlines | truncate: 120 }}{% endif %}</p>
</article> </article>
{% endfor %} {% endfor %}
</div><!-- /#index --> </div><!-- /#index -->

View file

@ -27,11 +27,21 @@
<div id="index" itemprop="mainContentOfPage" itemscope itemtype="http://schema.org/Blog"> <div id="index" itemprop="mainContentOfPage" itemscope itemtype="http://schema.org/Blog">
{% for post in site.posts %} {% for post in site.posts %}
<article itemscope itemtype="http://schema.org/BlogPosting" itemprop="blogPost"> {% unless post.next %}
<h2 itemprop="headline"><a href="{{ site.url }}{{ post.url }}" rel="bookmark" title="{{ post.title }}">{{ post.title }}</a></h2> <h3>{{ post.date | date: '%Y' }}</h3>
<p class="byline"><time datetime="{{ post.date | date_to_xmlschema }}" itemprop="datePublished">{{ post.date | date: "%B %d, %Y" }}</time></p> <hr />
<p itemprop="text">{% if post.description %}{{ post.description }}{% else %}{{ post.content | strip_html | strip_newlines | truncate: 120 }}{% endif %}</p> {% else %}
</article> {% capture year %}{{ post.date | date: '%Y' }}{% endcapture %}
{% capture nyear %}{{ post.next.date | date: '%Y' }}{% endcapture %}
{% if year != nyear %}
<h3>{{ post.date | date: '%Y' }}</h3>
<hr />
{% endif %}
{% endunless %}
<article itemscope itemtype="http://schema.org/BlogPosting" itemprop="blogPost">
<h2 itemprop="headline"><a href="{{ site.url }}{{ post.url }}" rel="bookmark" title="{{ post.title }}">{{ post.title }}</a></h2>
<p itemprop="text">{% if post.description %}{{ post.description }}{% else %}{{ post.content | strip_html | strip_newlines | truncate: 120 }}{% endif %}</p>
</article>
{% endfor %} {% endfor %}
</div><!-- /#index --> </div><!-- /#index -->

View file

@ -23,7 +23,7 @@
</div> </div>
<article itemscope itemtype="http://schema.org/BlogPosting" itemprop="blogPost"> <article itemscope itemtype="http://schema.org/BlogPosting" itemprop="blogPost">
<div class="headline-wrap"> <div class="headline-wrap">
<h1itemprop="headline">{{ page.title }}</h1> <h1 itemprop="headline">{{ page.title }}</h1>
<h2>{{ page.tagline }}</h2> <h2>{{ page.tagline }}</h2>
</div><!--/ .headline-wrap --> </div><!--/ .headline-wrap -->
<div class="article-wrap" itemprop="text"> <div class="article-wrap" itemprop="text">