From: yomguy Date: Mon, 20 Feb 2012 16:49:50 +0000 (+0100) Subject: move all edit buttons to main edit pages X-Git-Tag: 1.4.2~7 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=ea5ec3232b0da86a966e65e43b5204488392d4e5;p=telemeta.git move all edit buttons to main edit pages --- diff --git a/telemeta/models/media.py b/telemeta/models/media.py index 2b5c9426..ae1eb94d 100644 --- a/telemeta/models/media.py +++ b/telemeta/models/media.py @@ -681,7 +681,7 @@ class Format(ModelCore): item = ForeignKey(MediaItem, related_name="formats", verbose_name=_('item')) original_code = CharField(_('original code'), required=True) - support_number = CharField(_('support number')) + tape_number = CharField(_('tape number')) status = CharField(_('status')) conservation_state = CharField(_('conservation state')) comments = TextField(_('comments')) diff --git a/telemeta/templates/telemeta/collection_detail.html b/telemeta/templates/telemeta/collection_detail.html index 20a372ba..f72b9ccb 100644 --- a/telemeta/templates/telemeta/collection_detail.html +++ b/telemeta/templates/telemeta/collection_detail.html @@ -191,12 +191,14 @@ {% endblock technical_data %} - + + {% if related_media %}
{% block related %} {% include "telemeta/inc/collection_related.html" %} {% endblock related %}
+ {% endif %}

Items

