fix add to list for corpus and fonds

fix locales

diff --git a/telemeta/locale/de/LC_MESSAGES/django.mo b/telemeta/locale/de/LC_MESSAGES/django.mo
index ae84a61c39eae10e7feb7b64acfdeec5427a329a..2b1912979d8ee8e99f11ca2454a255f3ef47838c 100644 (file)
Binary files a/telemeta/locale/de/LC_MESSAGES/django.mo and b/telemeta/locale/de/LC_MESSAGES/django.mo differ

diff --git a/telemeta/locale/de/LC_MESSAGES/django.po b/telemeta/locale/de/LC_MESSAGES/django.po
index 668e3039110583762313c116e6fce57b3c502b72..418929b4d1624f0e5233d0703b9a5962999c8cc1 100644 (file)
--- a/telemeta/locale/de/LC_MESSAGES/django.po
+++ b/telemeta/locale/de/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 14:37+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"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -667,7 +667,7 @@ msgstr ""
 msgid "Desk"
 msgstr ""
 
-#: templates/telemeta/base.html:86 views/base.py:265
+#: templates/telemeta/base.html:86 views/base.py:269
 msgid "Lists"
 msgstr ""
 
@@ -778,7 +778,7 @@ msgid "Save"
 msgstr ""
 
 #: templates/telemeta/collection_detail.html:5
-#: templates/telemeta/collection_detail_dc.html:5 views/base.py:455
+#: templates/telemeta/collection_detail_dc.html:5 views/base.py:459
 msgid "Collection"
 msgstr ""
 
@@ -792,7 +792,7 @@ msgstr ""
 #: templates/telemeta/mediaitem_detail_video.html:231
 #: 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
 #: templates/telemeta/inc/resource_related.html:82
@@ -802,7 +802,7 @@ msgstr ""
 #: templates/telemeta/collection_detail.html:45
 #: 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 ""
 
@@ -813,7 +813,7 @@ msgstr ""
 #: templates/telemeta/collection_detail.html:49
 #: 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 ""
 
@@ -884,7 +884,7 @@ msgstr ""
 #: templates/telemeta/lists.html:58
 #: templates/telemeta/mediaitem_detail.html:320
 #: templates/telemeta/mediaitem_detail_video.html:363
-#: templates/telemeta/resource_detail.html:73
+#: templates/telemeta/resource_detail.html:95
 msgid "Delete"
 msgstr ""
 
@@ -1075,7 +1075,7 @@ msgstr ""
 msgid "Action"
 msgstr ""
 
-#: templates/telemeta/lists.html:89
+#: templates/telemeta/lists.html:92
 #: templates/telemeta/inc/module_revisions.html:40
 msgid "deleted"
 msgstr ""
@@ -1095,7 +1095,7 @@ msgstr ""
 #: templates/telemeta/mediaitem_add.html:5
 #: templates/telemeta/mediaitem_copy.html:5
 #: templates/telemeta/mediaitem_detail.html:5
-#: templates/telemeta/mediaitem_detail_video.html:5 views/base.py:618
+#: templates/telemeta/mediaitem_detail_video.html:5 views/base.py:622
 msgid "Item"
 msgstr ""
 
@@ -1230,7 +1230,7 @@ msgstr ""
 msgid "User Profile"
 msgstr ""
 
-#: templates/telemeta/profile_detail.html:8 views/base.py:1388
+#: templates/telemeta/profile_detail.html:8 views/base.py:1392
 msgid "User profile"
 msgstr ""
 
@@ -1292,7 +1292,7 @@ msgstr ""
 msgid "New"
 msgstr ""
 
-#: templates/telemeta/resource_detail.html:79
+#: templates/telemeta/resource_detail.html:101
 #: templates/telemeta/resource_detail_dc.html:16
 msgid "No such resource"
 msgstr ""
@@ -1389,7 +1389,7 @@ msgid "User"
 msgstr ""
 
 #: templates/telemeta/inc/module_searches.html:13
