diff --git a/telemeta/templates/telemeta_default/collection_detail.html b/telemeta/templates/telemeta_default/collection_detail.html index 04171651..fdf8c94b 100644 --- a/telemeta/templates/telemeta_default/collection_detail.html +++ b/telemeta/templates/telemeta_default/collection_detail.html @@ -1,5 +1,6 @@ {% extends "telemeta/base.html" %} {% load telemeta_utils %} +{% load i18n %} {% block extra_javascript %} @@ -22,15 +23,6 @@

Listen to this collection (M3U, XSPF)

- {% if 0 %} {# Use 1/0 for alternate player #} - -

- {% else %} @@ -43,7 +35,6 @@ so.addVariable("displayheight","0"); so.write('collection_player_c'); - {% endif %}

{% endif %} @@ -53,115 +44,100 @@

{% block general_info %}

Auteur / CÃ©dant: {{ collection.creator }}
Date: {{ collection.date_published }}
Date: {{ collection.annee_enr }}
Titre: {{ collection.title }}
Traduction du titre: {{ collection.native_title }}
DurÃ©e: {{ collection.duree_approx }}
Ãditeur: {{ collection.publisher }}
RÃ©fÃ©rence: {{ collection.publisher_reference }}
{% trans "Recording year" %}: {{ collection.recorded_from_year }} {{ collection.recorded_to_year|prepend:" - " }}

{% endblock general_info %}

{% block geoethnic_data %}

DonnÃ©es ethnographiques

{% trans "Geographic and cultural informations" %}

Ãtat / Nation: {{collection.get_countries|join:", "}}
EthnieÂ / Groupe social: {{ collection.get_ethnic_groups|join:", " }}
Contexte de lâenregistrement: {{ collection.terrain_ou_autre }}

{% endblock geoethnic_data %}

- {% if collection.is_published %}

- {% block publication_data %} -

DÃ©tails du document Ã©ditÃ©

+ {% block legal_data %} +

{% trans "Legal mentions" %}

RÃ©Ã©dition: {{ collection.publishing_status }}
Auteur Notice: {{ collection.booklet_writer }}
Notice: {{ collection.booklet_description }}

- {% endblock publication_data %} + {% endblock legal_data %}

- {% endif %}

- {% block document_identification %} -

Identification du document

+ {% block archive_data %} +

{% trans "Archiving data" %}

Cote: {{ collection.id }}
Format de l'original: {{ collection.physical_format }}

- {% endblock document_identification %} + {% endblock archive_data %}

- {% block document_data %} -

Informations documentaires

+ {% block technical_data %} +

{% trans "Technical data" %}

a informer: {{ collection.a_informer }}
acquisition mode: {{ collection.acquisition_mode }}
champ36: {{ collection.champ36 }}
collector: {{ collection.collector }}
comment: {{ collection.comment }}
deposant cnrs: {{ collection.deposant_cnrs }}
fiches: {{ collection.fiches }}
is full copy: {{ collection.is_full_copy }}
is original: {{ collection.is_original }}
numerisation: {{ collection.numerisation }}
physical items num: {{ collection.physical_items_num }}
publisher collection: {{ collection.publisher_collection }}
publisher serial id: {{ collection.publisher_serial_id }}
record author: {{ collection.record_author }}
record writer: {{ collection.record_writer }}
ref biblio: {{ collection.ref_biblio }}
rights: {{ collection.rights }}
travail: {{ collection.travail }}
tri dibm: {{ collection.tri_dibm }}
{% trans "Media type" %}: {% trans "Audio" %}
{% trans "Number of items" %}: {{ collection.items.count }}

- {% endblock document_data %} + {% endblock technical_data %}

Items

+ {% with collection.items.all as items %} + {% include "telemeta/inc/mediaitem_list.html" %} + {% endwith %} +

{% endblock %} diff --git a/telemeta/templatetags/telemeta_utils.py b/telemeta/templatetags/telemeta_utils.py index 622cec0a..0fb014d4 100644 --- a/telemeta/templatetags/telemeta_utils.py +++ b/telemeta/templatetags/telemeta_utils.py @@ -3,6 +3,9 @@ from django.utils.http import urlquote from telemeta.models import MediaItem, MediaCollection from django.core.urlresolvers import reverse import telemeta.models.dublincore as dc +from django.utils import html +from django import template +from django.utils.text import capfirst register = template.Library() @@ -93,3 +96,60 @@ def to_dublincore(resource): return dc.express_item(resource) else: return dc.express_collection(resource) + +class DescriptionListFieldNode(template.Node): + def __init__(self, variable, join_with = None): + cut = variable.split('.') + self.model = template.Variable('.'.join(cut[:-1])) + self.member = cut[-1] + self.join_with = join_with + + def render(self, context): + try: + model = self.model.resolve(context) + label = html.escape(capfirst(unicode(model.field_label(self.member)))) + try: + value = getattr(model, self.member) + except AttributeError: + value = '' + except template.VariableDoesNotExist: + label = unicode(self.model) + '.' + self.member + value = '' + + try: + value = value() + except TypeError: + pass + if self.join_with: + value = self.join_with.join([unicode(v) for v in value]) + if value: + value = html.escape(unicode(value)) + markup = '

' % (label, value) + return markup + + return '' + +@register.tag +def dl_field(parser, token): + cut = token.split_contents() + join_with = None + try: + tag_name, variable = cut + except ValueError: + try: + tag_name, variable, arg3, arg4, arg5 = cut + if arg3 == 'join' and arg4 == 'with'and arg5[0] == arg5[-1] and arg5[0] in ('"', "'"): + join_with = arg5[1:-1] + else: + raise ValueError() + except ValueError: + raise template.TemplateSyntaxError("%r tag: invalid arguments" + % token.contents.split()[0]) + + return DescriptionListFieldNode(variable, join_with=join_with) + +@register.filter +def prepend(str, prefix): + if str: + return prefix + unicode(str) + return '' -- 2.39.5