upgrade collection buttons, fix code place

diff --git a/telemeta/models/media.py b/telemeta/models/media.py
index e0aaeac10df9d12369d478737b1f2a44cd8ddd6c..e304f07832d7d41d0c5f430c1e7abb1ac2cec61b 100644 (file)
--- a/telemeta/models/media.py
+++ b/telemeta/models/media.py
@@ -229,6 +229,7 @@ class MediaCollection(MediaResource):
     legal_rights          = WeakForeignKey('LegalRight', related_name="collections", verbose_name=_('legal rights'))
 
     # Archiving data
+    code                  = CharField(_('code'), unique=True, required=True, validators=[is_valid_collection_code])
     acquisition_mode      = WeakForeignKey('AcquisitionMode', related_name="collections", verbose_name=_('mode of acquisition'))
     cnrs_contributor      = CharField(_('CNRS depositor'))
     copy_type             = WeakForeignKey('CopyType', related_name="collections", verbose_name=_('copy type'))
@@ -246,7 +247,6 @@ class MediaCollection(MediaResource):
     conservation_site     = CharField(_('conservation site'))
 
     # Technical data
-    code                  = CharField(_('code'), unique=True, required=True, validators=[is_valid_collection_code])
     old_code              = CharField(_('old code'), unique=False, null=True, blank=True)
     media_type            = WeakForeignKey('MediaType', related_name="collections", verbose_name=_('media type'))
     approx_duration       = DurationField(_('estimated duration'), help_text='hh:mm:ss')

diff --git a/telemeta/templates/telemeta/collection_detail.html b/telemeta/templates/telemeta/collection_detail.html
index 244d2f9b9c547c820f96613a99f49661ba531cb6..e4dedacdfdfac8d73714da98d21481692550eca9 100644 (file)
--- a/telemeta/templates/telemeta/collection_detail.html
+++ b/telemeta/templates/telemeta/collection_detail.html
@@ -39,15 +39,37 @@
 
 {% block title_buttons %}
   <div class="fixedWidthAsPlayer">
-    {% if user.is_authenticated and perms.telemeta.change_mediacollection %}
-      <a href="{% url "telemeta-collection-edit" collection.public_id %}" class="component_icon button icon_edit">{% trans "Edit" %}</a>
-      <a href="{% url "telemeta-collection-copy" collection.public_id %}" class="component_icon button icon_copy">{% trans "Copy" %}</a>
-      <a href="{% url "telemeta-collection-additem" collection.public_id %}" class="component_icon button icon_add">{% trans "Add item" %}</a>
-     {% endif %}
+    {% if user.is_authenticated and perms.telemeta.change_mediaitem %}
+    <a href="{% url "telemeta-collection-edit" collection.public_id %}">
+      <button type="button" class="btn btn-default">
+        <span class="glyphicon glyphicon-edit"></span> {% trans "Edit" %}
+      </button>
+    </a>
+    <a href="{% url "telemeta-collection-copy" collection.public_id %}">
+      <button type="button" class="btn btn-default">
+        <span class="glyphicon glyphicon-new-window"></span> {% trans "Copy" %}
+      </button>
+    </a>
+    {% endif %}
     {% if user.is_authenticated %}
-     <a href=# id="_add_to_playlist" class="component_icon button icon_add_to_playlist">{% trans "Add to playlist" %}</a>
+    <a id="_add_to_playlist" href='#'>
+      <button type="button" class="btn btn-default">
+        <span class="glyphicon glyphicon-pushpin"></span> {% trans "List" %}
+      </button>
+    </a>
+    {% endif %}
+    {% if user.is_authenticated and perms.telemeta.change_mediaitem %}
+    <a href="{% url "telemeta-collection-additem" collection.public_id %}">
+      <button type="button" class="btn btn-default">
+        <span class="glyphicon glyphicon-plus"></span> {% trans "Add item" %}
+      </button>
+    </a>
     {% if audio_export_enabled or perms.telemeta.can_download_all_items or user.is_superuser %}
-     <a href="{% url "telemeta-collection-package" collection.public_id %}" id="zip_package" class="component_icon button icon_zip">{% trans "Download" %} ZIP</a>
+    <a href="{% url "telemeta-collection-package" collection.public_id %}" id="zip_package">
+      <button type="button" class="btn btn-default">
+        <span class="glyphicon glyphicon-compressed"></span> {% trans "Zip" %}
+      </button>
+    </a>
     {% endif %}
     {% endif %}
    </div>
@@ -143,6 +165,7 @@
                 <h4><a href="#">{% trans "Archiving data" %}</a></h4>
                 <div>
                     <dl class="listing">
+                        {% dl_field collection "code" %}
                         {% dl_field collection "acquisition_mode" %}
                         {% dl_field collection "cnrs_contributor" %}
                         {% dl_field collection "copy_type" %}
@@ -177,7 +200,6 @@
                 <h4><a href="#">{% trans "Technical data" %}</a></h4>
                 <div>
                     <dl class="listing">
-                        {% dl_field collection "code" %}
                         {% dl_field collection "old_code" %}
                         {% dl_field collection "media_type" %}
                         {% if not collection.computed_duration %}

diff --git a/telemeta/templates/telemeta/mediaitem_detail.html b/telemeta/templates/telemeta/mediaitem_detail.html
index fa8fb68d5d9fcf8be789c985e828f5e34fe19428..ddf892315122b141e1d11eb365089585ef774f18 100644 (file)
--- a/telemeta/templates/telemeta/mediaitem_detail.html
+++ b/telemeta/templates/telemeta/mediaitem_detail.html
@@ -101,7 +101,7 @@
       </button>
     </a>
     {% if user.is_authenticated and perms.telemeta.change_mediaitem %}
-    <a href="{% url "telemeta-item-edit" item.id %}">
+    <a href="{% url "telemeta-item-edit" item.public_id %}">
       <button type="button" class="btn btn-default">
         <span class="glyphicon glyphicon-edit"></span> {% trans "Edit" %}
       </button>