Changeset 16383f0

Timestamp:

02/13/12 23:09:02 (16 months ago)

Author:

yomguy <yomguy@…>

Branches:

crem, crem2, dev2, diadems

Children:

7334cc3

Parents:

5bdea41 (diff), 5fe48d9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

yomguy <yomguy@…> (02/13/12 23:09:02)

git-committer:

yomguy <yomguy@…> (02/13/12 23:09:02)

Message:

Merge branch 'master' into crem

Files:

• CHANGELOG (modified) (1 diff)
• INSTALL.rst (modified) (8 diffs)
• README.rst (modified) (2 diffs)
• telemeta/forms/__init__.py (modified) (1 diff)
• telemeta/forms/system.py (added)
• telemeta/htdocs/css/indicator.gif (added)
• telemeta/htdocs/css/player.css (modified) (1 diff)
• telemeta/htdocs/images/adv_search_red.png (modified) (previous)
• telemeta/htdocs/images/maximize.png (modified) (previous)
• telemeta/htdocs/images/maximize_old.gif (added)
• telemeta/htdocs/images/maximize_old.png (added)
• telemeta/htdocs/images/search_wh2.png (added)
• telemeta/htdocs/js/locale.js (modified) (1 diff)
• telemeta/htdocs/js/playlist.js (modified) (5 diffs)
• telemeta/locale/de/LC_MESSAGES/django.mo (modified) (previous)
• telemeta/locale/de/LC_MESSAGES/django.po (modified) (46 diffs)
• telemeta/locale/de/LC_MESSAGES/djangojs.mo (modified) (previous)
• telemeta/locale/de/LC_MESSAGES/djangojs.po (modified) (2 diffs)
• telemeta/locale/fr/LC_MESSAGES/django.mo (modified) (previous)
• telemeta/locale/fr/LC_MESSAGES/django.po (modified) (48 diffs)
• telemeta/locale/fr/LC_MESSAGES/djangojs.mo (modified) (previous)
• telemeta/locale/fr/LC_MESSAGES/djangojs.po (modified) (2 diffs)
• telemeta/migrations/0003_auto__add_criteria__add_field_search_description.py (added)
• telemeta/migrations/0004_auto__del_field_search_keywords.py (added)
• telemeta/migrations/0005_auto__chg_field_search_date.py (added)
• telemeta/models/media.py (modified) (3 diffs)
• telemeta/models/query.py (modified) (1 diff)
• telemeta/models/system.py (modified) (4 diffs)
• telemeta/templates/telemeta/base.html (modified) (1 diff)
• telemeta/templates/telemeta/collection_detail.html (modified) (2 diffs)
• telemeta/templates/telemeta/inc/children_list.html (modified) (1 diff)
• telemeta/templates/telemeta/inc/module_revisions.html (modified) (1 diff)
• telemeta/templates/telemeta/inc/module_searches.html (added)
• telemeta/templates/telemeta/inc/module_user_revisions.html (added)
• telemeta/templates/telemeta/lists.html (modified) (6 diffs)
• telemeta/templates/telemeta/resource_detail.html (modified) (2 diffs)
• telemeta/templates/telemeta/resource_edit.html (modified) (1 diff)
• telemeta/templates/telemeta/search_results.html (modified) (4 diffs)
• telemeta/templatetags/telemeta_utils.py (modified) (1 diff)
• telemeta/urls.py (modified) (5 diffs)
• telemeta/util/locale_fix.py (modified) (1 diff)
• telemeta/views/base.py (modified) (14 diffs)
• tools/dev/fix_svn_authors.sh (added)
• tools/dev/make_doc.sh (added)
• tools/dev/merge_master_all.sh (added)
• tools/dev/merge_master_to.sh (added)
• tools/dev/push.sh (added)
• tools/dev/translate.sh (added)
• telemeta/pages/en/home.rst (modified) (1 diff)
• telemeta/pages/en/legal_notices.rst (modified) (1 diff)
• telemeta/pages/fr/home.rst (modified) (1 diff)
• telemeta/pages/fr/legal_notices.rst (modified) (1 diff)

CHANGELOG

@@ +1 @@
+telemeta (1.4-1) unstable; urgency=low
+
+For users:
+    
+ * add a Desk providing links to home and personal data
+ * add Fonds, Corpus and their related media to the models and to the search engine
+ * add some fancy drop down menus for main tabs
+ * add video media handling (WebM formats only and with the last TimeSide master branch)
+ * add playlist metadata editor
+ * fix some sad bugs for YouTube related URLs and previews
+ * cleanup admin page
+ * many bugfixes !
+
+For developers and maintainers:
+
+ * a new setting parameter: TELEMETA_DOWNLOAD_FORMATS = ('wav', 'mp3', 'webm') or whatever
+ * before upgrading, you need to BACKUP and manually delete old wrong MediaCorpus and MediaCorpusRelated tables
+ * we now use South for data model migration (./manage.py migrate telemeta). Add it to your apps. See INSTALL.rst. Email me if any pb!
+
+-- Guillaume Pellerin <yomguy@parisson.com>  Fri, 10 Feb 2012 16:10:22 +0200
+
 telemeta (1.3-1) unstable; urgency=low
 

INSTALL.rst

@@ -24 +24 @@
 
         sudo aptitude install python python-dev python-django python-xml python-mysqldb mysql-server \
-        python-ctypes python-setuptools python-support python-docutils \
-        python-libxml2 python-django-registration python-lxml python-numpy \
-        python-scipy python-imaging python-mutagen python-gobject python-gst0.10 \
-        gstreamer0.10-plugins-base gobject-introspection python-django-south
-
-    To get MP3 reading and writing, just add these lines to your /etc/apt/sources-list::
-
-        deb http://www.debian-multimedia.org stable main
-
-    Then::
-
+            python-ctypes python-setuptools python-support python-docutils \
+            python-libxml2 python-django-registration python-lxml python-numpy \
+            python-scipy python-imaging python-mutagen python-gobject python-gst0.10 \
+            gstreamer0.10-plugins-base gobject-introspection python-django-south
+
+    To get MP3 reading and writing::
+
+        echo 'deb http://www.debian-multimedia.org stable main' | sudo tee -a /etc/apt/sources-list
         sudo apt-get update
         sudo aptitude install gstreamer0.10-fluendo-mp3 gstreamer0.10-lame
@@ -40 +37 @@
 * On other linux platforms:
 
-    Please install all dependencies thanks to your application manager.
+    Please install all the equivalent dependencies thanks to your application manager or manually.
 
 
@@ -46 +43 @@
 -----------------------------
 
-Pip style (recommended)
-++++++++++++++++++++++++
+Pip method (highly recommended!)
++++++++++++++++++++++++++++++++++
 
 We strongly advise you use the python package tool as it installs some good dependencies automatically::
@@ -106 +103 @@
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
+It is strongly advised to use South and then enable data schema migrations between the models and the database.
+It will allow automatic DB updates when your / our models are modified. Because the first one you use is not only the best one...
+
 Install it using pip::
 
     sudo pip install south
 
-or, from source::
+or::
 
     sudo easy_install South
@@ -116 +116 @@
 
 -------------------------
-Testing (sandbox)
--------------------------
-
-If you just want to test Telemeta, a sandbox is available in the example/ directory.
-As Telemeta needs MySQL to work properly and fast, please create a database before editing setting.py
-
-
---------------------------
-Create a Django project
---------------------------
+Fast testing (sandbox)
+-------------------------
+
+If you just want to test Telemeta just now, a sandbox is available in the example/ directory::
+
+    cd example/sandbox_sqlite
+    ./manage.py syncdb
+    ./manage.py runserver 9000
+
+Now browse http://localhost:9000
+
+
+-------------------------------
+Create a new Telemeta project
+-------------------------------
 
 Start the project
@@ -196 +201 @@
     TELEMETA_GMAP_KEY =             your Google Map API key
     TELEMETA_DOWNLOAD_ENABLED =     True to enable raw audio data download
-    TELEMETA_STREAMING_FORMATS =    tuple of authoized streaming formats. Ex : ('mp3', 'ogg')
+    TELEMETA_STREAMING_FORMATS =    tuple of authorized streaming formats. Ex: ('mp3', 'ogg')
+    TELEMETA_DOWNLOAD_FORMATS =     tuple of authorized download formats. Ex: ('wav', 'mp3', 'webm')
     TELEMETA_PUBLIC_ACCESS_PERIOD = number of years above which item files are automagically published
     EMAIL_HOST =                    your default SMTP server
@@ -210 +216 @@
     CACHE_BACKEND = "file://" + TELEMETA_CACHE_DIR + "/data"
 
-If you want some personal templates, for example::
+Optional: if you want some personal templates, for example::
 
     TEMPLATE_DIRS = (
@@ -259 +265 @@
 
     ./manage.py syncdb
-    ./manage.py schemamigration telemeta --initial
-    ./manage.py migrate telemeta --fake
+
+If you want tu use the data schema migration system (South needed, see previous paragraph)::
+
     ./manage.py migrate telemeta
 

README.rst

@@ -11 +11 @@
 
     * Secure archiving, editing and publishing of audio files over internet.
-    * User friendly web frontend including workflows and high level search methods
+    * User friendly and full HTML web frontend including workflows and high level search methods
     * Smart dynamical and skinnable audio player (thanks to Timeside and SoundManager2)
     * "On the fly" analyzing, transcoding and metadata embedding based on an easy plugin architecture
@@ -26 +26 @@
 ================================
 
-See `INSTALL.rst <http://telemeta.org/browser/INSTALL.rst>`_ and `telemeta.org <http://telemeta.org>`_ for more informations.
+See `INSTALL.rst <http://github.com/yomguy/Telemeta/blob/master/INSTALL.rst>`_ and `telemeta.org <http://telemeta.org>`_ for more informations.
 
 
-Changelog
-=========
+Changes
+========
 
-See `CHANGELOG <http://telemeta.org/browser/CHANGELOG>`_
+(from 1.3)
+
+For users:
+
+ * add a Desk providing links to home and personal data
+ * add Fonds, Corpus and their related media to the models and to the search engine
+ * add some fancy drop down menus for main tabs
+ * add video media handling (WebM formats only and with the last TimeSide master branch)
+ * add playlist metadata editor
+ * fix some sad bugs for YouTube related URLs and previews
+ * cleanup admin page
+ * many bugfixes !
+
+For developers and maintainers:
+
+ * a new setting parameter: TELEMETA_DOWNLOAD_FORMATS = ('wav', 'mp3', 'webm') or whatever
+ * before upgrading, you need to BACKUP and manually delete old wrong MediaCorpus and MediaCorpusRelated tables
+ * we now use South for data model migration (./manage.py migrate telemeta). Add it to your apps. See INSTALL.rst. Email me if any pb!
+
+Full changelog : see `CHANGELOG <http://github.com/yomguy/Telemeta/blob/master/CHANGELOG>`_
 
 

telemeta/forms/__init__.py

@@ -2 +2 @@
 from media import *
 from language import *
+from system import *

telemeta/htdocs/css/player.css

@@ -17 +17 @@
     display: block;
     overflow: hidden;
-    float: right;
+    float: left;
     width: 18px;
     padding: 10px 0 0 0;

telemeta/htdocs/js/locale.js

@@ -11 +11 @@
     'Paste HTML to embed player in website': gettext('Paste HTML to embed player in website'),
     'delete the item permanently?' : gettext('delete the item permanently?'),
-    'delete the collection permanently?' : gettext('delete the collection permanently?')
+    'delete the collection permanently?' : gettext('delete the collection permanently?'),
+    'delete the playlist permanently?' : gettext('delete the playlist permanently?'),
+    'delete the resource from the playlist permanently?' : gettext('delete the resource from the playlist permanently?'),
 };
 

telemeta/htdocs/js/playlist.js

@@ -45 +45 @@
 
     addPlaylist: function(name, id){
-        //this.playlists[name]=id;
         this.playlists.push({
             'name':name,
             'id':id
+        });
+    },
+
+    addEditPlaylist: function(id, title, description){
+        this.playlists.push({
+            'id': id,
+            'title': title,
+            'description': description,
         });
     },
@@ -98 +105 @@
             window.location.reload();
         });