-msgid "Pattern"
+msgid "Criteria"
 msgstr ""
 
 #: templates/telemeta/inc/resource_list.html:7
@@ -1585,17 +1585,21 @@ msgstr ""
 msgid "Children"
 msgstr ""
 
-#: views/base.py:264 views/base.py:454 views/base.py:617 views/base.py:921
-#: views/base.py:1387
+#: 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:266 views/base.py:456 views/base.py:619 views/base.py:923
-#: views/base.py:1389
+#: 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:1418
+#: views/base.py:1422
 msgid "Last changes"
 msgstr ""

diff --git a/telemeta/locale/de/LC_MESSAGES/djangojs.mo b/telemeta/locale/de/LC_MESSAGES/djangojs.mo
index ae84a61c39eae10e7feb7b64acfdeec5427a329a..2b1912979d8ee8e99f11ca2454a255f3ef47838c 100644 (file)
Binary files a/telemeta/locale/de/LC_MESSAGES/djangojs.mo and b/telemeta/locale/de/LC_MESSAGES/djangojs.mo differ

diff --git a/telemeta/locale/de/LC_MESSAGES/djangojs.po b/telemeta/locale/de/LC_MESSAGES/djangojs.po
index bc6107628f86f0bdbd211898feddc4fef9b5ab1d..0e34aa5dc6f5b29c510a5798cd7d2487ae2c4d96 100644 (file)
--- a/telemeta/locale/de/LC_MESSAGES/djangojs.po
+++ b/telemeta/locale/de/LC_MESSAGES/djangojs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 14:37+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"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/telemeta/locale/fr/LC_MESSAGES/django.mo b/telemeta/locale/fr/LC_MESSAGES/django.mo
index ac3a02789ec1c702d23f10cc18837a6143c069da..d7377b9382197f000168963229d347fa521a79f0 100644 (file)
Binary files a/telemeta/locale/fr/LC_MESSAGES/django.mo and b/telemeta/locale/fr/LC_MESSAGES/django.mo differ

diff --git a/telemeta/locale/fr/LC_MESSAGES/django.po b/telemeta/locale/fr/LC_MESSAGES/django.po
index 4fd10516299a46b875c48c5e61fb813dbb405f7a..a460472daec5899db4bfada880fc18c59451b2ea 100644 (file)
--- a/telemeta/locale/fr/LC_MESSAGES/django.po
+++ b/telemeta/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 14:37+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"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -670,7 +670,7 @@ msgstr "Recherche"
 msgid "Desk"
 msgstr "Bureau"
 
-#: templates/telemeta/base.html:86 views/base.py:265
+#: templates/telemeta/base.html:86 views/base.py:269
 msgid "Lists"
 msgstr "Listes"
 
@@ -783,7 +783,7 @@ msgid "Save"
 msgstr "Enregistrer"
 
 #: templates/telemeta/collection_detail.html:5
-#: templates/telemeta/collection_detail_dc.html:5 views/base.py:455
+#: templates/telemeta/collection_detail_dc.html:5 views/base.py:459
 msgid "Collection"
 msgstr "Collection"
 
@@ -797,7 +797,7 @@ msgstr "Collection"
 #: templates/telemeta/mediaitem_detail_video.html:231
 #: 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
 #: templates/telemeta/inc/resource_related.html:82
@@ -807,7 +807,7 @@ msgstr "Editer"
 #: templates/telemeta/collection_detail.html:45
 #: 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"
 
@@ -818,7 +818,7 @@ msgstr "Ajouter item"
 #: templates/telemeta/collection_detail.html:49
 #: 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"
 
@@ -889,7 +889,7 @@ msgstr "Nombre d'items"
 #: templates/telemeta/lists.html:58
 #: templates/telemeta/mediaitem_detail.html:320
 #: templates/telemeta/mediaitem_detail_video.html:363