diff --git a/telemeta/templates/telemeta/collection_edit.html b/telemeta/templates/telemeta/collection_edit.html index 6cd84fad..305915cb 100644 --- a/telemeta/templates/telemeta/collection_edit.html +++ b/telemeta/templates/telemeta/collection_edit.html @@ -27,6 +27,9 @@
{% trans "Cancel" %} + {% if perms.telemeta.change_mediacollection %} + {% trans "Edit"%} {% trans "related media"%} + {% endif %} {% trans "Save" %}
diff --git a/telemeta/templates/telemeta/inc/collection_related.html b/telemeta/templates/telemeta/inc/collection_related.html index 14a3513a..9f735696 100644 --- a/telemeta/templates/telemeta/inc/collection_related.html +++ b/telemeta/templates/telemeta/inc/collection_related.html @@ -77,7 +77,4 @@
{% endif %} - {% if user.is_authenticated and perms.telemeta.change_mediacollection %} -
{% trans "Edit"%} {% trans "related media"%} - {% endif %} diff --git a/telemeta/templates/telemeta/inc/mediaitem_related.html b/telemeta/templates/telemeta/inc/mediaitem_related.html index ecb5448e..458c2669 100644 --- a/telemeta/templates/telemeta/inc/mediaitem_related.html +++ b/telemeta/templates/telemeta/inc/mediaitem_related.html @@ -77,7 +77,4 @@ {% endif %} - {% if user.is_authenticated and perms.telemeta.change_mediaitem %} -
{% trans "Edit"%} {% trans "related media"%} - {% endif %} diff --git a/telemeta/templates/telemeta/inc/resource_related.html b/telemeta/templates/telemeta/inc/resource_related.html index a20ae04b..442c7bfc 100644 --- a/telemeta/templates/telemeta/inc/resource_related.html +++ b/telemeta/templates/telemeta/inc/resource_related.html @@ -78,7 +78,4 @@ {% endif %} - {% if user.is_authenticated and perms.telemeta.change_mediaresource %} -
{% trans "Edit"%} {% trans "related media"%} - {% endif %} diff --git a/telemeta/templates/telemeta/mediaitem_detail.html b/telemeta/templates/telemeta/mediaitem_detail.html index 0c585c75..6044e68a 100644 --- a/telemeta/templates/telemeta/mediaitem_detail.html +++ b/telemeta/templates/telemeta/mediaitem_detail.html @@ -225,9 +225,7 @@ Item : {{ item }} {% endblock geoethnic_data %} - {% if user.is_authenticated and perms.telemeta.change_mediaitem %} - {% trans "Edit" %} {% trans "keywords" %} - {% endif %} +
{% block musical_data %}
@@ -264,9 +262,7 @@ Item : {{ item }}
{% endblock musical_data %}
- {% if user.is_authenticated and perms.telemeta.change_mediaitem %} - {% trans "Edit"%} {% trans "performance"%} - {% endif %} +
{% block general_data %}
@@ -303,7 +299,24 @@ Item : {{ item }}
{% trans "Media type" %}
{% trans mime_type|mime_to_media_type %}
{% dl_field item "approx_duration" %} + + {% if physical_format %} + {% dl_field physical_format "original_code" %} + {% dl_field physical_format "tape_number" %} + {% dl_field physical_format "status" %} + {% dl_field physical_format "conservation_state" %} + {% dl_field physical_format "tape_length" %} + {% dl_field physical_format "tape_width" %} + {% dl_field physical_format "tape_speed" %} + {% dl_field physical_format "tape_vendor" %} + {% dl_field physical_format "tape_thickness" %} + {% dl_field physical_format "tape_diameter" %} + {% dl_field physical_format "tape_reference" %} +
{% trans "Remarks" %}
+
{{ physical_format.comments|html_line_break|safe }}
+ {% endif %}
+
{% endblock technical_data %} @@ -311,11 +324,13 @@ Item : {{ item }} {% endblock infos %} +{% if related_media %}
{% block related %} {% include "telemeta/inc/mediaitem_related.html" %} {% endblock related %}
+{% endif %} {% endblock %} diff --git a/telemeta/templates/telemeta/mediaitem_edit.html b/telemeta/templates/telemeta/mediaitem_edit.html index 5767f769..68e4d529 100644 --- a/telemeta/templates/telemeta/mediaitem_edit.html +++ b/telemeta/templates/telemeta/mediaitem_edit.html @@ -34,11 +34,19 @@ {% endfor %}
- {% trans "Cancel" %} + {% trans "Cancel" %} + {% if perms.telemeta.change_mediaitem %} + {% trans "Edit" %} {% trans "keywords" %} + {% endif %} + {% if perms.telemeta.change_mediaitem %} + {% trans "Edit"%} {% trans "performance"%} + {% endif %} + {% if perms.telemeta.change_mediaitem %} + {% trans "Edit"%} {% trans "related media"%} + {% endif %} {% trans "Save" %} - +onclick="var d=document; d.getElementById('wait-img').style.display='inline'; setTimeout(function({d.getElementById('_editItemForm').submit();},300); return false;">{% trans "Save" %} +
diff --git a/telemeta/templates/telemeta/resource_detail.html b/telemeta/templates/telemeta/resource_detail.html index 94c3b5f7..74e900da 100644 --- a/telemeta/templates/telemeta/resource_detail.html +++ b/telemeta/templates/telemeta/resource_detail.html @@ -77,12 +77,14 @@ jQuery(document).ready(function(){ {% endblock general_info %} + {% if related_media %}
{% block related %} {% include "telemeta/inc/resource_related.html" %} {% endblock related %}
- + {% endif %} +

{{resource.children_type|capitalize }}

{% with resource.children.all as children %} diff --git a/telemeta/templates/telemeta/resource_edit.html b/telemeta/templates/telemeta/resource_edit.html index 8b4439f9..a8ddadf4 100644 --- a/telemeta/templates/telemeta/resource_edit.html +++ b/telemeta/templates/telemeta/resource_edit.html @@ -27,6 +27,9 @@
{% trans "Cancel" %} + {% if perms.telemeta.change_mediaresource %} + {% trans "Edit"%} {% trans "related media"%} + {% endif %} {% trans "Save" %}
diff --git a/telemeta/views/base.py b/telemeta/views/base.py index caa72a6a..0f22a482 100644 --- a/telemeta/views/base.py +++ b/telemeta/views/base.py @@ -643,6 +643,10 @@ class ItemView(object): else: last_revision = None + physical_format = Format.objects.filter(item=item) + if physical_format: + physical_format = physical_format[0] + return render(request, template, {'item': item, 'export_formats': formats, 'visualizers': graphers, 'visualizer_id': grapher_id, @@ -650,6 +654,7 @@ class ItemView(object): 'previous' : previous, 'next' : next, 'marker': marker_id, 'playlists' : playlists, 'public_access': public_access, 'width': width, 'height': height, 'related_media': related_media, 'mime_type': mime_type, 'last_revision': last_revision, + 'physical_format': physical_format, }) @method_decorator(permission_required('telemeta.change_mediaitem'))