-
-
-    },
+    },
+    
     remove: function(id){
         json([id],'telemeta.del_playlist',function(){
@@ -113 +119 @@
     },
 
-
+    update : function(dictionary){
+        json([dictionary],'telemeta.update_playlist',function(){
+        window.location.reload();
+        });
+    },
+
+    showEdit: function(anchorElement, id){
+
+        var t = gettrans('title');
+        var d = gettrans('description');
+        var dd = {};
+        var playlist = this;
+        
+        var playlists = this.playlists;
+        for (var i=0; i< playlists.length; i++){
+            if (playlists[i].id == id){
+                dd[t] = playlists[i].title;
+                dd[d] = playlists[i].description;
+            }
+        }
+        
+        new PopupDiv({
+            'content':dd,
+                    invoker:anchorElement,
+                    showOk:true,
+                    onOk:function(data){
+                        if(!data[t] && !data[d]){
+                            return;
+                        }
+                        //convert language
+                        playlist.update({
+                            'public_id': id,
+                            'title': data[t],
+                            'description': data[d],
+                        });
+                    }
+        }).show();
+    },
+    
     /*shows the popup for adding a resource to a playlist*/
-    showAddResourceToPlaylist: function(anchorElement,resourceType,objectId, optionalOkMessage){
+    showAddResourceToPlaylist: function(anchorElement, resourceType, objectId, optionalOkMessage){
         var ar = [];
         var playlists = this.playlists;
@@ -121 +165 @@
             ar.push(playlists[i].name);
         }
+        var pl = this;
+        
         if(!ar.length){
-            return;
-        }
-        var pl = this;
+            pl.showAdd(anchorElement);
+        }
+        
         //var addFcn = this.addResourceToPlaylist;
         new PopupDiv({
@@ -132 +178 @@
                 var val = data.selIndex;
                 var callbackok = undefined;
+                    
                 if(optionalOkMessage){
                     callbackok = function(){

telemeta/locale/de/LC_MESSAGES/django.po

@@ -9 +9 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-01 14:59+0100\n"
+"POT-Creation-Date: 2012-02-13 16:36+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -28 +28 @@
 
 #: models/enum.py:41 models/enum.py:139 models/media.py:455
+#: models/system.py:103
 msgid "value"
 msgstr ""
@@ -215 +216 @@
 
 #: models/media.py:123 models/media.py:522 models/media.py:541
-#: models/media.py:555
+#: models/system.py:115
 msgid "date"
 msgstr ""
@@ -243 +244 @@
 msgstr ""
 
-#: models/media.py:175 models/media.py:634
+#: models/media.py:175 models/media.py:622
 msgid "recording year (from)"
 msgstr ""
 
-#: models/media.py:176 models/media.py:635
+#: models/media.py:176 models/media.py:623
 msgid "recording year (until)"
 msgstr ""
@@ -415 +416 @@
 msgstr ""
 
-#: models/media.py:362 models/media.py:554
-#: templates/telemeta/mediaitem_detail.html:197
+#: models/media.py:362 templates/telemeta/mediaitem_detail.html:224
 #: templates/telemeta/mediaitem_detail_video.html:192
 msgid "keywords"
@@ -483 +483 @@
 msgstr ""
 
-#: models/media.py:520 models/system.py:54
+#: models/media.py:520 models/system.py:55
 msgid "time"
 msgstr ""
@@ -495 +495 @@
 msgstr ""
 
-#: models/media.py:633
+#: models/media.py:621
 msgid "collections"
 msgstr ""
 
-#: models/media.py:643 models/media.py:644 models/media.py:654
-#: models/media.py:669
+#: models/media.py:633 models/media.py:634 models/media.py:643
+#: models/media.py:660
 msgid "corpus"
 msgstr ""
 
-#: models/media.py:662 models/media.py:663 models/media.py:680
+#: models/media.py:653 models/media.py:654 models/media.py:671
 msgid "fonds"
 msgstr ""
 
-#: models/media.py:673 models/media.py:674
+#: models/media.py:664 models/media.py:665
 msgid "corpus related media"
 msgstr ""
 
-#: models/media.py:684 models/media.py:685
+#: models/media.py:675 models/media.py:676
 msgid "fonds related media"
 msgstr ""
 
-#: models/system.py:51
+#: models/system.py:52
 msgid "element type"
 msgstr ""
 
-#: models/system.py:52
+#: models/system.py:53
 msgid "element identifier"
 msgstr ""
 
-#: models/system.py:53
+#: models/system.py:54
 msgid "modification type"
 msgstr ""
 
-#: models/system.py:55
+#: models/system.py:56
 msgid "user"
 msgstr ""
 
-#: models/system.py:84 templates/telemeta/profile_detail.html:36
+#: models/system.py:85 templates/telemeta/profile_detail.html:36
 msgid "Institution"
 msgstr ""
 
-#: models/system.py:85 templates/telemeta/profile_detail.html:37
+#: models/system.py:86 templates/telemeta/profile_detail.html:37
 msgid "Department"
 msgstr ""
 
-#: models/system.py:86 templates/telemeta/profile_detail.html:38
+#: models/system.py:87 templates/telemeta/profile_detail.html:38
 msgid "Function"
 msgstr ""
 
-#: models/system.py:87 templates/telemeta/profile_detail.html:39
+#: models/system.py:88 templates/telemeta/profile_detail.html:39
 msgid "Attachment"
 msgstr ""
 
-#: models/system.py:88 templates/telemeta/profile_detail.html:40
+#: models/system.py:89 templates/telemeta/profile_detail.html:40
 msgid "Address"
 msgstr ""
 
-#: models/system.py:89 templates/telemeta/profile_detail.html:41
+#: models/system.py:90 templates/telemeta/profile_detail.html:41
 msgid "Telephone"
 msgstr ""
 
-#: models/system.py:90
+#: models/system.py:91
 msgid "Expiration_date"
 msgstr ""
 
-#: templates/admin/base.html:21 templates/telemeta/base.html:83
-#: templates/telemeta/base.html.py:100 templates/telemeta/base.html:106
+#: models/system.py:102
+msgid "key"
+msgstr ""
+
+#: models/system.py:116 templates/telemeta/mediaitem_detail_video.html:313
+#: templates/telemeta/inc/children_list.html:16
+#: templates/telemeta/inc/collection_related.html:38
+#: templates/telemeta/inc/mediaitem_related.html:38
+#: templates/telemeta/inc/resource_list.html:14
+#: templates/telemeta/inc/resource_related.html:38
+msgid "Description"
+msgstr ""
+
+#: models/system.py:118
+msgid "criteria"
+msgstr ""
+
+#: templates/admin/base.html:21 templates/telemeta/base.html:88
+#: templates/telemeta/base.html.py:92
 msgid "Home"
 msgstr ""
@@ -582 +599 @@
 
 #: templates/telemeta/admin_enumerations.html:6
-#: templates/telemeta/base.html:126 templates/telemeta/enumeration_edit.html:7
+#: templates/telemeta/base.html:112 templates/telemeta/enumeration_edit.html:7
 msgid "Enumerations"
 msgstr ""
 
 #: templates/telemeta/admin_enumerations.html:14
-#: templates/telemeta/lists.html:56 templates/telemeta/mediaitem_add.html:33
+#: templates/telemeta/lists.html:69 templates/telemeta/mediaitem_add.html:33
 #: templates/telemeta/mediaitem_copy.html:34
 #: templates/telemeta/mediaitem_detail_video.html:295
 #: templates/telemeta/mediaitem_edit.html:26
 #: templates/telemeta/search_criteria.html:78
-#: templates/telemeta/search_results.html:40
+#: templates/telemeta/search_results.html:41
 #: templates/telemeta/inc/children_list.html:15
 #: templates/telemeta/inc/collection_list.html:13
@@ -598 +615 @@
 #: templates/telemeta/inc/mediaitem_list.html:14
 #: templates/telemeta/inc/mediaitem_related.html:20
-#: templates/telemeta/inc/module_revisions.html:13
+#: templates/telemeta/inc/module_revisions.html:17
 #: templates/telemeta/inc/resource_list.html:13
 #: templates/telemeta/inc/resource_related.html:20
@@ -608 +625 @@
 msgstr ""
 
-#: templates/telemeta/admin_general.html:5 templates/telemeta/base.html:125
+#: templates/telemeta/admin_general.html:5 templates/telemeta/base.html:111
 msgid "General"
 msgstr ""
 
 #: templates/telemeta/admin_instruments.html:6
-#: templates/telemeta/admin_users.html:6 templates/telemeta/base.html:89
-#: templates/telemeta/base.html.py:120 templates/telemeta/users.html:5
-#: templates/telemeta/users.html.py:8
+#: templates/telemeta/admin_users.html:6 templates/telemeta/base.html:106
+#: templates/telemeta/users.html:5 templates/telemeta/users.html.py:8
 msgid "Users"
 msgstr ""
@@ -628 +644 @@
 msgstr ""
 
-#: templates/telemeta/base.html:59 templates/telemeta/base.html.py:102
+#: templates/telemeta/base.html:59 templates/telemeta/base.html.py:87
 msgid "Profile"
 msgstr ""
@@ -648 +664 @@
 msgstr ""
 
-#: templates/telemeta/base.html:84 templates/telemeta/base.html.py:112
+#: templates/telemeta/base.html:84
+msgid "Desk"
+msgstr ""
+
+#: templates/telemeta/base.html:86 views/base.py:269
+msgid "Lists"
+msgstr ""
+
+#: templates/telemeta/base.html:94
+msgid "Archives"
+msgstr ""
+
+#: templates/telemeta/base.html:96
+msgid "Fonds"
+msgstr ""
+
+#: templates/telemeta/base.html:97
+msgid "Corpus"
+msgstr ""
+
+#: templates/telemeta/base.html:98
 msgid "Collections"
 msgstr ""
 
-#: templates/telemeta/base.html:85 templates/telemeta/base.html.py:113
+#: templates/telemeta/base.html:99
 msgid "Items"
 msgstr ""
 
-#: templates/telemeta/base.html:86 templates/telemeta/base.html.py:117
-#: templates/telemeta/home.html:25
+#: templates/telemeta/base.html:103 templates/telemeta/home.html:25
 msgid "Geo Navigator"
 msgstr ""
 
-#: templates/telemeta/base.html:87 templates/telemeta/base.html.py:118
+#: templates/telemeta/base.html:104
 msgid "Advanced search"
 msgstr ""
 
-#: templates/telemeta/base.html:92 templates/telemeta/base.html.py:123
+#: templates/telemeta/base.html:109
 msgid "Admin"
 msgstr ""
 
-#: templates/telemeta/base.html:98
-msgid "Desk"
-msgstr ""
-
-#: templates/telemeta/base.html:101 views/base.py:264
-msgid "Lists"
-msgstr ""
-
-#: templates/telemeta/base.html:108
-msgid "Archives"
-msgstr ""
-
-#: templates/telemeta/base.html:110
-msgid "Fonds"
-msgstr ""
-
-#: templates/telemeta/base.html:111
-msgid "Corpus"
-msgstr ""
-
-#: templates/telemeta/base.html:127 templates/telemeta/instrument_edit.html:4
+#: templates/telemeta/base.html:113 templates/telemeta/instrument_edit.html:4
 #: templates/telemeta/instrument_edit.html:7
 #: templates/telemeta/instrument_edit_value.html:5
@@ -695 +710 @@
 msgstr ""
 
-#: templates/telemeta/base.html:159
+#: templates/telemeta/base.html:145
 msgid "Powered by"
 msgstr ""
 
-#: templates/telemeta/base.html:160
+#: templates/telemeta/base.html:146
 msgid "By"
 msgstr ""
 
-#: templates/telemeta/base.html:165
+#: templates/telemeta/base.html:151
 msgid ""
 "Usage of the archives in the respect of cultural heritage of the original "
@@ -709 +724 @@
 msgstr ""
 
-#: templates/telemeta/base.html:171
-#: templates/telemeta/collection_detail.html:117
+#: templates/telemeta/base.html:157
+#: templates/telemeta/collection_detail.html:121
 msgid "Legal notices"
 msgstr ""
@@ -737 +752 @@
 #: templates/telemeta/profile_edit.html:29
 #: templates/telemeta/resource_add.html:10
-#: templates/telemeta/resource_add.html:27
+#: templates/telemeta/resource_add.html:31
 #: templates/telemeta/resource_edit.html:9
-#: templates/telemeta/resource_edit.html:25
+#: templates/telemeta/resource_edit.html:29
 #: templates/telemeta/resource_related_edit.html:12
 #: templates/telemeta/resource_related_edit.html:39
@@ -757 +772 @@
 #: templates/telemeta/mediaitem_related_edit.html:41
 #: templates/telemeta/profile_edit.html:31
-#: templates/telemeta/resource_add.html:29
-#: templates/telemeta/resource_edit.html:27
+#: templates/telemeta/resource_add.html:33
+#: templates/telemeta/resource_edit.html:31
 #: templates/telemeta/resource_related_edit.html:41
 msgid "Save"
@@ -764 +779 @@
 
 #: templates/telemeta/collection_detail.html:5
-#: templates/telemeta/collection_detail_dc.html:5 views/base.py:411
+#: templates/telemeta/collection_detail_dc.html:5 views/base.py:459
 msgid "Collection"
 msgstr ""
 
 #: templates/telemeta/collection_detail.html:44
-#: templates/telemeta/mediaitem_detail.html:91
-#: templates/telemeta/mediaitem_detail.html:197
-#: templates/telemeta/mediaitem_detail.html:236
+#: templates/telemeta/lists.html:55
+#: templates/telemeta/mediaitem_detail.html:97
+#: templates/telemeta/mediaitem_detail.html:224
+#: templates/telemeta/mediaitem_detail.html:263
 #: templates/telemeta/mediaitem_detail_video.html:90
 #: templates/telemeta/mediaitem_detail_video.html:192
@@ -777 +793 @@
 #: templates/telemeta/mediaitem_detail_video.html:352
 #: templates/telemeta/profile_detail.html:65
-#: templates/telemeta/resource_detail.html:21
+#: templates/telemeta/resource_detail.html:43
 #: templates/telemeta/inc/collection_related.html:81
 #: templates/telemeta/inc/mediaitem_related.html:81
@@ -785 +801 @@
 
 #: templates/telemeta/collection_detail.html:45
-#: templates/telemeta/mediaitem_detail.html:92
+#: templates/telemeta/mediaitem_detail.html:98
 #: templates/telemeta/mediaitem_detail_video.html:91
-#: templates/telemeta/resource_detail.html:22
+#: templates/telemeta/resource_detail.html:44
 msgid "Copy"
 msgstr ""
@@ -796 +812 @@
 
 #: templates/telemeta/collection_detail.html:49
-#: templates/telemeta/mediaitem_detail.html:95
+#: templates/telemeta/mediaitem_detail.html:101
 #: templates/telemeta/mediaitem_detail_video.html:94
-#: templates/telemeta/resource_detail.html:25
+#: templates/telemeta/resource_detail.html:47
 msgid "Add to playlist"
 msgstr ""
@@ -807 +823 @@
 
 #: templates/telemeta/collection_detail.html:95
-#: templates/telemeta/lists.html:60
+#: templates/telemeta/lists.html:73
 #: templates/telemeta/inc/collection_list.html:17
 msgid "Recording period"
 msgstr ""
 
-#: templates/telemeta/collection_detail.html:104
-#: templates/telemeta/mediaitem_detail.html:177
+#: templates/telemeta/collection_detail.html:108
+#: templates/telemeta/mediaitem_detail.html:204
 #: templates/telemeta/mediaitem_detail_video.html:176
 msgid "Geographic and cultural informations"
 msgstr ""
 
-#: templates/telemeta/collection_detail.html:122
-#: templates/telemeta/lists.html:59
+#: templates/telemeta/collection_detail.html:126
+#: templates/telemeta/lists.html:72
 #: templates/telemeta/inc/collection_list.html:16
 #: templates/telemeta/inc/mediaitem_list.html:16
@@ -825 +841 @@
 msgstr ""
 
-#: templates/telemeta/collection_detail.html:131
+#: templates/telemeta/collection_detail.html:135
 msgid "Bibliographic references"
 msgstr ""
 
-#: templates/telemeta/collection_detail.html:144
-#: templates/telemeta/mediaitem_detail.html:253
+#: templates/telemeta/collection_detail.html:148
+#: templates/telemeta/mediaitem_detail.html:280
 #: templates/telemeta/mediaitem_detail_video.html:248
 msgid "Archiving data"
 msgstr ""
 
-#: templates/telemeta/collection_detail.html:150
+#: templates/telemeta/collection_detail.html:154
 msgid "Related documentation"
 msgstr ""
 
-#: templates/telemeta/collection_detail.html:154
+#: templates/telemeta/collection_detail.html:158
 msgid "Comments"
 msgstr ""
 
-#: templates/telemeta/collection_detail.html:168
-#: templates/telemeta/mediaitem_detail.html:269
+#: templates/telemeta/collection_detail.html:172
+#: templates/telemeta/mediaitem_detail.html:296
 #: templates/telemeta/mediaitem_detail_video.html:264
 msgid "Technical data"
 msgstr ""
 
-#: templates/telemeta/collection_detail.html:173
-#: templates/telemeta/mediaitem_detail.html:272
+#: templates/telemeta/collection_detail.html:177
+#: templates/telemeta/mediaitem_detail.html:299
 #: templates/telemeta/mediaitem_detail_video.html:267
 msgid "Media type"
 msgstr ""
 
-#: templates/telemeta/collection_detail.html:173
-#: templates/telemeta/mediaitem_detail.html:272
+#: templates/telemeta/collection_detail.html:177
 #: templates/telemeta/mediaitem_detail_video.html:267
 msgid "Audio"
 msgstr ""
 
-#: templates/telemeta/collection_detail.html:178
+#: templates/telemeta/collection_detail.html:182
 #: templates/telemeta/geo_countries.html:16
 msgid "Number of items"
 msgstr ""
 
-#: templates/telemeta/collection_detail.html:207
-#: templates/telemeta/lists.html:45
-#: templates/telemeta/mediaitem_detail.html:293
+#: templates/telemeta/collection_detail.html:211
+#: templates/telemeta/lists.html:58
+#: templates/telemeta/mediaitem_detail.html:320
 #: templates/telemeta/mediaitem_detail_video.html:363
-#: templates/telemeta/resource_detail.html:69
+#: templates/telemeta/resource_detail.html:95
 msgid "Delete"
 msgstr ""
@@ -892 +907 @@
 #: templates/telemeta/mediaitem_list.html:12
 #: templates/telemeta/search_results.html:13
-#: templates/telemeta/search_results.html:16
+#: templates/telemeta/search_results.html:17
 msgid "All"
 msgstr ""
@@ -907 +922 @@
 #: templates/telemeta/mediaitem_list.html:13
 #: templates/telemeta/search_results.html:14
-#: templates/telemeta/search_results.html:17
+#: templates/telemeta/search_results.html:18
 msgid "Sounds"
 msgstr ""
@@ -913 +928 @@
 #: templates/telemeta/collection_list.html:17
 #: templates/telemeta/enumeration_edit.html:23
-#: templates/telemeta/instrument_edit.html:22 templates/telemeta/lists.html:37
+#: templates/telemeta/instrument_edit.html:22 templates/telemeta/lists.html:49
 #: templates/telemeta/mediaitem_list.html:15
 #: templates/telemeta/resource_list.html:13
@@ -949 +964 @@
 #: templates/telemeta/enumeration_edit.html:31
 #: templates/telemeta/enumeration_edit_value.html:11
-#: templates/telemeta/mediaitem_detail.html:137
+#: templates/telemeta/mediaitem_detail.html:164
 #: templates/telemeta/mediaitem_detail_video.html:136
 msgid "Value"
@@ -1012 +1027 @@
 msgstr[1] ""
 
-#: templates/telemeta/home.html:14 templates/telemeta/home.html.py:57
+#: templates/telemeta/home.html:14 templates/telemeta/home.html.py:60
 msgid "Musical selection"
 msgstr ""
@@ -1030 +1045 @@
 msgstr ""
 
-#: templates/telemeta/lists.html:35 templates/telemeta/profile_detail.html:16
-msgid "Playlists"
-msgstr ""
-
-#: templates/telemeta/lists.html:57
-#: templates/telemeta/inc/module_revisions.html:14
+#: templates/telemeta/lists.html:47
+msgid "My playlists"
+msgstr ""
+
+#: templates/telemeta/lists.html:70
+#: templates/telemeta/inc/module_revisions.html:18
 msgid "Type"
 msgstr ""
 
-#: templates/telemeta/lists.html:58 templates/telemeta/mediaitem_add.html:34
+#: templates/telemeta/lists.html:71 templates/telemeta/mediaitem_add.html:34
 #: templates/telemeta/mediaitem_copy.html:35
 #: templates/telemeta/mediaitem_edit.html:27
@@ -1049 +1064 @@
 msgstr ""
 
-#: templates/telemeta/lists.html:61
+#: templates/telemeta/lists.html:74
 #: templates/telemeta/search_criteria.html:130
-#: templates/telemeta/search_results.html:57
+#: templates/telemeta/search_results.html:58
 #: templates/telemeta/inc/collection_list.html:18
 #: templates/telemeta/inc/mediaitem_list.html:23
@@ -1057 +1072 @@
 msgstr ""
 
-#: templates/telemeta/lists.html:62
+#: templates/telemeta/lists.html:75
 msgid "Action"
 msgstr ""
 
-#: templates/telemeta/lists.html:76
-#: templates/telemeta/inc/module_revisions.html:36
+#: templates/telemeta/lists.html:92
+#: templates/telemeta/inc/module_revisions.html:40
 msgid "deleted"
 msgstr ""
@@ -1081 +1096 @@
 #: templates/telemeta/mediaitem_copy.html:5
 #: templates/telemeta/mediaitem_detail.html:5
-#: templates/telemeta/mediaitem_detail_video.html:5 views/base.py:573
+#: templates/telemeta/mediaitem_detail_video.html:5 views/base.py:622
 msgid "Item"
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:97
+#: templates/telemeta/mediaitem_detail.html:103
 #: templates/telemeta/mediaitem_detail_video.html:96
 #: templates/telemeta/paginator.html:5
@@ -1091 +1106 @@
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:98
+#: templates/telemeta/mediaitem_detail.html:104
 #: templates/telemeta/mediaitem_detail_video.html:97
 #: templates/telemeta/paginator.html:23
@@ -1097 +1112 @@
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:126
+#: templates/telemeta/mediaitem_detail.html:153
 #: templates/telemeta/mediaitem_detail_video.html:125
 msgid "Analysis"
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:128
+#: templates/telemeta/mediaitem_detail.html:155
 #: templates/telemeta/mediaitem_detail_video.html:127
 msgid "Markers"
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:136
+#: templates/telemeta/mediaitem_detail.html:163
 #: templates/telemeta/mediaitem_detail_video.html:135
 msgid "Property"
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:138
+#: templates/telemeta/mediaitem_detail.html:165
 #: templates/telemeta/mediaitem_detail_video.html:137
 msgid "Unit"
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:146
+#: templates/telemeta/mediaitem_detail.html:173
 #: templates/telemeta/mediaitem_detail_video.html:145
 msgid "Download:"
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:167
+#: templates/telemeta/mediaitem_detail.html:194
 #: templates/telemeta/mediaitem_detail_video.html:166
 msgid "Recording date"
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:179
+#: templates/telemeta/mediaitem_detail.html:206
 #: templates/telemeta/mediaitem_detail_video.html:178
 #: templates/telemeta/inc/mediaitem_list.html:18
@@ -1133 +1148 @@
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:185
+#: templates/telemeta/mediaitem_detail.html:212
 msgid "Language ISO"
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:189
+#: templates/telemeta/mediaitem_detail.html:216
 #: templates/telemeta/mediaitem_detail_video.html:184
 msgid "Ethnographic context"
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:202
+#: templates/telemeta/mediaitem_detail.html:229
 #: templates/telemeta/mediaitem_detail_video.html:197
 msgid "Musical informations"
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:236
+#: templates/telemeta/mediaitem_detail.html:263
 #: templates/telemeta/mediaitem_detail_video.html:231
 msgid "performance"
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:241
+#: templates/telemeta/mediaitem_detail.html:268
 #: templates/telemeta/mediaitem_detail_video.html:236
 msgid "General informations"
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:243
+#: templates/telemeta/mediaitem_detail.html:270
 #: templates/telemeta/mediaitem_detail_video.html:238
 msgid "Remarks"
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:259
+#: templates/telemeta/mediaitem_detail.html:286
 #: templates/telemeta/mediaitem_detail_video.html:254
 msgid "Published references"
@@ -1185 +1200 @@
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail_video.html:313
-#: templates/telemeta/inc/children_list.html:16
-#: templates/telemeta/inc/collection_related.html:38
-#: templates/telemeta/inc/mediaitem_related.html:38
-#: templates/telemeta/inc/resource_list.html:14
-#: templates/telemeta/inc/resource_related.html:38
-msgid "Description"
-msgstr ""
-
 #: templates/telemeta/mediaitem_detail_video.html:316
 #: templates/telemeta/inc/collection_related.html:43
@@ -1225 +1231 @@
 msgstr ""
 
-#: templates/telemeta/profile_detail.html:8 views/base.py:1341
+#: templates/telemeta/profile_detail.html:8 views/base.py:1392
 msgid "User profile"
+msgstr ""
+
+#: templates/telemeta/profile_detail.html:16
+msgid "Playlists"
 msgstr ""
 
@@ -1283 +1293 @@
 msgstr ""
 
-#: templates/telemeta/resource_detail.html:75
+#: templates/telemeta/resource_detail.html:101
 #: templates/telemeta/resource_detail_dc.html:16
 msgid "No such resource"
@@ -1294 +1304 @@
 
 #: templates/telemeta/search_criteria.html:94
-#: templates/telemeta/search_results.html:43
+#: templates/telemeta/search_results.html:44
 #: templates/telemeta/inc/mediaitem_list.html:22
 msgid "Year of recording"
@@ -1301 +1311 @@
 #: templates/telemeta/search_criteria.html:101
 #: templates/telemeta/search_criteria.html:120
-#: templates/telemeta/search_results.html:45
-#: templates/telemeta/search_results.html:52
+#: templates/telemeta/search_results.html:46
+#: templates/telemeta/search_results.html:53
 msgid "to"
 msgstr ""
 
 #: templates/telemeta/search_criteria.html:113
-#: templates/telemeta/search_results.html:50
+#: templates/telemeta/search_results.html:51
 msgid "Year of publication"
 msgstr ""
@@ -1316 +1326 @@
 msgstr ""
 
-#: templates/telemeta/search_results.html:25
+#: templates/telemeta/search_results.html:26
 msgid "Search pattern"
 msgstr ""
@@ -1332 +1342 @@
 msgstr ""
 
-#: templates/telemeta/inc/children_list.html:34
-msgid "No resources"
+#: templates/telemeta/inc/children_list.html:35
+#: templates/telemeta/inc/resource_list.html:30
+msgid "No resource"
 msgstr ""
 
@@ -1368 +1379 @@
 msgstr ""
 
-#: templates/telemeta/inc/module_revisions.html:12
+#: templates/telemeta/inc/module_revisions.html:16
+#: templates/telemeta/inc/module_searches.html:12
 msgid "Date"
 msgstr ""
 
-#: templates/telemeta/inc/module_revisions.html:15
+#: templates/telemeta/inc/module_revisions.html:19
 #: templates/telemeta/inc/user_list.html:6
 msgid "User"
+msgstr ""
+
+#: templates/telemeta/inc/module_searches.html:13
+msgid "Criteria"
 msgstr ""
 
@@ -1380 +1396 @@
 #, python-format
 msgid " from %(first_on_page)s to %(last_on_page)s on %(hits)s"
-msgstr ""
-
-#: templates/telemeta/inc/resource_list.html:30
-msgid "No resource"
 msgstr ""
 
@@ -1544 +1556 @@
 msgstr ""
 
-#: templatetags/telemeta_utils.py:250
+#: templatetags/telemeta_utils.py:257
 #, python-format
 msgid "%(count)d item"
@@ -1551 +1563 @@
 msgstr[1] ""
 
-#: templatetags/telemeta_utils.py:253
+#: templatetags/telemeta_utils.py:260
 #, python-format
 msgid "%(count)d collection"
@@ -1566 +1578 @@
 msgstr ""
 
-#: views/base.py:263 views/base.py:410 views/base.py:572 views/base.py:866
-#: views/base.py:1340
+#: util/locale_fix.py:7
+msgid "My searches"
+msgstr ""
+
+#: util/locale_fix.py:8
+msgid "Children"
+msgstr ""
+
+#: util/locale_fix.py:9
+msgid "pattern"
+msgstr ""
+
+#: views/base.py:268 views/base.py:458 views/base.py:621 views/base.py:925
+#: views/base.py:1391
 msgid "Access not allowed"
 msgstr ""
 
-#: views/base.py:265 views/base.py:412 views/base.py:574 views/base.py:868
-#: views/base.py:1342
+#: views/base.py:270 views/base.py:460 views/base.py:623 views/base.py:927
+#: views/base.py:1393
 msgid ""
 "Please login or contact the website administator to get a private access."
 msgstr ""
 
-#: views/base.py:1371
+#: views/base.py:1422
 msgid "Last changes"
 msgstr ""

telemeta/locale/de/LC_MESSAGES/djangojs.po

@@ -9 +9 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-01 14:59+0100\n"
+"POT-Creation-Date: 2012-02-13 16:36+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -66 +66 @@
 msgid "delete the collection permanently?"
 msgstr ""
+
+#: htdocs/js/locale.js:14
+msgid "delete the playlist permanently?"
+msgstr ""
+
+#: htdocs/js/locale.js:15
+msgid "delete the resource from the playlist permanently?"
+msgstr ""

telemeta/locale/fr/LC_MESSAGES/django.po

@@ -9 +9 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-01 14:59+0100\n"
+"POT-Creation-Date: 2012-02-13 16:36+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Olivier Guilyardi <olivier samalyse com>\n"
@@ -27 +27 @@
 
 #: models/enum.py:41 models/enum.py:139 models/media.py:455
+#: models/system.py:103
 msgid "value"
 msgstr "valeur"
@@ -215 +216 @@
 
 #: models/media.py:123 models/media.py:522 models/media.py:541
-#: models/media.py:555
+#: models/system.py:115
 msgid "date"
 msgstr ""
@@ -243 +244 @@
 msgstr "déposant / contributeur"
 
-#: models/media.py:175 models/media.py:634
+#: models/media.py:175 models/media.py:622
 msgid "recording year (from)"
 msgstr "année d'enregistrement (depuis)"
 
-#: models/media.py:176 models/media.py:635
+#: models/media.py:176 models/media.py:623
 msgid "recording year (until)"
 msgstr "année d'enregistrement (jusqu'à)"
@@ -416 +417 @@
 msgstr "copie de"
 
-#: models/media.py:362 models/media.py:554
-#: templates/telemeta/mediaitem_detail.html:197
+#: models/media.py:362 templates/telemeta/mediaitem_detail.html:224
 #: templates/telemeta/mediaitem_detail_video.html:192
 msgid "keywords"
@@ -485 +485 @@
 msgstr "ressource"
 
-#: models/media.py:520 models/system.py:54
+#: models/media.py:520 models/system.py:55
 msgid "time"
 msgstr "heure"
@@ -497 +497 @@
 msgstr ""
 
-#: models/media.py:633
+#: models/media.py:621
 msgid "collections"
 msgstr "collections"
 
-#: models/media.py:643 models/media.py:644 models/media.py:654
-#: models/media.py:669
+#: models/media.py:633 models/media.py:634 models/media.py:643
+#: models/media.py:660
 msgid "corpus"
 msgstr "corpus"
 
-#: models/media.py:662 models/media.py:663 models/media.py:680
+#: models/media.py:653 models/media.py:654 models/media.py:671
 msgid "fonds"
 msgstr "fonds"
 
-#: models/media.py:673 models/media.py:674
+#: models/media.py:664 models/media.py:665
 msgid "corpus related media"
 msgstr "média associés"
 
-#: models/media.py:684 models/media.py:685
+#: models/media.py:675 models/media.py:676
 msgid "fonds related media"
 msgstr "média associés"
 
-#: models/system.py:51
+#: models/system.py:52
 msgid "element type"
 msgstr "type d'élément"
 
-#: models/system.py:52
+#: models/system.py:53
 msgid "element identifier"
 msgstr "identifiant de l'élément"
 
-#: models/system.py:53
+#: models/system.py:54
 msgid "modification type"
 msgstr "type de modification"
 
-#: models/system.py:55
+#: models/system.py:56
 msgid "user"
 msgstr "utilisateur"
 
-#: models/system.py:84 templates/telemeta/profile_detail.html:36
+#: models/system.py:85 templates/telemeta/profile_detail.html:36
 msgid "Institution"
 msgstr "Institution"
 
-#: models/system.py:85 templates/telemeta/profile_detail.html:37
+#: models/system.py:86 templates/telemeta/profile_detail.html:37
 msgid "Department"
 msgstr "Département"
 
-#: models/system.py:86 templates/telemeta/profile_detail.html:38
+#: models/system.py:87 templates/telemeta/profile_detail.html:38
 msgid "Function"
 msgstr "Fonction"
 
-#: models/system.py:87 templates/telemeta/profile_detail.html:39
+#: models/system.py:88 templates/telemeta/profile_detail.html:39
 msgid "Attachment"
 msgstr "Rattachement"
 
-#: models/system.py:88 templates/telemeta/profile_detail.html:40
+#: models/system.py:89 templates/telemeta/profile_detail.html:40
 msgid "Address"
 msgstr "Adresse"
 
-#: models/system.py:89 templates/telemeta/profile_detail.html:41
+#: models/system.py:90 templates/telemeta/profile_detail.html:41
 msgid "Telephone"
 msgstr "Téléphone"
 
-#: models/system.py:90
+#: models/system.py:91
 msgid "Expiration_date"
 msgstr "Date d'expiration"
 
-#: templates/admin/base.html:21 templates/telemeta/base.html:83
-#: templates/telemeta/base.html.py:100 templates/telemeta/base.html:106
+#: models/system.py:102
+#, fuzzy
+msgid "key"
+msgstr "Mot-clé"
+
+#: models/system.py:116 templates/telemeta/mediaitem_detail_video.html:313
+#: templates/telemeta/inc/children_list.html:16
+#: templates/telemeta/inc/collection_related.html:38
+#: templates/telemeta/inc/mediaitem_related.html:38
+#: templates/telemeta/inc/resource_list.html:14
+#: templates/telemeta/inc/resource_related.html:38
+msgid "Description"
+msgstr "Description"
+
+#: models/system.py:118
+msgid "criteria"
+msgstr ""
+
+#: templates/admin/base.html:21 templates/telemeta/base.html:88
+#: templates/telemeta/base.html.py:92
 msgid "Home"
 msgstr ""
@@ -584 +602 @@
 
 #: templates/telemeta/admin_enumerations.html:6
-#: templates/telemeta/base.html:126 templates/telemeta/enumeration_edit.html:7
+#: templates/telemeta/base.html:112 templates/telemeta/enumeration_edit.html:7
 msgid "Enumerations"
 msgstr "Énumérations"
 
 #: templates/telemeta/admin_enumerations.html:14
-#: templates/telemeta/lists.html:56 templates/telemeta/mediaitem_add.html:33
+#: templates/telemeta/lists.html:69 templates/telemeta/mediaitem_add.html:33
 #: templates/telemeta/mediaitem_copy.html:34
 #: templates/telemeta/mediaitem_detail_video.html:295
 #: templates/telemeta/mediaitem_edit.html:26
 #: templates/telemeta/search_criteria.html:78
-#: templates/telemeta/search_results.html:40
+#: templates/telemeta/search_results.html:41
 #: templates/telemeta/inc/children_list.html:15
 #: templates/telemeta/inc/collection_list.html:13
@@ -600 +618 @@
 #: templates/telemeta/inc/mediaitem_list.html:14
 #: templates/telemeta/inc/mediaitem_related.html:20
-#: templates/telemeta/inc/module_revisions.html:13
+#: templates/telemeta/inc/module_revisions.html:17
 #: templates/telemeta/inc/resource_list.html:13
 #: templates/telemeta/inc/resource_related.html:20
@@ -607 +625 @@
 
 #: templates/telemeta/admin_enumerations.html:24
-#, fuzzy
 msgid "No enumerations"
 msgstr "Aucune énumération"
 
-#: templates/telemeta/admin_general.html:5 templates/telemeta/base.html:125
+#: templates/telemeta/admin_general.html:5 templates/telemeta/base.html:111
 msgid "General"
 msgstr "Générale"
 
 #: templates/telemeta/admin_instruments.html:6
-#: templates/telemeta/admin_users.html:6 templates/telemeta/base.html:89
-#: templates/telemeta/base.html.py:120 templates/telemeta/users.html:5
-#: templates/telemeta/users.html.py:8
+#: templates/telemeta/admin_users.html:6 templates/telemeta/base.html:106
+#: templates/telemeta/users.html:5 templates/telemeta/users.html.py:8
 msgid "Users"
 msgstr "Utilisateurs"
@@ -624 +640 @@
 #: templates/telemeta/admin_instruments.html:15
 #: templates/telemeta/admin_users.html:11 templates/telemeta/users.html:16
-#, fuzzy
 msgid "No users"
 msgstr "Pas d'utilisateurs"
@@ -632 +647 @@
 msgstr "Bienvenue"
 
-#: templates/telemeta/base.html:59 templates/telemeta/base.html.py:102
+#: templates/telemeta/base.html:59 templates/telemeta/base.html.py:87
 msgid "Profile"
 msgstr "Profil"
@@ -652 +667 @@
 msgstr "Recherche"
 
-#: templates/telemeta/base.html:84 templates/telemeta/base.html.py:112
+#: templates/telemeta/base.html:84
+msgid "Desk"
+msgstr "Bureau"
+
+#: templates/telemeta/base.html:86 views/base.py:269
+msgid "Lists"
+msgstr "Listes"
+
+#: templates/telemeta/base.html:94
+msgid "Archives"
+msgstr "Archives"
+
+#: templates/telemeta/base.html:96
+msgid "Fonds"
+msgstr ""
+
+#: templates/telemeta/base.html:97
+msgid "Corpus"
+msgstr ""
+
+#: templates/telemeta/base.html:98
 msgid "Collections"
 msgstr "Collections"
 
-#: templates/telemeta/base.html:85 templates/telemeta/base.html.py:113
+#: templates/telemeta/base.html:99
 msgid "Items"
 msgstr "Items"
 
-#: templates/telemeta/base.html:86 templates/telemeta/base.html.py:117
-#: templates/telemeta/home.html:25
+#: templates/telemeta/base.html:103 templates/telemeta/home.html:25
 msgid "Geo Navigator"
 msgstr "Géo-Navigateur"
 
-#: templates/telemeta/base.html:87 templates/telemeta/base.html.py:118
+#: templates/telemeta/base.html:104
 msgid "Advanced search"
 msgstr "Recherche avancée"
 
-#: templates/telemeta/base.html:92 templates/telemeta/base.html.py:123
+#: templates/telemeta/base.html:109
 msgid "Admin"
 msgstr "Admin"
 
-#: templates/telemeta/base.html:98
-msgid "Desk"
-msgstr "Bureau"
-
-#: templates/telemeta/base.html:101 views/base.py:264
-msgid "Lists"
-msgstr "Listes"
-
-#: templates/telemeta/base.html:108
-msgid "Archives"
-msgstr "Archives"
-
-#: templates/telemeta/base.html:110
-msgid "Fonds"
-msgstr ""
-
-#: templates/telemeta/base.html:111
-msgid "Corpus"
-msgstr ""
-
-#: templates/telemeta/base.html:127 templates/telemeta/instrument_edit.html:4
+#: templates/telemeta/base.html:113 templates/telemeta/instrument_edit.html:4
 #: templates/telemeta/instrument_edit.html:7
 #: templates/telemeta/instrument_edit_value.html:5
@@ -699 +713 @@
 msgstr "Instruments"
 
-#: templates/telemeta/base.html:159
+#: templates/telemeta/base.html:145
 msgid "Powered by"
 msgstr "Propulsé par"
 
-#: templates/telemeta/base.html:160
+#: templates/telemeta/base.html:146
 msgid "By"
 msgstr "Par"
 
-#: templates/telemeta/base.html:165
+#: templates/telemeta/base.html:151
 msgid ""
 "Usage of the archives in the respect of cultural heritage of the original "
@@ -715 +729 @@
 "communautés d'origine."
 
-#: templates/telemeta/base.html:171
-#: templates/telemeta/collection_detail.html:117
+#: templates/telemeta/base.html:157
+#: templates/telemeta/collection_detail.html:121
 msgid "Legal notices"
 msgstr "Mentions légales"
@@ -743 +757 @@
 #: templates/telemeta/profile_edit.html:29
 #: templates/telemeta/resource_add.html:10
-#: templates/telemeta/resource_add.html:27
+#: templates/telemeta/resource_add.html:31
 #: templates/telemeta/resource_edit.html:9
-#: templates/telemeta/resource_edit.html:25
+#: templates/telemeta/resource_edit.html:29
 #: templates/telemeta/resource_related_edit.html:12
 #: templates/telemeta/resource_related_edit.html:39
@@ -763 +777 @@
 #: templates/telemeta/mediaitem_related_edit.html:41
 #: templates/telemeta/profile_edit.html:31
-#: templates/telemeta/resource_add.html:29
-#: templates/telemeta/resource_edit.html:27
+#: templates/telemeta/resource_add.html:33
+#: templates/telemeta/resource_edit.html:31
 #: templates/telemeta/resource_related_edit.html:41
 msgid "Save"
@@ -770 +784 @@
 
 #: templates/telemeta/collection_detail.html:5
-#: templates/telemeta/collection_detail_dc.html:5 views/base.py:411
+#: templates/telemeta/collection_detail_dc.html:5 views/base.py:459
 msgid "Collection"
 msgstr "Collection"
 
 #: templates/telemeta/collection_detail.html:44
-#: templates/telemeta/mediaitem_detail.html:91
-#: templates/telemeta/mediaitem_detail.html:197
-#: templates/telemeta/mediaitem_detail.html:236
+#: templates/telemeta/lists.html:55
+#: templates/telemeta/mediaitem_detail.html:97
+#: templates/telemeta/mediaitem_detail.html:224
+#: templates/telemeta/mediaitem_detail.html:263
 #: templates/telemeta/mediaitem_detail_video.html:90
 #: templates/telemeta/mediaitem_detail_video.html:192
@@ -783 +798 @@
 #: templates/telemeta/mediaitem_detail_video.html:352
 #: templates/telemeta/profile_detail.html:65
-#: templates/telemeta/resource_detail.html:21
+#: templates/telemeta/resource_detail.html:43
 #: templates/telemeta/inc/collection_related.html:81
 #: templates/telemeta/inc/mediaitem_related.html:81
@@ -791 +806 @@
 
 #: templates/telemeta/collection_detail.html:45
-#: templates/telemeta/mediaitem_detail.html:92
+#: templates/telemeta/mediaitem_detail.html:98
 #: templates/telemeta/mediaitem_detail_video.html:91
-#: templates/telemeta/resource_detail.html:22
+#: templates/telemeta/resource_detail.html:44
 msgid "Copy"
 msgstr "Copier"
@@ -802 +817 @@
 
 #: templates/telemeta/collection_detail.html:49
-#: templates/telemeta/mediaitem_detail.html:95
+#: templates/telemeta/mediaitem_detail.html:101
 #: templates/telemeta/mediaitem_detail_video.html:94
-#: templates/telemeta/resource_detail.html:25
+#: templates/telemeta/resource_detail.html:47
 msgid "Add to playlist"
 msgstr "Ajouter à la liste"
@@ -813 +828 @@
 
 #: templates/telemeta/collection_detail.html:95
-#: templates/telemeta/lists.html:60
+#: templates/telemeta/lists.html:73
 #: templates/telemeta/inc/collection_list.html:17
 msgid "Recording period"
 msgstr "Période d'enregistrement"
 
-#: templates/telemeta/collection_detail.html:104
-#: templates/telemeta/mediaitem_detail.html:177
+#: templates/telemeta/collection_detail.html:108
+#: templates/telemeta/mediaitem_detail.html:204
 #: templates/telemeta/mediaitem_detail_video.html:176
 msgid "Geographic and cultural informations"
 msgstr "Indications géographiques et culturelles"
 
-#: templates/telemeta/collection_detail.html:122
-#: templates/telemeta/lists.html:59
+#: templates/telemeta/collection_detail.html:126
+#: templates/telemeta/lists.html:72
 #: templates/telemeta/inc/collection_list.html:16
 #: templates/telemeta/inc/mediaitem_list.html:16
@@ -831 +846 @@
 msgstr "Collecteur"
 
-#: templates/telemeta/collection_detail.html:131
+#: templates/telemeta/collection_detail.html:135
 msgid "Bibliographic references"
 msgstr "Références bibliographiques"
 
-#: templates/telemeta/collection_detail.html:144
-#: templates/telemeta/mediaitem_detail.html:253
+#: templates/telemeta/collection_detail.html:148
+#: templates/telemeta/mediaitem_detail.html:280
 #: templates/telemeta/mediaitem_detail_video.html:248
 msgid "Archiving data"
 msgstr "Données d'archivage"
 
-#: templates/telemeta/collection_detail.html:150
+#: templates/telemeta/collection_detail.html:154
 msgid "Related documentation"
 msgstr "Documentation associée"
 
-#: templates/telemeta/collection_detail.html:154
+#: templates/telemeta/collection_detail.html:158
 msgid "Comments"
 msgstr "Commentaires"
 
-#: templates/telemeta/collection_detail.html:168
-#: templates/telemeta/mediaitem_detail.html:269
+#: templates/telemeta/collection_detail.html:172
+#: templates/telemeta/mediaitem_detail.html:296
 #: templates/telemeta/mediaitem_detail_video.html:264
 msgid "Technical data"
 msgstr "Données techniques"
 
-#: templates/telemeta/collection_detail.html:173
-#: templates/telemeta/mediaitem_detail.html:272
+#: templates/telemeta/collection_detail.html:177
+#: templates/telemeta/mediaitem_detail.html:299
 #: templates/telemeta/mediaitem_detail_video.html:267
 msgid "Media type"
 msgstr "Type de media"
 
-#: templates/telemeta/collection_detail.html:173
-#: templates/telemeta/mediaitem_detail.html:272
+#: templates/telemeta/collection_detail.html:177
 #: templates/telemeta/mediaitem_detail_video.html:267
 msgid "Audio"
 msgstr "Audio"
 
-#: templates/telemeta/collection_detail.html:178
+#: templates/telemeta/collection_detail.html:182
 #: templates/telemeta/geo_countries.html:16
 msgid "Number of items"
 msgstr "Nombre d'items"
 
-#: templates/telemeta/collection_detail.html:207
-#: templates/telemeta/lists.html:45
-#: templates/telemeta/mediaitem_detail.html:293
+#: templates/telemeta/collection_detail.html:211
+#: templates/telemeta/lists.html:58
+#: templates/telemeta/mediaitem_detail.html:320
 #: templates/telemeta/mediaitem_detail_video.html:363
-#: templates/telemeta/resource_detail.html:69
+#: templates/telemeta/resource_detail.html:95
 msgid "Delete"
 msgstr "Supprimer"
@@ -898 +912 @@
 #: templates/telemeta/mediaitem_list.html:12
 #: templates/telemeta/search_results.html:13
-#: templates/telemeta/search_results.html:16
+#: templates/telemeta/search_results.html:17
 msgid "All"
 msgstr "Tous"
@@ -913 +927 @@
 #: templates/telemeta/mediaitem_list.html:13
 #: templates/telemeta/search_results.html:14
-#: templates/telemeta/search_results.html:17
+#: templates/telemeta/search_results.html:18
 msgid "Sounds"
 msgstr "Sonores"
@@ -919 +933 @@
 #: templates/telemeta/collection_list.html:17
 #: templates/telemeta/enumeration_edit.html:23
-#: templates/telemeta/instrument_edit.html:22 templates/telemeta/lists.html:37
+#: templates/telemeta/instrument_edit.html:22 templates/telemeta/lists.html:49
 #: templates/telemeta/mediaitem_list.html:15
 #: templates/telemeta/resource_list.html:13
@@ -955 +969 @@
 #: templates/telemeta/enumeration_edit.html:31
 #: templates/telemeta/enumeration_edit_value.html:11
-#: templates/telemeta/mediaitem_detail.html:137
+#: templates/telemeta/mediaitem_detail.html:164
 #: templates/telemeta/mediaitem_detail_video.html:136
 msgid "Value"
@@ -1018 +1032 @@
 msgstr[1] "%(counter)s items "
 
-#: templates/telemeta/home.html:14 templates/telemeta/home.html.py:57
+#: templates/telemeta/home.html:14 templates/telemeta/home.html.py:60
 msgid "Musical selection"
 msgstr "Sélection musicale"
@@ -1036 +1050 @@
 msgstr "Cette énumération est vide"
 
-#: templates/telemeta/lists.html:35 templates/telemeta/profile_detail.html:16
-msgid "Playlists"
-msgstr "Listes de lecture"
-
-#: templates/telemeta/lists.html:57
-#: templates/telemeta/inc/module_revisions.html:14
+#: templates/telemeta/lists.html:47
+msgid "My playlists"
+msgstr "Mes listes de lecture"
+
+#: templates/telemeta/lists.html:70
+#: templates/telemeta/inc/module_revisions.html:18
 msgid "Type"
-msgstr ""
-
-#: templates/telemeta/lists.html:58 templates/telemeta/mediaitem_add.html:34
+msgstr "Type"
+
+#: templates/telemeta/lists.html:71 templates/telemeta/mediaitem_add.html:34
 #: templates/telemeta/mediaitem_copy.html:35
 #: templates/telemeta/mediaitem_edit.html:27
@@ -1055 +1069 @@
 msgstr "Cote"
 
-#: templates/telemeta/lists.html:61
+#: templates/telemeta/lists.html:74
 #: templates/telemeta/search_criteria.html:130
-#: templates/telemeta/search_results.html:57
+#: templates/telemeta/search_results.html:58
 #: templates/telemeta/inc/collection_list.html:18
 #: templates/telemeta/inc/mediaitem_list.html:23
@@ -1063 +1077 @@
 msgstr "Sonore"
 
-#: templates/telemeta/lists.html:62
+#: templates/telemeta/lists.html:75
 msgid "Action"
 msgstr "Action"
 
-#: templates/telemeta/lists.html:76
-#: templates/telemeta/inc/module_revisions.html:36
+#: templates/telemeta/lists.html:92
+#: templates/telemeta/inc/module_revisions.html:40
 msgid "deleted"
 msgstr "supprimé"
@@ -1088 +1102 @@
 #: templates/telemeta/mediaitem_copy.html:5
 #: templates/telemeta/mediaitem_detail.html:5
-#: templates/telemeta/mediaitem_detail_video.html:5 views/base.py:573
+#: templates/telemeta/mediaitem_detail_video.html:5 views/base.py:622
 msgid "Item"
 msgstr "Item"
 
-#: templates/telemeta/mediaitem_detail.html:97
+#: templates/telemeta/mediaitem_detail.html:103
 #: templates/telemeta/mediaitem_detail_video.html:96
 #: templates/telemeta/paginator.html:5
@@ -1098 +1112 @@
 msgstr "Précédent"
 
-#: templates/telemeta/mediaitem_detail.html:98
+#: templates/telemeta/mediaitem_detail.html:104
 #: templates/telemeta/mediaitem_detail_video.html:97
 #: templates/telemeta/paginator.html:23
@@ -1104 +1118 @@
 msgstr "Suivant"
 
-#: templates/telemeta/mediaitem_detail.html:126
+#: templates/telemeta/mediaitem_detail.html:153
 #: templates/telemeta/mediaitem_detail_video.html:125
 msgid "Analysis"
 msgstr "Analyse"
 
-#: templates/telemeta/mediaitem_detail.html:128
+#: templates/telemeta/mediaitem_detail.html:155
 #: templates/telemeta/mediaitem_detail_video.html:127
 msgid "Markers"
 msgstr "Marqueurs"
 
-#: templates/telemeta/mediaitem_detail.html:136
+#: templates/telemeta/mediaitem_detail.html:163
 #: templates/telemeta/mediaitem_detail_video.html:135
 msgid "Property"
 msgstr "Propriété"
 
-#: templates/telemeta/mediaitem_detail.html:138
+#: templates/telemeta/mediaitem_detail.html:165
 #: templates/telemeta/mediaitem_detail_video.html:137
 msgid "Unit"
 msgstr "Unité"
 
-#: templates/telemeta/mediaitem_detail.html:146
+#: templates/telemeta/mediaitem_detail.html:173
 #: templates/telemeta/mediaitem_detail_video.html:145
 msgid "Download:"
 msgstr "Téléchargement:"
 
-#: templates/telemeta/mediaitem_detail.html:167
+#: templates/telemeta/mediaitem_detail.html:194
 #: templates/telemeta/mediaitem_detail_video.html:166
 msgid "Recording date"
 msgstr "Date d'enregistrement"
 
-#: templates/telemeta/mediaitem_detail.html:179
+#: templates/telemeta/mediaitem_detail.html:206
 #: templates/telemeta/mediaitem_detail_video.html:178
 #: templates/telemeta/inc/mediaitem_list.html:18
@@ -1140 +1154 @@
 msgstr "Lieu"
 
-#: templates/telemeta/mediaitem_detail.html:185
+#: templates/telemeta/mediaitem_detail.html:212
 msgid "Language ISO"
 msgstr "Langue ISO"
 
-#: templates/telemeta/mediaitem_detail.html:189
+#: templates/telemeta/mediaitem_detail.html:216
 #: templates/telemeta/mediaitem_detail_video.html:184
 msgid "Ethnographic context"
 msgstr "Contexte ethnographique"
 
-#: templates/telemeta/mediaitem_detail.html:202
+#: templates/telemeta/mediaitem_detail.html:229
 #: templates/telemeta/mediaitem_detail_video.html:197
 msgid "Musical informations"
 msgstr "Informations sur la musique"
 
-#: templates/telemeta/mediaitem_detail.html:236
+#: templates/telemeta/mediaitem_detail.html:263
 #: templates/telemeta/mediaitem_detail_video.html:231
 msgid "performance"
 msgstr "composition"
 
-#: templates/telemeta/mediaitem_detail.html:241
+#: templates/telemeta/mediaitem_detail.html:268
 #: templates/telemeta/mediaitem_detail_video.html:236
 msgid "General informations"
 msgstr "Informations générales"
 
-#: templates/telemeta/mediaitem_detail.html:243
+#: templates/telemeta/mediaitem_detail.html:270
 #: templates/telemeta/mediaitem_detail_video.html:238
 msgid "Remarks"
 msgstr "Remarques"
 
-#: templates/telemeta/mediaitem_detail.html:259
+#: templates/telemeta/mediaitem_detail.html:286
 #: templates/telemeta/mediaitem_detail_video.html:254
 msgid "Published references"
@@ -1192 +1206 @@
 msgstr "Prévisualisation"
 
-#: templates/telemeta/mediaitem_detail_video.html:313
-#: templates/telemeta/inc/children_list.html:16
-#: templates/telemeta/inc/collection_related.html:38
-#: templates/telemeta/inc/mediaitem_related.html:38
-#: templates/telemeta/inc/resource_list.html:14
-#: templates/telemeta/inc/resource_related.html:38
-msgid "Description"
-msgstr "Description"
-
 #: templates/telemeta/mediaitem_detail_video.html:316
 #: templates/telemeta/inc/collection_related.html:43
@@ -1232 +1237 @@
 msgstr "Profil utilisateur"
 
-#: templates/telemeta/profile_detail.html:8 views/base.py:1341
+#: templates/telemeta/profile_detail.html:8 views/base.py:1392
 msgid "User profile"
 msgstr "Profil utilisateur"
+
+#: templates/telemeta/profile_detail.html:16
+msgid "Playlists"
+msgstr "Listes de lecture"
 
 #: templates/telemeta/profile_detail.html:32
@@ -1290 +1299 @@
 msgstr "Nouveau"
 
-#: templates/telemeta/resource_detail.html:75
+#: templates/telemeta/resource_detail.html:101
 #: templates/telemeta/resource_detail_dc.html:16
 msgid "No such resource"
@@ -1301 +1310 @@
 
 #: templates/telemeta/search_criteria.html:94
-#: templates/telemeta/search_results.html:43
+#: templates/telemeta/search_results.html:44
 #: templates/telemeta/inc/mediaitem_list.html:22
 msgid "Year of recording"
@@ -1308 +1317 @@
 #: templates/telemeta/search_criteria.html:101
 #: templates/telemeta/search_criteria.html:120
-#: templates/telemeta/search_results.html:45
-#: templates/telemeta/search_results.html:52
+#: templates/telemeta/search_results.html:46
+#: templates/telemeta/search_results.html:53
 msgid "to"
 msgstr "à"
 
 #: templates/telemeta/search_criteria.html:113
-#: templates/telemeta/search_results.html:50
+#: templates/telemeta/search_results.html:51
 msgid "Year of publication"
 msgstr "Année de publication"
@@ -1323 +1332 @@
 msgstr "Résultats de recherche"
 
-#: templates/telemeta/search_results.html:25
+#: templates/telemeta/search_results.html:26
 msgid "Search pattern"
-msgstr "Recherche"
+msgstr "Mots clés"
 
 #: templates/telemeta/inc/children_list.html:8
@@ -1339 +1348 @@
 msgstr "Référence"
 
-#: templates/telemeta/inc/children_list.html:34
-msgid "No resources"
+#: templates/telemeta/inc/children_list.html:35
+#: templates/telemeta/inc/resource_list.html:30
+msgid "No resource"
 msgstr "Aucune ressource"
 
@@ -1375 +1385 @@
 msgstr "Aucun item"
 
-#: templates/telemeta/inc/module_revisions.html:12
+#: templates/telemeta/inc/module_revisions.html:16
+#: templates/telemeta/inc/module_searches.html:12
 msgid "Date"
 msgstr ""
 
-#: templates/telemeta/inc/module_revisions.html:15
+#: templates/telemeta/inc/module_revisions.html:19
 #: templates/telemeta/inc/user_list.html:6
 msgid "User"
 msgstr "Utilisateur"
+
+#: templates/telemeta/inc/module_searches.html:13
+msgid "Criteria"
+msgstr ""
 
 #: templates/telemeta/inc/resource_list.html:7
@@ -1388 +1403 @@
 msgid " from %(first_on_page)s to %(last_on_page)s on %(hits)s"
 msgstr " de %(first_on_page)s à %(last_on_page)s sur %(hits)s"
-
-#: templates/telemeta/inc/resource_list.html:30
-#, fuzzy
-msgid "No resource"
-msgstr "Aucune ressource"
 
 #: templates/telemeta/inc/user_list.html:9
@@ -1558 +1568 @@
 msgstr ""
 
-#: templatetags/telemeta_utils.py:250
+#: templatetags/telemeta_utils.py:257
 #, python-format
 msgid "%(count)d item"
@@ -1565 +1575 @@
 msgstr[1] "%(count)d items"
 
-#: templatetags/telemeta_utils.py:253
+#: templatetags/telemeta_utils.py:260
 #, python-format
 msgid "%(count)d collection"
@@ -1580 +1590 @@
 msgstr "Toutes les dernières modifications"
 
-#: views/base.py:263 views/base.py:410 views/base.py:572 views/base.py:866
-#: views/base.py:1340
+#: util/locale_fix.py:7
+msgid "My searches"
+msgstr "Mes recherches"
+
+#: util/locale_fix.py:8
+msgid "Children"
+msgstr "Enfants"
+
+#: util/locale_fix.py:9
+msgid "pattern"
+msgstr "mots clés"
+
+#: views/base.py:268 views/base.py:458 views/base.py:621 views/base.py:925
+#: views/base.py:1391
 msgid "Access not allowed"
 msgstr "Accès non autorisé"
 
-#: views/base.py:265 views/base.py:412 views/base.py:574 views/base.py:868
-#: views/base.py:1342
+#: views/base.py:270 views/base.py:460 views/base.py:623 views/base.py:927
+#: views/base.py:1393
 msgid ""
 "Please login or contact the website administator to get a private access."
@@ -1593 +1615 @@
 "pour obtenir un accès privé."
 
-#: views/base.py:1371
+#: views/base.py:1422
 msgid "Last changes"
 msgstr "Dernières modifications"

telemeta/locale/fr/LC_MESSAGES/djangojs.po

@@ -9 +9 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-01 14:59+0100\n"
+"POT-Creation-Date: 2012-02-13 16:36+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Guillaume Pellerin <yomguy@parisson.com>\n"
@@ -66 +66 @@
 msgid "delete the collection permanently?"
 msgstr "supprimer la collection définitivement ?"
+
+#: htdocs/js/locale.js:14
+msgid "delete the playlist permanently?"
+msgstr "supprimer la liste de lecture définitivement ?"
+
+#: htdocs/js/locale.js:15
+msgid "delete the resource from the playlist permanently?"
+msgstr "supprimer la ressource de la liste de lecture définitivement ?"

telemeta/models/media.py

@@ -547 +547 @@
     class Meta(MetaCore):
         db_table = 'media_transcoding'
-
-
-class Search(ModelCore):
-    "Keywork search"
-
-    element_type = 'search'
-
-    username = ForeignKey(User, related_name="searches", db_column="username")
-    keywords = CharField(_('keywords'), required=True)
-    date = DateField(_('date'), auto_now_add=True)
-
-    class Meta(MetaCore):
-        db_table = 'searches'
-
-    def __unicode__(self):
-        return self.keywords
 
 
@@ -642 +626 @@
     recorded_to_year      = IntegerField(_('recording year (until)'))
 
+    objects = MediaCorpusManager()
+
     @property
     def public_id(self):
@@ -660 +646 @@
     children = models.ManyToManyField(MediaCorpus, related_name="fonds", verbose_name=_('corpus'), blank=True, null=True)
 
+    objects = MediaFondsManager()
+
     @property
     def public_id(self):

telemeta/models/query.py

@@ -417 +417 @@
     flatname_map.__doc__ = LocationQuerySet.flatname_map.__doc__
 
+
+class MediaCorpusQuerySet(CoreQuerySet):
+    "Base class for all media resource query sets"
+
+    def quick_search(self, pattern):
+        "Perform a quick search on text and char fields"
+        from telemeta.models.media import MediaCorpus
+        mod = MediaCorpus()
+        pattern = pattern.strip()
+        q = Q(code__contains=pattern)
+        fields = mod.to_dict()
+        keys =  fields.keys()
+
+        for field in keys:
+            field_str = str(mod._meta.get_field(field))
+            if 'CharField' in field_str or 'TextField' in field_str:
+                q = q | word_search_q(field, pattern)
+
+        return self.filter(q)
+
+
+class MediaCorpusManager(CoreManager):
+    "Manage media resource queries"
+
+    def get_query_set(self):
+        "Return resource query sets"
+        return MediaCorpusQuerySet(self.model)
+
+    def quick_search(self, *args, **kwargs):
+        return self.get_query_set().quick_search(*args, **kwargs)
+    quick_search.__doc__ = MediaCorpusQuerySet.quick_search.__doc__
+
+
+class MediaFondsQuerySet(CoreQuerySet):
+    "Base class for all media resource query sets"
+
+    def quick_search(self, pattern):
+        "Perform a quick search on text and char fields"
+        from telemeta.models.media import MediaFonds
+        mod = MediaFonds()
+        pattern = pattern.strip()
+        q = Q(code__contains=pattern)
+        fields = mod.to_dict()
+        keys =  fields.keys()
+        for field in keys:
+            field_str = str(mod._meta.get_field(field))
+            if 'CharField' in field_str or 'TextField' in field_str:
+                q = q | word_search_q(field, pattern)
+        return self.filter(q)
+
+
+class MediaFondsManager(CoreManager):
+    "Manage media resource queries"
+
+    def get_query_set(self):
+        "Return resource query sets"
+        return MediaFondsQuerySet(self.model)
+
+    def quick_search(self, *args, **kwargs):
+        return self.get_query_set().quick_search(*args, **kwargs)
+    quick_search.__doc__ = MediaFondsQuerySet.quick_search.__doc__

telemeta/models/system.py

@@ -40 +40 @@
 from django.core.exceptions import ObjectDoesNotExist
 from django.utils.translation import ugettext_lazy as _
-import django.db.models
+import django.db.models as models
 from django.forms import ModelForm
 
@@ -46 +46 @@
 class Revision(ModelCore):
     "Revision made by user"
+
     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'))
@@ -78 +79 @@
 
 
-class UserProfile(django.db.models.Model):
+class UserProfile(models.Model):
     "User profile extension"
 
@@ -93 +94 @@
         db_table = 'profiles'
 
-class UserProfileForm(ModelForm):
-    class Meta:
-        model = UserProfile
+
+class Criteria(ModelCore):
+    "Search criteria"
+
+    element_type = 'search_criteria'
+
+    key = CharField(_('key'), required=True)
+    value = CharField(_('value'), required=True)
+
+    class Meta(MetaCore):
+        db_table = 'search_criteria'
+
+
+class Search(ModelCore):
+    "Keywork search"
+
+    element_type = 'search'
+
+    username = ForeignKey(User, related_name="searches", db_column="username")
+    date = DateTimeField(_('date'), auto_now_add=True)
+    description = CharField(_('Description'))
+    criteria = models.ManyToManyField(Criteria, related_name="search",
+                                      verbose_name=_('criteria'), blank=True, null=True)
+
+    class Meta(MetaCore):
+        db_table = 'searches'
+        ordering = ['-date']
+
+    def __unicode__(self):
+        return self.keywords
+
+
+

telemeta/templates/telemeta/base.html

@@ -84 +84 @@
   <li><a href="#desk#" class="blue">{% trans "Desk" %}</a></span>
    <ul>
-    <li><a href="{% url telemeta-desk-home %}">{% trans "Home" %}</a></li>
     <li><a href="{% url telemeta-desk-lists %}">{% trans "Lists" %}</a></li>
     <li><a href="{% url telemeta-desk-profile user.username %}">{% trans "Profile" %}</a></li>
+    <li><a href="{% url telemeta-desk-home %}">{% trans "Home" %}</a></li>
    </ul>
   </li>

telemeta/templates/telemeta/collection_detail.html

@@ -27 +27 @@
         {% endif %}
     });
-        {% endif %}
+    {% endif %}
 </script>
 {% endblock %}
@@ -96 +96 @@
                     <dd>{% if collection.recorded_from_year %}{{ collection.recorded_from_year }}{% endif %}{% if collection.recorded_from_year and collection.recorded_to_year %} - {% endif %}{% if  collection.recorded_to_year %}{{ collection.recorded_to_year}}{% endif %}</dd>
                 {% dl_field collection "year_published" placeholder %}
+                {% for parent in parents %}
+                <dt>{% trans parent.element_type|capitalize %}</dt>
+                <dd><a href="{% url telemeta-resource-detail parent.element_type parent.public_id %}">{{ parent.title }}</a></dd>
+                {% endfor %}
             </dl>
         {% endblock general_info %}

telemeta/templates/telemeta/inc/children_list.html

@@ -33 +33 @@
 
 {% else %}
-    <p>{% trans "No resources" %}</p>
+    <p>{% trans "No resource" %}</p>
 
 {% endif %}
-

telemeta/templates/telemeta/inc/module_revisions.html

@@ -3 +3 @@
 
    <div class="module">
-    <h3><a href="{% url telemeta-rss %}">
-      <img src="{% url telemeta-images "rss.png" %}" alt="rss" style="vertical-align:middle" /></a>
-      {% trans title %}</h3>
-      <a href="/rss" style="float:right" class="icon_rss">&nbsp;&nbsp;</a>
+    
+    {% block rss_title %}
+      <a href="{% url telemeta-rss %}">
+      <img src="{% url telemeta-images "rss.png" %}" alt="rss" style="vertical-align:middle" />
+      <h3>{% trans title %}</h3></a>
+      <a href="{% url telemeta-rss %}" style="float:right" class="icon_rss">&nbsp;&nbsp;</a>
+    {% endblock rss_title %}
+    
     <div class="vscroll">
     <table class="listing" bgcolor="#FFFFFF" style="width: 100%">

telemeta/templates/telemeta/lists.html

@@ -11 +11 @@
         var a = jQuery('#_new_playlist'); 
         a.unbind('click').click(function(){p.showAdd(a);return false;});
-    });
-   
+        });
+
+    {% for playlist in playlists %}
+        playlistUtils.addEditPlaylist('{{playlist.playlist.public_id}}','{{ playlist.playlist.title }}','{{playlist.playlist.description}}');
+    {% endfor %}
+        
+
 </script>
 {% endblock %}