-#: templates/telemeta/resource_detail.html:73
+#: templates/telemeta/resource_detail.html:95
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -1080,7 +1080,7 @@ msgstr "Sonore"
 msgid "Action"
 msgstr "Action"
 
-#: templates/telemeta/lists.html:89
+#: templates/telemeta/lists.html:92
 #: templates/telemeta/inc/module_revisions.html:40
 msgid "deleted"
 msgstr "supprimé"
@@ -1101,7 +1101,7 @@ msgstr "Mot de passe oublié"
 #: templates/telemeta/mediaitem_add.html:5
 #: templates/telemeta/mediaitem_copy.html:5
 #: templates/telemeta/mediaitem_detail.html:5
-#: templates/telemeta/mediaitem_detail_video.html:5 views/base.py:618
+#: templates/telemeta/mediaitem_detail_video.html:5 views/base.py:622
 msgid "Item"
 msgstr "Item"
 
@@ -1236,7 +1236,7 @@ msgstr "Formation"
 msgid "User Profile"
 msgstr "Profil utilisateur"
 
-#: templates/telemeta/profile_detail.html:8 views/base.py:1388
+#: templates/telemeta/profile_detail.html:8 views/base.py:1392
 msgid "User profile"
 msgstr "Profil utilisateur"
 
@@ -1298,7 +1298,7 @@ msgstr ""
 msgid "New"
 msgstr "Nouveau"
 
-#: templates/telemeta/resource_detail.html:79
+#: templates/telemeta/resource_detail.html:101
 #: templates/telemeta/resource_detail_dc.html:16
 msgid "No such resource"
 msgstr "Aucune ressource de ce type"
@@ -1333,7 +1333,7 @@ msgstr "Résultats de recherche"
 
 #: templates/telemeta/search_results.html:26
 msgid "Search pattern"
-msgstr "Recherche"
+msgstr "Mots clés"
 
 #: templates/telemeta/inc/children_list.html:8
 #, fuzzy, python-format
@@ -1395,7 +1395,7 @@ msgid "User"
 msgstr "Utilisateur"
 
 #: templates/telemeta/inc/module_searches.html:13
-msgid "Pattern"
+msgid "Criteria"
 msgstr ""
 
 #: templates/telemeta/inc/resource_list.html:7
@@ -1597,20 +1597,24 @@ msgstr "Mes recherches"
 msgid "Children"
 msgstr "Enfants"
 
-#: views/base.py:264 views/base.py:454 views/base.py:617 views/base.py:921
-#: views/base.py:1387
+#: 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:266 views/base.py:456 views/base.py:619 views/base.py:923
-#: views/base.py:1389
+#: 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 ""
 "Connectez-vous s'il vous plaît ou bien contactez l'administrateur du site "
 "pour obtenir un accès privé."
 
-#: views/base.py:1418
+#: views/base.py:1422
 msgid "Last changes"
 msgstr "Dernières modifications"
 

diff --git a/telemeta/locale/fr/LC_MESSAGES/djangojs.mo b/telemeta/locale/fr/LC_MESSAGES/djangojs.mo
index 92b4c033fb3d1656a37c63215aef1cd7b0c9f4db..24c6b25d1302a4b37740ed042f89ca627e34899f 100644 (file)
Binary files a/telemeta/locale/fr/LC_MESSAGES/djangojs.mo and b/telemeta/locale/fr/LC_MESSAGES/djangojs.mo differ

