fix paginator style, add collection public_id to mediaitem_edit and mediaitem_copy...

diff --git a/telemeta/templates/telemeta_default/inc/collection_list.html b/telemeta/templates/telemeta_default/inc/collection_list.html
index e81c9b3f24b1e9f0df953480cbc08a6022ae8250..eb5ad62700f6bebd207ba6a415376885a0c4dfb4 100644 (file)
--- 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 01b7826a71bc1459f87fd2017b240e7949668a1b..48cd29f2f888ed2d7fac7ed69bc90a6a44d9ae9b 100644 (file)
--- 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 5973fbf7e1485a3f0b00a72e403e406fbdcc5382..b503d3b13905c9360fb3330b3d483e9b96a84754 100644 (file)
--- 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 1c93e824d98e8ee07abc7bde716b5c9b48aa0a5a..7aabeed3939aabf1fcc2f5662859ec587260d6b6 100644 (file)
--- 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 %}