change add icon, adapt add_item for a given collection, add the button

diff --git a/telemeta/htdocs/css/telemeta.css b/telemeta/htdocs/css/telemeta.css
index 9c5635276717eb73749d21de0c02c5b14c3f02b1..5e565eebc3cfb300465cd992ddc5d382f89733a0 100644 (file)
--- a/telemeta/htdocs/css/telemeta.css
+++ b/telemeta/htdocs/css/telemeta.css
@@ -1099,6 +1099,9 @@ a.image-link {
 .icon_add{
     background-image: url('/images/add.png');
 }
+.icon_add_to_playlist{
+    background-image: url('/images/add_to_playlist.png');
+}
 .icon_login{
     background-image: url('/images/password.png');
 }

diff --git a/telemeta/htdocs/images/add.png b/telemeta/htdocs/images/add.png
index 8431237bd374e68931a13df798bc0996452f705f..fe07994c2c79feceb44bb6b69889bf6b09bf4d8b 100644 (file)
Binary files a/telemeta/htdocs/images/add.png and b/telemeta/htdocs/images/add.png differ

diff --git a/telemeta/locale/de/LC_MESSAGES/django.mo b/telemeta/locale/de/LC_MESSAGES/django.mo
index 02f452c82dcc8058b710314afd286011bda9bb74..d72dc777c25c00fdc4b2f6b7929e769c8a46b96d 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 03dc755b81cde63610097c8dbc08c5e463826a32..78dcc5374c75d58a780568db0cbe80f96a2b4f39 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: 2011-05-11 14:04+0200\n"
+"POT-Creation-Date: 2011-05-11 16:01+0200\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"
@@ -605,7 +605,7 @@ msgid ""
 msgstr ""
 
 #: templates/telemeta_default/base.html:118
-#: templates/telemeta_default/collection_detail.html:111
+#: templates/telemeta_default/collection_detail.html:114
 #: templates/telemeta_default/collection_detail_new.html:116
 msgid "Legal notices"
 msgstr ""
@@ -661,28 +661,32 @@ msgstr ""
 msgid "Copy"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:47
+#: templates/telemeta_default/collection_detail.html:45
+msgid "Add item"
+msgstr ""
+
+#: templates/telemeta_default/collection_detail.html:48
 #: templates/telemeta_default/collection_detail_new.html:47
 #: templates/telemeta_default/mediaitem_detail.html:101
 msgid "Add to playlist"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:57
+#: templates/telemeta_default/collection_detail.html:60
 msgid "Listen to this collection"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:89
+#: templates/telemeta_default/collection_detail.html:92
 #: templates/telemeta_default/collection_detail_new.html:93
 msgid "Recording year"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:98
+#: templates/telemeta_default/collection_detail.html:101
 #: templates/telemeta_default/collection_detail_new.html:103
 #: templates/telemeta_default/mediaitem_detail.html:228
 msgid "Geographic and cultural informations"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:116
+#: templates/telemeta_default/collection_detail.html:119
 #: templates/telemeta_default/collection_detail_new.html:121
 #: templates/telemeta_default/home.html:52
 #: templates/telemeta_default/inc/collection_list.html:16
@@ -690,31 +694,31 @@ msgstr ""
 msgid "Recordist"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:137
+#: templates/telemeta_default/collection_detail.html:140
 #: templates/telemeta_default/collection_detail_new.html:142
 #: templates/telemeta_default/mediaitem_detail.html:294
 msgid "Archiving data"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:160
+#: templates/telemeta_default/collection_detail.html:163
 #: templates/telemeta_default/collection_detail_new.html:165
 #: templates/telemeta_default/mediaitem_detail.html:309
 msgid "Technical data"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:165
+#: templates/telemeta_default/collection_detail.html:168
 #: templates/telemeta_default/collection_detail_new.html:170
 #: templates/telemeta_default/mediaitem_detail.html:312
 msgid "Media type"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:165
+#: templates/telemeta_default/collection_detail.html:168
 #: templates/telemeta_default/collection_detail_new.html:170
 #: templates/telemeta_default/mediaitem_detail.html:312
 msgid "Audio"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:170
+#: templates/telemeta_default/collection_detail.html:173
 #: templates/telemeta_default/collection_detail_new.html:175
 #: templates/telemeta_default/geo_countries.html:17
 msgid "Number of items"
@@ -1086,7 +1090,7 @@ msgstr ""
 msgid "No item"
 msgstr ""
 
-#: templates/telemeta_default/inc/module_revisions.html:7 web/base.py:1079
+#: templates/telemeta_default/inc/module_revisions.html:7 web/base.py:1083
 msgid "Last changes"
 msgstr ""
 
@@ -1260,11 +1264,11 @@ msgid_plural "%(count)d collections"
 msgstr[0] ""
 msgstr[1] ""
 
-#: web/base.py:1090
+#: web/base.py:1094
 msgid "Access not allowed"
 msgstr ""
 
-#: web/base.py:1092
+#: web/base.py:1096
 msgid ""
 "Please login or contact the website administator to get admin or private "
 "access."

diff --git a/telemeta/locale/fr/LC_MESSAGES/django.mo b/telemeta/locale/fr/LC_MESSAGES/django.mo
index 0355b2cab5809f5b126106bf135211502e6052fe..7cf0674d2e15e9751d5bf48e70b5ba1de89ef78b 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 113894716a76e10dd685a1598cdbe214dfe324a1..1ec8495209b7ddb6456f2d4a49710b1f0da14bf3 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: 2011-05-11 14:04+0200\n"
+"POT-Creation-Date: 2011-05-11 16:01+0200\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"
@@ -611,7 +611,7 @@ msgstr ""
 "communautés d'origine."
 
 #: templates/telemeta_default/base.html:118
-#: templates/telemeta_default/collection_detail.html:111
+#: templates/telemeta_default/collection_detail.html:114
 #: templates/telemeta_default/collection_detail_new.html:116
 msgid "Legal notices"
 msgstr "Mentions légales"
@@ -667,28 +667,32 @@ msgstr "Editer"
 msgid "Copy"
 msgstr "Copier"
 
-#: templates/telemeta_default/collection_detail.html:47
+#: templates/telemeta_default/collection_detail.html:45
+msgid "Add item"
+msgstr "Ajouter item"
+
+#: templates/telemeta_default/collection_detail.html:48
 #: templates/telemeta_default/collection_detail_new.html:47
 #: templates/telemeta_default/mediaitem_detail.html:101
 msgid "Add to playlist"
 msgstr "Ajouter à la liste"
 
-#: templates/telemeta_default/collection_detail.html:57
+#: templates/telemeta_default/collection_detail.html:60
 msgid "Listen to this collection"
 msgstr "Écouter la collection"
 
-#: templates/telemeta_default/collection_detail.html:89
+#: templates/telemeta_default/collection_detail.html:92
 #: templates/telemeta_default/collection_detail_new.html:93
 msgid "Recording year"
 msgstr "Année d'enregistrement"
 
-#: templates/telemeta_default/collection_detail.html:98
+#: templates/telemeta_default/collection_detail.html:101
 #: templates/telemeta_default/collection_detail_new.html:103
 #: templates/telemeta_default/mediaitem_detail.html:228
 msgid "Geographic and cultural informations"
 msgstr "Indications géographiques et culturelles"
 
-#: templates/telemeta_default/collection_detail.html:116
+#: templates/telemeta_default/collection_detail.html:119
 #: templates/telemeta_default/collection_detail_new.html:121
 #: templates/telemeta_default/home.html:52
 #: templates/telemeta_default/inc/collection_list.html:16
@@ -696,31 +700,31 @@ msgstr "Indications géographiques et culturelles"
 msgid "Recordist"
 msgstr "Collecteur"
 
-#: templates/telemeta_default/collection_detail.html:137
+#: templates/telemeta_default/collection_detail.html:140
 #: templates/telemeta_default/collection_detail_new.html:142
 #: templates/telemeta_default/mediaitem_detail.html:294
 msgid "Archiving data"
 msgstr "Données d'archivage"
 
-#: templates/telemeta_default/collection_detail.html:160
+#: templates/telemeta_default/collection_detail.html:163
 #: templates/telemeta_default/collection_detail_new.html:165
 #: templates/telemeta_default/mediaitem_detail.html:309
 msgid "Technical data"
 msgstr "Données techniques"
 
-#: templates/telemeta_default/collection_detail.html:165
+#: templates/telemeta_default/collection_detail.html:168
 #: templates/telemeta_default/collection_detail_new.html:170
 #: templates/telemeta_default/mediaitem_detail.html:312
 msgid "Media type"
 msgstr "Type de media"
 
-#: templates/telemeta_default/collection_detail.html:165
+#: templates/telemeta_default/collection_detail.html:168
 #: templates/telemeta_default/collection_detail_new.html:170
 #: templates/telemeta_default/mediaitem_detail.html:312
 msgid "Audio"
 msgstr "Audio"
 
-#: templates/telemeta_default/collection_detail.html:170
+#: templates/telemeta_default/collection_detail.html:173
 #: templates/telemeta_default/collection_detail_new.html:175
 #: templates/telemeta_default/geo_countries.html:17
 msgid "Number of items"
@@ -1093,7 +1097,7 @@ msgstr "Etat/Continent"
 msgid "No item"
 msgstr "Aucun item"
 
-#: templates/telemeta_default/inc/module_revisions.html:7 web/base.py:1079
+#: templates/telemeta_default/inc/module_revisions.html:7 web/base.py:1083
 msgid "Last changes"
 msgstr "Dernières modifications"
 
@@ -1273,11 +1277,11 @@ msgid_plural "%(count)d collections"
 msgstr[0] "%(count)d collection"
 msgstr[1] "%(count)d collections"
 
-#: web/base.py:1090
+#: web/base.py:1094
 msgid "Access not allowed"
 msgstr "Accès non autorisé"
 
-#: web/base.py:1092
+#: web/base.py:1096
 msgid ""
 "Please login or contact the website administator to get admin or private "
 "access."

diff --git a/telemeta/models/system.py b/telemeta/models/system.py
index afdc68a8dfbe0720f2dcfae684b5a951cf5e6a08..40d17235970beb09d94690d98d3bf9b58ef879d8 100644 (file)
--- a/telemeta/models/system.py
+++ b/telemeta/models/system.py
@@ -75,7 +75,7 @@ class Revision(ModelCore):
 class UserProfile(django.db.models.Model):
     "User profile extension"
     
-    user            = ForeignKey(User, unique=True)
+    user            = ForeignKey(User, unique=True, required=True)
     institution     = CharField(_('Institution'))
     function        = CharField(_('Function'))
     address         = TextField(_('Address'))

diff --git a/telemeta/templates/telemeta_default/collection_detail.html b/telemeta/templates/telemeta_default/collection_detail.html
index 13400322f81a22f827329b930f4797eb103868ef..069a7ed28e788ae1906f602ad14afd09203f24eb 100644 (file)
--- a/telemeta/templates/telemeta_default/collection_detail.html
+++ b/telemeta/templates/telemeta_default/collection_detail.html
@@ -38,14 +38,17 @@
 {% endblock %}
 
 {% block title_buttons %}
-      <a href="{% url telemeta-collection-dublincore collection.public_id %}" class="component_icon button icon_dublin_core">Dublin Core</a>
+  <div class="fixedWidthAsPlayer">
     {% if user.is_authenticated and perms.telemeta.change_mediacollection %}
       <a href="{% url telemeta-collection-edit collection.public_id %}" class="component_icon button icon_edit">{% trans "Edit" %}</a>
       <a href="{% url telemeta-collection-copy collection.public_id %}" class="component_icon button icon_copy">{% trans "Copy" %}</a>
+      <a href="{% url telemeta-collection-additem collection.public_id %}" class="component_icon button icon_add">{% trans "Add item" %}</a>
      {% endif %}
     {% if user.is_authenticated %}
-    <a href=# id ="_add_to_playlist" class="component_icon button icon_add">{% trans "Add to playlist" %}</a>
+    <a href=# id ="_add_to_playlist" class="component_icon button icon_add_to_playlist">{% trans "Add to playlist" %}</a>
     {% endif %}
+    <a href="{% url telemeta-collection-dublincore collection.public_id %}" class="component_icon button icon_dublin_core">Dublin Core</a>
+   </div>
 {% endblock %}
 
 {% block content %}

diff --git a/telemeta/templates/telemeta_default/mediaitem_detail.html b/telemeta/templates/telemeta_default/mediaitem_detail.html
index 933217c32887201eec12b5793ffcd78c5166faa6..408cf1b31fbcad5eccca2282e53054c133255e1c 100644 (file)
--- a/telemeta/templates/telemeta_default/mediaitem_detail.html
+++ b/telemeta/templates/telemeta_default/mediaitem_detail.html
@@ -98,7 +98,7 @@
     <a href="{% url telemeta-item-copy item.public_id %}" class="component_icon button icon_copy">{% trans "Copy" %}</a>
     {% endif %}
     {% if user.is_authenticated %}
-    <a id="_add_to_playlist" href='#' class="component_icon button icon_add">{% trans "Add to playlist" %}</a>
+    <a id="_add_to_playlist" href='#' class="component_icon button icon_add_to_playlist">{% trans "Add to playlist" %}</a>
     {% endif %}
     <a href="{% url telemeta-item-detail previous %}" class="component_icon button icon_previous">{% trans "Previous" %}</a>
     <a href="{% url telemeta-item-detail next %}" class="component_icon button icon_next">{% trans "Next" %}</a>

diff --git a/telemeta/urls.py b/telemeta/urls.py
index ca70ed14428c276db7e76e2351bd950bf3796583..8cd990da64ab6e01e06be8c99aa38703ec0e6b04 100644 (file)
--- a/telemeta/urls.py
+++ b/telemeta/urls.py
@@ -131,6 +131,8 @@ urlpatterns = patterns('',
         dict(template='telemeta/collection_edit.html'), name="telemeta-collection-copy"),
     url(r'^collection/add/$', web_view.collection_add,
         dict(template='telemeta/collection_add.html'), name="telemeta-collection-add"),
+    url(r'^collection/(?P<public_id>[A-Za-z0-9._-]+)/add_item/$', web_view.item_add,
+        dict(template='telemeta/mediaitem_add.html'), name="telemeta-collection-additem"),
 
     # search
     url(r'^search/$', web_view.search, name="telemeta-search"),

diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index ae27cbff52856d84a29fee721bb9e04f00c81bcc..434c4be8400d3dff568c64446d853dfdd918b4ae 100644 (file)
--- a/telemeta/web/base.py
+++ b/telemeta/web/base.py
@@ -352,9 +352,13 @@ class WebView(object):
                     })
         
     @method_decorator(permission_required('telemeta.add_mediaitem'))
-    def item_add(self, request, template='telemeta/mediaitem_add.html'):
+    def item_add(self, request, public_id=None, template='telemeta/mediaitem_add.html'):
         """Show the details of a given item"""
-        item = MediaItem()
+        if public_id:
+            collection = MediaCollection.objects.get(public_id=public_id)
+            item = MediaItem(collection=collection)
+        else:
+            item = MediaItem()
         if request.method == 'POST':
             form = MediaItemForm(data=request.POST, files=request.FILES, instance=item)
             if form.is_valid():