@@ -18 +23 @@
 {% block content %}
 <div id="module-set" style="width: 33%">
+
+    {% block module_searches %}
+    {% with searches as searches and "My searches" as title %}
+    {% include "telemeta/inc/module_searches.html" %}
+    {% endwith %}
+    {% endblock %}
+    
     {% block module_user_revisions %}
     {% with user_revisions as revisions and "My last changes" as title %}
-    {% include "telemeta/inc/module_revisions.html" %}
+    {% include "telemeta/inc/module_user_revisions.html" %}
     {% endwith %}
     {% endblock %}
@@ -33 +45 @@
 
 <div class="home-description">
-    <h1><img src="{% url telemeta-images "playlist_title.png" %}" alt="playlists" style="vertical-align:middle" /> {% trans "Playlists" %}</h1>
-    <a href=# id="_new_playlist" style="float:right" class="component_icon button icon_add">
+    <h1><img src="{% url telemeta-images "playlist_title.png" %}" alt="playlists" style="vertical-align:middle" /> {% trans "My playlists" %}</h1>
+    <a href="#" id="_new_playlist" style="float:right" class="component_icon button icon_add">
         {% trans "Add" %}</a>
     {% for playlist in playlists %}
@@ -40 +52 @@
         <tr>
             <td style="border-bottom:1px solid #6A0307;color:#6A0307;font-size: 100%">{{ playlist.playlist.title }}</td>
