From fa4aa9cc94fc0e17173876ebb817b44b8076a6df Mon Sep 17 00:00:00 2001
From: yomguy <yomguy@parisson.com>
Date: Sat, 30 Apr 2011 01:05:41 +0200
Subject: [PATCH] fix paginator style, add collection public_id to
 mediaitem_edit and mediaitem_copy templates

---
 .../templates/telemeta_default/inc/collection_list.html    | 3 +--
 .../templates/telemeta_default/inc/mediaitem_list.html     | 3 +--
 telemeta/templates/telemeta_default/mediaitem_copy.html    | 7 ++++++-
 telemeta/templates/telemeta_default/mediaitem_edit.html    | 6 +++++-
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/telemeta/templates/telemeta_default/inc/collection_list.html b/telemeta/templates/telemeta_default/inc/collection_list.html
index e81c9b3f..eb5ad627 100644
--- a/telemeta/templates/telemeta_default/inc/collection_list.html
+++ b/telemeta/templates/telemeta_default/inc/collection_list.html
@@ -4,8 +4,7 @@
 {% if hits %}
 <p class="pagination">
 {% blocktrans %}Collections {{ first_on_page }} to {{ last_on_page }} on {{ hits }}{% endblocktrans %}
-&nbsp;&nbsp;
-{% if is_paginated %}{% load paginator %}{% paginator 5 %}{% endif %}
+| Pages : {% if is_paginated %}{% load paginator %}{% paginator 5 %}{% endif %}
 </p>
 {% endif %}
 <table class="listing">
diff --git a/telemeta/templates/telemeta_default/inc/mediaitem_list.html b/telemeta/templates/telemeta_default/inc/mediaitem_list.html
index 01b7826a..48cd29f2 100644
--- a/telemeta/templates/telemeta_default/inc/mediaitem_list.html
+++ b/telemeta/templates/telemeta_default/inc/mediaitem_list.html
@@ -4,8 +4,7 @@
 {% if hits %}
 <p class="pagination">
 {% blocktrans %}Items {{ first_on_page }} to {{ last_on_page }} on {{ hits }}{% endblocktrans %}
-&nbsp;&nbsp;
-{% if is_paginated %}{% load paginator %}{% paginator 5 %}{% endif %}
+| Pages : {% if is_paginated %}{% load paginator %}{% paginator 5 %}{% endif %}
 </p>
 {% endif %}
 
diff --git a/telemeta/templates/telemeta_default/mediaitem_copy.html b/telemeta/templates/telemeta_default/mediaitem_copy.html
index 5973fbf7..b503d3b1 100644
--- a/telemeta/templates/telemeta_default/mediaitem_copy.html
+++ b/telemeta/templates/telemeta_default/mediaitem_copy.html
@@ -25,7 +25,12 @@
         {% if not field.html_name == "copied_from_item" %}
         <tr>
             <tr><td class="error">{{ field.errors }}</td></tr>
-            <td>{{ field.label_tag }}:</td><td> {{ field }}</td>
+            <td>{{ field.label_tag }}:</td>
+             {% if field.html_name == "collection" %}
+              <td>{{ field }} <br />&nbsp;{% trans "Code" %} : {{ item.collection.code }}</td>
+             {% else %}
+              <td>{{ field }}</td>
+             {% endif %}
         </tr>
         {% endif %}
        {% endfor %}
diff --git a/telemeta/templates/telemeta_default/mediaitem_edit.html b/telemeta/templates/telemeta_default/mediaitem_edit.html
index 1c93e824..7aabeed3 100644
--- a/telemeta/templates/telemeta_default/mediaitem_edit.html
+++ b/telemeta/templates/telemeta_default/mediaitem_edit.html
@@ -3,7 +3,7 @@
 {% load telemeta_utils %}
 
   {% block title %}
-        <img src="images/item.png" style="vertical-align:middle" /> <h1>Item : {{ item }}</h1>
+    <img src="images/item.png" style="vertical-align:middle" /> <h1>Item : {{ item }}</h1>
   {% endblock %}
   {% block title_buttons %}
    <a href="{% url telemeta-item-detail item.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
@@ -20,9 +20,13 @@
             <td>{{ field.label_tag }}:</td>
              {% if field.html_name == "file" %}
               <td> {{ item.file.name }} <br /> {{ field }}</td>
+             {% else %}
+             {% if field.html_name == "collection" %}
+              <td>{{ field }} <br />&nbsp;{% trans "Code" %} : {{ item.collection.code }}</td>
              {% else %}
               <td>{{ field }}</td>
              {% endif %}
+             {% endif %}
         </tr>
         {% endif %}
        {% endfor %}
-- 
2.39.5