From: yomguy Date: Mon, 30 Jan 2012 14:47:10 +0000 (+0100) Subject: * UNSTABLE X-Git-Tag: 1.3.9~41 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=566f17d55beb16fe6ea13dfa14190f8cc5e8745c;p=telemeta.git * UNSTABLE * remove default template links (get the original templates to personalize * Funds > Fonds * add ResourceView as a generic view of MediaBaseResource based classes (like MediaCorpus and MediaFonds) * bugfixes * fix some urls --- diff --git a/telemeta/admin.py b/telemeta/admin.py index c57291c6..3edbd968 100644 --- a/telemeta/admin.py +++ b/telemeta/admin.py @@ -7,7 +7,7 @@ from telemeta.models.system import * from django.contrib import admin -class MediaFundAdmin(admin.ModelAdmin): +class MediaFondsAdmin(admin.ModelAdmin): search_fields = ['title', 'code'] ordering = ['code'] @@ -71,7 +71,7 @@ class RevisionAdmin(admin.ModelAdmin): ordering = ['-time'] -admin.site.register(MediaFund, MediaFundAdmin) +admin.site.register(MediaFonds, MediaFondsAdmin) admin.site.register(MediaCorpus, MediaCorpusAdmin) admin.site.register(MediaCollection, MediaCollectionAdmin) admin.site.register(MediaItem, MediaItemAdmin) diff --git a/telemeta/forms/media.py b/telemeta/forms/media.py index 589e8830..798d1671 100644 --- a/telemeta/forms/media.py +++ b/telemeta/forms/media.py @@ -36,20 +36,28 @@ from django.forms import ModelForm from telemeta.models import * -class MediaFundForm(ModelForm): +class MediaFondsForm(ModelForm): class Meta: - model = MediaFund + model = MediaFonds + +class MediaFondsRelatedForm(ModelForm): + class Meta: + model = MediaFondsRelated class MediaCorpusForm(ModelForm): class Meta: model = MediaCorpus - + +class MediaCorpusRelatedForm(ModelForm): + class Meta: + model = MediaCorpusRelated + class MediaCollectionForm(ModelForm): class Meta: model = MediaCollection def clean_doctype_code(self): return self.cleaned_data['doctype_code'] or 0 - + class MediaCollectionRelatedForm(ModelForm): class Meta: model = MediaCollectionRelated @@ -63,7 +71,7 @@ class MediaItemForm(ModelForm): class MediaItemRelatedForm(ModelForm): class Meta: model = MediaItemRelated - + class MediaItemKeywordForm(ModelForm): class Meta: model = MediaItemKeyword @@ -71,7 +79,7 @@ class MediaItemKeywordForm(ModelForm): class MediaItemPerformanceForm(ModelForm): class Meta: model = MediaItemPerformance - + def __init__(self, *args, **kwds): super(MediaItemPerformanceForm, self).__init__(*args, **kwds) self.fields['instrument'].queryset = Instrument.objects.order_by('name') diff --git a/telemeta/htdocs/css/telemeta.css b/telemeta/htdocs/css/telemeta.css index 7d78fe02..7b1a36b2 100644 --- a/telemeta/htdocs/css/telemeta.css +++ b/telemeta/htdocs/css/telemeta.css @@ -510,7 +510,7 @@ text-align:center; /* you can make a different style for default selected value */ #nav a.selected { -color:#f00; +color:#FFF; } /* submenu, it's hidden by default */ diff --git a/telemeta/models/media.py b/telemeta/models/media.py index 9bfd4f2b..aea9cbb1 100644 --- a/telemeta/models/media.py +++ b/telemeta/models/media.py @@ -111,6 +111,46 @@ class MediaBaseResource(MediaResource): ordering = ['code'] +class MediaRelated(MediaResource): + "Related media" + + element_type = 'media' + + title = CharField(_('title')) + date = DateTimeField(_('date'), auto_now=True) + description = TextField(_('description')) + mime_type = CharField(_('mime_type'), null=True) + url = CharField(_('url'), max_length=500) + credits = CharField(_('credits')) + file = FileField(_('file'), upload_to='items/%Y/%m/%d', db_column="filename") + + def is_image(self): + is_url_image = False + if self.url: + url_types = ['.png', '.jpg', '.gif', '.jpeg'] + for type in url_types: + if type in self.url: + is_url_image = True + return 'image' in self.mime_type or is_url_image + + def save(self, force_insert=False, force_update=False): + super(MediaRelated, self).save(force_insert, force_update) + + def set_mime_type(self): + if self.file: + self.mime_type = mimetypes.guess_type(self.file.path)[0] + + def __unicode__(self): + if self.title and not re.match('^ *N *$', self.title): + title = self.title + else: + title = unicode(self.item) + return title + + class Meta: + abstract = True + + class MediaCollection(MediaResource): "Describe a collection of items" @@ -247,44 +287,6 @@ class MediaCollection(MediaResource): ordering = ['code'] verbose_name = _('collection') -class MediaRelated(MediaResource): - "Related media" - - element_type = 'media' - - title = CharField(_('title')) - date = DateTimeField(_('date'), auto_now=True) - description = TextField(_('description')) - mime_type = CharField(_('mime_type'), null=True) - url = CharField(_('url'), max_length=500) - credits = CharField(_('credits')) - file = FileField(_('file'), upload_to='items/%Y/%m/%d', db_column="filename") - - def is_image(self): - is_url_image = False - if self.url: - url_types = ['.png', '.jpg', '.gif', '.jpeg'] - for type in url_types: - if type in self.url: - is_url_image = True - return 'image' in self.mime_type or is_url_image - - def save(self, force_insert=False, force_update=False): - super(MediaRelated, self).save(force_insert, force_update) - - def set_mime_type(self): - if self.file: - self.mime_type = mimetypes.guess_type(self.file.path)[0] - - def __unicode__(self): - if self.title and not re.match('^ *N *$', self.title): - title = self.title - else: - title = unicode(self.item) - return title - - class Meta: - abstract = True class MediaCollectionRelated(MediaRelated): "Collection related media" @@ -622,46 +624,56 @@ class MediaCorpus(MediaBaseResource): "Describe a corpus" element_type = 'corpus' - - collections = models.ManyToManyField(MediaCollection) - + children_type = 'collections' + + children = models.ManyToManyField(MediaCollection, related_name="corpus", verbose_name=_('collections')) + + @property + def public_id(self): + return self.code + class Meta(MetaCore): db_table = 'media_corpus' verbose_name = _('corpus') verbose_name_plural = _('corpus') +class MediaFonds(MediaBaseResource): + "Describe fonds" + + element_type = 'fonds' + children_type = 'corpus' + + children = models.ManyToManyField(MediaCorpus, related_name="fonds", verbose_name=_('corpus')) + + @property + def public_id(self): + return self.code + + class Meta(MetaCore): + db_table = 'media_fonds' + verbose_name = _('fonds') + verbose_name_plural = _('fonds') + + class MediaCorpusRelated(MediaRelated): "Corpus related media" - corpus = ForeignKey(MediaCorpus, related_name="related", verbose_name=_('corpus')) + resource = ForeignKey(MediaCorpus, related_name="related", verbose_name=_('corpus')) class Meta(MetaCore): db_table = 'media_corpus_related' verbose_name = _('corpus related media') verbose_name_plural = _('corpus related media') - - -class MediaFund(MediaBaseResource): - "Describe a fund" - - element_type = 'fund' - - corpus = models.ManyToManyField(MediaCorpus) - - class Meta(MetaCore): - db_table = 'media_funds' - verbose_name = _('fund') -class MediaFundRelated(MediaRelated): - "Fund related media" +class MediaFondsRelated(MediaRelated): + "Fonds related media" - fund = ForeignKey(MediaFund, related_name="related", verbose_name=_('fund')) + resource = ForeignKey(MediaFonds, related_name="related", verbose_name=_('fonds')) class Meta(MetaCore): - db_table = 'media_fund_related' - verbose_name = _('fund related media') - verbose_name_plural = _('fund related media') - - \ No newline at end of file + db_table = 'media_fonds_related' + verbose_name = _('fonds related media') + verbose_name_plural = _('fonds related media') + diff --git a/telemeta/models/system.py b/telemeta/models/system.py index 0a3f8339..33f9b4fe 100644 --- a/telemeta/models/system.py +++ b/telemeta/models/system.py @@ -45,7 +45,7 @@ from django.forms import ModelForm class Revision(ModelCore): "Revision made by user" - ELEMENT_TYPE_CHOICES = (('collection', 'collection'), ('item', 'item'), ('part', 'part'), ('marker', 'marker'), ('media', 'media')) + ELEMENT_TYPE_CHOICES = (('collection', 'collection'), ('item', 'item'), ('part', 'part'), ('marker', 'marker'), ('media', 'media'), ('fonds', 'fonds'), ('corpus', 'corpus')) CHANGE_TYPE_CHOICES = (('import', 'import'), ('create', 'create'), ('update', 'update'), ('delete','delete')) element_type = CharField(_('element type'), choices=ELEMENT_TYPE_CHOICES, max_length=16, required=True) diff --git a/telemeta/templates/telemeta/admin.html b/telemeta/templates/telemeta/admin.html index a5334e83..ff32173e 100644 --- a/telemeta/templates/telemeta/admin.html +++ b/telemeta/templates/telemeta/admin.html @@ -1 +1,32 @@ -{% extends "telemeta_default/admin.html" %} +{% extends "telemeta/base.html" %} +{% load telemeta_utils %} +{% load i18n %} + +{% block stylesheets %} +{{ block.super }} + +{% endblock %} + +{% block title %} +

{% trans "Administration" %}

+{% endblock %} + +{% block content %} + +{% block tab %} +
+ +
+{% endblock tab %} + +
+ {% block tabcontents %} + {% endblock %} +
+ +{% endblock %} diff --git a/telemeta/templates/telemeta/admin_enumerations.html b/telemeta/templates/telemeta/admin_enumerations.html index 1d1dd2d3..9c68d74f 100644 --- a/telemeta/templates/telemeta/admin_enumerations.html +++ b/telemeta/templates/telemeta/admin_enumerations.html @@ -1 +1,27 @@ -{% extends "telemeta_default/admin_enumerations.html" %} +{% extends "telemeta/admin.html" %} +{% load telemeta_utils %} +{% load i18n %} + +{% block tabcontents %} +

{% trans "Enumerations" %}

+ +{% if enumerations %} + + + + + + {% for enum in enumerations %} + + {% endfor %} + +
{% trans "Title"%}
+ {{ enum.name|capfirst }}
+ + {% else %} +

{% trans "No enumerations" %}

+ {% endif %} + +{% endblock %} + + diff --git a/telemeta/templates/telemeta/admin_general.html b/telemeta/templates/telemeta/admin_general.html index 1154dc27..ec562324 100644 --- a/telemeta/templates/telemeta/admin_general.html +++ b/telemeta/templates/telemeta/admin_general.html @@ -1 +1,6 @@ -{% extends "telemeta_default/admin_general.html" %} +{% extends "telemeta/admin.html" %} +{% load i18n %} + +{% block tabcontents %} + + {% endif %} + {% endif %} + {% endif %} + + + {% endfor %} + + + + {% endif %} + {% if user.is_authenticated and perms.telemeta.change_mediacollection %} +
{% trans "Edit"%} {% trans "related media"%} + {% endif %} + diff --git a/telemeta/templates/telemeta/inc/dublincore.html b/telemeta/templates/telemeta/inc/dublincore.html index 2c6134bb..9d2a151f 100644 --- a/telemeta/templates/telemeta/inc/dublincore.html +++ b/telemeta/templates/telemeta/inc/dublincore.html @@ -1,2 +1,21 @@ -{% extends "telemeta_default/inc/dublincore.html" %} +{% load telemeta_utils %} +{% load i18n %} +

{% trans "Dublin Core Metadata" %}

+
+
ElementRefinement
Value
+ {% for element in resource.elements %} +
{{ element.name }}{{ element.refinement|default:" " }}
+
+ {% if element.related|is_item or element.related|is_collection %} + {% if element.related|is_item %} + {{ element.value }} + {% else %} + {{ element.value }} + {% endif %} + {% else %} + {{ element.value }} + {% endif %} +
+ {% endfor %} +
diff --git a/telemeta/templates/telemeta/inc/mediaitem_list.html b/telemeta/templates/telemeta/inc/mediaitem_list.html index fd2269c3..cc09245c 100644 --- a/telemeta/templates/telemeta/inc/mediaitem_list.html +++ b/telemeta/templates/telemeta/inc/mediaitem_list.html @@ -1 +1,60 @@ -{% extends "telemeta_default/inc/mediaitem_list.html" %} +{% load telemeta_utils %} +{% load i18n %} +{% if items %} + +{% if hits %} +

+{% blocktrans %}Items {{ first_on_page }} to {{ last_on_page }} on {{ hits }}{% endblocktrans %} +| Pages : {% if pages == 1 %}1{% else %}{% if is_paginated %}{% load paginator %}{% paginator 5 %}{% endif %}{% endif %} +

+{% endif %} + + + + + + + {% if location_name %} + + {% else %} + + {% endif %} + + + +{% for item in items %} + + + + + {% if location_name %} + + {% else %} + + {% endif %} + + + +{% endfor %} +
{% trans "Title" %}{% trans "Code" %}{% trans "Recordist" %}{% trans "Location" %}{% trans "Country/Continent" %}{% trans "Year of recording" %}{% trans "Sound" %}
+ {{ item }} + + {{ item.code|default:item.old_code }} + {{ item.apparent_collector }}{{ item.location.name }}{{ item.country_or_continent|default:' ' }} + {% if item.recorded_from_date %} + {{ item.recorded_from_date.year }} + {% if item.recorded_to_date and not item.recorded_to_date.year|equals:item.recorded_from_date.year %} + - {{ item.recorded_to_date.year }} + {% endif %} + {% endif %} + + {% if item.file %} + + yes + {% endif %} +
+ +{% else %} +

{% trans "No item" %}

+{% endif %} + diff --git a/telemeta/templates/telemeta/inc/mediaitem_related.html b/telemeta/templates/telemeta/inc/mediaitem_related.html index 69cbd768..ecb5448e 100644 --- a/telemeta/templates/telemeta/inc/mediaitem_related.html +++ b/telemeta/templates/telemeta/inc/mediaitem_related.html @@ -1 +1,83 @@ -{% extends "telemeta_default/inc/mediaitem_related.html" %} +{% load i18n %} +{% load telemeta_utils %} + +
+

{% trans "Related media" %}

+ {% if related_media %} +
+ + + + + + + + + {% for media in related_media %} + + + + + + {% endfor %} + +
{% trans "Media" %}{% trans "Preview" %}
+
+
{% trans "Title" %}
+
+ {% if media.url %} + + {% if media.title %} + {{ media.title }} + {% else %} + {{ media.url|get_filename }} + {% endif %} + {% else %} + + {% if media.title %} + {{ media.title }} + {% else %} + {{ media.file|get_filename }} + {% endif %} + {% endif %} +
+
{% trans "Description" %}
+
{{ media.description|html_line_break|safe }}
+
{% trans "Credits" %}
+
{{ media.credits }}
+ {% dl_field media "mime_type" %} +
{% trans "URL" %}
+
+ {% if media.url %} + {{ media.url }} + {% else %} + {% if media.file %} + + {% url telemeta-item-related item.public_id media.id %} + + {% endif %} + {% endif %} +
+
+ 		{% if media.is_image %} + {% if media.url %} + + + {% else %} + + + {% endif %} + {% else %} + {% if media.url %} + {% if "youtu" in media.url %} + + {% endif %} + {% endif %} + {% endif %} +
+
+ {% endif %} + {% if user.is_authenticated and perms.telemeta.change_mediaitem %} +
{% trans "Edit"%} {% trans "related media"%} + {% endif %} +
diff --git a/telemeta/templates/telemeta/inc/module_revisions.html b/telemeta/templates/telemeta/inc/module_revisions.html index 2b8503fb..5df16154 100644 --- a/telemeta/templates/telemeta/inc/module_revisions.html +++ b/telemeta/templates/telemeta/inc/module_revisions.html @@ -1 +1,42 @@ -{% extends "telemeta_default/inc/module_revisions.html" %} +{% load telemeta_utils %} +{% load i18n %} + +
+

+ rss + {% trans "Last changes" %}

+    +
+ + + + + + + + {% for r in revisions %} + + + + + + + {% endfor %} +
{% trans "Date" %}{% trans "Title" %}{% trans "Type" %}{% trans "User" %}
{{ r.revision.time }} + {% if r.element %} + {% if r.revision.element_type == "collection" %} + {{ r.element.title }} + {% endif %} + {% if r.revision.element_type == "item" %} + + {% if r.element.title != '' %}{{ r.element.title }}{% else %}{{ r.element.collection.title }} - {{ r.element.track }}{% endif %} + {% endif %} + {% if r.revision.element_type == "marker" %} + {{ r.element.title }} + {% endif %} + {% else %} + {% trans "deleted" %} + {% endif %} + {{ r.revision.element_type }}{% if r.revision.user %}{{ r.revision.user.username }}{% endif %}
+
+
\ No newline at end of file diff --git a/telemeta/templates/telemeta/inc/resource_list.html b/telemeta/templates/telemeta/inc/resource_list.html new file mode 100644 index 00000000..2f8c199e --- /dev/null +++ b/telemeta/templates/telemeta/inc/resource_list.html @@ -0,0 +1,32 @@ +{% load telemeta_utils %} +{% load i18n %} +{% if resources %} +{% if hits %} + +

+{{ type|capitalize }}{% blocktrans %} from {{ first_on_page }} to {{ last_on_page }} on {{ hits }}{% endblocktrans %} +| Pages : {% if pages == 1 %}1{% else %}{% if is_paginated %}{% load paginator %}{% paginator 5 %}{% endif %}{% endif %} +

+{% endif %} + + + + + + + +{% for resource in resources %} + + + + + + +{% endfor %} +
{% trans "Title" %}{% trans "Description" %}{% trans "Code" %}{% trans "Reference" %}
+ {{ resource.title }} + {{ resource.description }}{{ resource.code }}{{ resource.reference }}
+{% else %} +

{% trans "No resource" %}

+{% endif %} + diff --git a/telemeta/templates/telemeta/inc/resource_related.html b/telemeta/templates/telemeta/inc/resource_related.html new file mode 100644 index 00000000..71ada2c5 --- /dev/null +++ b/telemeta/templates/telemeta/inc/resource_related.html @@ -0,0 +1,83 @@ +{% load i18n %} +{% load telemeta_utils %} + +
+

{% trans "Related media" %}

+ {% if related_media %} +
+ + + + + + + + + {% for media in related_media %} + + + + + + {% endfor %} + +
{% trans "Media" %}{% trans "Preview" %}
+
+
{% trans "Title" %}
+
+ {% if media.url %} + + {% if media.title %} + {{ media.title }} + {% else %} + {{ media.url|get_filename }} + {% endif %} + {% else %} + + {% if media.title %} + {{ media.title }} + {% else %} + {{ media.file|get_filename }} + {% endif %} + {% endif %} +
+
{% trans "Description" %}
+
{{ media.description|html_line_break|safe }}
+
{% trans "Credits" %}
+
{{ media.credits }}
+ {% dl_field media "mime_type" %} +
{% trans "URL" %}
+
+ {% if media.url %} + {{ media.url }} + {% else %} + {% if media.file %} + + {% url telemeta-resource-related type resource.public_id media.id %} + + {% endif %} + {% endif %} +
+
+ 		{% if media.is_image %} + {% if media.url %} + + + {% else %} + + + {% endif %} + {% else %} + {% if media.url %} + {% if "youtu" in media.url %} + + {% endif %} + {% endif %} + {% endif %} +
+
+ {% endif %} + {% if user.is_authenticated and perms.telemeta.change_mediaresource %} +
{% trans "Edit"%} {% trans "related media"%} + {% endif %} +
diff --git a/telemeta/templates/telemeta/inc/user_list.html b/telemeta/templates/telemeta/inc/user_list.html index 09c47422..a82240a9 100644 --- a/telemeta/templates/telemeta/inc/user_list.html +++ b/telemeta/templates/telemeta/inc/user_list.html @@ -1 +1,23 @@ -{% extends "telemeta_default/inc/user_list.html" %} +{% load i18n %} +{% load telemeta_utils %} + + + + + + + + + + + {% for user in users %} + + + + + + + + {% endfor %} + +
{% trans "User"%}{% trans "First Name"%}{% trans "Last Name"%}{% trans "E-mail"%}{% trans "Groups"%}
{{user.username}}{{ user.first_name }}{{ user.last_name }}{{ user.email }}{% for group in user.groups.all %}{{ group }} {% endfor %}
\ No newline at end of file diff --git a/telemeta/templates/telemeta/index.html b/telemeta/templates/telemeta/index.html index faa9b415..a5bf2dc2 100644 --- a/telemeta/templates/telemeta/index.html +++ b/telemeta/templates/telemeta/index.html @@ -1 +1,69 @@ -{% extends "telemeta_default/index.html" %} +{% extends "telemeta/base.html" %} +{% load telemeta_utils %} +{% load i18n %} + +{% block content %} +
+
+ +{% block modules %} + +{% if sound_pub_item %} +
+

playlist + {% trans "Musical selection" %}

+
    +
  • {{ sound_pub_item }}{% if sound_pub_item.alt_title %} ({{ sound_pub_item.alt_title }}){% endif %}
    {{ sound_pub_item.location.fullnames|to_string }}
    + +
    • +
+
+{% endif %} + +
+

world + {% trans "Geo Navigator" %}

+ + {% trans +
+ +{% include "telemeta/inc/module_revisions.html" %} + +{{ block.super }} +
+

+ Partenaires


+
+ CNRS    + MCC   + MNHN +

+ TGE Adonis +
+
+ +{% endblock %} + +
+ +
+vox +{{ page_content|render_flatpage }} +
+ +{% if sound_pub_items %} +
+

playlists + {% trans "Musical selection" %}

+ +{% for item in sound_pub_items %} + +{% endfor %} + +
{{ item }}{% if item.alt_title %} ({{ item.alt_title }}){% endif %}
{{ item.location.fullnames|to_string }}
+
+
+{% endif %} + +
+{% endblock %} diff --git a/telemeta/templates/telemeta/instrument_edit.html b/telemeta/templates/telemeta/instrument_edit.html index a612c3f4..4988a6fa 100644 --- a/telemeta/templates/telemeta/instrument_edit.html +++ b/telemeta/templates/telemeta/instrument_edit.html @@ -1 +1,49 @@ -{% extends "telemeta_default/instrument_edit.html" %} +{% extends "telemeta/admin.html" %} +{% load i18n %} + +{% block head_title %}{% trans "Instruments" %} - {{ block.super }}{% endblock %} + +{% block tabcontents %} +

{% trans "Instruments" %}

+
{% csrf_token %} +
+ {% trans "Add entry" %} +
+ + +
+
+
+ {% trans "Add" %} +
+
+
+ {% if instruments %} +
{% csrf_token %} + + + + + {% for record in instruments %} + + + + + {% endfor %} + +
 {% trans "Name"%}
+ {{record.name}}
+
+
+ {% trans "Remove selected items" %} +
+
+ {% else %} +

{% trans "This instrument list is empty" %}

+ {% endif %} + +
+{% endblock %} diff --git a/telemeta/templates/telemeta/instrument_edit_value.html b/telemeta/templates/telemeta/instrument_edit_value.html index 247ec968..ca28c254 100644 --- a/telemeta/templates/telemeta/instrument_edit_value.html +++ b/telemeta/templates/telemeta/instrument_edit_value.html @@ -1 +1,26 @@ -{% extends "telemeta_default/instrument_edit_value.html" %} +{% extends "telemeta/admin.html" %} +{% load i18n %} + +{% block head_title %}{% trans "Instruments" %} - {{ block.super }}{% endblock %} + +{% block tabcontents %} +

{% trans "Instruments" %}

+
{% csrf_token %} +
+ {% trans "Modify an entry" %} +
+ + +
+
+
+ {% trans "Save" %} + {% trans "Cancel" %} +
+
+
+
+{% endblock %} diff --git a/telemeta/templates/telemeta/login.html b/telemeta/templates/telemeta/login.html index e6c64d59..e4c58c07 100644 --- a/telemeta/templates/telemeta/login.html +++ b/telemeta/templates/telemeta/login.html @@ -1 +1,24 @@ -{% extends "telemeta_default/login.html" %} +{% extends "telemeta/base.html" %} +{% load i18n %} + +{% block title %} + {% trans "User authentication" %} +{% endblock %} + +{% block content %} +{% if form.errors %} +

{% trans "Your username and password didn't match. Please try again." %}

+{% endif %} +
{% csrf_token %} +

+{{ form.username.label_tag }} +{{ form.username }}
+{{ form.password.label_tag }} +{{ form.password }} +

+ + +{% trans "Password forgotten" %} ? +
+{% endblock %} diff --git a/telemeta/templates/telemeta/mediaitem_add.html b/telemeta/templates/telemeta/mediaitem_add.html index 954910dd..ee05ac19 100644 --- a/telemeta/templates/telemeta/mediaitem_add.html +++ b/telemeta/templates/telemeta/mediaitem_add.html @@ -1 +1,61 @@ -{% extends "telemeta_default/mediaitem_add.html" %} +{% extends "telemeta/base.html" %} +{% load telemeta_utils %} +{% load i18n %} + +{% block head_title %}{% trans "Item" %}- {{ block.super }}{% endblock %} + +{% if item %} +{% block title %} + item Item : NEW +{% endblock %} + +{% block title_buttons %} + {% if perms.telemeta.add_mediaitem %} + {% trans "Cancel" %} + {% endif %} +{% endblock %} + +{% block content %} + {% block infos %} +
+
{% csrf_token %} +
    {% for error in form.non_field_errors %}
  • {{ error }}
    • {% endfor %}
+ + {% for field in form %} + + {% if field.html_name == "copied_from_item" %} + + {% else %} + + + {% if field.html_name == "collection" %} + + {% else %} + + {% endif %} + {% endif %} + + {% endfor %} +
{{ field.label_tag.as_hidden }}{{ field.as_hidden }}
{{ field.errors }}
{{ field.label_tag }}: {% trans "Title" %} : {{ item.collection.title }}
+  {% trans "Code" %} : {{ item.collection.code }}
+ {{ field }}		{{ field }}
+
+ {% trans "Cancel" %} + {% trans "Save" %} + +
+
+
+ {% endblock infos %} + +{% endblock %} + +{% block delete %} +{% endblock %} + +{% else %} +

No such item

+{% endif %} diff --git a/telemeta/templates/telemeta/mediaitem_copy.html b/telemeta/templates/telemeta/mediaitem_copy.html index 154f7a0c..64bbaac7 100644 --- a/telemeta/templates/telemeta/mediaitem_copy.html +++ b/telemeta/templates/telemeta/mediaitem_copy.html @@ -1 +1,56 @@ -{% extends "telemeta_default/mediaitem_copy.html" %} +{% extends "telemeta/mediaitem_detail.html" %} +{% load telemeta_utils %} +{% load i18n %} + +{% block head_title %}{% trans "Item" %}- {{ block.super }}{% endblock %} + +{% block extra_javascript %} +{% endblock %} + +{% block title %} + item Item : NEW +{% endblock %} + +{% block title_buttons %} + {% if user.is_authenticated and perms.telemeta.add_mediaitem %} + {% trans "Cancel" %} + {% endif %} +{% endblock %} + +{% block content %} + {% block infos %} +
+
{% csrf_token %} +
    {% for error in form.non_field_errors %}
  • {{ error }}
    • {% endfor %}
+ + {% for field in form %} + + {% if field.html_name == "copied_from_item" %} + + {% else %} + + + {% if field.html_name == "collection" %} + + {% else %} + + {% endif %} + {% endif %} + + {% endfor %} +
{{ field.label_tag.as_hidden }}{{ field.as_hidden }}
{{ field.errors }}
{{ field.label_tag }}: {% trans "Title" %} : {{ item.collection.title }}
+  {% trans "Code" %} : {{ item.collection.code }}
+ {{ field }}		{{ field }}
+
+ {% trans "Cancel" %} + {% trans "Save" %} +
+
+
+ {% endblock infos %} +{% endblock %} + +{% block delete %} +{% endblock %} + diff --git a/telemeta/templates/telemeta/mediaitem_detail.html b/telemeta/templates/telemeta/mediaitem_detail.html index b09e6a88..927da5fc 100644 --- a/telemeta/templates/telemeta/mediaitem_detail.html +++ b/telemeta/templates/telemeta/mediaitem_detail.html @@ -1 +1,299 @@ -{% extends "telemeta_default/mediaitem_detail.html" %} +{% extends "telemeta/base.html" %} +{% load telemeta_utils %} +{% load i18n %} + +{% block head_title %}{% trans "Item" %} : {% if item.title %}{{ item.title }}{% else %}{{ item.public_id}}{% endif %} - {{ block.super }}{% endblock %} + +{% block stylesheets %} +{{ block.super }} + + +{% endblock %} + +{% block extra_javascript %} +{% if item %} + +{% if item.file %} +{% if public_access or perms.telemeta.can_play_all_items %} + + +{% endif %} +{% endif %} + + + + +{% if item.file %} +{% if public_access or perms.telemeta.can_play_all_items %} + + +{% endif %} +{% endif %} + + +{% endif %} +{% endblock %} + +{% if item %} + +{% block title %} +item +Item : {{ item }} +{% endblock %} + +{% block title_buttons %} +
+ {% if user.is_authenticated and perms.telemeta.change_mediaitem %} + {% trans "Edit" %} + {% trans "Copy" %} + {% endif %} + {% if user.is_authenticated %} + {% trans "Add to playlist" %} + {% endif %} + {% trans "Previous" %} + {% trans "Next" %} + Dublin Core +
+{% endblock %} + +{% block content %} +
+ {% if item.file %} + {% if public_access or perms.telemeta.can_play_all_items %} +
+ Minimize + </> +
+
+
+
+ Maximize + </> +
+
+
+
+ + + + +
+ +
+ + + + + + +
{% trans "Property" %}{% trans "Value" %}{% trans "Unit" %}
+
+ + + {% if audio_export_enabled or perms.telemeta.can_download_all_items or user.is_superuser %} +
+

download {% trans "Download:" %} + {% for format in export_formats %} + + {{ format.extension }} + {% endfor %}

+
+ {% endif %} + +
+ {% endif %} + {% endif %} + + {% block infos %} +
+ {% block general_info %} +
+ {% dl_field item "title" placeholder %} + {% dl_field item "alt_title" %} + {% 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 %}
+ +
+ {% 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 %} +
+ {% if user.is_authenticated and perms.telemeta.change_mediaitem %} + {% trans "Edit" %} {% trans "keywords" %} + {% endif %} +
+ {% 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 %} +
+ {% if user.is_authenticated and perms.telemeta.change_mediaitem %} + {% trans "Edit"%} {% trans "performance"%} + {% endif %} +
+ {% block general_data %} +
+

{% trans "General informations" %}

+
+
{% trans "Remarks" %}
+
{{ item.comment|html_line_break|safe }}
+ {% dl_field item "collector_selection" %} +
+
+ {% endblock general_data %} +
+
+ {% block archive_data %} +
+

{% trans "Archiving data" %}

+
+ {% dl_field item "code" %} + {% dl_field item "old_code" %} + {% dl_field item "track" %} + {% dl_field item "creator_reference" %} +
{% trans "Published references" %}
+
{{ item.external_references|html_line_break|safe }}
+ {% dl_field item "public_access_label" %} +
+
+ {% endblock archive_data %} +
+
+ {% block technical_data %} +
+

{% trans "Technical data" %}

+
+
+
{% trans "Media type" %}
{% trans "Audio" %}
+ {% dl_field item "approx_duration" %} +
+
+
+ {% endblock technical_data %} +
+ {% endblock infos %} +
+ +
+ {% block related %} + {% include "telemeta/inc/mediaitem_related.html" %} + {% endblock related %} +
+ +{% endblock %} + +{% block delete %} +{% if user.is_authenticated and perms.telemeta.delete_mediaitem %} + {% trans "Delete" %} +{% endif %} +{% endblock %} + +{% else %} +

No such item

+{% endif %} diff --git a/telemeta/templates/telemeta/mediaitem_detail_dc.html b/telemeta/templates/telemeta/mediaitem_detail_dc.html index 7924eeb3..d745dc67 100644 --- a/telemeta/templates/telemeta/mediaitem_detail_dc.html +++ b/telemeta/templates/telemeta/mediaitem_detail_dc.html @@ -1 +1,20 @@ -{% extends "telemeta_default/mediaitem_detail_dc.html" %} +{% extends "telemeta/mediaitem_detail.html" %} +{% load telemeta_utils %} +{% load i18n %} + +{% if item %} +{% block title_buttons %} + {% trans "Normal View" %} +{% endblock %} + +{% block infos %} +{% with item|to_dublincore as resource %} +{% include "telemeta/inc/dublincore.html" %} +{% endwith %} +{% endblock %} +{% else %} +

{% trans "No such item" %}

+{% endif %} + +{% block related %} +{% endblock related %} diff --git a/telemeta/templates/telemeta/mediaitem_edit.html b/telemeta/templates/telemeta/mediaitem_edit.html index db8aacd1..5767f769 100644 --- a/telemeta/templates/telemeta/mediaitem_edit.html +++ b/telemeta/templates/telemeta/mediaitem_edit.html @@ -1 +1,51 @@ -{% extends "telemeta_default/mediaitem_edit.html" %} +{% extends "telemeta/mediaitem_detail.html" %} +{% load i18n %} +{% load telemeta_utils %} + +{% block title %} + Item : {{ item }} +{% endblock %} + +{% block title_buttons %} +{% trans "Cancel" %} +{% endblock %} + +{% block infos %} +
+
{% csrf_token %} + + + {% for field in form %} + + {% if field.html_name == "copied_from_item" %} + + {% else %} + + + {% if field.html_name == "collection" %} + + {% else %} + + {% endif %} + {% endif %} + + {% endfor %} +
{% for error in form.non_field_errors %}
  • {{ error }}
    • {% endfor %}
    {{ field.label_tag.as_hidden }}{{ field.as_hidden }}
    {{ field.errors }}
    {{ field.label_tag }}: {% trans "Title" %} : {{ item.collection.title }}
    +  {% trans "Code" %} : {{ item.collection.code }}
    + {{ field }}    		{{ field }}
    +
    + {% trans "Cancel" %} + {% trans "Save" %} + +
    +
    +
    +{% endblock infos %} + +{% block related %} +{% endblock %} + +{% block delete %} +{% endblock %} diff --git a/telemeta/templates/telemeta/mediaitem_keywords_edit.html b/telemeta/templates/telemeta/mediaitem_keywords_edit.html index 4287ae81..9e2ca7d6 100644 --- a/telemeta/templates/telemeta/mediaitem_keywords_edit.html +++ b/telemeta/templates/telemeta/mediaitem_keywords_edit.html @@ -1 +1,48 @@ -{% extends "telemeta_default/mediaitem_keywords_edit.html" %} +{% extends "telemeta/mediaitem_detail.html" %} +{% load i18n %} +{% load telemeta_utils %} + +{% block extra_javascript %} +{% endblock %} + + {% block title %} + item

    Item : {{ item }}

    + {% endblock %} + {% block title_buttons %} + {% trans "Cancel" %} + {% endblock %} + +{% block content %} + {% block infos %} +
    +
    {% csrf_token %} + + {{ formset.management_form }} + {% for form in formset.forms %} + + + {% for field in form %} + + {% if "item" in field.html_name or "id" in field.html_name %} + + {% else %} + + {% endif %} + + {% endfor %} +
    {% trans "Keyword" %} :
    {{ field.label_tag.as_hidden }}{{ field.as_hidden }}{{ field.label_tag }}: {{ field }}
    +
    + {% endfor %} + +
    + {% trans "Cancel" %} + {% trans "Save" %} +
    + +
    +
    + + {% endblock infos %} +{% endblock content %} diff --git a/telemeta/templates/telemeta/mediaitem_list.html b/telemeta/templates/telemeta/mediaitem_list.html index 6ee20464..26e45237 100644 --- a/telemeta/templates/telemeta/mediaitem_list.html +++ b/telemeta/templates/telemeta/mediaitem_list.html @@ -1 +1,25 @@ -{% extends "telemeta_default/mediaitem_list.html" %} +{% extends "telemeta/base.html" %} +{% load i18n %} +{% load telemeta_utils %} + +{% block head_title %}{% trans "Media Items" %} - {{ block.super }}{% endblock %} + +{% block title %} + item {% trans "Media Items" %} +{% endblock %} + +{% block title_buttons %} + {% trans "All" %} + {% trans "Sounds" %} + {% if user.is_authenticated and perms.telemeta.add_mediaitem %} + {% trans "Add" %} + {% endif %} +{% endblock %} + +{% block content %} +{% with object_list as items %} +
    +{% include "telemeta/inc/mediaitem_list.html" %} +
    +{% endwith %} +{% endblock %} diff --git a/telemeta/templates/telemeta/mediaitem_performances_edit.html b/telemeta/templates/telemeta/mediaitem_performances_edit.html index d01dd245..a12ff3fe 100644 --- a/telemeta/templates/telemeta/mediaitem_performances_edit.html +++ b/telemeta/templates/telemeta/mediaitem_performances_edit.html @@ -1 +1,50 @@ -{% extends "telemeta_default/mediaitem_performances_edit.html" %} +{% extends "telemeta/mediaitem_detail.html" %} +{% load i18n %} +{% load telemeta_utils %} + +{% block extra_javascript %}{% endblock %} + +{% block title %} + Item : {{ item }} +{% endblock %} + +{% block title_buttons %} + {% trans "Cancel" %} +{% endblock %} + +{% block content %} + {% block infos %} +
    +
    {% csrf_token %} + + {{ formset.management_form }} + {% for form in formset.forms %} +
    + + + {% for field in form %} + + {% if not "media_item" in field.html_name %} + {% if "id" in field.html_name %} + + {% else %} + + {% endif %} + {% else %} + + {% endif %} + + {% endfor %} +
    {% trans "Performance" %} :
    {{ field.label_tag.as_hidden }}{{ field.as_hidden }}{{ field.label_tag }}: {{ field }}{{ field.label_tag.as_hidden }}{{ field.as_hidden }}
    +
    + {% endfor %} +
    + {% trans "Cancel" %} + {% trans "Save" %} +
    +
    +
    + {% endblock infos %} +{% endblock content %} diff --git a/telemeta/templates/telemeta/mediaitem_player.html b/telemeta/templates/telemeta/mediaitem_player.html index 2b8b1a1a..0c4149ee 100644 --- a/telemeta/templates/telemeta/mediaitem_player.html +++ b/telemeta/templates/telemeta/mediaitem_player.html @@ -1 +1,44 @@ -{% extends "telemeta_default/mediaitem_player.html" %} +{% extends "telemeta/mediaitem_detail.html" %} +{% load telemeta_utils %} +{% load i18n %} + + +{% block stylesheets %} +{{ block.super }} + +{% endblock %} + +{% block title %}{% endblock %} +{% block title_buttons %}{% endblock %} + +{% block layout %} +{% block content %} +
    +{% if item.file %} + {% if public_access or user.is_staff %} +
    +
    +
    +
    +
    +
    +
    + {% organization %} - Item : {% if item.code %}{{ item.code }}{% else %}{{ item.old_code }}{% endif %} + Telemeta powered +
    +
    + {% endif %} +{% endif %} +
    + +{% endblock content%} +{% endblock layout %} + +{% block footer %}{% endblock %} diff --git a/telemeta/templates/telemeta/mediaitem_related_edit.html b/telemeta/templates/telemeta/mediaitem_related_edit.html index 6b318a9e..506d279e 100644 --- a/telemeta/templates/telemeta/mediaitem_related_edit.html +++ b/telemeta/templates/telemeta/mediaitem_related_edit.html @@ -1 +1,47 @@ -{% extends "telemeta_default/mediaitem_related_edit.html" %} +{% extends "telemeta/mediaitem_detail.html" %} +{% load i18n %} +{% load telemeta_utils %} + +{% block extra_javascript %}{% endblock %} + +{% block title %} + Item : {{ item }} +{% endblock %} + +{% block title_buttons %} + {% trans "Cancel" %} +{% endblock %} + +{% block content %} + {% block infos %} +
    +
    {% csrf_token %} + + {{ formset.management_form }} + {% for form in formset.forms %} +
    + + + {% for field in form %} + + + {% if "media_item" in field.html_name or "id" in field.html_name or "item" in field.html_name or "mime_type" in field.html_name %} + + {% else %} + + {% endif %} + + {% endfor %} +
    {% trans "Media" %} :
    {{ field.errors }}
    {{ field.label_tag.as_hidden }}{{ field.as_hidden }}{{ field.label_tag }}: {{ field }}
    +
    + {% endfor %} +
    + {% trans "Cancel" %} + {% trans "Save" %} +
    +
    +
    + {% endblock infos %} +{% endblock content %} diff --git a/telemeta/templates/telemeta/mediaitem_xspf.xml b/telemeta/templates/telemeta/mediaitem_xspf.xml index f4b9b65e..f899cbec 100644 --- a/telemeta/templates/telemeta/mediaitem_xspf.xml +++ b/telemeta/templates/telemeta/mediaitem_xspf.xml @@ -1 +1,13 @@ -{% extends "telemeta_default/mediaitem_xspf.xml" %} +{% extends "telemeta/base_xspf.xml" %} +{% load telemeta_utils %} + +{% block tracklist %} + + {{ item }} + mp3 + http://{{ host }}{% url telemeta-item-export item.public_id,"mp3" %} + {{ item.get_duration|mul:1000 }} + http://{{ host }}{% url telemeta-item-detail item.public_id %} + +{% endblock %} + diff --git a/telemeta/templates/telemeta/messages.html b/telemeta/templates/telemeta/messages.html index 787f796a..c0442bea 100644 --- a/telemeta/templates/telemeta/messages.html +++ b/telemeta/templates/telemeta/messages.html @@ -1 +1,12 @@ -{% extends "telemeta_default/messages.html" %} +{% extends "telemeta/base.html" %} +{% load i18n %} + +{% block content %} +{% if messages %} + {% for message in messages %} +

    {{ message }}

    +

    {{ description }} + {% endfor %} +{% endif %} +{% endblock %} + diff --git a/telemeta/templates/telemeta/paginator.html b/telemeta/templates/telemeta/paginator.html index 98e2779c..e47187d6 100644 --- a/telemeta/templates/telemeta/paginator.html +++ b/telemeta/templates/telemeta/paginator.html @@ -1 +1,24 @@ -{% extends "telemeta_default/paginator.html" %} +{% load telemeta_utils %} +{% load i18n %} + +{% if has_previous %} + < {% trans "Previous" %} +{% endif %} + +{% if show_first %} +1 ... +{% endif %} +{% for linkpage in page_numbers %} + {% ifequal linkpage page %} + {{ page }} + {% else %} + {{ linkpage }} + {% endifequal %} +{% endfor %} +{% if show_last %} + ... + {{ pages }} +{% endif %} +{% if has_next %} + {% trans "Next" %} > +{% endif %} diff --git a/telemeta/templates/telemeta/profile_detail.html b/telemeta/templates/telemeta/profile_detail.html index 45611525..b24b0860 100644 --- a/telemeta/templates/telemeta/profile_detail.html +++ b/telemeta/templates/telemeta/profile_detail.html @@ -1 +1,71 @@ -{% extends "telemeta_default/profile_detail.html" %} +{% extends "telemeta/base.html" %} +{% load i18n %} +{% load telemeta_utils %} + +{% block head_title %}{% trans "User Profile" %} : {{ usr.username }}{% endblock %} + +{% block title %} + user {% trans "User profile" %} : {{ usr.username }} +{% endblock %} + +{% block content %} +

    + {% block modules %} +
    +

    playlists + {% trans "Playlists" %}

    +
      + {% for p in playlists %} +
    • + {{ p.playlist.title }} +
      + {{ p.playlist.description }} +
      • + {% endfor %} +
    +
    + {% endblock %} +
    + +
    +
    +
    {% trans "First Name" %}
    {{ usr.first_name }}
    +
    {% trans "Last Name" %}
    {{ usr.last_name }}
    +
    {% trans "Email" %}
    {{ usr.email }}
    + +
    {% trans "Institution" %}
    {% if profile %}{{ profile.institution }}{% endif %}
    +
    {% trans "Function" %}
    {% if profile %}{{ profile.function }}{% endif %}
    +
    {% trans "Address" %}
    {% if profile %}{{ profile.address }}{% endif %}
    +
    {% trans "Telephone" %}
    {% if profile %}{{ profile.telephone }}{% endif %}
    +
    {% trans "Expiration date" %}
    {% if profile %}{{ profile.expiration_date }}{% endif %}
    + +
    {% trans "Is staff" %}
    {{ usr.is_staff }}
    +
    {% trans "Is superuser" %}
    {{ usr.is_superuser }}
    +
    {% blocktrans count user.groups.all.count as counter %}Group{% plural %}Groups{% endblocktrans %}
    {% for group in usr.groups.all %}{{ group }} {% endfor %}
    +
    {% trans "Last login" %}
    {{ usr.last_login }}
    + {% if user.is_authenticated and user.username == usr.username %} +
    {% trans "Language" %}
    {% csrf_token %} + + + {% trans "Apply" %} +
    +
    + {% endif %} +
    +
    + + {% if user.is_authenticated and user.username == usr.username or user.is_staff %} + {% trans "Edit" %} + {% endif %} + {% if user.is_authenticated and user.username == usr.username %} + {% trans "Change password" %} + {% endif %} + + +{% endblock %} + diff --git a/telemeta/templates/telemeta/profile_edit.html b/telemeta/templates/telemeta/profile_edit.html index 5b952804..3a64c7e5 100644 --- a/telemeta/templates/telemeta/profile_edit.html +++ b/telemeta/templates/telemeta/profile_edit.html @@ -1 +1,35 @@ -{% extends "telemeta_default/profile_edit.html" %} +{% extends "telemeta/profile_detail.html" %} +{% load i18n %} +{% load telemeta_utils %} + +{% block title_buttons %} + {% trans "Cancel" %} +{% endblock %} + +{% block content %} +
    +
    {% csrf_token %} + + {% for form in forms %} + {% for field in form %} + {% if not field.html_name in user_hidden_fields %} + + + + + {% else %} + + + + {% endif %} + {% endfor %} + {% endfor %} +
    {{ field.errors }}
    {% trans field.label_tag %} : {{ field }}
    {{ field.label_tag.as_hidden }}{{ field.as_hidden }}
    +
    + {% trans "Cancel" %} + {% trans "Save" %} +
    +
    +
    +{% endblock %} diff --git a/telemeta/templates/telemeta/registration/logged_out.html b/telemeta/templates/telemeta/registration/logged_out.html index 12e792ac..8a31a2c0 100644 --- a/telemeta/templates/telemeta/registration/logged_out.html +++ b/telemeta/templates/telemeta/registration/logged_out.html @@ -1,8 +1,6 @@ {% extends "telemeta/base.html" %} {% load i18n %} -{% block breadcrumbs %}
    {% trans 'Home' %}
    {% endblock %} - {% block content %}

    {% trans "Thanks for spending some quality time with the Web site today." %}

    diff --git a/telemeta/templates/telemeta/registration/password_change_done.html b/telemeta/templates/telemeta/registration/password_change_done.html index 63bc2191..075a6855 100644 --- a/telemeta/templates/telemeta/registration/password_change_done.html +++ b/telemeta/templates/telemeta/registration/password_change_done.html @@ -1 +1,11 @@ -{% extends "telemeta_default/registration/password_change_done.html" %} \ No newline at end of file +{% extends "telemeta/base.html" %} +{% load i18n %} +{% block userlinks %}{% url django-admindocs-docroot as docsroot %}{% if docsroot %}{% trans 'Documentation' %} / {% endif %}{% trans 'Change password' %} / {% trans 'Log out' %}{% endblock %} + +{% block title %}
    {% trans 'Password change successful' %}{% endblock %} + +{% block content %} + +

    {% trans 'Your password was changed.' %}

    + +{% endblock %} diff --git a/telemeta/templates/telemeta/registration/password_change_form.html b/telemeta/templates/telemeta/registration/password_change_form.html index c2f232c2..79274dbb 100644 --- a/telemeta/templates/telemeta/registration/password_change_form.html +++ b/telemeta/templates/telemeta/registration/password_change_form.html @@ -1 +1,49 @@ -{% extends "telemeta_default/registration/password_change_form.html" %} \ No newline at end of file +{% extends "telemeta/base.html" %} +{% load i18n adminmedia %} +{% block extrastyle %}{{ block.super }}{% endblock %} +{% block userlinks %}{% url django-admindocs-docroot as docsroot %}{% if docsroot %}{% trans 'Documentation' %} / {% endif %} {% trans 'Change password' %} / {% trans 'Log out' %}{% endblock %} + +{% block title %}
    {% trans 'Password change' %}{% endblock %} + +{% block content %}
    + +
    {% csrf_token %} +
    +{% if form.errors %} +

    + {% blocktrans count form.errors.items|length as counter %}Please correct the error below.{% plural %}Please correct the errors below.{% endblocktrans %} +

    +{% endif %} + +

    {% trans "Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly." %}

    + +
    + +
    + {{ form.old_password.errors }} + {{ form.old_password }} +
    + +
    + {{ form.new_password1.errors }} + {{ form.new_password1 }} +
    + +
    +{{ form.new_password2.errors }} + {{ form.new_password2 }} +
    + +
    + +
    +
    + {% trans 'Change my password' %} +
    + + +
    +
    + +{% endblock %} diff --git a/telemeta/templates/telemeta/registration/password_reset_complete.html b/telemeta/templates/telemeta/registration/password_reset_complete.html index 069712c9..d32849ff 100644 --- a/telemeta/templates/telemeta/registration/password_reset_complete.html +++ b/telemeta/templates/telemeta/registration/password_reset_complete.html @@ -1 +1,9 @@ -{% extends "telemeta_default/registration/password_reset_complete.html" %} \ No newline at end of file +{% extends "telemeta/base.html" %} +{% load i18n %} + +{% block title %}
    {% trans 'Password reset complete' %}{% endblock %} + +{% block content %} +

    {% trans "Your password has been set. You may go ahead and log in now." %}

    +

    {% trans 'Log in' %}

    +{% endblock %} diff --git a/telemeta/templates/telemeta/registration/password_reset_confirm.html b/telemeta/templates/telemeta/registration/password_reset_confirm.html index cf76fccf..9a8b6829 100644 --- a/telemeta/templates/telemeta/registration/password_reset_confirm.html +++ b/telemeta/templates/telemeta/registration/password_reset_confirm.html @@ -1 +1,23 @@ -{% extends "telemeta_default/registration/password_reset_confirm.html" %} \ No newline at end of file +{% extends "telemeta/base.html" %} +{% load i18n %} + +{% block title %}
    {% trans 'Password reset' %}{% endblock %} + +{% block content %} +{% if validlink %} +

    {% trans "Please enter your new password twice so we can verify you typed it in correctly." %}

    + +
    {% csrf_token %} +{{ form.new_password1.errors }} +

    {{ form.new_password1 }}

    +{{ form.new_password2.errors }} +

    {{ form.new_password2 }}

    +

    {% trans 'Change my password' %}

    +
    + +{% else %} +

    {% trans 'Password reset unsuccessful' %}

    +

    {% trans "The password reset link was invalid, possibly because it has already been used. Please request a new password reset." %}

    + +{% endif %} +{% endblock %} diff --git a/telemeta/templates/telemeta/registration/password_reset_done.html b/telemeta/templates/telemeta/registration/password_reset_done.html index d32a6dde..88a57c46 100644 --- a/telemeta/templates/telemeta/registration/password_reset_done.html +++ b/telemeta/templates/telemeta/registration/password_reset_done.html @@ -1 +1,8 @@ -{% extends "telemeta_default/registration/password_reset_done.html" %} \ No newline at end of file +{% extends "telemeta/base.html" %} +{% load i18n %} + +{% block title %}
    {% trans 'Password reset successful' %}{% endblock %} + +{% block content %} +

    {% trans "We've e-mailed you instructions for setting your password to the e-mail address you submitted. You should be receiving it shortly." %}

    +{% endblock %} diff --git a/telemeta/templates/telemeta/registration/password_reset_email.html b/telemeta/templates/telemeta/registration/password_reset_email.html index 7c1c2731..3b786ac4 100644 --- a/telemeta/templates/telemeta/registration/password_reset_email.html +++ b/telemeta/templates/telemeta/registration/password_reset_email.html @@ -1 +1,15 @@ -{% extends "telemeta_default/registration/password_reset_email.html" %} \ No newline at end of file +{% load i18n %}{% autoescape off %} +{% trans "You're receiving this e-mail because you requested a password reset" %} +{% blocktrans %}for your user account at {{ site_name }}{% endblocktrans %}. + +{% trans "Please go to the following page and choose a new password:" %} +{% block reset_link %} +{{ protocol }}://{{ domain }}{% url telemeta-password-reset-confirm uidb36=uid token=token %} +{% endblock %} +{% trans "Your username, in case you've forgotten:" %} {{ user.username }} + +{% trans "Thanks for using our site!" %} + +{% blocktrans %}The {{ site_name }} team{% endblocktrans %} + +{% endautoescape %} diff --git a/telemeta/templates/telemeta/registration/password_reset_form.html b/telemeta/templates/telemeta/registration/password_reset_form.html index f02a94c9..6da1b847 100644 --- a/telemeta/templates/telemeta/registration/password_reset_form.html +++ b/telemeta/templates/telemeta/registration/password_reset_form.html @@ -1 +1,13 @@ -{% extends "telemeta_default/registration/password_reset_form.html" %} \ No newline at end of file +{% extends "telemeta/base.html" %} +{% load i18n %} + +{% block title %}
    {% trans "Password reset" %}{% endblock %} + +{% block content %} +

    {% trans "Forgotten your password? Enter your e-mail address below, and we'll e-mail instructions for setting a new one." %}

    + +
    {% csrf_token %} +{{ form.email.errors }} +

    {{ form.email }} {% trans 'Reset my password' %}

    +
    +{% endblock %} diff --git a/telemeta/templates/telemeta/resource_add.html b/telemeta/templates/telemeta/resource_add.html new file mode 100644 index 00000000..23ddb224 --- /dev/null +++ b/telemeta/templates/telemeta/resource_add.html @@ -0,0 +1,36 @@ +{% extends "telemeta/resource_detail.html" %} +{% load i18n %} +{% load telemeta_utils %} + +{% block title %} + {{ type }} : {% trans "New" %} +{% endblock %} + +{% block title_buttons %} + {% trans "Cancel" %} +{% endblock %} + + +{% block infos %} +
    +
    {% csrf_token %} + + + {% for field in form %} + + + + + {% endfor %} +
    {% for error in form.non_field_errors %}
  • {{ error }}
    • {% endfor %}
    {{ field.errors }}
    {{ field.label_tag }}: {{ field }}
    +
    + {% trans "Cancel" %} + {% trans "Save" %} +
    +
    +
    +{% endblock infos%} + +{% block delete %} +{% endblock %} diff --git a/telemeta/templates/telemeta/resource_detail.html b/telemeta/templates/telemeta/resource_detail.html new file mode 100644 index 00000000..b36604d6 --- /dev/null +++ b/telemeta/templates/telemeta/resource_detail.html @@ -0,0 +1,74 @@ +{% extends "telemeta/base.html" %} +{% load i18n %} +{% load telemeta_utils %} + +{% block head_title %}{% trans type %}{{resource|prepend:' : '}} - {{ block.super }}{% endblock %} + +{% block extra_javascript %} +{% endblock %} + +{% if resource %} + +{% block title %} + + {{ type|capitalize }} : + {{ resource.title }} +{% endblock %} + +{% block title_buttons %} +
    + {% if user.is_authenticated and perms.telemeta.change_mediaresource %} + {% trans "Edit" %} + {% trans "Copy" %} + {% endif %} + {% if user.is_authenticated %} + {% trans "Add to playlist" %} + {% endif %} + Dublin Core +
    +{% endblock %} + +{% block content %} + {% block infos %} +
    + +
    +
    + {% block general_info %} +
    + {% dl_field resource "reference" %} + {% dl_field resource "title" %} + {% dl_field resource "description" %} + {% dl_field resource "code" %} +
    + {% endblock general_info %} + +
    + {% block related %} + {% include "telemeta/inc/resource_related.html" %} + {% endblock related %} +
    + +
    +

    {{resource.children_type|capitalize }}

    + {% with resource.children.all as children %} + {% include "telemeta/inc/children_list.html" %} + {% endwith %} +
    + + {% endblock infos %} +
    +{% endblock %} + +{% block delete %} +{% if user.is_authenticated and perms.telemeta.delete_mediaresource %} + {% trans "Delete" %} +{% endif %} + +{% endblock %} + +{% else %} +

    No such resource

    +{% endif %} + diff --git a/telemeta/templates/telemeta/resource_edit.html b/telemeta/templates/telemeta/resource_edit.html new file mode 100644 index 00000000..6996ba24 --- /dev/null +++ b/telemeta/templates/telemeta/resource_edit.html @@ -0,0 +1,34 @@ +{% extends "telemeta/resource_detail.html" %} +{% load i18n %} +{% load telemeta_utils %} + +{% block title %} + {{ type }} : {{ resource }} +{% endblock %} +{% block title_buttons %} + {% trans "Cancel" %} +{% endblock %} + +{% block infos %} +
    +
    {% csrf_token %} + + + {% for field in form %} + + + + + {% endfor %} +
    {% for error in form.non_field_errors %}
  • {{ error }}
    • {% endfor %}
    {{ field.errors }}
    {{ field.label_tag }}: {{ field }}
    +
    + {% trans "Cancel" %} + {% trans "Save" %} +
    +
    +
    +{% endblock infos%} + +{% block delete %} +{% endblock %} diff --git a/telemeta/templates/telemeta/resource_list.html b/telemeta/templates/telemeta/resource_list.html new file mode 100644 index 00000000..47820da9 --- /dev/null +++ b/telemeta/templates/telemeta/resource_list.html @@ -0,0 +1,23 @@ +{% extends "telemeta/base.html" %} +{% load telemeta_utils %} +{% load i18n %} + +{% block head_title %}{% trans type %} - {{ block.super }}{% endblock %} + +{% block title%} + {{ type|capitalize }} +{% endblock %} + +{% block title_buttons %} + {% if user.is_authenticated and perms.telemeta.add_mediacollection %} + {% trans "Add" %} + {% endif %} +{% endblock %} + +{% block content %} +{% with object_list as resources and type as type %} +
    +{% include "telemeta/inc/resource_list.html" %} +
    +{% endwith %} +{% endblock %} diff --git a/telemeta/templates/telemeta/resource_related_edit.html b/telemeta/templates/telemeta/resource_related_edit.html new file mode 100644 index 00000000..35c4afc9 --- /dev/null +++ b/telemeta/templates/telemeta/resource_related_edit.html @@ -0,0 +1,47 @@ +{% extends "telemeta/resource_detail.html" %} +{% load i18n %} +{% load telemeta_utils %} + +{% block extra_javascript %}{% endblock %} + +{% block title %} + {{ type|capitalize }} : {{ resource }} +{% endblock %} + +{% block title_buttons %} + {% trans "Cancel" %} +{% endblock %} + +{% block content %} + {% block infos %} +
    +
    {% csrf_token %} + + {{ formset.management_form }} + {% for form in formset.forms %} +
    + + + {% for field in form %} + + + {% if "resource" in field.html_name or "id" in field.html_name or "mime_type" in field.html_name %} + + {% else %} + + {% endif %} + + {% endfor %} +
    {% trans "Media" %} :
    {{ field.errors }}
    {{ field.label_tag.as_hidden }}{{ field.as_hidden }}{{ field.label_tag }}: {{ field }}
    +
    + {% endfor %} +
    + {% trans "Cancel" %} + {% trans "Save" %} +
    +
    +
    + {% endblock infos %} +{% endblock content %} diff --git a/telemeta/templates/telemeta/search_criteria.html b/telemeta/templates/telemeta/search_criteria.html index 7f1b05a0..6885f9e8 100644 --- a/telemeta/templates/telemeta/search_criteria.html +++ b/telemeta/templates/telemeta/search_criteria.html @@ -1 +1,142 @@ -{% extends "telemeta_default/search_criteria.html" %} +{% extends "telemeta/base.html" %} +{% load telemeta_utils %} +{% load i18n %} + +{% block head_title %}{% trans "Advanced Search" %} - {{ block.super }}{% endblock %} + +{% block stylesheets %} +{{ block.super }} + +{% endblock %} + +{% block extra_javascript %} + + + +{% endblock %} + +{% block title %} + advanced-search {% trans "Advanced Search" %} +{% endblock %} + +{% block content %} +
    {% csrf_token %} +
    + +

    + + +

    + +

    + + +

    + +

    + + +

    + +

    + + +

    + +

    + + +

    + + {% if rec_years %} +

    + + + {% trans "to" %} + +

    + {% endif %} + + {% if pub_years %} +

    + + + {% trans "to" %} + +

    + {% endif %} + +

    + +

    + +
    + +

    +{% trans 'Search' %} +

    + +
    +{% endblock %} diff --git a/telemeta/templates/telemeta/search_results.html b/telemeta/templates/telemeta/search_results.html index 846d4110..ced78171 100644 --- a/telemeta/templates/telemeta/search_results.html +++ b/telemeta/templates/telemeta/search_results.html @@ -1 +1,85 @@ -{% extends "telemeta_default/search_results.html" %} +{% extends "telemeta/base.html" %} +{% load telemeta_utils %} +{% load i18n %} + +{% block head_title %}{% trans "Search Results" %} - {{ block.super }}{% endblock %} + +{% block title %} + search-results {% trans "Search Results" %} +{% endblock %} + +{% block title_buttons %} + {% ifequal type 'items' %} + {% trans "All" %} + {% trans "Sounds" %} + {% else %} + {% trans "All" %} + {% trans "Sounds" %} + {% endifequal %} +{% endblock %} + +{% block content %} +{% if criteria %} + +{% endif %} + +{% ifequal type 'items' %} + +

    Collections ({{collections_num}}) | Items ({{items_num}})

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

    Collections ({{collections_num}}) | Items ({{items_num}}) +

    + + {% with object_list as collections %} +
    + {% include "telemeta/inc/collection_list.html" %} +
    + {% endwith %} + +{% endifequal %} + +{% endblock %} diff --git a/telemeta/templates/telemeta/users.html b/telemeta/templates/telemeta/users.html index 8a03ebf4..4f73df1e 100644 --- a/telemeta/templates/telemeta/users.html +++ b/telemeta/templates/telemeta/users.html @@ -1 +1,18 @@ -{% extends "telemeta_default/users.html" %} +{% extends "telemeta/base.html" %} +{% load i18n %} +{% load telemeta_utils %} + +{% block head_title %}{% trans "Users" %} - {{ block.super }}{% endblock %} + +{% block title %} + user {% trans "Users" %} +{% endblock %} + +{% block content %} + {% if users %} +
    + {% include "telemeta/inc/user_list.html" %} + {% else %} +

    {% trans "No users" %}

    + {% endif %} +{% endblock %} diff --git a/telemeta/templates/telemeta_default/admin.html b/telemeta/templates/telemeta_default/admin.html deleted file mode 100644 index ff32173e..00000000 --- a/telemeta/templates/telemeta_default/admin.html +++ /dev/null @@ -1,32 +0,0 @@ -{% extends "telemeta/base.html" %} -{% load telemeta_utils %} -{% load i18n %} - -{% block stylesheets %} -{{ block.super }} - -{% endblock %} - -{% block title %} -

    {% trans "Administration" %}

    -{% endblock %} - -{% block content %} - -{% block tab %} -
    - -
    -{% endblock tab %} - -
    - {% block tabcontents %} - {% endblock %} -
    - -{% endblock %} diff --git a/telemeta/templates/telemeta_default/admin_enumerations.html b/telemeta/templates/telemeta_default/admin_enumerations.html deleted file mode 100644 index 9c68d74f..00000000 --- a/telemeta/templates/telemeta_default/admin_enumerations.html +++ /dev/null @@ -1,27 +0,0 @@ -{% extends "telemeta/admin.html" %} -{% load telemeta_utils %} -{% load i18n %} - -{% block tabcontents %} -

    {% trans "Enumerations" %}

    - -{% if enumerations %} - - - - - - {% for enum in enumerations %} - - {% endfor %} - -
    {% trans "Title"%}
    - {{ enum.name|capfirst }}
    - - {% else %} -

    {% trans "No enumerations" %}

    - {% endif %} - -{% endblock %} - - diff --git a/telemeta/templates/telemeta_default/admin_general.html b/telemeta/templates/telemeta_default/admin_general.html deleted file mode 100644 index ec562324..00000000 --- a/telemeta/templates/telemeta_default/admin_general.html +++ /dev/null @@ -1,6 +0,0 @@ -{% extends "telemeta/admin.html" %} -{% load i18n %} - -{% block tabcontents %} - - {% endif %} - {% endif %} - {% endif %} - - - {% endfor %} - - - - {% endif %} - {% if user.is_authenticated and perms.telemeta.change_mediacollection %} -
    {% trans "Edit"%} {% trans "related media"%} - {% endif %} - diff --git a/telemeta/templates/telemeta_default/inc/corpus_list.html b/telemeta/templates/telemeta_default/inc/corpus_list.html deleted file mode 100644 index 1e50ea36..00000000 --- a/telemeta/templates/telemeta_default/inc/corpus_list.html +++ /dev/null @@ -1,31 +0,0 @@ -{% load telemeta_utils %} -{% load i18n %} -{% if corpi %} -{% if hits %} - -

    -{% blocktrans %}Corpus {{ first_on_page }} to {{ last_on_page }} on {{ hits }}{% endblocktrans %} -| Pages : {% if pages == 1 %}1{% else %}{% if is_paginated %}{% load paginator %}{% paginator 5 %}{% endif %}{% endif %} -

    -{% endif %} - - - - - - - -{% for corpus in corpi %} - - - - - -{% endfor %} -
    {% trans "Title" %}{% trans "Description" %}{% trans "Code" %}{% trans "Reference" %}
    - {{ corpus.title }} - {{ corpus.code }}{{ corpus.reference }}
    -{% else %} -

    {% trans "No corpus" %}

    -{% endif %} - diff --git a/telemeta/templates/telemeta_default/inc/dublincore.html b/telemeta/templates/telemeta_default/inc/dublincore.html deleted file mode 100644 index 9d2a151f..00000000 --- a/telemeta/templates/telemeta_default/inc/dublincore.html +++ /dev/null @@ -1,21 +0,0 @@ -{% load telemeta_utils %} -{% load i18n %} - -

    {% trans "Dublin Core Metadata" %}

    -
    -
    ElementRefinement
    Value
    - {% for element in resource.elements %} -
    {{ element.name }}{{ element.refinement|default:" " }}
    -
    - {% if element.related|is_item or element.related|is_collection %} - {% if element.related|is_item %} - {{ element.value }} - {% else %} - {{ element.value }} - {% endif %} - {% else %} - {{ element.value }} - {% endif %} -
    - {% endfor %} -
    diff --git a/telemeta/templates/telemeta_default/inc/fund_list.html b/telemeta/templates/telemeta_default/inc/fund_list.html deleted file mode 100644 index 00f5e8d2..00000000 --- a/telemeta/templates/telemeta_default/inc/fund_list.html +++ /dev/null @@ -1,31 +0,0 @@ -{% load telemeta_utils %} -{% load i18n %} -{% if funds %} -{% if hits %} - -

    -{% blocktrans %}Funds {{ first_on_page }} to {{ last_on_page }} on {{ hits }}{% endblocktrans %} -| Pages : {% if pages == 1 %}1{% else %}{% if is_paginated %}{% load paginator %}{% paginator 5 %}{% endif %}{% endif %} -

    -{% endif %} - - - - - - - -{% for fund in funds %} - - - - - -{% endfor %} -
    {% trans "Title" %}{% trans "Description" %}{% trans "Code" %}{% trans "Reference" %}
    - {{ fund.title }} - {{ fund.code }}{{ fund.reference }}
    -{% else %} -

    {% trans "No fund" %}

    -{% endif %} - diff --git a/telemeta/templates/telemeta_default/inc/mediaitem_list.html b/telemeta/templates/telemeta_default/inc/mediaitem_list.html deleted file mode 100644 index cc09245c..00000000 --- a/telemeta/templates/telemeta_default/inc/mediaitem_list.html +++ /dev/null @@ -1,60 +0,0 @@ -{% load telemeta_utils %} -{% load i18n %} -{% if items %} - -{% if hits %} -

    -{% blocktrans %}Items {{ first_on_page }} to {{ last_on_page }} on {{ hits }}{% endblocktrans %} -| Pages : {% if pages == 1 %}1{% else %}{% if is_paginated %}{% load paginator %}{% paginator 5 %}{% endif %}{% endif %} -

    -{% endif %} - - - - - - - {% if location_name %} - - {% else %} - - {% endif %} - - - -{% for item in items %} - - - - - {% if location_name %} - - {% else %} - - {% endif %} - - - -{% endfor %} -
    {% trans "Title" %}{% trans "Code" %}{% trans "Recordist" %}{% trans "Location" %}{% trans "Country/Continent" %}{% trans "Year of recording" %}{% trans "Sound" %}
    - {{ item }} - - {{ item.code|default:item.old_code }} - {{ item.apparent_collector }}{{ item.location.name }}{{ item.country_or_continent|default:' ' }} - {% if item.recorded_from_date %} - {{ item.recorded_from_date.year }} - {% if item.recorded_to_date and not item.recorded_to_date.year|equals:item.recorded_from_date.year %} - - {{ item.recorded_to_date.year }} - {% endif %} - {% endif %} - - {% if item.file %} - - yes - {% endif %} -
    - -{% else %} -

    {% trans "No item" %}

    -{% endif %} - diff --git a/telemeta/templates/telemeta_default/inc/mediaitem_related.html b/telemeta/templates/telemeta_default/inc/mediaitem_related.html deleted file mode 100644 index ecb5448e..00000000 --- a/telemeta/templates/telemeta_default/inc/mediaitem_related.html +++ /dev/null @@ -1,83 +0,0 @@ -{% load i18n %} -{% load telemeta_utils %} - -
    -

    {% trans "Related media" %}

    - {% if related_media %} -
    - - - - - - - - - {% for media in related_media %} - - - - - - {% endfor %} - -
    {% trans "Media" %}{% trans "Preview" %}
    -
    -
    {% trans "Title" %}
    -
    - {% if media.url %} - - {% if media.title %} - {{ media.title }} - {% else %} - {{ media.url|get_filename }} - {% endif %} - {% else %} - - {% if media.title %} - {{ media.title }} - {% else %} - {{ media.file|get_filename }} - {% endif %} - {% endif %} -
    -
    {% trans "Description" %}
    -
    {{ media.description|html_line_break|safe }}
    -
    {% trans "Credits" %}
    -
    {{ media.credits }}
    - {% dl_field media "mime_type" %} -
    {% trans "URL" %}
    -
    - {% if media.url %} - {{ media.url }} - {% else %} - {% if media.file %} - - {% url telemeta-item-related item.public_id media.id %} - - {% endif %} - {% endif %} -
    -
    -     		{% if media.is_image %} - {% if media.url %} - - - {% else %} - - - {% endif %} - {% else %} - {% if media.url %} - {% if "youtu" in media.url %} - - {% endif %} - {% endif %} - {% endif %} -
    -
    - {% endif %} - {% if user.is_authenticated and perms.telemeta.change_mediaitem %} -
    {% trans "Edit"%} {% trans "related media"%} - {% endif %} -
    diff --git a/telemeta/templates/telemeta_default/inc/module_revisions.html b/telemeta/templates/telemeta_default/inc/module_revisions.html deleted file mode 100644 index 5df16154..00000000 --- a/telemeta/templates/telemeta_default/inc/module_revisions.html +++ /dev/null @@ -1,42 +0,0 @@ -{% load telemeta_utils %} -{% load i18n %} - -
    -

    - rss - {% trans "Last changes" %}

    -    -
    - - - - - - - - {% for r in revisions %} - - - - - - - {% endfor %} -
    {% trans "Date" %}{% trans "Title" %}{% trans "Type" %}{% trans "User" %}
    {{ r.revision.time }} - {% if r.element %} - {% if r.revision.element_type == "collection" %} - {{ r.element.title }} - {% endif %} - {% if r.revision.element_type == "item" %} - - {% if r.element.title != '' %}{{ r.element.title }}{% else %}{{ r.element.collection.title }} - {{ r.element.track }}{% endif %} - {% endif %} - {% if r.revision.element_type == "marker" %} - {{ r.element.title }} - {% endif %} - {% else %} - {% trans "deleted" %} - {% endif %} - {{ r.revision.element_type }}{% if r.revision.user %}{{ r.revision.user.username }}{% endif %}
    -
    -
    \ No newline at end of file diff --git a/telemeta/templates/telemeta_default/inc/user_list.html b/telemeta/templates/telemeta_default/inc/user_list.html deleted file mode 100644 index a82240a9..00000000 --- a/telemeta/templates/telemeta_default/inc/user_list.html +++ /dev/null @@ -1,23 +0,0 @@ -{% load i18n %} -{% load telemeta_utils %} - - - - - - - - - - - {% for user in users %} - - - - - - - - {% endfor %} - -
    {% trans "User"%}{% trans "First Name"%}{% trans "Last Name"%}{% trans "E-mail"%}{% trans "Groups"%}
    {{user.username}}{{ user.first_name }}{{ user.last_name }}{{ user.email }}{% for group in user.groups.all %}{{ group }} {% endfor %}
    \ No newline at end of file diff --git a/telemeta/templates/telemeta_default/index.html b/telemeta/templates/telemeta_default/index.html deleted file mode 100644 index a5bf2dc2..00000000 --- a/telemeta/templates/telemeta_default/index.html +++ /dev/null @@ -1,69 +0,0 @@ -{% extends "telemeta/base.html" %} -{% load telemeta_utils %} -{% load i18n %} - -{% block content %} -
    -
    - -{% block modules %} - -{% if sound_pub_item %} -
    -

    playlist - {% trans "Musical selection" %}

    -
      -
    • {{ sound_pub_item }}{% if sound_pub_item.alt_title %} ({{ sound_pub_item.alt_title }}){% endif %}
      {{ sound_pub_item.location.fullnames|to_string }}
      - -
      • -
    -
    -{% endif %} - -
    -

    world - {% trans "Geo Navigator" %}

    - - {% trans -
    - -{% include "telemeta/inc/module_revisions.html" %} - -{{ block.super }} -
    -

    - Partenaires


    -
    - CNRS    - MCC   - MNHN -

    - TGE Adonis -
    -
    - -{% endblock %} - -
    - -
    -vox -{{ page_content|render_flatpage }} -
    - -{% if sound_pub_items %} -
    -

    playlists - {% trans "Musical selection" %}

    - -{% for item in sound_pub_items %} - -{% endfor %} - -
    {{ item }}{% if item.alt_title %} ({{ item.alt_title }}){% endif %}
    {{ item.location.fullnames|to_string }}
    -
    -
    -{% endif %} - -
    -{% endblock %} diff --git a/telemeta/templates/telemeta_default/instrument_edit.html b/telemeta/templates/telemeta_default/instrument_edit.html deleted file mode 100644 index 4988a6fa..00000000 --- a/telemeta/templates/telemeta_default/instrument_edit.html +++ /dev/null @@ -1,49 +0,0 @@ -{% extends "telemeta/admin.html" %} -{% load i18n %} - -{% block head_title %}{% trans "Instruments" %} - {{ block.super }}{% endblock %} - -{% block tabcontents %} -

    {% trans "Instruments" %}

    -
    {% csrf_token %} -
    - {% trans "Add entry" %} -
    - - -
    -
    -
    - {% trans "Add" %} -
    -
    -
    - {% if instruments %} -
    {% csrf_token %} - - - - - {% for record in instruments %} - - - - - {% endfor %} - -
     {% trans "Name"%}
    - {{record.name}}
    -
    -
    - {% trans "Remove selected items" %} -
    -
    - {% else %} -

    {% trans "This instrument list is empty" %}

    - {% endif %} - -
    -{% endblock %} diff --git a/telemeta/templates/telemeta_default/instrument_edit_value.html b/telemeta/templates/telemeta_default/instrument_edit_value.html deleted file mode 100644 index ca28c254..00000000 --- a/telemeta/templates/telemeta_default/instrument_edit_value.html +++ /dev/null @@ -1,26 +0,0 @@ -{% extends "telemeta/admin.html" %} -{% load i18n %} - -{% block head_title %}{% trans "Instruments" %} - {{ block.super }}{% endblock %} - -{% block tabcontents %} -

    {% trans "Instruments" %}

    -
    {% csrf_token %} -
    - {% trans "Modify an entry" %} -
    - - -
    -
    -
    - {% trans "Save" %} - {% trans "Cancel" %} -
    -
    -
    -
    -{% endblock %} diff --git a/telemeta/templates/telemeta_default/login.html b/telemeta/templates/telemeta_default/login.html deleted file mode 100644 index e4c58c07..00000000 --- a/telemeta/templates/telemeta_default/login.html +++ /dev/null @@ -1,24 +0,0 @@ -{% extends "telemeta/base.html" %} -{% load i18n %} - -{% block title %} - {% trans "User authentication" %} -{% endblock %} - -{% block content %} -{% if form.errors %} -

    {% trans "Your username and password didn't match. Please try again." %}

    -{% endif %} -
    {% csrf_token %} -

    -{{ form.username.label_tag }} -{{ form.username }}
    -{{ form.password.label_tag }} -{{ form.password }} -

    - - -{% trans "Password forgotten" %} ? -
    -{% endblock %} diff --git a/telemeta/templates/telemeta_default/mediaitem_add.html b/telemeta/templates/telemeta_default/mediaitem_add.html deleted file mode 100644 index ee05ac19..00000000 --- a/telemeta/templates/telemeta_default/mediaitem_add.html +++ /dev/null @@ -1,61 +0,0 @@ -{% extends "telemeta/base.html" %} -{% load telemeta_utils %} -{% load i18n %} - -{% block head_title %}{% trans "Item" %}- {{ block.super }}{% endblock %} - -{% if item %} -{% block title %} - item Item : NEW -{% endblock %} - -{% block title_buttons %} - {% if perms.telemeta.add_mediaitem %} - {% trans "Cancel" %} - {% endif %} -{% endblock %} - -{% block content %} - {% block infos %} -
    -
    {% csrf_token %} -
      {% for error in form.non_field_errors %}
    • {{ error }}
      • {% endfor %}
    - - {% for field in form %} - - {% if field.html_name == "copied_from_item" %} - - {% else %} - - - {% if field.html_name == "collection" %} - - {% else %} - - {% endif %} - {% endif %} - - {% endfor %} -
    {{ field.label_tag.as_hidden }}{{ field.as_hidden }}
    {{ field.errors }}
    {{ field.label_tag }}: {% trans "Title" %} : {{ item.collection.title }}
    -  {% trans "Code" %} : {{ item.collection.code }}
    - {{ field }}    		{{ field }}
    -
    - {% trans "Cancel" %} - {% trans "Save" %} - -
    -
    -
    - {% endblock infos %} - -{% endblock %} - -{% block delete %} -{% endblock %} - -{% else %} -

    No such item

    -{% endif %} diff --git a/telemeta/templates/telemeta_default/mediaitem_copy.html b/telemeta/templates/telemeta_default/mediaitem_copy.html deleted file mode 100644 index 64bbaac7..00000000 --- a/telemeta/templates/telemeta_default/mediaitem_copy.html +++ /dev/null @@ -1,56 +0,0 @@ -{% extends "telemeta/mediaitem_detail.html" %} -{% load telemeta_utils %} -{% load i18n %} - -{% block head_title %}{% trans "Item" %}- {{ block.super }}{% endblock %} - -{% block extra_javascript %} -{% endblock %} - -{% block title %} - item Item : NEW -{% endblock %} - -{% block title_buttons %} - {% if user.is_authenticated and perms.telemeta.add_mediaitem %} - {% trans "Cancel" %} - {% endif %} -{% endblock %} - -{% block content %} - {% block infos %} -
    -
    {% csrf_token %} -
      {% for error in form.non_field_errors %}
    • {{ error }}
      • {% endfor %}
    - - {% for field in form %} - - {% if field.html_name == "copied_from_item" %} - - {% else %} - - - {% if field.html_name == "collection" %} - - {% else %} - - {% endif %} - {% endif %} - - {% endfor %} -
    {{ field.label_tag.as_hidden }}{{ field.as_hidden }}
    {{ field.errors }}
    {{ field.label_tag }}: {% trans "Title" %} : {{ item.collection.title }}
    -  {% trans "Code" %} : {{ item.collection.code }}
    - {{ field }}    		{{ field }}
    -
    - {% trans "Cancel" %} - {% trans "Save" %} -
    -
    -
    - {% endblock infos %} -{% endblock %} - -{% block delete %} -{% endblock %} - diff --git a/telemeta/templates/telemeta_default/mediaitem_detail.html b/telemeta/templates/telemeta_default/mediaitem_detail.html deleted file mode 100644 index 927da5fc..00000000 --- a/telemeta/templates/telemeta_default/mediaitem_detail.html +++ /dev/null @@ -1,299 +0,0 @@ -{% extends "telemeta/base.html" %} -{% load telemeta_utils %} -{% load i18n %} - -{% block head_title %}{% trans "Item" %} : {% if item.title %}{{ item.title }}{% else %}{{ item.public_id}}{% endif %} - {{ block.super }}{% endblock %} - -{% block stylesheets %} -{{ block.super }} - - -{% endblock %} - -{% block extra_javascript %} -{% if item %} - -{% if item.file %} -{% if public_access or perms.telemeta.can_play_all_items %} - - -{% endif %} -{% endif %} - - - - -{% if item.file %} -{% if public_access or perms.telemeta.can_play_all_items %} - - -{% endif %} -{% endif %} - - -{% endif %} -{% endblock %} - -{% if item %} - -{% block title %} -item -Item : {{ item }} -{% endblock %} - -{% block title_buttons %} -
    - {% if user.is_authenticated and perms.telemeta.change_mediaitem %} - {% trans "Edit" %} - {% trans "Copy" %} - {% endif %} - {% if user.is_authenticated %} - {% trans "Add to playlist" %} - {% endif %} - {% trans "Previous" %} - {% trans "Next" %} - Dublin Core -
    -{% endblock %} - -{% block content %} -
    - {% if item.file %} - {% if public_access or perms.telemeta.can_play_all_items %} -
    - Minimize - </> -
    -
    -
    -
    - Maximize - </> -
    -
    -
    -
    - - - - -
    - -
    - - - - - - -
    {% trans "Property" %}{% trans "Value" %}{% trans "Unit" %}
    -
    - - - {% if audio_export_enabled or perms.telemeta.can_download_all_items or user.is_superuser %} -
    -

    download {% trans "Download:" %} - {% for format in export_formats %} - - {{ format.extension }} - {% endfor %}

    -
    - {% endif %} - -
    - {% endif %} - {% endif %} - - {% block infos %} -
    - {% block general_info %} -
    - {% dl_field item "title" placeholder %} - {% dl_field item "alt_title" %} - {% 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 %}
    - -
    - {% 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 %} -
    - {% if user.is_authenticated and perms.telemeta.change_mediaitem %} - {% trans "Edit" %} {% trans "keywords" %} - {% endif %} -
    - {% 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 %} -
    - {% if user.is_authenticated and perms.telemeta.change_mediaitem %} - {% trans "Edit"%} {% trans "performance"%} - {% endif %} -
    - {% block general_data %} -
    -

    {% trans "General informations" %}

    -
    -
    {% trans "Remarks" %}
    -
    {{ item.comment|html_line_break|safe }}
    - {% dl_field item "collector_selection" %} -
    -
    - {% endblock general_data %} -
    -
    - {% block archive_data %} -
    -

    {% trans "Archiving data" %}

    -
    - {% dl_field item "code" %} - {% dl_field item "old_code" %} - {% dl_field item "track" %} - {% dl_field item "creator_reference" %} -
    {% trans "Published references" %}
    -
    {{ item.external_references|html_line_break|safe }}
    - {% dl_field item "public_access_label" %} -
    -
    - {% endblock archive_data %} -
    -
    - {% block technical_data %} -
    -

    {% trans "Technical data" %}

    -
    -
    -
    {% trans "Media type" %}
    {% trans "Audio" %}
    - {% dl_field item "approx_duration" %} -
    -
    -
    - {% endblock technical_data %} -
    - {% endblock infos %} -
    - -
    - {% block related %} - {% include "telemeta/inc/mediaitem_related.html" %} - {% endblock related %} -
    - -{% endblock %} - -{% block delete %} -{% if user.is_authenticated and perms.telemeta.delete_mediaitem %} - {% trans "Delete" %} -{% endif %} -{% endblock %} - -{% else %} -

    No such item

    -{% endif %} diff --git a/telemeta/templates/telemeta_default/mediaitem_detail_dc.html b/telemeta/templates/telemeta_default/mediaitem_detail_dc.html deleted file mode 100644 index d745dc67..00000000 --- a/telemeta/templates/telemeta_default/mediaitem_detail_dc.html +++ /dev/null @@ -1,20 +0,0 @@ -{% extends "telemeta/mediaitem_detail.html" %} -{% load telemeta_utils %} -{% load i18n %} - -{% if item %} -{% block title_buttons %} - {% trans "Normal View" %} -{% endblock %} - -{% block infos %} -{% with item|to_dublincore as resource %} -{% include "telemeta/inc/dublincore.html" %} -{% endwith %} -{% endblock %} -{% else %} -

    {% trans "No such item" %}

    -{% endif %} - -{% block related %} -{% endblock related %} diff --git a/telemeta/templates/telemeta_default/mediaitem_edit.html b/telemeta/templates/telemeta_default/mediaitem_edit.html deleted file mode 100644 index 5767f769..00000000 --- a/telemeta/templates/telemeta_default/mediaitem_edit.html +++ /dev/null @@ -1,51 +0,0 @@ -{% extends "telemeta/mediaitem_detail.html" %} -{% load i18n %} -{% load telemeta_utils %} - -{% block title %} - Item : {{ item }} -{% endblock %} - -{% block title_buttons %} -{% trans "Cancel" %} -{% endblock %} - -{% block infos %} -
    -
    {% csrf_token %} - - - {% for field in form %} - - {% if field.html_name == "copied_from_item" %} - - {% else %} - - - {% if field.html_name == "collection" %} - - {% else %} - - {% endif %} - {% endif %} - - {% endfor %} -
    {% for error in form.non_field_errors %}
  • {{ error }}
    • {% endfor %}
    {{ field.label_tag.as_hidden }}{{ field.as_hidden }}
    {{ field.errors }}
    {{ field.label_tag }}: {% trans "Title" %} : {{ item.collection.title }}
    -  {% trans "Code" %} : {{ item.collection.code }}
    - {{ field }}    		{{ field }}
    -
    - {% trans "Cancel" %} - {% trans "Save" %} - -
    -
    -
    -{% endblock infos %} - -{% block related %} -{% endblock %} - -{% block delete %} -{% endblock %} diff --git a/telemeta/templates/telemeta_default/mediaitem_keywords_edit.html b/telemeta/templates/telemeta_default/mediaitem_keywords_edit.html deleted file mode 100644 index 9e2ca7d6..00000000 --- a/telemeta/templates/telemeta_default/mediaitem_keywords_edit.html +++ /dev/null @@ -1,48 +0,0 @@ -{% extends "telemeta/mediaitem_detail.html" %} -{% load i18n %} -{% load telemeta_utils %} - -{% block extra_javascript %} -{% endblock %} - - {% block title %} - item

    Item : {{ item }}

    - {% endblock %} - {% block title_buttons %} - {% trans "Cancel" %} - {% endblock %} - -{% block content %} - {% block infos %} -
    -
    {% csrf_token %} - - {{ formset.management_form }} - {% for form in formset.forms %} - - - {% for field in form %} - - {% if "item" in field.html_name or "id" in field.html_name %} - - {% else %} - - {% endif %} - - {% endfor %} -
    {% trans "Keyword" %} :
    {{ field.label_tag.as_hidden }}{{ field.as_hidden }}{{ field.label_tag }}: {{ field }}
    -
    - {% endfor %} - -
    - {% trans "Cancel" %} - {% trans "Save" %} -
    - -
    -
    - - {% endblock infos %} -{% endblock content %} diff --git a/telemeta/templates/telemeta_default/mediaitem_list.html b/telemeta/templates/telemeta_default/mediaitem_list.html deleted file mode 100644 index 26e45237..00000000 --- a/telemeta/templates/telemeta_default/mediaitem_list.html +++ /dev/null @@ -1,25 +0,0 @@ -{% extends "telemeta/base.html" %} -{% load i18n %} -{% load telemeta_utils %} - -{% block head_title %}{% trans "Media Items" %} - {{ block.super }}{% endblock %} - -{% block title %} - item {% trans "Media Items" %} -{% endblock %} - -{% block title_buttons %} - {% trans "All" %} - {% trans "Sounds" %} - {% if user.is_authenticated and perms.telemeta.add_mediaitem %} - {% trans "Add" %} - {% endif %} -{% endblock %} - -{% block content %} -{% with object_list as items %} -
    -{% include "telemeta/inc/mediaitem_list.html" %} -
    -{% endwith %} -{% endblock %} diff --git a/telemeta/templates/telemeta_default/mediaitem_performances_edit.html b/telemeta/templates/telemeta_default/mediaitem_performances_edit.html deleted file mode 100644 index a12ff3fe..00000000 --- a/telemeta/templates/telemeta_default/mediaitem_performances_edit.html +++ /dev/null @@ -1,50 +0,0 @@ -{% extends "telemeta/mediaitem_detail.html" %} -{% load i18n %} -{% load telemeta_utils %} - -{% block extra_javascript %}{% endblock %} - -{% block title %} - Item : {{ item }} -{% endblock %} - -{% block title_buttons %} - {% trans "Cancel" %} -{% endblock %} - -{% block content %} - {% block infos %} -
    -
    {% csrf_token %} - - {{ formset.management_form }} - {% for form in formset.forms %} -
    - - - {% for field in form %} - - {% if not "media_item" in field.html_name %} - {% if "id" in field.html_name %} - - {% else %} - - {% endif %} - {% else %} - - {% endif %} - - {% endfor %} -
    {% trans "Performance" %} :
    {{ field.label_tag.as_hidden }}{{ field.as_hidden }}{{ field.label_tag }}: {{ field }}{{ field.label_tag.as_hidden }}{{ field.as_hidden }}
    -
    - {% endfor %} -
    - {% trans "Cancel" %} - {% trans "Save" %} -
    -
    -
    - {% endblock infos %} -{% endblock content %} diff --git a/telemeta/templates/telemeta_default/mediaitem_player.html b/telemeta/templates/telemeta_default/mediaitem_player.html deleted file mode 100644 index 0c4149ee..00000000 --- a/telemeta/templates/telemeta_default/mediaitem_player.html +++ /dev/null @@ -1,44 +0,0 @@ -{% extends "telemeta/mediaitem_detail.html" %} -{% load telemeta_utils %} -{% load i18n %} - - -{% block stylesheets %} -{{ block.super }} - -{% endblock %} - -{% block title %}{% endblock %} -{% block title_buttons %}{% endblock %} - -{% block layout %} -{% block content %} -
    -{% if item.file %} - {% if public_access or user.is_staff %} -
    -
    -
    -
    -
    -
    -
    - {% organization %} - Item : {% if item.code %}{{ item.code }}{% else %}{{ item.old_code }}{% endif %} - Telemeta powered -
    -
    - {% endif %} -{% endif %} -
    - -{% endblock content%} -{% endblock layout %} - -{% block footer %}{% endblock %} diff --git a/telemeta/templates/telemeta_default/mediaitem_related_edit.html b/telemeta/templates/telemeta_default/mediaitem_related_edit.html deleted file mode 100644 index 506d279e..00000000 --- a/telemeta/templates/telemeta_default/mediaitem_related_edit.html +++ /dev/null @@ -1,47 +0,0 @@ -{% extends "telemeta/mediaitem_detail.html" %} -{% load i18n %} -{% load telemeta_utils %} - -{% block extra_javascript %}{% endblock %} - -{% block title %} - Item : {{ item }} -{% endblock %} - -{% block title_buttons %} - {% trans "Cancel" %} -{% endblock %} - -{% block content %} - {% block infos %} -
    -
    {% csrf_token %} - - {{ formset.management_form }} - {% for form in formset.forms %} -
    - - - {% for field in form %} - - - {% if "media_item" in field.html_name or "id" in field.html_name or "item" in field.html_name or "mime_type" in field.html_name %} - - {% else %} - - {% endif %} - - {% endfor %} -
    {% trans "Media" %} :
    {{ field.errors }}
    {{ field.label_tag.as_hidden }}{{ field.as_hidden }}{{ field.label_tag }}: {{ field }}
    -
    - {% endfor %} -
    - {% trans "Cancel" %} - {% trans "Save" %} -
    -
    -
    - {% endblock infos %} -{% endblock content %} diff --git a/telemeta/templates/telemeta_default/mediaitem_xspf.xml b/telemeta/templates/telemeta_default/mediaitem_xspf.xml deleted file mode 100644 index f899cbec..00000000 --- a/telemeta/templates/telemeta_default/mediaitem_xspf.xml +++ /dev/null @@ -1,13 +0,0 @@ -{% extends "telemeta/base_xspf.xml" %} -{% load telemeta_utils %} - -{% block tracklist %} - - {{ item }} - mp3 - http://{{ host }}{% url telemeta-item-export item.public_id,"mp3" %} - {{ item.get_duration|mul:1000 }} - http://{{ host }}{% url telemeta-item-detail item.public_id %} - -{% endblock %} - diff --git a/telemeta/templates/telemeta_default/messages.html b/telemeta/templates/telemeta_default/messages.html deleted file mode 100644 index c0442bea..00000000 --- a/telemeta/templates/telemeta_default/messages.html +++ /dev/null @@ -1,12 +0,0 @@ -{% extends "telemeta/base.html" %} -{% load i18n %} - -{% block content %} -{% if messages %} - {% for message in messages %} -

    {{ message }}

    -

    {{ description }} - {% endfor %} -{% endif %} -{% endblock %} - diff --git a/telemeta/templates/telemeta_default/paginator.html b/telemeta/templates/telemeta_default/paginator.html deleted file mode 100644 index e47187d6..00000000 --- a/telemeta/templates/telemeta_default/paginator.html +++ /dev/null @@ -1,24 +0,0 @@ -{% load telemeta_utils %} -{% load i18n %} - -{% if has_previous %} - < {% trans "Previous" %} -{% endif %} - -{% if show_first %} -1 ... -{% endif %} -{% for linkpage in page_numbers %} - {% ifequal linkpage page %} - {{ page }} - {% else %} - {{ linkpage }} - {% endifequal %} -{% endfor %} -{% if show_last %} - ... - {{ pages }} -{% endif %} -{% if has_next %} - {% trans "Next" %} > -{% endif %} diff --git a/telemeta/templates/telemeta_default/profile_detail.html b/telemeta/templates/telemeta_default/profile_detail.html deleted file mode 100644 index b24b0860..00000000 --- a/telemeta/templates/telemeta_default/profile_detail.html +++ /dev/null @@ -1,71 +0,0 @@ -{% extends "telemeta/base.html" %} -{% load i18n %} -{% load telemeta_utils %} - -{% block head_title %}{% trans "User Profile" %} : {{ usr.username }}{% endblock %} - -{% block title %} - user {% trans "User profile" %} : {{ usr.username }} -{% endblock %} - -{% block content %} -

    - {% block modules %} -
    -

    playlists - {% trans "Playlists" %}

    -
      - {% for p in playlists %} -
    • - {{ p.playlist.title }} -
      - {{ p.playlist.description }} -
      • - {% endfor %} -
    -
    - {% endblock %} -
    - -
    -
    -
    {% trans "First Name" %}
    {{ usr.first_name }}
    -
    {% trans "Last Name" %}
    {{ usr.last_name }}
    -
    {% trans "Email" %}
    {{ usr.email }}
    - -
    {% trans "Institution" %}
    {% if profile %}{{ profile.institution }}{% endif %}
    -
    {% trans "Function" %}
    {% if profile %}{{ profile.function }}{% endif %}
    -
    {% trans "Address" %}
    {% if profile %}{{ profile.address }}{% endif %}
    -
    {% trans "Telephone" %}
    {% if profile %}{{ profile.telephone }}{% endif %}
    -
    {% trans "Expiration date" %}
    {% if profile %}{{ profile.expiration_date }}{% endif %}
    - -
    {% trans "Is staff" %}
    {{ usr.is_staff }}
    -
    {% trans "Is superuser" %}
    {{ usr.is_superuser }}
    -
    {% blocktrans count user.groups.all.count as counter %}Group{% plural %}Groups{% endblocktrans %}
    {% for group in usr.groups.all %}{{ group }} {% endfor %}
    -
    {% trans "Last login" %}
    {{ usr.last_login }}
    - {% if user.is_authenticated and user.username == usr.username %} -
    {% trans "Language" %}
    {% csrf_token %} - - - {% trans "Apply" %} -
    -
    - {% endif %} -
    -
    - - {% if user.is_authenticated and user.username == usr.username or user.is_staff %} - {% trans "Edit" %} - {% endif %} - {% if user.is_authenticated and user.username == usr.username %} - {% trans "Change password" %} - {% endif %} - - -{% endblock %} - diff --git a/telemeta/templates/telemeta_default/profile_edit.html b/telemeta/templates/telemeta_default/profile_edit.html deleted file mode 100644 index 3a64c7e5..00000000 --- a/telemeta/templates/telemeta_default/profile_edit.html +++ /dev/null @@ -1,35 +0,0 @@ -{% extends "telemeta/profile_detail.html" %} -{% load i18n %} -{% load telemeta_utils %} - -{% block title_buttons %} - {% trans "Cancel" %} -{% endblock %} - -{% block content %} -
    -
    {% csrf_token %} - - {% for form in forms %} - {% for field in form %} - {% if not field.html_name in user_hidden_fields %} - - - - - {% else %} - - - - {% endif %} - {% endfor %} - {% endfor %} -
    {{ field.errors }}
    {% trans field.label_tag %} : {{ field }}
    {{ field.label_tag.as_hidden }}{{ field.as_hidden }}
    -
    - {% trans "Cancel" %} - {% trans "Save" %} -
    -
    -
    -{% endblock %} diff --git a/telemeta/templates/telemeta_default/registration/logged_out.html b/telemeta/templates/telemeta_default/registration/logged_out.html deleted file mode 100644 index 8a31a2c0..00000000 --- a/telemeta/templates/telemeta_default/registration/logged_out.html +++ /dev/null @@ -1,10 +0,0 @@ -{% extends "telemeta/base.html" %} -{% load i18n %} - -{% block content %} - -

    {% trans "Thanks for spending some quality time with the Web site today." %}

    - -

    {% trans 'Log in again' %}

    - -{% endblock %} diff --git a/telemeta/templates/telemeta_default/registration/password_change_done.html b/telemeta/templates/telemeta_default/registration/password_change_done.html deleted file mode 100644 index 075a6855..00000000 --- a/telemeta/templates/telemeta_default/registration/password_change_done.html +++ /dev/null @@ -1,11 +0,0 @@ -{% extends "telemeta/base.html" %} -{% load i18n %} -{% block userlinks %}{% url django-admindocs-docroot as docsroot %}{% if docsroot %}{% trans 'Documentation' %} / {% endif %}{% trans 'Change password' %} / {% trans 'Log out' %}{% endblock %} - -{% block title %}
    {% trans 'Password change successful' %}{% endblock %} - -{% block content %} - -

    {% trans 'Your password was changed.' %}

    - -{% endblock %} diff --git a/telemeta/templates/telemeta_default/registration/password_change_form.html b/telemeta/templates/telemeta_default/registration/password_change_form.html deleted file mode 100644 index 79274dbb..00000000 --- a/telemeta/templates/telemeta_default/registration/password_change_form.html +++ /dev/null @@ -1,49 +0,0 @@ -{% extends "telemeta/base.html" %} -{% load i18n adminmedia %} -{% block extrastyle %}{{ block.super }}{% endblock %} -{% block userlinks %}{% url django-admindocs-docroot as docsroot %}{% if docsroot %}{% trans 'Documentation' %} / {% endif %} {% trans 'Change password' %} / {% trans 'Log out' %}{% endblock %} - -{% block title %}
    {% trans 'Password change' %}{% endblock %} - -{% block content %}
    - -
    {% csrf_token %} -
    -{% if form.errors %} -

    - {% blocktrans count form.errors.items|length as counter %}Please correct the error below.{% plural %}Please correct the errors below.{% endblocktrans %} -

    -{% endif %} - -

    {% trans "Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly." %}

    - -
    - -
    - {{ form.old_password.errors }} - {{ form.old_password }} -
    - -
    - {{ form.new_password1.errors }} - {{ form.new_password1 }} -
    - -
    -{{ form.new_password2.errors }} - {{ form.new_password2 }} -
    - -
    - -
    -
    - {% trans 'Change my password' %} -
    - - -
    -
    - -{% endblock %} diff --git a/telemeta/templates/telemeta_default/registration/password_reset_complete.html b/telemeta/templates/telemeta_default/registration/password_reset_complete.html deleted file mode 100644 index d32849ff..00000000 --- a/telemeta/templates/telemeta_default/registration/password_reset_complete.html +++ /dev/null @@ -1,9 +0,0 @@ -{% extends "telemeta/base.html" %} -{% load i18n %} - -{% block title %}
    {% trans 'Password reset complete' %}{% endblock %} - -{% block content %} -

    {% trans "Your password has been set. You may go ahead and log in now." %}

    -

    {% trans 'Log in' %}

    -{% endblock %} diff --git a/telemeta/templates/telemeta_default/registration/password_reset_confirm.html b/telemeta/templates/telemeta_default/registration/password_reset_confirm.html deleted file mode 100644 index 9a8b6829..00000000 --- a/telemeta/templates/telemeta_default/registration/password_reset_confirm.html +++ /dev/null @@ -1,23 +0,0 @@ -{% extends "telemeta/base.html" %} -{% load i18n %} - -{% block title %}
    {% trans 'Password reset' %}{% endblock %} - -{% block content %} -{% if validlink %} -

    {% trans "Please enter your new password twice so we can verify you typed it in correctly." %}

    - -
    {% csrf_token %} -{{ form.new_password1.errors }} -

    {{ form.new_password1 }}

    -{{ form.new_password2.errors }} -

    {{ form.new_password2 }}

    -

    {% trans 'Change my password' %}

    -
    - -{% else %} -

    {% trans 'Password reset unsuccessful' %}

    -

    {% trans "The password reset link was invalid, possibly because it has already been used. Please request a new password reset." %}

    - -{% endif %} -{% endblock %} diff --git a/telemeta/templates/telemeta_default/registration/password_reset_done.html b/telemeta/templates/telemeta_default/registration/password_reset_done.html deleted file mode 100644 index 88a57c46..00000000 --- a/telemeta/templates/telemeta_default/registration/password_reset_done.html +++ /dev/null @@ -1,8 +0,0 @@ -{% extends "telemeta/base.html" %} -{% load i18n %} - -{% block title %}
    {% trans 'Password reset successful' %}{% endblock %} - -{% block content %} -

    {% trans "We've e-mailed you instructions for setting your password to the e-mail address you submitted. You should be receiving it shortly." %}

    -{% endblock %} diff --git a/telemeta/templates/telemeta_default/registration/password_reset_email.html b/telemeta/templates/telemeta_default/registration/password_reset_email.html deleted file mode 100644 index 3b786ac4..00000000 --- a/telemeta/templates/telemeta_default/registration/password_reset_email.html +++ /dev/null @@ -1,15 +0,0 @@ -{% load i18n %}{% autoescape off %} -{% trans "You're receiving this e-mail because you requested a password reset" %} -{% blocktrans %}for your user account at {{ site_name }}{% endblocktrans %}. - -{% trans "Please go to the following page and choose a new password:" %} -{% block reset_link %} -{{ protocol }}://{{ domain }}{% url telemeta-password-reset-confirm uidb36=uid token=token %} -{% endblock %} -{% trans "Your username, in case you've forgotten:" %} {{ user.username }} - -{% trans "Thanks for using our site!" %} - -{% blocktrans %}The {{ site_name }} team{% endblocktrans %} - -{% endautoescape %} diff --git a/telemeta/templates/telemeta_default/registration/password_reset_form.html b/telemeta/templates/telemeta_default/registration/password_reset_form.html deleted file mode 100644 index 6da1b847..00000000 --- a/telemeta/templates/telemeta_default/registration/password_reset_form.html +++ /dev/null @@ -1,13 +0,0 @@ -{% extends "telemeta/base.html" %} -{% load i18n %} - -{% block title %}
    {% trans "Password reset" %}{% endblock %} - -{% block content %} -

    {% trans "Forgotten your password? Enter your e-mail address below, and we'll e-mail instructions for setting a new one." %}

    - -
    {% csrf_token %} -{{ form.email.errors }} -

    {{ form.email }} {% trans 'Reset my password' %}

    -
    -{% endblock %} diff --git a/telemeta/templates/telemeta_default/search_criteria.html b/telemeta/templates/telemeta_default/search_criteria.html deleted file mode 100644 index 6885f9e8..00000000 --- a/telemeta/templates/telemeta_default/search_criteria.html +++ /dev/null @@ -1,142 +0,0 @@ -{% extends "telemeta/base.html" %} -{% load telemeta_utils %} -{% load i18n %} - -{% block head_title %}{% trans "Advanced Search" %} - {{ block.super }}{% endblock %} - -{% block stylesheets %} -{{ block.super }} - -{% endblock %} - -{% block extra_javascript %} - - - -{% endblock %} - -{% block title %} - advanced-search {% trans "Advanced Search" %} -{% endblock %} - -{% block content %} -
    {% csrf_token %} -
    - -

    - - -

    - -

    - - -

    - -

    - - -

    - -

    - - -

    - -

    - - -

    - - {% if rec_years %} -

    - - - {% trans "to" %} - -

    - {% endif %} - - {% if pub_years %} -

    - - - {% trans "to" %} - -

    - {% endif %} - -

    - -

    - -
    - -

    -{% trans 'Search' %} -

    - -
    -{% endblock %} diff --git a/telemeta/templates/telemeta_default/search_results.html b/telemeta/templates/telemeta_default/search_results.html deleted file mode 100644 index ced78171..00000000 --- a/telemeta/templates/telemeta_default/search_results.html +++ /dev/null @@ -1,85 +0,0 @@ -{% extends "telemeta/base.html" %} -{% load telemeta_utils %} -{% load i18n %} - -{% block head_title %}{% trans "Search Results" %} - {{ block.super }}{% endblock %} - -{% block title %} - search-results {% trans "Search Results" %} -{% endblock %} - -{% block title_buttons %} - {% ifequal type 'items' %} - {% trans "All" %} - {% trans "Sounds" %} - {% else %} - {% trans "All" %} - {% trans "Sounds" %} - {% endifequal %} -{% endblock %} - -{% block content %} -{% if criteria %} - -{% endif %} - -{% ifequal type 'items' %} - -

    Collections ({{collections_num}}) | Items ({{items_num}})

    - - {% with object_list as items %} -
    - {% include "telemeta/inc/mediaitem_list.html" %} -
    - {% endwith %} - -{% else %} - -

    Collections ({{collections_num}}) | Items ({{items_num}}) -

    - - {% with object_list as collections %} -
    - {% include "telemeta/inc/collection_list.html" %} -
    - {% endwith %} - -{% endifequal %} - -{% endblock %} diff --git a/telemeta/templates/telemeta_default/users.html b/telemeta/templates/telemeta_default/users.html deleted file mode 100644 index 4f73df1e..00000000 --- a/telemeta/templates/telemeta_default/users.html +++ /dev/null @@ -1,18 +0,0 @@ -{% extends "telemeta/base.html" %} -{% load i18n %} -{% load telemeta_utils %} - -{% block head_title %}{% trans "Users" %} - {{ block.super }}{% endblock %} - -{% block title %} - user {% trans "Users" %} -{% endblock %} - -{% block content %} - {% if users %} -
    - {% include "telemeta/inc/user_list.html" %} - {% else %} -

    {% trans "No users" %}

    - {% endif %} -{% endblock %} diff --git a/telemeta/templatetags/telemeta_utils.py b/telemeta/templatetags/telemeta_utils.py index 4ea2b15e..88879c79 100644 --- a/telemeta/templatetags/telemeta_utils.py +++ b/telemeta/templatetags/telemeta_utils.py @@ -15,6 +15,7 @@ import re import os import datetime from django.conf import settings +from django.template.defaultfilters import stringfilter register = template.Library() @@ -356,3 +357,8 @@ def get_youtube(link): @register.filter def to_utf8(word): return word.encode('utf-8') + +@register.filter +@stringfilter +def capitalize(value): + return value.capitalize() diff --git a/telemeta/urls.py b/telemeta/urls.py index 191e15fc..460e2bde 100644 --- a/telemeta/urls.py +++ b/telemeta/urls.py @@ -36,10 +36,10 @@ from django.conf.urls.defaults import * from django.views.generic.simple import redirect_to -from telemeta.models import MediaItem, MediaCollection, MediaItemMarker, MediaCorpus, MediaFund +from telemeta.models import MediaItem, MediaCollection, MediaItemMarker, MediaCorpus, MediaFonds from telemeta.views.base import GeneralView, AdminView, CollectionView, ItemView, \ InstrumentView, PlaylistView, ProfileView, GeoView, \ - LastestRevisionsFeed + LastestRevisionsFeed, ResourceView from jsonrpc import jsonrpc_site import os.path import telemeta.config @@ -55,6 +55,7 @@ instrument_view = InstrumentView() playlist_view = PlaylistView() profile_view = ProfileView() geo_view = GeoView() +resource_view = ResourceView() # query sets for Django generic views all_items = { 'queryset': MediaItem.objects.enriched().order_by('code', 'old_code') } @@ -64,7 +65,7 @@ all_collections_unpublished = { 'queryset': MediaCollection.objects.filter(code_ all_collections_published = { 'queryset': MediaCollection.objects.filter(code__contains='_E_'), } all_collections_sound = { 'queryset': MediaCollection.objects.sound().order_by('code', 'old_code') } all_corpus = { 'queryset': MediaCorpus.objects.all().order_by('title') } -all_funds = { 'queryset': MediaFund.objects.all().order_by('title') } +all_fonds = { 'queryset': MediaFonds.objects.all().order_by('title') } # ID's regular expressions export_extensions = "|".join(item_view.list_export_extensions()) @@ -78,33 +79,33 @@ urlpatterns = patterns('', # TODO: make a real archives tree view url(r'^archives/$', redirect_to, {'url': '/archives/collections/'}, name="telemeta-archives"), - + # items - url(r'^archives/items/$', 'django.views.generic.list_detail.object_list', + url(r'^archives/items/$', 'django.views.generic.list_detail.object_list', dict(all_items, paginate_by=20, template_name="telemeta/mediaitem_list.html"), name="telemeta-items"), url(r'^archives/items_sound/$', 'django.views.generic.list_detail.object_list', dict(all_items_sound, paginate_by=20, template_name="telemeta/mediaitem_list.html"), name="telemeta-items-sound"), - url(r'^archives/items/(?P[A-Za-z0-9._-]+)/$', item_view.item_detail, + url(r'^archives/items/(?P[A-Za-z0-9._-]+)/$', item_view.item_detail, name="telemeta-item-detail"), - url(r'^archives/items/(?P[A-Za-z0-9._-]+)/dc/$', item_view.item_detail, + url(r'^archives/items/(?P[A-Za-z0-9._-]+)/dc/$', item_view.item_detail, {'template': 'telemeta/mediaitem_detail_dc.html'}, name="telemeta-item-dublincore"), - url(r'^archives/items/(?P[A-Za-z0-9._-]+)/dc/xml/$', item_view.item_detail, + url(r'^archives/items/(?P[A-Za-z0-9._-]+)/dc/xml/$', item_view.item_detail, {'format': 'dublin_core_xml'}, name="telemeta-item-dublincore-xml"), - url(r'^archives/items/download/(?P[A-Za-z0-9._-]+)\.(?P' - + export_extensions + ')$', + url(r'^archives/items/download/(?P[A-Za-z0-9._-]+)\.(?P' + + export_extensions + ')$', item_view.item_export, name="telemeta-item-export"), - url(r'^archives/items/(?P[A-Za-z0-9._-]+)/visualize/(?P[0-9a-z_]+)/(?P[0-9A-Z]+)x(?P[0-9A-Z]+)/$', + url(r'^archives/items/(?P[A-Za-z0-9._-]+)/visualize/(?P[0-9a-z_]+)/(?P[0-9A-Z]+)x(?P[0-9A-Z]+)/$', item_view.item_visualize, name="telemeta-item-visualize"), - url(r'^archives/items/(?P[A-Za-z0-9._-]+)/analyze/xml/$', + url(r'^archives/items/(?P[A-Za-z0-9._-]+)/analyze/xml/$', item_view.item_analyze_xml, name="telemeta-item-analyze-xml"), - url(r'^archives/items/(?P[A-Za-z0-9._-]+)/item_xspf.xml$', - item_view.item_playlist, + url(r'^archives/items/(?P[A-Za-z0-9._-]+)/item_xspf.xml$', + item_view.item_playlist, dict(template="telemeta/mediaitem_xspf.xml", mimetype="application/xspf+xml"), name="telemeta-item-xspf"), url(r'^archives/items/(?P[A-Za-z0-9._-]+)/edit/$', item_view.item_edit, @@ -126,7 +127,7 @@ urlpatterns = patterns('', url(r'^markers/(?P[A-Za-z0-9]+)/$', item_view.item_detail, name="telemeta-item-detail-marker"), # FIXME: need all paths url(r'^items/(?P[A-Za-z0-9._-s/]+)/$', redirect_to, {'url': '/archives/items/%(path)s/', 'permanent': False}, name="telemeta-item-redir"), - + # collections url(r'^archives/collections/$', 'django.views.generic.list_detail.object_list', dict(all_collections, paginate_by=20, template_name="telemeta/collection_list.html"), name="telemeta-collections"), @@ -134,19 +135,19 @@ urlpatterns = patterns('', dict(all_collections_unpublished, paginate_by=20, template_name="telemeta/collection_list.html"), name="telemeta-collections-unpublished"), url(r'^archives/collections_published/$', 'django.views.generic.list_detail.object_list', dict(all_collections_published, paginate_by=20, template_name="telemeta/collection_list.html"), name="telemeta-collections-published"), - url(r'^archives/collections/?page=(?P[0-9]+)$', + url(r'^archives/collections/?page=(?P[0-9]+)$', 'django.views.generic.list_detail.object_list', dict(all_collections, paginate_by=20)), url(r'^archives/collections/(?P[A-Za-z0-9._-]+)/$', collection_view.collection_detail, dict(template="telemeta/collection_detail.html"), name="telemeta-collection-detail"), url(r'^archives/collections/(?P[A-Za-z0-9._-]+)/dc/$', collection_view.collection_detail, dict(template="telemeta/collection_detail_dc.html"), name="telemeta-collection-dublincore"), - url(r'^archives/collections/(?P[A-Za-z0-9._-]+)/collection_xspf.xml$', - collection_view.collection_playlist, + url(r'^archives/collections/(?P[A-Za-z0-9._-]+)/collection_xspf.xml$', + collection_view.collection_playlist, dict(template="telemeta/collection_xspf.xml", mimetype="application/xspf+xml"), name="telemeta-collection-xspf"), url(r'^archives/collections/(?P[A-Za-z0-9._-]+)/collection.m3u$', - collection_view.collection_playlist, + collection_view.collection_playlist, dict(template="telemeta/collection.m3u", mimetype="audio/mpegurl"), name="telemeta-collection-m3u"), url(r'^archives/collections/(?P[A-Za-z0-9._-]+)/edit/$', collection_view.collection_edit, @@ -164,115 +165,110 @@ urlpatterns = patterns('', dict(all_collections_sound, paginate_by=20, template_name="telemeta/collection_list.html"), name="telemeta-collections-sound"), # FIXME: need all paths url(r'^collections/(?P[A-Za-z0-9._-s/]+)/$', redirect_to, {'url': '/archives/collections/%(path)s/', 'permanent': False}, name="telemeta-collection-redir"), - - # Corpus + + # RESOURCES + # Corpus list url(r'^archives/corpus/$', 'django.views.generic.list_detail.object_list', - dict(all_corpus, paginate_by=20, template_name="telemeta/corpus_list.html"), name="telemeta-corpus"), - url(r'^archives/corpus/(?P[A-Za-z0-9._-]+)/$', corpus_view.corpus_detail, - dict(template="telemeta/corpus_detail.html"), name="telemeta-corpus-detail"), - url(r'^archives/corpus/(?P[A-Za-z0-9._-]+)/dc/$', corpus_view.corpus_detail, - dict(template="telemeta/corpus_detail_dc.html"), name="telemeta-corpus-dublincore"), - url(r'^archives/corpus/(?P[A-Za-z0-9._-]+)/edit/$', corpus_view.corpus_edit, - dict(template='telemeta/corpus_edit.html'), name="telemeta-corpus-edit"), - url(r'^archives/corpus/(?P[A-Za-z0-9._-]+)/copy/$', corpus_view.corpus_copy, - dict(template='telemeta/corpus_edit.html'), name="telemeta-corpus-copy"), - url(r'^archives/corpus_new/add/$', corpus_view.corpus_add, - dict(template='telemeta/corpus_add.html'), name="telemeta-corpus-add"), - - # Funds - url(r'^archives/funds/$', 'django.views.generic.list_detail.object_list', - dict(all_funds, paginate_by=20, template_name="telemeta/fund_list.html"), name="telemeta-funds"), - url(r'^archives/funds/(?P[A-Za-z0-9._-]+)/$', fund_view.fund_detail, - dict(template="telemeta/fund_detail.html"), name="telemeta-fund-detail"), - url(r'^archives/funds/(?P[A-Za-z0-9._-]+)/dc/$', fund_view.fund_detail, - dict(template="telemeta/fund_detail_dc.html"), name="telemeta-fund-dublincore"), - url(r'^archives/funds/(?P[A-Za-z0-9._-]+)/edit/$', fund_view.fund_edit, - dict(template='telemeta/fund_edit.html'), name="telemeta-fund-edit"), - url(r'^archives/funds/(?P[A-Za-z0-9._-]+)/copy/$', fund_view.fund_copy, - dict(template='telemeta/fund_edit.html'), name="telemeta-fund-copy"), - url(r'^archives/fund/add/$', fund_view.fund_add, - dict(template='telemeta/fund_add.html'), name="telemeta-fund-add"), - + dict(all_corpus, paginate_by=20, template_name="telemeta/resource_list.html", extra_context={'type':'corpus'}), name="telemeta-corpus"), + # Fonds list + url(r'^archives/fonds/$', 'django.views.generic.list_detail.object_list', + dict(all_fonds, paginate_by=20, template_name="telemeta/resource_list.html", extra_context={'type':'fonds'}), name="telemeta-fonds"), + + # Generic resource + url(r'^archives/(?P[A-Za-z0-9._-]+)/(?P[A-Za-z0-9._-]+)/$', resource_view.detail, + dict(template="telemeta/resource_detail.html"), name="telemeta-resource-detail"), + url(r'^archives/(?P[A-Za-z0-9._-]+)/(?P[A-Za-z0-9._-]+)/dc/$', resource_view.detail, + dict(template="telemeta/resource_detail_dc.html"), name="telemeta-resource-dublincore"), + url(r'^archives/(?P[A-Za-z0-9._-]+)/(?P[A-Za-z0-9._-]+)/edit/$', resource_view.edit, + dict(template='telemeta/resource_edit.html'), name="telemeta-resource-edit"), + url(r'^archives/(?P[A-Za-z0-9._-]+)/(?P[A-Za-z0-9._-]+)/copy/$', resource_view.copy, + dict(template='telemeta/resource_edit.html'), name="telemeta-resource-copy"), + url(r'^archives/(?P[A-Za-z0-9._-]+)_add$', resource_view.add, + dict(template='telemeta/resource_add.html'), name="telemeta-resource-add"), + url(r'^archives/(?P[A-Za-z0-9._-]+)/(?P[A-Za-z0-9._-]+)/delete/$', resource_view.delete, name="telemeta-resource-delete"), + url(r'^archives/(?P[A-Za-z0-9._-]+)/(?P[A-Za-z0-9._-]+)/related/(?P[A-Za-z0-9._-]+)$', resource_view.related_stream, name="telemeta-resource-related"), + url(r'^archives/(?P[A-Za-z0-9._-]+)/(?P[A-Za-z0-9._-]+)/related_edit/$', resource_view.related_edit, dict(template='telemeta/resource_related_edit.html'), name="telemeta-resource-related_edit"), + # search url(r'^search/$', general_view.search, name="telemeta-search"), - url(r'^search/collections/$', general_view.search, {'type': 'collections'}, + url(r'^search/collections/$', general_view.search, {'type': 'collections'}, name="telemeta-search-collections"), - url(r'^search/items/$', general_view.search, {'type': 'items'}, + url(r'^search/items/$', general_view.search, {'type': 'items'}, name="telemeta-search-items"), url(r'^search/criteria/$', general_view.edit_search, name="telemeta-search-criteria"), url(r'^complete_location/$', general_view.complete_location, name="telemeta-complete-location"), - # administration - url(r'^admin/$', admin_view.admin_index, name="telemeta-admin"), - url(r'^admin/general/$', admin_view.admin_general, name="telemeta-admin-general"), - url(r'^admin/enumerations/$', admin_view.admin_enumerations, name="telemeta-admin-enumerations"), - url(r'^admin/users/$', admin_view.admin_users, name="telemeta-admin-users"), - + # administration + url(r'^admin/$', admin_view.admin_index, name="telemeta-admin"), + url(r'^admin/general/$', admin_view.admin_general, name="telemeta-admin-general"), + url(r'^admin/enumerations/$', admin_view.admin_enumerations, name="telemeta-admin-enumerations"), + url(r'^admin/users/$', admin_view.admin_users, name="telemeta-admin-users"), + # instruments administration - url(r'^admin/instruments/$', + url(r'^admin/instruments/$', instrument_view.edit_instrument , - name="telemeta-instrument-edit"), - url(r'^admin/instruments/add/$', + name="telemeta-instrument-edit"), + url(r'^admin/instruments/add/$', instrument_view.add_to_instrument, - name="telemeta-instrument-add"), - url(r'^admin/instruments/update/$', + name="telemeta-instrument-add"), + url(r'^admin/instruments/update/$', instrument_view.update_instrument, - name="telemeta-instrument-update"), + name="telemeta-instrument-update"), url(r'^admin/instruments/' + r'(?P[0-9]+)/$', instrument_view.edit_instrument_value, - name="telemeta-instrument-record-edit"), + name="telemeta-instrument-record-edit"), url(r'^admin/instruments/' + r'(?P[0-9]+)/update/$', - instrument_view.update_instrument_value, - name="telemeta-instrument-record-update"), - + instrument_view.update_instrument_value, + name="telemeta-instrument-record-update"), + # enumerations administration - url(r'^admin/enumerations/(?P[0-9a-z]+)/$', + url(r'^admin/enumerations/(?P[0-9a-z]+)/$', admin_view.edit_enumeration , - name="telemeta-enumeration-edit"), - url(r'^admin/enumerations/(?P[0-9a-z]+)/add/$', + name="telemeta-enumeration-edit"), + url(r'^admin/enumerations/(?P[0-9a-z]+)/add/$', admin_view.add_to_enumeration, - name="telemeta-enumeration-add"), - url(r'^admin/enumerations/(?P[0-9a-z]+)/update/$', + name="telemeta-enumeration-add"), + url(r'^admin/enumerations/(?P[0-9a-z]+)/update/$', admin_view.update_enumeration, - name="telemeta-enumeration-update"), + name="telemeta-enumeration-update"), url(r'^admin/enumerations/(?P[0-9a-z]+)/' + r'(?P[0-9]+)/$', admin_view.edit_enumeration_value, - name="telemeta-enumeration-record-edit"), + name="telemeta-enumeration-record-edit"), url(r'^admin/enumerations/(?P[0-9a-z]+)/' + r'(?P[0-9]+)/update/$', - admin_view.update_enumeration_value, - name="telemeta-enumeration-record-update"), + admin_view.update_enumeration_value, + name="telemeta-enumeration-record-update"), # Geographic browsing url(r'^geo/$', geo_view.list_continents, name="telemeta-geo-continents"), - url(r'^geo/(?P[a-z_]+)/$', geo_view.list_countries, + url(r'^geo/(?P[a-z_]+)/$', geo_view.list_countries, name="telemeta-geo-countries"), - url(r'^geo/collections/(?P[a-z_]+)/(?P[a-z_]+)/$', - geo_view.list_country_collections, + url(r'^geo/collections/(?P[a-z_]+)/(?P[a-z_]+)/$', + geo_view.list_country_collections, name="telemeta-geo-country-collections"), - url(r'^geo/items/(?P[a-z_]+)/(?P[a-z_]+)/$', - geo_view.list_country_items, + url(r'^geo/items/(?P[a-z_]+)/(?P[a-z_]+)/$', + geo_view.list_country_items, name="telemeta-geo-country-items"), - url(r'^geo/country_info/(?P[0-9a-z]+)/$', + url(r'^geo/country_info/(?P[0-9a-z]+)/$', geo_view.country_info, name="telemeta-country-info"), # CSS+Images (FIXME: for developement only) - url(r'^css/(?P.*)$', 'django.views.static.serve', + url(r'^css/(?P.*)$', 'django.views.static.serve', {'document_root': htdocs+'/css'}, name="telemeta-css"), - url(r'images/(?P.*)$', 'django.views.static.serve', + url(r'images/(?P.*)$', 'django.views.static.serve', {'document_root': htdocs+'/images'}, name="telemeta-images"), - url(r'^js/(?P.*)$', 'django.views.static.serve', + url(r'^js/(?P.*)$', 'django.views.static.serve', {'document_root': htdocs+'/js'}, name="telemeta-js"), - url(r'^swf/(?P.*)$', 'django.views.static.serve', + url(r'^swf/(?P.*)$', 'django.views.static.serve', {'document_root': htdocs+'/swf'}, name="telemeta-swf"), - url(r'^timeside/(?P.*)$', 'django.views.static.serve', + url(r'^timeside/(?P.*)$', 'django.views.static.serve', {'document_root': htdocs+'/timeside'}, name="telemeta-timeside"), @@ -291,29 +287,29 @@ urlpatterns = patterns('', # Users url(r'^users/$', general_view.users, name="telemeta-users"), - + # Profiles url(r'^users/(?P[A-Za-z0-9._-]+)/profile/$', profile_view.profile_detail, name="telemeta-profile-detail"), url(r'^users/(?P[A-Za-z0-9._-]+)/profile/edit/$', profile_view.profile_edit, name="telemeta-profile-edit"), - + # Registration url(r'^accounts/password_change/$', 'django.contrib.auth.views.password_change', {'template_name': 'telemeta/registration/password_change_form.html'}, name="telemeta-password-change"), url(r'^accounts/password_change_done/$', 'django.contrib.auth.views.password_change_done', {'template_name': 'telemeta/registration/password_change_done.html'}, name="telemeta-password-change-done"), - + url(r'^accounts/password_reset/$', 'django.contrib.auth.views.password_reset', {'template_name': 'telemeta/registration/password_reset_form.html', 'email_template_name': 'telemeta/registration/password_reset_email.html'}, name="telemeta-password-reset"), url(r'^accounts/password_reset_done/$', 'django.contrib.auth.views.password_reset_done', {'template_name': 'telemeta/registration/password_reset_done.html'}, name="telemeta-password-reset-done"), url(r'^accounts/password_reset_confirm/(?P[A-Za-z0-9._-]+)/(?P[A-Za-z0-9._-]+)/$', 'django.contrib.auth.views.password_reset_confirm', {'template_name': 'telemeta/registration/password_reset_confirm.html'}, name="telemeta-password-reset-confirm"), url(r'^accounts/password_reset_complete/$', 'django.contrib.auth.views.password_reset_complete', {'template_name': 'telemeta/registration/password_reset_complete.html'}, name="telemeta-password-reset-complete"), url(r'^accounts/password_reset_complete/$', 'django.contrib.auth.views.password_reset_complete', {'template_name': 'telemeta/registration/password_reset_complete.html'}, name="telemeta-password-reset-complete"), - + # JSON RPC url(r'json/$', jsonrpc_site.dispatch, name='jsonrpc_mountpoint'), # for the graphical browser/web console only, omissible - # url(r'json/browse/', 'jsonrpc.views.browse', name="jsonrpc_browser"), - + # url(r'json/browse/', 'jsonrpc.views.browse', name="jsonrpc_browser"), + # Playlists url(r'^playlists/(?P[a-zA-Z0-9]+)/(?P[a-zA-Z0-9]+)/csv/$', playlist_view.playlist_csv_export, name="telemeta-playlist-csv-export"), - + # RSS feeds url(r'^rss/$', LastestRevisionsFeed(), name="telemeta-rss"), diff --git a/telemeta/views/base.py b/telemeta/views/base.py index 1bed4a09..f0135261 100644 --- a/telemeta/views/base.py +++ b/telemeta/views/base.py @@ -144,6 +144,17 @@ def get_revisions(nb): element = MediaItemMarker.objects.get(pk=revision.element_id) except: element = None + if revision.element_type == 'corpus': + try: + element = MediaCorpus.objects.get(pk=revision.element_id) + except: + element = None + if revision.element_type == 'fonds': + try: + element = MediaFonds.objects.get(pk=revision.element_id) + except: + element = None + if not element == None: revisions.append({'revision': revision, 'element': element}) return revisions @@ -177,17 +188,14 @@ def check_related_media(medias): media.set_mime_type() media.save() if not media.title and media.url: - try: - from lxml import etree - parser = etree.HTMLParser() - tree = etree.parse(media.url, parser) - title = tree.find(".//title").text - title = title.replace('\n', '').strip() - media.title = title - except: - media.title = media.url + import lxml.etree + parser = lxml.etree.HTMLParser() + parser = lxml.etree.HTMLParser() + tree = lxml.etree.parse(media.url, parser) + title = tree.find(".//title").text + media.title = title.replace('\n', '').strip() media.save() - + class GeneralView(object): """Provide general web UI methods""" @@ -383,7 +391,7 @@ class CollectionView(object): related_media = MediaCollectionRelated.objects.filter(collection=collection) check_related_media(related_media) - + return render(request, template, {'collection': collection, 'playlists': playlists, 'public_access': public_access, 'items': items, 'related_media': related_media}) @method_decorator(permission_required('telemeta.change_mediacollection')) @@ -560,7 +568,7 @@ class ItemView(object): related_media = MediaItemRelated.objects.filter(item=item) check_related_media(related_media) - + return render(request, template, {'item': item, 'export_formats': formats, 'visualizers': graphers, 'visualizer_id': grapher_id, @@ -1367,219 +1375,127 @@ class LastestRevisionsFeed(Feed): -class CorpusView(object): - """Provide Corpus web UI methods""" - - def corpus_detail(self, request, public_id, template='telemeta/corpus_detail.html'): - corpus = MediaCorpus.objects.get(public_id=public_id) - items = corpus.items.enriched() - items = items.order_by('code', 'old_code') - - if corpus.public_access == 'none' and not (request.user.is_staff or request.user.is_superuser): - mess = ugettext('Access not allowed') - title = ugettext('Corpus') + ' : ' + public_id + ' : ' + mess - description = ugettext('Please login or contact the website administator to get a private access.') - messages.error(request, title) - return render(request, 'telemeta/messages.html', {'description' : description}) - - public_access = get_public_access(corpus.public_access, corpus.recorded_from_year, - corpus.recorded_to_year) - playlists = get_playlists(request) - - related_media = MediaCorpusRelated.objects.filter(corpus=corpus) +class ResourceView(object): + """Provide Resource web UI methods""" + + types = {'corpus': + {'model': MediaCorpus, + 'form' : MediaCorpusForm, + 'related': MediaCorpusRelated, + 'related_form': MediaCorpusRelatedForm + }, + 'fonds': + {'model': MediaFonds, + 'form' : MediaFondsForm, + 'related': MediaFondsRelated, + 'related_form': MediaFondsRelatedForm + } + } + + def setup(self, type): + self.model = self.types[type]['model'] + self.form = self.types[type]['form'] + self.related = self.types[type]['related'] + self.related_form = self.types[type]['related_form'] + self.type = type + + def detail(self, request, type, public_id, template='telemeta/resource_detail.html'): + self.setup(type) + resource = self.model.objects.get(code=public_id) + children = resource.children.all() + children = children.order_by('code') + + related_media = self.related.objects.filter(resource=resource) check_related_media(related_media) - return render(request, template, {'corpus': corpus, 'playlists': playlists, 'public_access': public_access, 'items': items, 'related_media': related_media}) + return render(request, template, {'resource': resource, 'type': type, 'children': children, 'related_media': related_media}) - @method_decorator(permission_required('telemeta.change_mediacorpus')) - def corpus_edit(self, request, public_id, template='telemeta/corpus_edit.html'): - corpus = MediaCorpus.objects.get(public_id=public_id) + def edit(self, request, type, public_id, template='telemeta/resource_edit.html'): + self.setup(type) + resource = self.model.objects.get(code=public_id) if request.method == 'POST': - form = MediaCorpusForm(data=request.POST, files=request.FILES, instance=corpus) + form = self.form(data=request.POST, files=request.FILES, instance=resource) if form.is_valid(): code = form.cleaned_data['code'] if not code: code = public_id form.save() - corpus.set_revision(request.user) - return HttpResponseRedirect('/corpus/'+code) + resource.set_revision(request.user) + return HttpResponseRedirect('/archives/'+self.type+'/'+code) else: - form = MediaCorpusForm(instance=corpus) + form = self.form(instance=resource) + return render(request, template, {'resource': resource, 'type': type, 'form': form,}) - return render(request, template, {'corpus': corpus, "form": form,}) - - @method_decorator(permission_required('telemeta.add_mediacorpus')) - def corpus_add(self, request, template='telemeta/corpus_add.html'): - corpus = MediaCorpus() + def add(self, request, type, template='telemeta/resource_add.html'): + self.setup(type) + resource = self.model() if request.method == 'POST': - form = MediaCorpusForm(data=request.POST, files=request.FILES, instance=corpus) + form = self.form(data=request.POST, files=request.FILES, instance=resource) if form.is_valid(): code = form.cleaned_data['code'] if not code: code = public_id form.save() - corpus.set_revision(request.user) - return HttpResponseRedirect('/corpus/'+code) + resource.set_revision(request.user) + return HttpResponseRedirect('/archives/'+self.type +'/'+code) else: - form = MediaCorpusForm(instance=corpus) - - return render(request, template, {'corpus': corpus, "form": form,}) + form = self.form(instance=resource) + return render(request, template, {'resource': resource, 'type': type, 'form': form,}) - @method_decorator(permission_required('telemeta.add_mediacorpus')) - def corpus_copy(self, request, public_id, template='telemeta/corpus_edit.html'): + def copy(self, request, type, public_id, template='telemeta/resource_edit.html'): + self.setup(type) if request.method == 'POST': - corpus = MediaCorpus() - form = MediaCorpusForm(data=request.POST, files=request.FILES, instance=corpus) + resource = self.model() + form = self.form(data=request.POST, files=request.FILES, instance=resource) if form.is_valid(): code = form.cleaned_data['code'] if not code: code = public_id - form.save() - corpus.set_revision(request.user) - return HttpResponseRedirect('/corpus/'+code) + resource.save() + resource.set_revision(request.user) + return HttpResponseRedirect('/archives/'+self.type +'/'+code) else: - corpus = MediaCorpus.objects.get(public_id=public_id) - form = MediaCorpusForm(instance=corpus) - - return render(request, template, {'corpus': corpus, "form": form,}) - - @method_decorator(permission_required('telemeta.delete_mediacorpus')) - def corpus_delete(self, request, public_id): - """Delete a given corpus""" - corpus = MediaCorpus.objects.get(public_id=public_id) - corpus.delete() - return HttpResponseRedirect('/corpus/') - - def related_media_corpus_stream(self, request, corpus_public_id, media_id): - corpus = MediaCorpus.objects.get(public_id=corpus_public_id) - media = MediaCorpusRelated.objects.get(corpus=corpus, id=media_id) - response = HttpResponse(stream_from_file(media.file.path), mimetype=media.mime_type) -# response['Content-Disposition'] = 'attachment' - return response - - @method_decorator(permission_required('telemeta.change_mediacorpus')) - def related_media_edit(self, request, public_id, template): - corpus = MediaCorpus.objects.get(public_id=public_id) - MediaCorpusRelatedFormSet = inlineformset_factory(MediaCorpus, MediaCorpusRelated, form=MediaCorpusRelatedForm) - if request.method == 'POST': - formset = MediaCorpusRelatedFormSet(data=request.POST, files=request.FILES, instance=corpus) - if formset.is_valid(): - formset.save() - corpus.set_revision(request.user) - return HttpResponseRedirect('/corpus/'+public_id) - else: - formset = MediaCorpusRelatedFormSet(instance=corpus) - - return render(request, template, {'corpus': corpus, 'formset': formset,}) + resource = self.model.objects.get(code=public_id) + form = self.form(instance=resource) + return render(request, template, {'resource': resource, 'type': type, "form": form,}) -class CorpusView(object): - """Provide Corpuss web UI methods""" - - def corpus_detail(self, request, public_id, template='telemeta/corpus_detail.html'): - corpus = MediaCorpus.objects.get(public_id=public_id) - collections = corpus.collections.enriched() - collections = collections.order_by('code') - - if corpus.public_access == 'none' and not (request.user.is_staff or request.user.is_superuser): - mess = ugettext('Access not allowed') - title = ugettext('Corpus') + ' : ' + public_id + ' : ' + mess - description = ugettext('Please login or contact the website administator to get a private access.') - messages.error(request, title) - return render(request, 'telemeta/messages.html', {'description' : description}) - - related_media = MediaCorpusRelated.objects.filter(corpus=corpus) - check_related_media(related_media) - - return render(request, template, {'corpus': corpus, 'collections': collections, 'related_media': related_media}) - - @method_decorator(permission_required('telemeta.change_mediacorpus')) - def corpus_edit(self, request, public_id, template='telemeta/corpus_edit.html'): - corpus = MediaCorpus.objects.get(public_id=public_id) - if request.method == 'POST': - form = MediaCorpusForm(data=request.POST, files=request.FILES, instance=corpus) - if form.is_valid(): - code = form.cleaned_data['code'] - if not code: - code = public_id - form.save() - corpus.set_revision(request.user) - return HttpResponseRedirect('/archives/corpus/'+code) - else: - form = MediaCorpusForm(instance=corpus) - - return render(request, template, {'corpus': corpus, "form": form,}) - - @method_decorator(permission_required('telemeta.add_mediacorpus')) - def corpus_add(self, request, template='telemeta/corpus_add.html'): - corpus = MediaCorpus() - if request.method == 'POST': - form = MediaCorpusForm(data=request.POST, files=request.FILES, instance=corpus) - if form.is_valid(): - code = form.cleaned_data['code'] - if not code: - code = public_id - form.save() - corpus.set_revision(request.user) - return HttpResponseRedirect('/archives/corps/'+code) - else: - form = MediaCorpusForm(instance=corpus) - - return render(request, template, {'corpus': corpus, "form": form,}) - - @method_decorator(permission_required('telemeta.add_mediacorpus')) - def corpus_copy(self, request, public_id, template='telemeta/corpus_edit.html'): - if request.method == 'POST': - corpus = MediaCorpus() - form = MediaCorpusForm(data=request.POST, files=request.FILES, instance=corpus) - if form.is_valid(): - code = form.cleaned_data['code'] - if not code: - code = public_id - form.save() - corpus.set_revision(request.user) - return HttpResponseRedirect('/archives/corpus/'+code) - else: - corpus = MediaCorpus.objects.get(public_id=public_id) - form = MediaCorpusForm(instance=corpus) - - return render(request, template, {'corpus': corpus, "form": form,}) - - def corpus_playlist(self, request, public_id, template, mimetype): + def playlist(self, request, type, public_id, template, mimetype): + self.setup(type) try: - corpus = MediaCorpus.objects.get(public_id=public_id) + resource = self.model.objects.get(code=public_id) except ObjectDoesNotExist: raise Http404 template = loader.get_template(template) - context = RequestContext(request, {'corpus': corpus, 'host': request.META['HTTP_HOST']}) + context = RequestContext(request, {'resource': resource, 'host': request.META['HTTP_HOST']}) return HttpResponse(template.render(context), mimetype=mimetype) - @method_decorator(permission_required('telemeta.delete_mediacorpus')) - def corpus_delete(self, request, public_id): - """Delete a given corpus""" - corpus = MediaCorpus.objects.get(public_id=public_id) - corpus.delete() - return HttpResponseRedirect('/archives/corpus/') + def delete(self, request, type, public_id): + self.setup(type) + resource = self.model.objects.get(code=public_id) + resource.delete() + return HttpResponseRedirect('/archives/'+self.type+'/') - def related_media_corpus_stream(self, request, corpus_public_id, media_id): - corpus = MediaCorpus.objects.get(public_id=corpus_public_id) - media = MediaCorpusRelated.objects.get(corpus=corpus, id=media_id) + def related_stream(self, request, type, public_id, media_id): + self.setup(type) + resource = self.model.objects.get(code=public_id) + media = self.related.objects.get(resource=resource, id=media_id) response = HttpResponse(stream_from_file(media.file.path), mimetype=media.mime_type) # response['Content-Disposition'] = 'attachment' return response - @method_decorator(permission_required('telemeta.change_mediacorpus')) - def related_media_edit(self, request, public_id, template): - corpus = MediaCorpus.objects.get(public_id=public_id) - MediaCorpusRelatedFormSet = inlineformset_factory(MediaCorpus, MediaCorpusRelated, form=MediaCorpusRelatedForm) + def related_edit(self, request, type, public_id, template): + self.setup(type) + resource = self.model.objects.get(code=public_id) + ResourceRelatedFormSet = inlineformset_factory(self.model, self.related, form=self.related_form) if request.method == 'POST': - formset = MediaCorpusRelatedFormSet(data=request.POST, files=request.FILES, instance=corpus) + formset = ResourceRelatedFormSet(data=request.POST, files=request.FILES, instance=resource) if formset.is_valid(): formset.save() - corpus.set_revision(request.user) - return HttpResponseRedirect('/archives/corpus/'+public_id) + resource.set_revision(request.user) + return HttpResponseRedirect('/archives/'+self.type+'/'+public_id) else: - formset = MediaCorpusRelatedFormSet(instance=corpus) + formset = ResourceRelatedFormSet(instance=resource) + return render(request, template, {'resource': resource, 'type': type, 'formset': formset,}) - return render(request, template, {'corpus': corpus, 'formset': formset,})