-            <td style="width:66ex; padding-right: 0; border-bottom:1px solid #6A0307; text-align:right">
+            <td style="width:86ex; padding-right: 0; border-bottom:1px solid #6A0307; text-align:right">
+            <a href="#" id="{{playlist.playlist.public_id}}" onclick="playlistUtils.showEdit(this, this.id); return false;" class="component_icon button icon_edit">{% trans "Edit" %}</a>
                 <a href="{% url telemeta-playlist-csv-export playlist.playlist.public_id 'collections' %}" class="component_icon button icon_csv">CSV Collections</a>
                 <a href="{% url telemeta-playlist-csv-export playlist.playlist.public_id 'items' %}" class="component_icon button icon_csv">CSV Items</a>
-                <a href="#" id="{{playlist.playlist.public_id}}" onclick="playlistUtils.remove(this.id);return false;" class="component_icon button icon_cancel">{% trans "Delete" %}</a>
+                <a href="#" id="{{playlist.playlist.public_id}}" onclick="if(confirm(gettrans('delete the playlist permanently?'))){playlistUtils.remove(this.id);};return false;" class="component_icon button icon_cancel">{% trans "Delete" %}</a>
             </td>
         </tr>
@@ -74 +87 @@
                 <a href="{% url telemeta-item-detail-marker resource.element.public_id %}">{{ resource.element }}</a>
                 {% endif %}
