Merge branch 'hotfix/minor' into develop

master
Michael Rose 2013-08-23 15:57:19 -04:00
commit 1a6ed92e2a
1 changed files with 4 additions and 4 deletions

View File

@ -16,7 +16,7 @@ image:
{% if post.link %} {% if post.link %}
<h1 class="entry-title" itemprop="name"><a href="{{ site.url }}{{ post.url }}" rel="bookmark" itemprop="url" title="{{ post.title }}"><i class="icon-double-angle-right"></i></a> <a href="{{ post.link }}">{{ post.title }}</a></h1> <h1 class="entry-title" itemprop="name"><a href="{{ site.url }}{{ post.url }}" rel="bookmark" itemprop="url" title="{{ post.title }}"><i class="icon-double-angle-right"></i></a> <a href="{{ post.link }}">{{ post.title }}</a></h1>
{% else %} {% else %}
<h1 class="entry-title" itemprop="name"><a href="{{ post.url }}" rel="bookmark" title="{{ post.title }}" itemprop="url">{{ post.title }}</a></h1> <h1 class="entry-title" itemprop="name"><a href="{{ site.url }}{{ post.url }}" rel="bookmark" title="{{ post.title }}" itemprop="url">{{ post.title }}</a></h1>
{% endif %} {% endif %}
</header> </header>
<div class="entry-content" itemprop="description"> <div class="entry-content" itemprop="description">
@ -30,7 +30,7 @@ image:
{% if paginator.previous_page == 1 %} {% if paginator.previous_page == 1 %}
<a href="{{ site.url }}" class="btn">Previous</a> <a href="{{ site.url }}" class="btn">Previous</a>
{% else %} {% else %}
<a href="/page{{ paginator.previous_page }}" class="btn">Previous</a> <a href="{{ site.url }}/page{{ paginator.previous_page }}" class="btn">Previous</a>
{% endif %} {% endif %}
{% else %} {% else %}
Previous Previous
@ -48,13 +48,13 @@ image:
{% if count == paginator.page %} {% if count == paginator.page %}
<span class="current-page">{{ count }}</span> <span class="current-page">{{ count }}</span>
{% else %} {% else %}
<a href="/page{{ count }}">{{ count }}</a> <a href="{{ site.url }}/page{{ count }}">{{ count }}</a>
{% endif %} {% endif %}
</li> </li>
{% endfor %} {% endfor %}
</ul> </ul>
{% if paginator.next_page %} {% if paginator.next_page %}
<a href="{{ paginator.next_page_path }}" class="btn">Next</a> <a href="{{ site.url }}/page{{ paginator.next_page }}" class="btn">Next</a>
{% else %} {% else %}
Next Next
{% endif %} {% endif %}