diff --git a/telemeta/locale/fr/LC_MESSAGES/djangojs.po b/telemeta/locale/fr/LC_MESSAGES/djangojs.po
index eda025a56a3266a988491390f74b571a5fb0cbc4..2bbd55c8a7f491c685771abca8283e24f1a77102 100644 (file)
--- a/telemeta/locale/fr/LC_MESSAGES/djangojs.po
+++ b/telemeta/locale/fr/LC_MESSAGES/djangojs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 14:37+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"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/telemeta/templates/telemeta/inc/module_searches.html b/telemeta/templates/telemeta/inc/module_searches.html
index de3ee08d8d3815801219ad0c7f78909d505800c9..82c5ab667c96ea288cd85b64483f1794452f2923 100644 (file)
--- a/telemeta/templates/telemeta/inc/module_searches.html
+++ b/telemeta/templates/telemeta/inc/module_searches.html
@@ -10,14 +10,14 @@
     <table class="listing" bgcolor="#FFFFFF" style="width: 100%">
       <tr>
         <th class="highlight">{% trans "Date" %}</th>
-        <th>{% trans "Pattern" %}</th>
+        <th>{% trans "Criteria" %}</th>
       </tr>
     {% for s in searches %}
      <tr {% if not forloop.counter0|divisibleby:"2" %}class="odd"{% endif %}>
         <td>{{ s.date }}</td>
         <td><a href="{% url telemeta-search-items %}?{{s.criteria.all|build_pattern_string|build_query_string}}">
             {% for c in s.criteria.all %}
-                <li>{{ c.key }} : {{ c.value}}</li>
+                <li>{% trans c.key %} : {{ c.value}}</li>
             {% endfor %}
           </a>
         </td>

diff --git a/telemeta/templates/telemeta/lists.html b/telemeta/templates/telemeta/lists.html
index 21b5d491a5c3a9362904976c088c132b5c4cc0f7..fbd545a69e5c66e7b5f872a4123e976b0f44f70e 100644 (file)
--- a/telemeta/templates/telemeta/lists.html
+++ b/telemeta/templates/telemeta/lists.html
@@ -86,6 +86,9 @@
                 {% if resource.type == "marker" and not resource.element == None  %}
                 <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>
             <td>{{ resource.type }}</td>

diff --git a/telemeta/templates/telemeta/resource_detail.html b/telemeta/templates/telemeta/resource_detail.html
index 73e9224604c97f26c8355759654b714bfa3222c9..226e9b61d9e26eb065f5bbb69d38c1cfe094862a 100644 (file)
--- a/telemeta/templates/telemeta/resource_detail.html
+++ b/telemeta/templates/telemeta/resource_detail.html
@@ -5,6 +5,28 @@
 {% block head_title %}{% trans type %}{{resource|prepend:' : '}} - {{ block.super }}{% endblock %}
 
 {% 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 %}
 
 {% if resource %}

diff --git a/telemeta/util/locale_fix.py b/telemeta/util/locale_fix.py
index 397045c4d6c7b1e6d2ad4aaedf76cd90b44ddf2d..16989254345604ebb0004e43066209645b745cd2 100644 (file)
--- a/telemeta/util/locale_fix.py
+++ b/telemeta/util/locale_fix.py
@@ -6,3 +6,4 @@ a = _("My last changes")
 a = _("All last changes")
 a = _("My searches")
 a = _("Children")
+a = _("pattern")

diff --git a/telemeta/views/base.py b/telemeta/views/base.py
index ccd9783aa6ed3579c654be7855b93dad7fe1da51..5d4b5fe3614860c01d17378a9c0ad20821af21ae 100644 (file)
--- a/telemeta/views/base.py
+++ b/telemeta/views/base.py
@@ -182,6 +182,10 @@ def get_playlists(request, user=None):
                         element = MediaCollection.objects.get(id=resource.resource_id)
                     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
                 resources.append({'element': element, 'type': resource.resource_type, 'public_id': resource.public_id })
@@ -1495,12 +1499,13 @@ class ResourceView(object):
         children = children.order_by('code')
         related_media = self.related.objects.filter(resource=resource)
         check_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 })
+        return render(request, template, {'resource': resource, 'type': type, 'children': children, 'related_media': related_media, 'parents': parents, 'playlists': playlists })
 
     @jsonrpc_method('telemeta.change_fonds')
     @jsonrpc_method('telemeta.change_corpus')