+                {% if resource.type == "corpus" or resource.type == "fonds" %}
+                <a href="{% url telemeta-resource-detail resource.type resource.element.public_id %}">{{ resource.element.title }}</a>
+                {% endif %}
                 {% if resource.element == None %}{% trans "deleted" %}{% endif %}
             </td>
@@ -96 +112 @@
             </td>
             <td style="vertical-align:middle">
-                <a href="#" onclick="playlistUtils.removeResource('{{resource.public_id}}');return false;" class="component_icon button icon_cancel" style="padding: 4px 12px;"></a>
+            <a href="#" onclick="if(confirm(gettrans('delete the resource from the playlist permanently?'))){playlistUtils.removeResource('{{resource.public_id}}');};return false;" class="component_icon button icon_cancel" style="padding: 4px 12px;"></a>
             </td>
         </tr>

telemeta/templates/telemeta/resource_detail.html

@@ -6 +6 @@
 
 {% block extra_javascript %}
+<script src="{% url telemeta-js "popupdiv.js" %}" type="text/javascript"></script>
+<script src="{% url telemeta-js "playlist.js" %}" type="text/javascript"></script>
+<script>
+{% if user.is_authenticated %}
+jQuery(document).ready(function(){
+    var p = playlistUtils;
+    
+    {% for playlist in playlists %}
+    p.addPlaylist('{{ playlist.playlist.title }}','{{playlist.playlist.public_id}}');
+    {% endfor %}
+    
+    {% if resource %}
+    var anchor = jQuery('#_add_to_playlist');
+    if(anchor.length){
+        anchor.click(function(){
+            p.showAddResourceToPlaylist(anchor,'{{type}}','{{resource.id}}',gettrans('resource added to the selected playlist'));return false;
+            });
+            }
+    {% endif %}
+    });
+    {% endif %}
+    </script>
 {% endblock %}
 
