Changeset 1d503bb

Timestamp:

06/01/12 01:25:30 (12 months ago)

Author:

yomguy <yomguy@…>

Branches:

master, crem, crem2, dev, diadems, generic, lam, nlivemulti, release/1.4.4, storage

Children:

fafadfa, ce34009

Parents:

e6922a5

git-author:

yomguy <yomguy@…> (06/01/12 01:25:30)

git-committer:

yomguy <yomguy@…> (06/01/12 01:25:30)

Message:

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

Location:

telemeta

Files:

• models/media.py (modified) (1 diff)
• templates/telemeta/mediaitem_edit.html (modified) (2 diffs)
• urls.py (modified) (1 diff)

telemeta/models/media.py

@@ -365 +365 @@
     copied_from_item      = WeakForeignKey('self', related_name="copies", verbose_name=_('copy of'))
 
+    # Technical data
+    approx_duration       = DurationField(_('approximative duration'))
+
     # Media
     file                  = FileField(_('file'), upload_to='items/%Y/%m/%d', db_column="filename")
-
-    # Technical data
-    approx_duration       = DurationField(_('approximative duration'))
 
     # Manager

telemeta/templates/telemeta/mediaitem_edit.html

@@ -17 +17 @@
     {% 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>
@@ -36 +38 @@
     {% 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>

telemeta/urls.py

@@ -123 +123 @@
     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"),