fix

diff --git a/telemeta/templates/collection_detail.html b/telemeta/templates/collection_detail.html
index 5936b9c52857a17d0ac6df3211c74a3710b2653f..e43ab70bb82d8656343a39e055c882217ddad3f6 100644 (file)
--- a/telemeta/templates/collection_detail.html
+++ b/telemeta/templates/collection_detail.html
@@ -48,7 +48,7 @@
     {% endif %}
     <div id="leftcol">
         <div class="intro">
-            <span>{% if object.items.count %}{{ object.items.count }} {% ifequal object.items.count '1' %}item{% else %}items{% endifequal %}{% else %}No item{% endif %}</span>
+            <span>{% if object.items.count %}{{ object.items.count }} {% ifequal object.items.count 1 %}item{% else %}items{% endifequal %}{% else %}No item{% endif %}</span>
         </div>
         <div class="infos">
             <dl class="listing">

diff --git a/telemeta/templates/collection_detail_dc.html b/telemeta/templates/collection_detail_dc.html
index 7d08ea2e53cc6de1efa1790122f527eea1cbe405..8f01ecacdb638c479a322c98d8b05bb8a56dd259 100644 (file)
--- a/telemeta/templates/collection_detail_dc.html
+++ b/telemeta/templates/collection_detail_dc.html
@@ -16,6 +16,9 @@
         <dt><span>{{ element.name }}</span>{{ element.refinement|default:"&nbsp;" }}</dt><dd>{% ifequal element.field "collection" %}<a href="{% url telemeta-collection-dublincore item.collection.id|urlencode %}">{{ element.value }}</a>{% else %}{{ element.value }}{% endifequal %}</dd>
         {% endif %}
         {% endfor %}
+        {% for item in object.ordered_items %}
+        <dt><span>relation</span>hasPart</dt><dd><a href="{% url telemeta-item-dublincore item.id|urlencode %}">{{ item.id }}</a></dd>
+        {% endfor %}
     </dl>
 {% endblock %}
 {% else %}

diff --git a/telemeta/templates/inc/collection_list.html b/telemeta/templates/inc/collection_list.html
index 70dea2b87acc4070aac8fd8a66b274aa0efbcd4e..31fbf023ad9c2911183c37090aa61de023751bf1 100644 (file)
--- a/telemeta/templates/inc/collection_list.html
+++ b/telemeta/templates/inc/collection_list.html
@@ -1,9 +1,10 @@
+{% load telemeta_utils %}
 {% if collections %}
     {% if hits %}
     <p class="pagination">Records {{ first_on_page }} to {{ last_on_page }} on {{ hits }} 
     &nbsp;&nbsp;
-    {% if has_previous %} <a href="?page={{ previous }}">&lt;&lt;</a> {% endif %}
-    {% if has_next %} <a href="?page={{ next }}">&gt;&gt;</a> {% endif %}
+    {% if has_previous %} <a href="?page={{ previous }}&amp;{{criteria|build_query_string}}">&lt;&lt;</a> {% endif %}
+    {% if has_next %} <a href="?page={{ next }}&amp;{{criteria|build_query_string}}">&gt;&gt;</a> {% endif %}
     </p>
     {% endif %}
     <ul>

diff --git a/telemeta/templates/inc/mediaitem_list.html b/telemeta/templates/inc/mediaitem_list.html
index 9f0324813c224d8277e8e980cc85d46862699423..b231f2ca042a632d563584984ba45e7a18fb630b 100644 (file)
--- a/telemeta/templates/inc/mediaitem_list.html
+++ b/telemeta/templates/inc/mediaitem_list.html
@@ -1,9 +1,10 @@
+{% load telemeta_utils %}
 {% if items %}
     {% if hits %}
     <p class="pagination">Records {{ first_on_page }} to {{ last_on_page }} on {{ hits }} 
     &nbsp;&nbsp;
-    {% if has_previous %} <a href="?page={{ previous }}">&lt;&lt;</a> {% endif %}
-    {% if has_next %} <a href="?page={{ next }}">&gt;&gt;</a> {% endif %}
+    {% if has_previous %} <a href="?page={{ previous }}&amp;{{criteria|build_query_string}}">&lt;&lt;</a> {% endif %}
+    {% if has_next %} <a href="?page={{ next }}&amp;{{criteria|build_query_string}}">&gt;&gt;</a> {% endif %}
     </p>
     {% endif %}
     <ul>