order item lists of collections by code and old_code, add analytics block to base...

diff --git a/telemeta/templates/telemeta_default/base.html b/telemeta/templates/telemeta_default/base.html
index d64b3f98d3e4a8fe598622638a2ceda9d3e02d66..3f3d1010bef58a4f46d743d065e17804c956654e 100644 (file)
--- a/telemeta/templates/telemeta_default/base.html
+++ b/telemeta/templates/telemeta_default/base.html
@@ -135,5 +135,9 @@
 {% endblock %}
 </div>
 {% endblock layout %}
+
+{% block analytics %}
+{% endblock analytics %}
+
 </body>
 </html>

diff --git a/telemeta/templates/telemeta_default/collection_detail.html b/telemeta/templates/telemeta_default/collection_detail.html
index d3f6bac01c6d30b559aba5515603dc726823bdec..cb29c98e0f19796114590ad092da8774e50f0b93 100644 (file)
--- a/telemeta/templates/telemeta_default/collection_detail.html
+++ b/telemeta/templates/telemeta_default/collection_detail.html
@@ -181,18 +181,14 @@
             </div>
         {% endblock technical_data %}
         </div>
-        <h4>Items</h4>
-        {% with collection.items.enriched as items %}
+        
+        <div class="extraInfos">
+        <h4><img src="{% url telemeta-images "item_title.png" %}" style="vertical-align:middle" /> Items</h4>
         {% with "1" as location_name %}
             {% include "telemeta/inc/mediaitem_list.html" %}
         {% endwith %}
-        {% endwith %}
-        <!--
-        {% with collection.ordered_items as items %}
-            {% include "telemeta/inc/mediaitem_list.html" %}
-        {% endwith %}
-        -->
-
+        </div>
+        
         {% endblock infos %}
     </div>
 {% endblock %}

diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index ec3fa80e1bb9eadb5314bc02ec9d6070601ae712..3d64bebc1dcf18008d5c43b96700465663dc1b53 100644 (file)
--- a/telemeta/web/base.py
+++ b/telemeta/web/base.py
@@ -343,6 +343,8 @@ class CollectionView(object):
 
     def collection_detail(self, request, public_id, template='telemeta/collection_detail.html'):
         collection = MediaCollection.objects.get(public_id=public_id)
+        items = collection.items.enriched()
+        items = items.order_by('code', 'old_code')
         
         if collection.public_access == 'none' and not (request.user.is_staff or request.user.is_superuser):
             mess = ugettext('Access not allowed') 
@@ -354,7 +356,8 @@ class CollectionView(object):
         public_access = get_public_access(collection.public_access, collection.recorded_from_year, 
                                                 collection.recorded_to_year)
         playlists = get_playlists(request)
-        return render(request, template, {'collection': collection, 'playlists': playlists, 'public_access': public_access})
+        
+        return render(request, template, {'collection': collection, 'playlists': playlists, 'public_access': public_access, 'items': items})
 
     @method_decorator(permission_required('telemeta.change_mediacollection'))
     def collection_edit(self, request, public_id, template='telemeta/collection_edit.html'):
@@ -440,10 +443,11 @@ class ItemView(object):
         # Get previous and next items
         pks = []
         items = MediaItem.objects.filter(collection=item.collection)
+        items = items.order_by('code', 'old_code')
+        
         if len(items) > 1:
             for it in items:
                 pks.append(it.pk)
-            pks.sort()
             for pk in pks:
                 if pk == item.pk:
                     if pk == pks[0]: