From: yomguy <yomguy@parisson.com>
Date: Thu, 31 May 2012 23:25:30 +0000 (+0200)
Subject: fix bug for item marker url, add <hr> to item edit
X-Git-Tag: 1.4.4^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=1d503bb6b43d2ad285239e937ede919aabaa07cf;p=telemeta.git

fix bug for item marker url, add <hr> to item edit
---

diff --git a/telemeta/models/media.py b/telemeta/models/media.py
index 34fb7d6b..9932ce96 100644
--- a/telemeta/models/media.py
+++ b/telemeta/models/media.py
@@ -364,12 +364,12 @@ class MediaItem(MediaResource):
     external_references   = TextField(_('published references'))
     copied_from_item      = WeakForeignKey('self', related_name="copies", verbose_name=_('copy of'))
 
-    # Media
-    file                  = FileField(_('file'), upload_to='items/%Y/%m/%d', db_column="filename")
-
     # Technical data
     approx_duration       = DurationField(_('approximative duration'))
 
+    # Media
+    file                  = FileField(_('file'), upload_to='items/%Y/%m/%d', db_column="filename")
+
     # Manager
     objects               = MediaItemManager()
 
diff --git a/telemeta/templates/telemeta/mediaitem_edit.html b/telemeta/templates/telemeta/mediaitem_edit.html
index e0f03d18..c665d3be 100644
--- a/telemeta/templates/telemeta/mediaitem_edit.html
+++ b/telemeta/templates/telemeta/mediaitem_edit.html
@@ -16,6 +16,8 @@
     <table>
     {% for form in forms %}
     <tr><td colspan="2">{% for error in form.non_field_errors %}<li class="error">{{ error }}</li>{% endfor %}</td></tr>
+    <tr><td colspan="2"><h2>{{ form.prefix|capitalize }}</h2><hr /></td></tr>
+
     {% for field in form %}
     <tr>
     {% if field.html_name in hidden_fields %}
@@ -35,6 +37,7 @@
     {% endfor %}
     {% endfor %}
     </table>
+    <hr />
     <div align="center" style="margin-top:3ex;">
     <a href="{% url telemeta-item-detail item.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
     {% if perms.telemeta.change_mediaitem %}
diff --git a/telemeta/urls.py b/telemeta/urls.py
index 36b3be2c..b6b77e3f 100644
--- a/telemeta/urls.py
+++ b/telemeta/urls.py
@@ -122,7 +122,7 @@ urlpatterns = patterns('',
     url(r'^archives/items/(?P<item_public_id>[A-Za-z0-9._-]+)/related/(?P<media_id>[A-Za-z0-9._-]+)$', item_view.related_media_item_stream, name="telemeta-item-related"),
     url(r'^archives/items/(?P<public_id>[A-Za-z0-9._-]+)/related_edit/$', item_view.related_media_edit,  dict(template='telemeta/mediaitem_related_edit.html'), name="telemeta-item-related_edit"),
     # Markers
-    url(r'^markers/(?P<marker_id>[A-Za-z0-9]+)/$', item_view.item_detail, name="telemeta-item-detail-marker"),
+    url(r'^archives/markers/(?P<marker_id>[A-Za-z0-9]+)/$', item_view.item_detail, name="telemeta-item-detail-marker"),
     # FIXME: need all paths
     url(r'^items/(?P<path>[A-Za-z0-9._-s/]+)/$', redirect_to, {'url': '/archives/items/%(path)s/', 'permanent': False}, name="telemeta-item-redir"),