@@ -43 +65 @@
                 {% dl_field resource field.name %}
                {% endif %}
-              {% endfor %}  
+              {% endfor %}
+              {% for parent in parents %}
+              <dt>{% trans parent.element_type|capitalize %}</dt>
+              <dd><a href="{% url telemeta-resource-detail parent.element_type parent.public_id %}">{{ parent.title }}</a></dd>
+               {% endfor %}
             </dl>
         {% endblock general_info %}

telemeta/templates/telemeta/resource_edit.html

@@ -19 +19 @@
             <tr><td class="error">{{ field.errors }}</td></tr>
             {% if "children" in field.html_name %}
-            <td>{{ field.label_tag }}:</td><td><div class="vscroll"> {{ field }}</div></td>
+            <td>{% trans field.label_tag %}:</td><td><div class="vscroll"> {{ field }}</div></td>
             {% else %}
              <td>{{ field.label_tag }}:</td><td> {{ field }}</td>

telemeta/templates/telemeta/search_results.html

@@ -13 +13 @@
      <a href="{% url telemeta-search-items %}?{{criteria|with_no_sound|build_query_string}}" class="component_icon button icon_filter">{% trans "All" %}</a>
      <a href="{% url telemeta-search-items %}?{{criteria|with_sound|build_query_string}}" class="component_icon button icon_filter">{% trans "Sounds" %}</a>
-    {% else %}
+    {% endifequal %}
+    {% ifequal type 'collections' %}
      <a href="{% url telemeta-search-collections %}?{{criteria|with_no_sound|build_query_string}}" class="component_icon button icon_filter">{% trans "All" %}</a>
      <a href="{% url telemeta-search-collections %}?{{criteria|with_sound|build_query_string}}" class="component_icon button icon_filter">{% trans "Sounds" %}</a>
@@ -61 +62 @@
 
 {% ifequal type 'items' %}
-
-  <p><a href="{% url telemeta-search-collections %}?{{criteria|build_query_string}}">Collections ({{collections_num}})</a> | <b>Items ({{items_num}})</b></p>
-
+<p><b>Items ({{items_num}}) | <a href="{% url telemeta-search-collections %}?{{criteria|build_query_string}}">Collections ({{collections_num}})</a> | <a href="{% url telemeta-search-corpus %}?{{criteria|build_query_string}}">Corpus ({{corpus_num}})</a> | <a href="{% url telemeta-search-fonds %}?{{criteria|build_query_string}}">Fonds ({{fonds_num}})</a></b></p>
   {% with object_list as items %}
    <div class="fullpage">
