Fixed a minor bug in templates (when displaying list of articles).

4 files changed, 31 insertions, 30 deletions

diff --git a/pyaggr3g470r/templates/articles.html b/pyaggr3g470r/templates/articles.html
index 28420b5c..32631ca0 100644
--- a/pyaggr3g470r/templates/articles.html
+++ b/pyaggr3g470r/templates/articles.html
@@ -3,35 +3,35 @@
 <div class="container">
     <div class="jumbotron">
         <h2><a href="{{ feed.site_link  }}">{{ feed.title }}</a></h2>
-        <h3>{{ feed.articles|length  }} articles.</h3>
+        <h3>{{ feed.articles|count  }} articles.</h3>
     </div>
-    {% for number in range(0, feed.articles|length-2, 3) %}
-        <div class="row">
-            {% for n in range(number, number+3) %}
-            <div class="col-xs-6 col-sm-4 col-md-4">
-                 {% if feed.articles[n].readed %}<h3>{% else %}<h1>{% endif %}
-                     <a href="/article/{{ feed.articles[n].id }}">{{ feed.articles[n].title }}</a><h2>
-                  {% if feed.articles[n].readed %}</h3>{% else %}</h1>{% endif %}
-                <h6>{{ feed.articles[n].date }}</h6>
+    {% if feed.articles|count == 0  %}
+        <h1>No articles.</h1>
+    {% else %}
+        {% for number in range(0, feed.articles|length-(feed.articles|length % 3), 3) %}
+            <div class="row">
+                {% for n in range(number, number+3) %}
+                <div class="col-xs-6 col-sm-4 col-md-4">
+                    {% if feed.articles[n].readed %}<h3>{% else %}<h1>{% endif %}
+                        <a href="/article/{{ feed.articles[n].id }}">{{ feed.articles[n].title }}</a><h2>
+                    {% if feed.articles[n].readed %}</h3>{% else %}</h1>{% endif %}
+                    <h6>{{ feed.articles[n].date }}</h6>
+                </div>
+                {% endfor %}
             </div>
-            {% endfor %}
-        </div>
-    {% endfor %}
-    {% if feed.articles|length % 3 !=0 %}
-        <div class="row">
-            <div class="col-xs-6 col-sm-4 col-md-4">
-                 {% if feed.articles[feed.articles|length-2].readed %}<h3>{% else %}<h1>{% endif %}
-                     <a href="/article/{{ feed.articles[feed.articles|length-2].id }}">{{ feed.articles[feed.articles|length-2].title }}</a><h2>
-                  {% if feed.articles[feed.articles|length-2].readed %}</h3>{% else %}</h1>{% endif %}
-                <h6>{{ feed.articles[feed.articles|length-2].date }}</h6>
+        {% endfor %}
+        {% if feed.articles|length % 3 != 0 %}
+            <div class="row">
+                 {% for n in range(feed.articles|length-(feed.articles|length % 3), feed.articles|length) %}
+                    <div class="col-xs-6 col-sm-4 col-md-4">
+                        {% if feed.articles[n].readed %}<h3>{% else %}<h1>{% endif %}
+                            <a href="/article/{{ feed.articles[n].id }}">{{ feed.articles[n].title }}</a><h2>
+                        {% if feed.articles[n].readed %}</h3>{% else %}</h1>{% endif %}
+                        <h6>{{ feed.articles[n].date }}</h6>
+                    </div>
+                {% endfor %}
             </div>
-            <div class="col-xs-6 col-sm-4 col-md-4">
-                 {% if feed.articles[feed.articles|length-1].readed %}<h3>{% else %}<h1>{% endif %}
-                     <a href="/article/{{ feed.articles[feed.articles|length-1].id }}">{{ feed.articles[feed.articles|length-1].title }}</a><h2>
-                  {% if feed.articles[feed.articles|length-1].readed %}</h3>{% else %}</h1>{% endif %}
-                <h6>{{ feed.articles[feed.articles|length-1].date }}</h6>
-            </div>
-        </div>
+        {% endif %}
     {% endif %}
 </div><!-- /.container -->
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/pyaggr3g470r/templates/favorites.html b/pyaggr3g470r/templates/favorites.html
index e60ccd85..3a02cb05 100644
--- a/pyaggr3g470r/templates/favorites.html
+++ b/pyaggr3g470r/templates/favorites.html
@@ -25,7 +25,7 @@
             {% endfor %}
             {% if feed.articles|length % 3 != 0 %}
                 <div class="row">
-                    {% for n in range(0, feed.articles|length % 3) %}
+                     {% for n in range(feed.articles|length-(feed.articles|length % 3), feed.articles|length) %}
                         <div class="col-xs-6 col-sm-4 col-md-4">
                             {% if feed.articles[n].readed %}<h3>{% else %}<h1>{% endif %}
                                 <a href="/article/{{ feed.articles[n].id }}">{{ feed.articles[n].title }}</a><h2>
diff --git a/pyaggr3g470r/templates/home.html b/pyaggr3g470r/templates/home.html
index 46842382..c2b0da86 100644
--- a/pyaggr3g470r/templates/home.html
+++ b/pyaggr3g470r/templates/home.html
@@ -22,7 +22,7 @@
         {% endfor %}
         {% if feed.articles|length % 3 != 0 %}
             <div class="row">
-                {% for n in range(0, feed.articles|length % 3) %}
+                 {% for n in range(feed.articles|length-(feed.articles|length % 3), feed.articles|length) %}
                     <div class="col-xs-6 col-sm-4 col-md-4">
                         {% if feed.articles[n].readed %}<h3>{% else %}<h1>{% endif %}
                             <a href="/article/{{ feed.articles[n].id }}">{{ feed.articles[n].title }}</a><h2>
diff --git a/pyaggr3g470r/templates/unread.html b/pyaggr3g470r/templates/unread.html
index a7991363..2296e6ec 100644
--- a/pyaggr3g470r/templates/unread.html
+++ b/pyaggr3g470r/templates/unread.html
@@ -9,6 +9,7 @@
                 <div class="col-md-6 col-md-offset-3">
                 <h1>{{ feed.title }}</h1>
                 <a href="/articles/{{ feed.oid }}"><i class="glyphicon glyphicon-th-list"></i></a>
+                <h3>{{ feed.articles|length }} unread articles.</h3>
                 </div>
             </div>
             {% for number in range(0, feed.articles|length-(feed.articles|length % 3), 3) %}
@@ -25,7 +26,7 @@
             {% endfor %}
             {% if feed.articles|length % 3 != 0 %}
                 <div class="row">
-                    {% for n in range(0, feed.articles|length % 3) %}
+                    {% for n in range(feed.articles|length-(feed.articles|length % 3), feed.articles|length) %}
                         <div class="col-xs-6 col-sm-4 col-md-4">
                             {% if feed.articles[n].readed %}<h3>{% else %}<h1>{% endif %}
                                 <a href="/article/{{ feed.articles[n].id }}">{{ feed.articles[n].title }}</a><h2>