Fix a template bug.

This commit is contained in:
Alexis Metaireau 2011-02-17 19:03:23 +00:00
commit 8171e1753c

View file

@ -2,31 +2,32 @@
{% block content_title %}{% endblock %} {% block content_title %}{% endblock %}
{% block content %} {% block content %}
{% if articles %} {% if articles %}
{% for article in articles_page.object_list %} {% for article in articles_page.object_list %}
{% if loop.first and not articles_page.has_previous() %}
<aside id="featured" class="body"><article> {# First item #}
<h1 class="entry-title"><a href="{{ SITEURL }}/{{ article.url {% if loop.first and not articles_page.has_previous() %}
}}">{{ article.title }}</a></h1> <aside id="featured" class="body">
{% include 'article_infos.html' %} <article>
{{ article.content }} <h1 class="entry-title"><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h1>
{% include 'comments.html' %} {% include 'article_infos.html' %}{{ article.content }}{% include 'comments.html' %}
</article> </article>
{% if loop.length == 1 %} {% if loop.length == 1 %}
{% include 'pagination.html' %} {% include 'pagination.html' %}
{% endif %} {% endif %}
</aside><!-- /#featured --> </aside><!-- /#featured -->
{% if loop.length > 1 %} {% if loop.length > 1 %}
<section id="content" class="body"> <section id="content" class="body">
<h1>Other articles</h1> <h1>Other articles</h1>
<hr /> <hr />
<ol id="posts-list" class="hfeed"> <ol id="posts-list" class="hfeed">
{% endif %} {% endif %}
{% else %} {# other items #}
{% if loop.first and articles_page.has_previous %} {% else %}
<section id="content" class="body"> {% if loop.first and articles_page.has_previous %}
<ol id="posts-list" class="hfeed" start="{{ articles_paginator.per_page -1 }}"> <section id="content" class="body">
{% endif %} <ol id="posts-list" class="hfeed" start="{{ articles_paginator.per_page -1 }}">
<li><article class="hentry"> {% endif %}
<li><article class="hentry">
<header> <header>
<h1><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title}}">{{ article.title }}</a></h1> <h1><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title}}">{{ article.title }}</a></h1>
</header> </header>
@ -37,15 +38,16 @@
<a class="readmore" href="{{ SITEURL }}/{{ article.url }}">read more</a> <a class="readmore" href="{{ SITEURL }}/{{ article.url }}">read more</a>
{% include 'comments.html' %} {% include 'comments.html' %}
</div><!-- /.entry-content --> </div><!-- /.entry-content -->
</article></li> </article></li>
{% endif %} {% endif %}
{% if loop.last and (articles_page.has_previous() or not articles_page.has_previous() and loop.length > 1) %} {% if loop.last and (articles_page.has_previous()
{% include 'pagination.html' %} or not articles_page.has_previous() and loop.length > 1) %}
{% endif %} {% include 'pagination.html' %}
{% endif %}
{% endfor %} {% endfor %}
</ol><!-- /#posts-list --> {% if loop.length > 1 or articles_page.has_previous() %}
{% if loop.length > 1 %} </ol><!-- /#posts-list -->
</section><!-- /#content --> </section><!-- /#content -->
{% endif %} {% endif %}
{% else %} {% else %}
<section id="content" class="body"> <section id="content" class="body">