@@ -69 +68 @@
    </div>
   {% endwith %}    
-
-{% else %}
-
-  <p><b>Collections ({{collections_num}})</b> | <a href="{% url telemeta-search-items %}?{{criteria|build_query_string}}">Items ({{items_num}})</a>
-  </p>
-
+{% endifequal %}
+  
+{% ifequal type 'collections' %}
+<p><b><a href="{% url telemeta-search-items %}?{{criteria|build_query_string}}">Items ({{items_num}})</a> | Collections ({{collections_num}}) | <a href="{% url telemeta-search-corpus %}?{{criteria|build_query_string}}">Corpus ({{corpus_num}})</a> | <a href="{% url telemeta-search-fonds %}?{{criteria|build_query_string}}">Fonds ({{fonds_num}})</a>
+  </b></p>
   {% with object_list as collections %}
    <div class="fullpage">
@@ -80 +78 @@
    </div>
   {% endwith %}
-
 {% endifequal %}
 
+{% if type == 'corpus' %}
+<p><b><a href="{% url telemeta-search-items %}?{{criteria|build_query_string}}">Items ({{items_num}})</a> | <a href="{% url telemeta-search-collections %}?{{criteria|build_query_string}}">Collections ({{collections_num}})</a> | Corpus ({{corpus_num}}) | <a href="{% url telemeta-search-fonds %}?{{criteria|build_query_string}}">Fonds ({{fonds_num}})</a>
+</b></p>
+{% endif %}
+
+{% if type == 'fonds' %}
+<p><b><a href="{% url telemeta-search-items %}?{{criteria|build_query_string}}">Items ({{items_num}})</a> | <a href="{% url telemeta-search-collections %}?{{criteria|build_query_string}}">Collections ({{collections_num}})</a> | <a href="{% url telemeta-search-corpus %}?{{criteria|build_query_string}}">Corpus ({{corpus_num}})</a> | Fonds ({{fonds_num}})
+</b></p>
+{% endif %}
+
+{% if type == 'corpus' or type == 'fonds' %}
+{% with object_list as resources and type as type %}
+<div class="fullpage">
+{% include "telemeta/inc/resource_list.html" %}
+</div>
+{% endwith %}
+{% endif %}
+
+
 {% endblock %}

telemeta/templatetags/telemeta_utils.py

@@ -71 +71 @@
         value = value.replace(bad, good)
     return value
+
+@register.filter
+def build_pattern_string(criteria):
+    dict = {}
+    for c in criteria:
+        dict[c.key] = c.value
+    return dict
 
 @register.filter

telemeta/urls.py

@@ -40 +40 @@
 from telemeta.views.base import GeneralView, AdminView, CollectionView, ItemView, \
                                 InstrumentView, PlaylistView, ProfileView, GeoView, \
-                                LastestRevisionsFeed, ResourceView
+                                LastestRevisionsFeed, ResourceView, UserRevisionsFeed
 from jsonrpc import jsonrpc_site
 import os.path
@@ -74 +74 @@
 
 urlpatterns = patterns('',
-    url(r'^$', general_view.index, name="telemeta-home"),
+    url(r'^$', general_view.home, name="telemeta-home"),
 
     # items
@@ -190 +190 @@
         {'format': 'dublin_core_xml'},
         name="telemeta-resource-dublincore-xml"),
+    url(r'^archives/$', general_view.search, name="telemeta-archives"),
 
     # search
@@ -197 +198 @@
     url(r'^search/items/$', general_view.search, {'type': 'items'},
         name="telemeta-search-items"),
+    url(r'^search/corpus/$', general_view.search, {'type': 'corpus'},
+        name="telemeta-search-corpus"),
+    url(r'^search/fonds/$', general_view.search, {'type': 'fonds'},
+        name="telemeta-search-fonds"),
+
     url(r'^search/criteria/$', general_view.edit_search, name="telemeta-search-criteria"),
     url(r'^complete_location/$', general_view.complete_location, name="telemeta-complete-location"),
@@ -296 +302 @@
     url(r'^desk/lists/$', general_view.lists, name="telemeta-desk-lists"),
     url(r'^desk/profile/(?P<username>[A-Za-z0-9._-]+)/$', profile_view.profile_detail, name="telemeta-desk-profile"),
-    url(r'^desk/home/$', general_view.index, name="telemeta-desk-home"),
+    url(r'^desk/home/$', general_view.home, name="telemeta-desk-home"),
 
     # Profiles
     url(r'^users/(?P<username>[A-Za-z0-9._-]+)/profile/$', profile_view.profile_detail, name="telemeta-profile-detail"),
     url(r'^users/(?P<username>[A-Za-z0-9._-]+)/profile/edit/$', profile_view.profile_edit, name="telemeta-profile-edit"),
-#    url(r'^users/(?P<username>[A-Za-z0-9._-]+)/profile/rss/$', profile_view.rss, name="telemeta-profile-rss"),
-
+    url(r'^users/(?P<username>[A-Za-z0-9._-]+)/rss/$', UserRevisionsFeed(),  name="telemeta-user-rss"),
 
     # Registration

telemeta/util/locale_fix.py

@@ -5 +5 @@
 a = _("My last changes")
 a = _("All last changes")
+a = _("My searches")
+a = _("Children")
+a = _("pattern")

telemeta/views/base.py

@@ -52 +52 @@
 from django.http import HttpResponse, HttpResponseRedirect
 from django.http import Http404
-from django.shortcuts import render_to_response, redirect
+from django.shortcuts import render_to_response, redirect, get_object_or_404
 from django.views.generic import list_detail
+from django.views.generic import DetailView
 from django.conf import settings
 from django.contrib import auth
@@ -182 +183 @@
                     if resource.resource_type == 'marker':
                         element = MediaItemMarker.objects.get(id=resource.resource_id)
+                    if resource.resource_type == 'corpus':
+                        element = MediaCorpus.objects.get(id=resource.resource_id)
+                    if resource.resource_type == 'fonds':
+                        element = MediaFonds.objects.get(id=resource.resource_id)
                 except:
                     element = None
@@ -217 +222 @@
     """Provide general web UI methods"""
 
-    def index(self, request):
+    def home(self, request):
         """Render the index page"""
 
@@ -309 +314 @@
         collections = MediaCollection.objects.enriched()
         items = MediaItem.objects.enriched()
+        corpus = MediaCorpus.objects.all()
+        fonds  = MediaFonds.objects.all()
         input = request.REQUEST
         criteria = {}
@@ -315 +322 @@
             'pattern': lambda value: (
                 collections.quick_search(value),
-                items.quick_search(value)),
+                items.quick_search(value),
+                corpus.quick_search(value),
+                fonds.quick_search(value),
+                ),
             'title': lambda value: (
                 collections.word_search('title', value),
-                items.by_title(value)),
+                items.by_title(value),
+                corpus.word_search('title', value),
+                fonds.word_search('title', value)),
             'location': lambda value: (
                 collections.by_location(Location.objects.get(name=value)),
@@ -354 +366 @@
                 try:
                     res = func(value)
-                    if len(res)  > 2:
+                    if len(res)  > 4:
+                        collections, items, corpus, fonds, value = res
+                    elif len(res) == 4:
+                        collections, items, corpus, fonds = res
+                    elif len(res) == 3:
                         collections, items, value = res
+                        corpus = corpus.none()
+                        fonds = fonds.none()
                     else:
                         collections, items = res
+                        corpus = corpus.none()
+                        fonds = fonds.none()
+
                 except ObjectDoesNotExist:
                     collections = collections.none()
                     items = items.none()
+                    corpus = corpus.none()
+                    fonds = fonds.none()
 
                 criteria[key] = value
 
+        # Save the search
+        user = request.user
+        if user:
+            if user.is_authenticated():
+                search = Search(username=user)
+                search.save()
+                if criteria:
+                    for key in criteria.keys():
+                        value = criteria[key]
+                        if key == 'ethnic_group':
+                            try:
+                                group = EthnicGroup.objects.get(value=value)
+                                value = group.id
+                            except:
+                                value = ''
+                        criter = Criteria(key=key, value=value)
+                        criter.save()
+                        search.criteria.add(criter)
+                    search.save()
+
         if type is None:
-            if collections.count():
+            if items.count():
+                type = 'items'
+            else:
                 type = 'collections'
-            else:
-                type = 'items'
 
         if type == 'items':
             objects = items
-        else:
+        elif type == 'collections':
             objects = collections
+        elif type == 'corpus':
+            objects = corpus
+        elif type == 'fonds':
+            objects = fonds
 
         return list_detail.object_list(request, objects,
             template_name='telemeta/search_results.html', paginate_by=20,
             extra_context={'criteria': criteria, 'collections_num': collections.count(),
-                'items_num': items.count(), 'type' : type})
+                'items_num': items.count(), 'corpus_num': corpus.count(), 'fonds_num': fonds.count(),
+                'type' : type,})
 
     def complete_location(self, request, with_items=True):
@@ -420 +468 @@
         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})
+        parents = MediaCorpus.objects.filter(children=collection)
+
+        return render(request, template, {'collection': collection, 'playlists': playlists, 'public_access': public_access, 'items': items, 'related_media': related_media, 'parents': parents })
 
     @method_decorator(permission_required('telemeta.change_mediacollection'))
@@ -665 +714 @@
         media = MediaItemRelated.objects.get(item=item, id=media_id)
         response = HttpResponse(stream_from_file(media.file.path), mimetype=media.mime_type)
-#        response['Content-Disposition'] = 'attachment'
+#        response['Content-Disposition'] = 'attachment; '+'filename='+media.title+'.'+ext
         return response
 
@@ -1248 +1297 @@
         if isinstance(playlist, dict):
             m = Playlist.objects.get(public_id=playlist['public_id'])
-            m.title = float(playlist['title'])
+            m.title = playlist['title']
             m.description = playlist['description']
             m.save()
@@ -1408 +1457 @@
 
 
+class UserRevisionsFeed(LastestRevisionsFeed):
+
+    def get_object(self, request, username):
+        return get_object_or_404(User, username=username)
+
+    def items(self, obj):
+        return get_revisions(self.n_items, obj)
+
+
 class ResourceView(object):
     """Provide Resource web UI methods"""
@@ -1415 +1473 @@
                 'form' : MediaCorpusForm,
                 'related': MediaCorpusRelated,
-                'related_form': MediaCorpusRelatedForm
+                'related_form': MediaCorpusRelatedForm,
+                'parent': MediaFonds,
                 },
             'fonds':
@@ -1421 +1480 @@
                 'form' : MediaFondsForm,
                 'related': MediaFondsRelated,
-                'related_form': MediaFondsRelatedForm
+                'related_form': MediaFondsRelatedForm,
+                'parent': None,
                 }
             }
@@ -1430 +1490 @@
         self.related = self.types[type]['related']
         self.related_form = self.types[type]['related_form']
+        self.parent = self.types[type]['parent']
         self.type = type
 
@@ -1439 +1500 @@
         related_media = self.related.objects.filter(resource=resource)
         check_related_media(related_media)
-
-        return render(request, template, {'resource': resource, 'type': type, 'children': children, 'related_media': related_media})
+        playlists = get_playlists(request)
+        if self.parent:
+            parents = self.parent.objects.filter(children=resource)
+        else:
+            parents = []
+
+        return render(request, template, {'resource': resource, 'type': type, 'children': children, 'related_media': related_media, 'parents': parents, 'playlists': playlists })
 
     @jsonrpc_method('telemeta.change_fonds')

telemeta/pages/en/home.rst

@@ -1 @@
-==================================
-Telemeta : an open web audio CMS
-==================================
+==============================================
+Sound archives of the CNRS - Musée de l'Homme
+==============================================
 
-`Telemeta <http://telemeta.org>`_ is a web audio archiving program which introduces useful and secure methods to backup, index, transcode, analyse and publish any digitalized audio file with its metadata. It is dedicated to professionnals who wants to easily organize, backup and publish documented sound collections of audio files, CDs, digitalized vinyls and magnetic tapes over a strong database, in accordance with open web standards.
+The establishment of the `CREM <http://www.crem-cnrs.fr>`_’s audio archives is the result of a long history of scientific research on music. Since the birth of ethnomusicology (then "comparative musicology"), which coincided with the invention of the first recorders in the late nineteenth century, recording music materials and their classification and preservation are central in our knowledge of the musical Man.
 
-Key features of Telemeta:
-    
- * Secure archiving, editing and publishing of audio files over internet.
- * User friendly web frontend including workflows and high level search methods
- * Smart dynamical and skinnable audio player (thanks to `TimeSide <http://code.google.com/p/timeside/>`_ and `SoundManager2 <http://www.schillmania.com/projects/soundmanager2/>`_)
- * "On the fly" analyzing, transcoding and metadata embedding based on an easy plugin architecture
- * Collaborative temporal indexing with fast user marker management
- * Multi-format support : FLAC, OGG, MP3, WAV and more
- * User management with individual profiles and rights
- * User playlist management with CSV data export
- * Geo-Navigator for audio geolocalization
- * `DublinCore <http://dublincore.org/>`_ compatibility
- * `OAI-PMH <http://www.openarchives.org/pmh/>`_ data provider
- * Relational database system (MySQL type)
- * RSS feeds generator
- * XML serialized backup
+.. image:: home_img.jpg
+    :align: left
 
-This web audio CMS is exclusively based on open source modules and can be run on any Unix or Linux system. It is mostly written in Python and JavaScript.
+With the foundation of the Sound Archive at the Musée d’Ethnographie du Trocadéro by André Schaeffner in 1932 (which became the Sound Archive of the Musée de l’Homme in 1937) and the creation in 1967 of "Laboratoire d’Analyse sonore" on Gilbert Rouget initiative and the creation of a research team from the `CNRS <http://www.cnrs.fr/>`_ (Scientific Research National Center in France) in 1968, both at the `Musée de l’Homme <http://www.museedelhomme.fr/>`_, the conservation of this vast archives collection was more closely related to research : it is powered by the fieldworks of researchers on all continents; collections can serve for research, diachronic and synchronic comparisons, the preparation of new fieldworks and the training of Ph.D students. In 1985, the `CNRS <http://www.cnrs.fr/>`_ and the `Musée National d'Histoire Naturelle <http://www.mnhn.fr/>`_ (National Museum of Natural History) decided to join efforts to preserve this vast archives, therefore called "Sound Archives of CNRS - Musée de l'Homme". A small portion of these archives has been published in 78s (Vox Africa, etc ...), 33 rpm discs and CD (Chant du Monde, Harmonia Mundi). Currently, analogic media are being digitalized with the assistance of the Ministry of Culture and National Library of France. With the installation of the `Center for Research in Ethnomusicology <http://www.crem-cnrs.fr>`_ (CREM, Department of Ethnology and Comparative Sociology, CNRS UMR 7186) at the University of Paris Ouest-Nanterre in 2009, and the opening of the `Telemeta <http://telemeta.org>`_ platform in 2010, this collection sound archives from the era of the Internet.
+
+The archives of CREM, the most important in Europe, are distinguished by their wealth:
+
+ * Nearly 3,500 hours of recordings of unpublished field.
+ * Approximately 3700 hours of material published (more than 5000 discs, many of which are very rare).
+
+The collaborative platform `Telemeta <http://telemeta.org>`_ aims to make these archives available to researchers and to the extent possible, the public, in compliance with the intellectual and moral rights of musicians and collectors. Developed with the support of the program `TGE-Adonis <http://www.tge-adonis.fr/>`_ of the `CNRS <http://www.cnrs.fr/>`_, allows researchers to exchange data online with communities producing their music in their home countries, including through collaborative tools like markers , spaces, comments, etc...
+
+This site is managed by the `CREM <http://www.crem-cnrs.fr>`_. All collaborations are welcome to enrich and enhance this precious musical heritage common to all humanity. Currently, a thousand hours is searchable by code or `access on site and CREM (Université Paris Ouest - Nanterre - La Défense, Building C, Ground Floor, Room 20) <http://goo.gl/maps/ZgHg>`_, and the Central Library Muséum National d'Histoire Naturelle, and the Bibliothèque François Mitterand (garden).
 
 |
