From 3543530ffff1fe6dcb84c94b3a8502589c17165e Mon Sep 17 00:00:00 2001 From: yomguy Date: Wed, 30 May 2012 17:20:36 +0200 Subject: [PATCH] update item template --- .../templates/telemeta/mediaitem_detail.html | 147 ++++++++---------- 1 file changed, 64 insertions(+), 83 deletions(-) diff --git a/telemeta/templates/telemeta/mediaitem_detail.html b/telemeta/templates/telemeta/mediaitem_detail.html index 2a2a96e9..c7f81647 100644 --- a/telemeta/templates/telemeta/mediaitem_detail.html +++ b/telemeta/templates/telemeta/mediaitem_detail.html @@ -189,95 +189,71 @@ Item : {{ item }} {% block general_info %}
{% dl_field item "title" placeholder %} - {% dl_field item "alt_title" %} + +
{% trans "Instruments" %}
+
+ {% if item.performances %} + {% for performance in item.performances.all %}{{ performance.instrument|default:"" }}, {% endfor %} + {% endif %} +
+ +
{% trans "Recording date" %}
+
{% if item.recorded_from_date %}{{ item.recorded_from_date }}{% endif %}{% if item.recorded_from_date and item.recorded_to_date%} - {% endif %}{% if item.recorded_to_date %}{{ item.recorded_to_date}}{% endif %}
+ {% dl_field item "collector" placeholder %} +
{% field_label item "collection" %}
{{ item.collection }}
-
{% trans "Recording date" %}
-
{% if item.recorded_from_date %}{{ item.recorded_from_date }}{% endif %}{% if item.recorded_from_date and item.recorded_to_date%} - {% endif %}{% if item.recorded_to_date %}{{ item.recorded_to_date}}{% endif %}
+
{% trans "Location" %}
+
{% if item.location %}{{ item.location.fullnames|join:"
" }}{% endif %}
+ + {% dl_field item "summary" %} + {% dl_field item "scientist" %} + {% dl_field item "contributor" %} + +
{% trans "Interprets" %}
+ {% if item.performances %} +
{% for performance in item.performances.all %}{{ performance.musicians|default:"" }}, {% endfor %}
+ {% endif %} + + {% dl_field item "author" %} + {% dl_field item "subject" %}
{% trans "Remarks" %}
{{ item.comment|html_line_break|safe }}
+
{% trans "Media type" %}
+
{% trans mime_type|mime_to_media_type %}
+ {% if last_revision %} -
{% trans "Last modification" %}
-
{{ last_revision.time }} {% if user.is_authenticated %}({{last_revision.user.username}}){% endif %}
+
{% trans "Last modification" %}
+
{{ last_revision.time }} {% if user.is_authenticated %}({{last_revision.user.username}}){% endif %}
{% endif %} -
{% endblock general_info %} -
- {% block geoethnic_data %} -
-

{% trans "Geographic and cultural informations" %}

-
-
{% trans "Location" %}
-
{% if item.location %}{{ item.location.fullnames|join:"
" }}{% endif %}
- {% dl_field item "location_comment" %} - {% dl_field item "cultural_area" %} - {% dl_field item "language" %} - {% if item.language_iso %} -
{% trans "Language ISO" %}
-
{{ item.language_iso.name|to_utf8 }}
- {% endif %} - {% dl_field item "ethnic_group" placeholder %} -
{% trans "Ethnographic context" %}
-
{{ item.context_comment|html_line_break|safe }}
- {% dl_field item "keywords" join with ", " %} -
-
- {% endblock geoethnic_data %} -
-
- {% block musical_data %} -
-

{% trans "Musical informations" %}

-
- {% dl_field item "vernacular_style" %} - {% dl_field item "generic_style" %} - {% dl_field item "author" %} -
- {% if item.performances %} -
- - - - - - - - - - - {% for performance in item.performances.all %} - - - - - - - {% endfor %} - -
{% field_label "MediaItemPerformance" "instruments_num" %}{% field_label "MediaItemPerformance" "instrument" %}{% field_label "MediaItemPerformance" "alias" %}{% field_label "MediaItemPerformance" "musicians" %}
{{ performance.instruments_num }}{{ performance.instrument|default:"" }}{{ performance.alias|default:"" }}{{ performance.musicians }}
-
- {% endif %} -
- {% endblock musical_data %} -
- {% block general_data %} + {% block legal_mentions %}
-

{% trans "General informations" %}

+

{% trans "Legal mentions" %}

- +
{% trans "Organization" %}
+
{% organization %}
+ {% dl_field item "public_access_label" %} + {% dl_field item "depositor" %} +
{% trans "Rights" %}
+
{% if item.performances %} + {% for performance in item.performances.all %}{{ performance.instrument|default:"" }}, {% endfor %} + {% endif %}{{ item.author }} +
- {% endblock general_data %} + {% endblock legal_mentions %}
+
{% block archive_data %}
@@ -285,41 +261,46 @@ Item : {{ item }}
{% dl_field item "code" %} {% dl_field item "old_code" %} - {% dl_field item "track" %} + {% if format %} + {% dl_field format "original_status" %} + {% dl_field format "original_number" %} + {% endif %} + {% dl_field item "recordist" %} + {% if format %} + {% dl_field format "original_location" %} + {% endif %} {% dl_field item "creator_reference" %}
{% trans "Published references" %}
{{ item.external_references|html_line_break|safe }}
- {% dl_field item "public_access_label" %} + {% dl_field item "digitalist" %} + {% dl_field item "digitization_date" %} + {% dl_field item "publishing_date" %}
{% endblock archive_data %}
+
{% block technical_data %}

{% trans "Technical data" %}

-
{% trans "Media type" %}
-
{% trans mime_type|mime_to_media_type %}
{% dl_field item "approx_duration" %} - {% if format %} {% dl_field format "physical_format" %} - {% dl_field format "original_code" %} - {% dl_field format "original_number" %} - {% dl_field format "original_status" %} - {% dl_field format "original_location" %} - {% dl_field format "original_state" %} - {% dl_field format "original_audio_quality" %} -
{% trans "Comments" %}
-
{{ format.original_comments|html_line_break|safe }}
- {% dl_field format "tape_wheel_diameter" %} - {% dl_field format "tape_thickness" %} + {% dl_field format "recording_system" %} + {% dl_field format "original_channels" %} {% dl_field format "tape_speed" %} + {% dl_field format "tape_wheel_diameter" %} {% dl_field format "tape_vendor" %} {% dl_field format "tape_reference" %} +
{% trans "Comments" %}
+
{{ format.original_comments|html_line_break|safe }}
+ {% dl_field format "tape_thickness" %} {% dl_field format "sticker_presence" %} + {% dl_field format "original_state" %} + {% dl_field format "original_audio_quality" %} {% endif %}
-- 2.39.5