Fix bug with pagination usage.

[django-migdal.git] / migdal / templates / migdal / entry / entry_list.html

diff --git a/migdal/templates/migdal/entry/entry_list.html b/migdal/templates/migdal/entry/entry_list.html
index 3585adb..e07bb76 100644 (file)
--- a/migdal/templates/migdal/entry/entry_list.html
+++ b/migdal/templates/migdal/entry/entry_list.html
@@ -1,23 +1,23 @@
 {% extends "base.html" %}
 {% extends "base.html" %}

-{% load url from future %}

 {% load i18n %}
 {% load pagination_tags fnp_prevnext %}
 {% load migdal_tags %}
 
 
 {% load i18n %}
 {% load pagination_tags fnp_prevnext %}
 {% load migdal_tags %}
 
 

-{% block "body" %}
+{% block titleextra %}{% if category %}{{ category.title }} :: {% elif entry_type %}{{ entry_type|capfirst }} :: {% endif %}{% endblock %}
+
+
+{% block body %}

 
 {% if category %}
 
 {% if category %}

-    <h1>{% trans "Category" %}: {{ category }}
-    <!--a href="{% url 'migdal_category_feed' category.slug %}">RSS</a-->
-    </h1>
+    <h1>{% trans "Category" %}: {{ category }}</h1>

 {% elif entry_type %}
 {% elif entry_type %}

-    <h1>{{ entry_type|capfirst }}
-    <!--a href="{% url 'migdal_entry_list_'|add:entry_type.db|add:'_feed' %}">RSS</a-->
-    </h1>
+    <h1>{{ entry_type|capfirst }}</h1>

 {% endif %}
 
 {% endif %}
 

-{% if object_list.promobox and request.page == 1 %}
+{% autopaginate object_list 10 as page %}
+
+{% if object_list.promobox and page.number == 1 %}

 <div id="promobox">
 <ul id="promobox-switcher">
 {% for object in object_list.promobox %}
 <div id="promobox">
 <ul id="promobox-switcher">
 {% for object in object_list.promobox %}


@@ -45,9 +45,11 @@
     </p>
 {% endif %}
 
     </p>
 {% endif %}
 

+{% if not object_list %}
+   <p class="warning">{% trans "Work in progress." %}</p>
+{% endif %}

 
 

-{% autopaginate object_list 10 %}
-{% for object in object_list %}
+{% for object in page %}

     {% entry_short object %}
 {% endfor %}
 {% prevnext %}
     {% entry_short object %}
 {% endfor %}
 {% prevnext %}