-

telemeta/pages/en/legal_notices.rst

@@ -1 @@
-==================
-Legal notices
-==================
+=====================
+Legal Notices
+=====================
 
-**Telemeta is edited by Parisson SARL**
+**Site editor:**
 
-| Parisson SARL 
-| 16 rue Jacques Louvel-Tessier 75010 Paris, France
-| `http://parisson.com <http://parisson.com>`_
-|
-| Copyright (C) 2006-2011 Parisson SARL
-|
-| This software is governed by the CeCILL v2 license under French law and
-| abiding by the rules of distribution of free software.  You can  use, 
-| modify and/ or redistribute the software under the terms of the CeCILL v2
-| license as circulated by CEA, CNRS and INRIA at the following URL
-| `http://www.cecill.info <http://www.cecill.info>`_. 
-|
-| As a counterpart to the access to the source code and  rights to copy,
-| modify and redistribute granted by the license, users are provided only
-| with a limited warranty  and the software's author,  the holder of the
-| economic rights,  and the successive licensors  have only  limited
-| liability. 
-|
-| In this respect, the user's attention is drawn to the risks associated
-| with loading,  using,  modifying and/or developing or reproducing the
-| software by the user in light of its specific status of free software,
-| that may mean  that it is complicated to manipulate,  and  that  also
-| therefore means  that it is reserved for developers  and  experienced
-| professionals having in-depth computer knowledge. Users are therefore
-| encouraged to load and test the software's suitability as regards their
-| requirements in conditions enabling the security of their systems and/or 
-| data to be ensured and,  more generally, to use and operate it in the 
-| same conditions as regards security. 
-|
-| The fact that you are presently reading this means that you have had
-| knowledge of the CeCILL v2 license and that you accept its terms.
+ | Centre de Recherche en Ethnomusicologie (CREM - LESC UMR 7186 CNRS) 
+ | MAE - 21, allée de l'Université
+ | 92023 Nanterre cedex
+ | France
 
+**Managing editor:**
+
+ | Jean Lambert (director du CREM)
+ | e-mail : lambert (at) mnhn.fr
+
+**Design and project manager:**
+
+ | Joséphine Simonnot (CREM)
+ | e-mail : josephine.simonnot (at) mae.u-paris10.fr
+ 
+**Head of archives at CREM :**
+
+ | Aude Da Cruz-Lima (CREM)
+ | e-mail : aude.da-cruz-lima (at) mae.u-paris10.fr
+ 
+**Design and head of development:**
+
+ | Guillaume Pellerin (`Parisson <http://parisson.com>`_)
+ | e-mail : guillaume.pellerin@parisson.com
+
+**Telemeta CREM uses GeoEthno:**
+
+ | © CNRS
+ | Responsable de GeoEthno: Isabelle Donze
+ | Laboratoire d'ethnologie et de sociologie comparative
+ | Bibliothèque Eric-de-Dampierre (Responsable : Marie-Dominique Mouton)
+ | Maison de l'Archéologie et de l'Ethnologie
+ | Université de Paris Ouest La Défense - 92023 Nanterre cedex - France
+ | Contact : bibethno@mae.u-paris10.fr 
+
+| **AUDIO FILE COPYING FORBIDDEN IF NOT EXPLICITLY ALLOWED**
+| **COMMERCIAL USING OF THE ARCHIVES FORBIDDEN IF NOT EXPLICITLY ALLOWED**
+
+
+

telemeta/pages/fr/home.rst

@@ -1 @@
-===================================
-Telemeta : un CMS audio libre
-===================================
+============================================
+Archives sonores du CNRS - Musée de l'Homme 
+============================================
 
-`Telemeta <http://telemeta.org>`_ est une solution libre d'archivage et d'indexation audio basée sur une interface de type web. Elle offre des fonctions avancées d'édition, d'indexation, de transcodage, de publication et de sauvegarde d'archives audio et de leurs méta-données. Il donne accès aux ressources distantes publiées ou privatisés issues de collections numérisées (fichiers, CD audio, vinyl ou bandes magnétiques) par l'intermédiaire d'un simple navigateur ou d'une application dédiée en accord avec les standards du web.
+La constitution des archives sonores du `CREM <http://www.crem-cnrs.fr>`_ est l’aboutissement d’une longue histoire de la recherche scientifique sur la musique. Depuis la naissance de l’ethnomusicologie (alors « musicologie comparée »), qui coïncida avec l'invention des premiers appareils enregistreurs à la fin du XIXe siècle, l'enregistrement des documents musicaux, ainsi que leur classification et leur conservation occupent une place centrale dans notre connaissance de l’Homme musical.
 
-Liste des fonctionnalités principales:
+.. image:: home_img.jpg
+    :align: left
 
- * Edition, archivage pérenne sécurisé, indexation collaborative sur la base d'une application web
- * Interface utilisateur conforme aux standards ouverts du web
- * Moteur de recherche par mots clés ou par critères (géographiques, ethniques, etc...)
- * Lecteur audio avancé dynamique et paramétrable (tous formats audio et video supportés)
- * Moteur d'analyse et de visualisation audio basée sur une structure de modules paramétrables
- * Transcodage vers les formats FLAC, OGG, MP3 et WAV avec encapsulation des métadonnées à la volée
- * Gestion complète des droits et profils utilisateurs
- * Gestion de listes de lecture personnelles avec export CSV
- * Indexation temporelle à la volée (marqueurs textuels sur le lecteur web audio)
- * Base de données relationnelle (type MySQL)
- * Service d'accès aux données par le protocole OAI-PMH (moissonnage)
- * Compatibilité `DublinCore <http://dublincore.org/>`_
- * Service de moissonnage `OAI-PMH <http://www.openarchives.org/pmh/>`_ 
- * Geo-navigateur pour la géolocalisation audio (Google Maps)
- * Flux RSS dynamique des dernières modifications
- * Sauvegarde sérialisée des archives et de leurs métadonnées aux formats WAV + XML
- * Traduction complète anglais / français (détection automatique et/ou contrainte manuelle)
- 
-Ce CMS audio est exclusivement basé sur des modules open source et peut être installé sur tout système Linux ou Unix.
-Il est majoritairement écrit en Python et JavaScript.
+Avec l'ouverture de la Phonothèque au Musée d'Ethnographie du Trocadéro par André Schaeffner en 1932 (qui devint la Phonothèque du Musée de l’Homme en 1937) puis la création en 1967 du "Laboratoire d'analyse du son" à l'initiative de Gilbert Rouget, ainsi que la création d'une équipe de recherche du `CNRS <http://www.cnrs.fr/>`_ en 1968, tous deux au `Musée de l’Homme <http://www.museedelhomme.fr/>`_, la conservation de ce vaste fonds d'archives sonores fut plus étroitement liée à la recherche : celui-ci est alimenté par les missions de terrain des chercheurs sur tous les continents ; les collections permettent à la fois des recherches de laboratoire, des comparaisons diachroniques et synchroniques, la préparation de nouveaux terrains et la formation des doctorants. En 1985, le `CNRS <http://www.cnrs.fr/>`_ et le `Musée National d'Histoire Naturelle <http://www.mnhn.fr/>`_ décidèrent de joindre leurs efforts pour conserver ce vaste fonds d'archives, baptisé dès lors "Archives sonores CNRS - Musée de l'Homme". Une petite partie de ces archives a été publiée en disques 78 tours (Africa Vox, etc…), disques 33 tours  et en CD (Chant du Monde, Harmonia Mundi). Actuellement, les supports analogiques sont en cours de numérisation grâce à l'aide du Ministère de la Culture et de la Bibliothèque Nationale de France, Avec l’installation du `Centre de Recherche en Ethnomusicologie <http://www.crem-cnrs.fr>`_ (CREM, `Laboratoire d'Ethnologie et de Sociologie Comparative <http://www.u-paris10.fr/LESC/0/fiche___laboratoire/&RH=rec_lab>`_, UMR 7186) à l’Université de Paris Ouest - Nanterre La Défense en 2009, et l’ouverture de la plate-forme `Telemeta <http://telemeta.org>`_ en 2011, ce fonds d’archives sonores entre dans l’ère de l'internet.
+
+Les archives du CREM, parmi les plus importantes d’Europe, se distinguent par leur richesse :
+
+ * près de 3500 heures d'enregistrements de terrain non publiés.
+ * environ 3700 heures de documents publiés (plus de 5000 disques dont beaucoup sont très rares).
+
+La plateforme collaborative `Telemeta <http://telemeta.org>`_ vise à rendre ces archives accessibles aux chercheurs et, dans la mesure du possible, au public, dans le respect des droits intellectuels et moraux des musiciens et des collecteurs. Mise au point grâce au soutien du programme `TGE-Adonis <http://www.tge-adonis.fr/>`_ du `CNRS <http://www.cnrs.fr/>`_, elle permet aux chercheurs d'échanger les données en ligne, avec les communautés productrices de ces musiques dans leur pays d'origine, notamment au moyen d’outils collaboratifs comme des marqueurs temporels, des espaces de commentaires, etc... 
+
+La gestion de la plateforme est assurée par le `CREM <http://www.crem-cnrs.fr>`_. Le site accueille toutes les collaborations visant à enrichir et valoriser ce précieux patrimoine musical commun à toute l'Humanité. Actuellement, un millier d’heures est consultable en ligne avec un code d’accès, mais aussi `sur place au CREM (Université Paris-Ouest Nanterre-La Défense, bâtiment C, rez-de-chaussée, pièce 20) <http://goo.gl/maps/ZgHg>`_, ainsi qu’à la Bibliothèque centrale du Muséum National d’Histoire Naturelle, et à la Bibliothèque François Mitterand (rez de jardin).
 
 |

telemeta/pages/fr/legal_notices.rst

@@ -1 @@
-==================
-Mentions légales
-==================
+=====================
+Mentions Légales
+=====================
 
-**Telemeta est édité par la Société Parisson SARL**
+**Editeur du site :**
 
-| Parisson SARL 
-| 16 rue Jacques Louvel-Tessier 75010 Paris, France
-| `http://parisson.com <http://parisson.com>`_
-|
-| Copyright (C) 2006-2011 Parisson SARL
-|
-| Ce logiciel est régi par la licence CeCILL v2 soumise au droit français et
-| respectant les principes de diffusion des logiciels libres. Vous pouvez
-| utiliser, modifier et/ou redistribuer ce programme sous les conditions
-| de la licence CeCILL v2 telle que diffusée par le CEA, le CNRS et l'INRIA 
-| sur le site `http://www.cecill.info <http://www.cecill.info>`_.
-|
-| En contrepartie de l'accessibilité au code source et des droits de copie,
-| de modification et de redistribution accordés par cette licence, il n'est
-| offert aux utilisateurs qu'une garantie limitée.  Pour les mêmes raisons,
-| seule une responsabilité restreinte pèse sur l'auteur du programme,  le
-| titulaire des droits patrimoniaux et les concédants successifs.
-|
-| A cet égard  l'attention de l'utilisateur est attirée sur les risques
-| associés au chargement,  à l'utilisation,  à la modification et/ou au
-| développement et à la reproduction du logiciel par l'utilisateur étant 
-| donné sa spécificité de logiciel libre, qui peut le rendre complexe à 
-| manipuler et qui le réserve donc à des développeurs et des professionnels
-| avertis possédant  des  connaissances  informatiques approfondies.  Les
-| utilisateurs sont donc invités à charger  et  tester  l'adéquation  du
-| logiciel à leurs besoins dans des conditions permettant d'assurer la
-| sécurité de leurs systèmes et ou de leurs données et, plus généralement, 
-| à l'utiliser et l'exploiter dans les mêmes conditions de sécurité. 
-|
-| Le fait que vous puissiez accéder à cet en-tête signifie que vous avez 
-| pris connaissance de la licence CeCILL v2, et que vous en avez accepté les
-| termes.
+ | Centre de Recherche en Ethnomusicologie (CREM - LESC UMR 7186 CNRS) 
+ | MAE - 21, allée de l'Université
+ | 92023 Nanterre cedex
+ | France
+
+**Directeur de publication :**
+
+ | Jean Lambert (directeur du CREM)
+ | e-mail : lambert (at) mnhn.fr
+
+**Chef de projet et conception :**
+
+ | Joséphine Simonnot (CREM)
+ | e-mail : josephine.simonnot (at) mae.u-paris10.fr
+ 
+**Responsable des archives du CREM :**
+
+ | Aude Da Cruz-Lima (CREM)
+ | e-mail : aude.da-cruz-lima (at) mae.u-paris10.fr
+ 
+**Chef du développement et conception:**
+
+ | Guillaume Pellerin (`Parisson <http://parisson.com>`_)
+ | e-mail : guillaume.pellerin@parisson.com
+
+**Telemeta CREM utilise GeoEthno:**
+
+ | © CNRS
+ | Responsable de GeoEthno: Isabelle Donze
+ | Laboratoire d'ethnologie et de sociologie comparative
+ | Bibliothèque Eric-de-Dampierre (Responsable : Marie-Dominique Mouton)
+ | Maison de l'Archéologie et de l'Ethnologie
+ | Université de Paris Ouest La Défense - 92023 Nanterre cedex - France
+ | Contact : bibethno@mae.u-paris10.fr 
+
+| **COPIE DES ARCHIVES SONORES INTERDITE SI PAS EXPLICITEMENT AUTORISÉ**
+| **UTILISATION COMMERCIALE DES ARCHIVES SONORES INTERDITE SI PAS EXPLICITEMENT AUTORISÉ**
+
+
+