fix various access rights, change date display, fix "comment" field title

diff --git a/example/sandbox/settings.py b/example/sandbox/settings.py
index 18ef40c1b4a77268911e0af8cbfb5a18996a12ef..f85fe5eb9bc32df297a9b6105179d4e455f40b24 100644 (file)
--- a/example/sandbox/settings.py
+++ b/example/sandbox/settings.py
@@ -14,10 +14,10 @@ MANAGERS = ADMINS
 
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
-        'NAME': 'sandbox.db',                      # Or path to database file if using sqlite3.
-        'USER': '',                      # Not used with sqlite3.
-        'PASSWORD': '',                  # Not used with sqlite3.
+        'ENGINE': 'django.db.backends.mysql', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
+        'NAME': 'telemeta_sandbox',                      # Or path to database file if using sqlite3.
+        'USER': '********',                      # Not used with sqlite3.
+        'PASSWORD': '********',                  # Not used with sqlite3.
         'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.
         'PORT': '',                      # Set to empty string for default. Not used with sqlite3.
     }
@@ -109,8 +109,8 @@ TEMPLATE_CONTEXT_PROCESSORS = (
 )
 
 TELEMETA_ORGANIZATION = 'Parisson'
-TELEMETA_SUBJECTS = ('Test', 'Sandbox')
-TELEMETA_GMAP_KEY = 'ABQIAAAArg7eSfnfTkBRma8glnGrlxRVbMrhnNNvToCbZQtWdaMbZTA_3RRGObu5PDoiBImgalVnnLU2yN4RMA'
+TELEMETA_SUBJECTS = ('test', 'telemeta', 'sandbox')
+TELEMETA_GMAP_KEY = '***************************************************************************'
 TELEMETA_DOWNLOAD_ENABLED = True
 TELEMETA_STREAMING_FORMATS = ('mp3', 'ogg')
 TELEMETA_PUBLIC_ACCESS_PERIOD = 51

diff --git a/telemeta/locale/de/LC_MESSAGES/django.mo b/telemeta/locale/de/LC_MESSAGES/django.mo
index 8b9b055c7d24085267fd1bd7f72eaf54895171d0..5fd218f0d22f064db13f42ecdf003ba905a57f24 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 9489b8be9caf4044409babe898036b6f7a22df8f..b0a47d5c4c3d93fafcd242effab33d29637ccd30 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-06-08 16:37+0200\n"
+"POT-Creation-Date: 2011-06-22 11:42+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"
@@ -322,15 +322,15 @@ msgid "cultural area"
 msgstr ""
 
 #: models/media.py:244
-msgid "comments"
+msgid "language"
 msgstr ""
 
 #: models/media.py:245
-msgid "moda_execut"
+msgid "comments"
 msgstr ""
 
 #: models/media.py:246
-msgid "language"
+msgid "moda_execut"
 msgstr ""
 
 #: models/media.py:253
@@ -366,7 +366,7 @@ msgid "file"
 msgstr ""
 
 #: models/media.py:278 models/media.py:471
-#: templates/telemeta_default/mediaitem_detail.html:177
+#: templates/telemeta_default/mediaitem_detail.html:176
 msgid "keywords"
 msgstr ""
 
@@ -463,47 +463,23 @@ msgstr ""
 msgid "user"
 msgstr ""
 
-#: models/system.py:81
-msgid "username"
-msgstr ""
-
-#: models/system.py:82
-msgid "level"
-msgstr ""
-
-#: models/system.py:83
-msgid "first name"
-msgstr ""
-
-#: models/system.py:84
-msgid "last name"
-msgstr ""
-
-#: models/system.py:85
-msgid "phone"
-msgstr ""
-
-#: models/system.py:86
-msgid "email"
-msgstr ""
-
-#: models/system.py:99 templates/telemeta_default/profile_detail.html:36
+#: models/system.py:81 templates/telemeta_default/profile_detail.html:36
 msgid "Institution"
 msgstr ""
 
-#: models/system.py:100 templates/telemeta_default/profile_detail.html:37
+#: models/system.py:82 templates/telemeta_default/profile_detail.html:37
 msgid "Function"
 msgstr ""
 
-#: models/system.py:101 templates/telemeta_default/profile_detail.html:38
+#: models/system.py:83 templates/telemeta_default/profile_detail.html:38
 msgid "Address"
 msgstr ""
 
-#: models/system.py:102 templates/telemeta_default/profile_detail.html:39
+#: models/system.py:84 templates/telemeta_default/profile_detail.html:39
 msgid "Telephone"
 msgstr ""
 
-#: models/system.py:103
+#: models/system.py:85
 msgid "Expiration_date"
 msgstr ""
 
@@ -672,7 +648,7 @@ msgid ""
 msgstr ""
 
 #: templates/telemeta_default/base.html:125
-#: templates/telemeta_default/collection_detail.html:135
+#: templates/telemeta_default/collection_detail.html:137
 msgid "Legal notices"
 msgstr ""
 
@@ -716,15 +692,15 @@ msgid "Collection"
 msgstr ""
 
 #: templates/telemeta_default/collection_detail.html:64
-#: templates/telemeta_default/mediaitem_detail.html:77
-#: templates/telemeta_default/mediaitem_detail.html:177
-#: templates/telemeta_default/mediaitem_detail.html:216
+#: templates/telemeta_default/mediaitem_detail.html:76
+#: templates/telemeta_default/mediaitem_detail.html:176
+#: templates/telemeta_default/mediaitem_detail.html:215
 #: templates/telemeta_default/profile_detail.html:63
 msgid "Edit"
 msgstr ""
 
 #: templates/telemeta_default/collection_detail.html:65
-#: templates/telemeta_default/mediaitem_detail.html:78
+#: templates/telemeta_default/mediaitem_detail.html:77
 msgid "Copy"
 msgstr ""
 
@@ -733,64 +709,63 @@ msgid "Add item"
 msgstr ""
 
 #: templates/telemeta_default/collection_detail.html:69
-#: templates/telemeta_default/mediaitem_detail.html:81
+#: templates/telemeta_default/mediaitem_detail.html:80
 msgid "Add to playlist"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:81
+#: templates/telemeta_default/collection_detail.html:82
 msgid "Listen to this collection"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:113
-msgid "Recording year"
+#: templates/telemeta_default/collection_detail.html:115
+msgid "Recording period"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:122
-#: templates/telemeta_default/mediaitem_detail.html:161
+#: templates/telemeta_default/collection_detail.html:124
+#: templates/telemeta_default/mediaitem_detail.html:160
 msgid "Geographic and cultural informations"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:140
+#: templates/telemeta_default/collection_detail.html:142
 #: templates/telemeta_default/home.html:49
 #: templates/telemeta_default/inc/collection_list.html:16
 #: templates/telemeta_default/inc/mediaitem_list.html:16
 msgid "Recordist"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:149
+#: templates/telemeta_default/collection_detail.html:151
 msgid "Bibliographic references"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:162
-#: templates/telemeta_default/mediaitem_detail.html:233
+#: templates/telemeta_default/collection_detail.html:164
+#: templates/telemeta_default/mediaitem_detail.html:232
 msgid "Archiving data"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:168
+#: templates/telemeta_default/collection_detail.html:170
 msgid "Related documentation"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:172
-#: templates/telemeta_default/mediaitem_detail.html:169
+#: templates/telemeta_default/collection_detail.html:174
 msgid "Comments"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:186
-#: templates/telemeta_default/mediaitem_detail.html:249
+#: templates/telemeta_default/collection_detail.html:188
+#: templates/telemeta_default/mediaitem_detail.html:248
 msgid "Technical data"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:191
-#: templates/telemeta_default/mediaitem_detail.html:252
+#: templates/telemeta_default/collection_detail.html:193
+#: templates/telemeta_default/mediaitem_detail.html:251
 msgid "Media type"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:191
-#: templates/telemeta_default/mediaitem_detail.html:252
+#: templates/telemeta_default/collection_detail.html:193
+#: templates/telemeta_default/mediaitem_detail.html:251
 msgid "Audio"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:196
+#: templates/telemeta_default/collection_detail.html:198
 #: templates/telemeta_default/geo_countries.html:16
 msgid "Number of items"
 msgstr ""
@@ -852,7 +827,7 @@ msgstr ""
 #: templates/telemeta_default/enumeration_edit.html:14
 #: templates/telemeta_default/enumeration_edit.html:28
 #: templates/telemeta_default/enumeration_edit_value.html:14
-#: templates/telemeta_default/mediaitem_detail.html:121
+#: templates/telemeta_default/mediaitem_detail.html:120
 msgid "Value"
 msgstr ""
 
@@ -920,7 +895,7 @@ msgid "Playlists"
 msgstr ""
 
 #: templates/telemeta_default/home.html:35
-#: templates/telemeta_default/mediaitem_detail.html:263
+#: templates/telemeta_default/mediaitem_detail.html:262
 msgid "Delete"
 msgstr ""
 
@@ -996,62 +971,66 @@ msgstr ""
 msgid "Item"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:83
+#: templates/telemeta_default/mediaitem_detail.html:82
 #: templates/telemeta_default/paginator.html:5
 msgid "Previous"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:84
+#: templates/telemeta_default/mediaitem_detail.html:83
 #: templates/telemeta_default/paginator.html:23
 msgid "Next"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:110
+#: templates/telemeta_default/mediaitem_detail.html:109
 msgid "Analysis"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:112
+#: templates/telemeta_default/mediaitem_detail.html:111
 msgid "Markers"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:120
+#: templates/telemeta_default/mediaitem_detail.html:119
 msgid "Property"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:122
+#: templates/telemeta_default/mediaitem_detail.html:121
 msgid "Unit"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:130
+#: templates/telemeta_default/mediaitem_detail.html:129
 msgid "Download:"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:151
+#: templates/telemeta_default/mediaitem_detail.html:150
 msgid "Recording date"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:163
+#: templates/telemeta_default/mediaitem_detail.html:162
 #: templates/telemeta_default/inc/mediaitem_list.html:18
 msgid "Location"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:182
+#: templates/telemeta_default/mediaitem_detail.html:168
+msgid "Comments / ethnographic context"
+msgstr ""
+
+#: templates/telemeta_default/mediaitem_detail.html:181
 msgid "Musical informations"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:216
+#: templates/telemeta_default/mediaitem_detail.html:215
 msgid "performance"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:221
+#: templates/telemeta_default/mediaitem_detail.html:220
 msgid "General informations"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:223
+#: templates/telemeta_default/mediaitem_detail.html:222
 msgid "Remarks"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:239
+#: templates/telemeta_default/mediaitem_detail.html:238
 msgid "Published references"
 msgstr ""
 
@@ -1172,7 +1151,8 @@ msgstr ""
 msgid "No item"
 msgstr ""
 
-#: templates/telemeta_default/inc/module_revisions.html:7 web/base.py:1099
+#: templates/telemeta_default/inc/module_revisions.html:7 web/base.py:1083
+#: web/base.py:1197
 msgid "Last changes"
 msgstr ""
 
@@ -1346,11 +1326,11 @@ msgid_plural "%(count)d collections"
 msgstr[0] ""
 msgstr[1] ""
 
-#: web/base.py:1110
+#: web/base.py:1094
 msgid "Access not allowed"
 msgstr ""
 
-#: web/base.py:1112
+#: 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 6cc5da7a03922aedb45f600f22840c480eb74c5a..c51a8538ad8c9e7029e3a09ab5d8ae6ee024787e 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 933dcb127cce6201cfd516a83911ecf32b2ff91b..15c941698e17ae9e7897b671f543c01ec8b6e0e6 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-06-08 16:37+0200\n"
+"POT-Creation-Date: 2011-06-22 11:42+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"
@@ -322,17 +322,17 @@ msgid "cultural area"
 msgstr "aire culturelle"
 
 #: models/media.py:244
+msgid "language"
+msgstr "langue"
+
+#: models/media.py:245
 msgid "comments"
 msgstr "commentaires"
 
-#: models/media.py:245
+#: models/media.py:246
 msgid "moda_execut"
 msgstr "moda_execut"
 
-#: models/media.py:246
-msgid "language"
-msgstr "langue"
-
 #: models/media.py:253
 msgid "author / compositor"
 msgstr "auteur / compositeur"
@@ -366,7 +366,7 @@ msgid "file"
 msgstr "fichier"
 
 #: models/media.py:278 models/media.py:471
-#: templates/telemeta_default/mediaitem_detail.html:177
+#: templates/telemeta_default/mediaitem_detail.html:176
 msgid "keywords"
 msgstr "mots-clés"
 
@@ -468,48 +468,23 @@ msgstr "type de modification"
 msgid "user"
 msgstr "utilisateur"
 
-#: models/system.py:81
-msgid "username"
-msgstr "nom d'utilisateur"
-
-#: models/system.py:82
-msgid "level"
-msgstr "niveau"
-
-#: models/system.py:83
-msgid "first name"
-msgstr "prénom"
-
-#: models/system.py:84
-msgid "last name"
-msgstr "nom de famille"
-
-#: models/system.py:85
-msgid "phone"
-msgstr "téléphone"
-
-#: models/system.py:86
-#, fuzzy
-msgid "email"
-msgstr "Courriel"
-
-#: models/system.py:99 templates/telemeta_default/profile_detail.html:36
+#: models/system.py:81 templates/telemeta_default/profile_detail.html:36
 msgid "Institution"
 msgstr "Institution"
 
-#: models/system.py:100 templates/telemeta_default/profile_detail.html:37
+#: models/system.py:82 templates/telemeta_default/profile_detail.html:37
 msgid "Function"
 msgstr "Fonction"
 
-#: models/system.py:101 templates/telemeta_default/profile_detail.html:38
+#: models/system.py:83 templates/telemeta_default/profile_detail.html:38
 msgid "Address"
 msgstr "Adresse"
 
-#: models/system.py:102 templates/telemeta_default/profile_detail.html:39
+#: models/system.py:84 templates/telemeta_default/profile_detail.html:39
 msgid "Telephone"
 msgstr "Téléphone"
 
-#: models/system.py:103
+#: models/system.py:85
 #, fuzzy
 msgid "Expiration_date"
 msgstr "Date d'expiration"
@@ -681,7 +656,7 @@ msgstr ""
 "communautés d'origine."
 
 #: templates/telemeta_default/base.html:125
-#: templates/telemeta_default/collection_detail.html:135
+#: templates/telemeta_default/collection_detail.html:137
 msgid "Legal notices"
 msgstr "Mentions légales"
 
@@ -725,15 +700,15 @@ msgid "Collection"
 msgstr "Collection"
 
 #: templates/telemeta_default/collection_detail.html:64
-#: templates/telemeta_default/mediaitem_detail.html:77
-#: templates/telemeta_default/mediaitem_detail.html:177
-#: templates/telemeta_default/mediaitem_detail.html:216
+#: templates/telemeta_default/mediaitem_detail.html:76
+#: templates/telemeta_default/mediaitem_detail.html:176
+#: templates/telemeta_default/mediaitem_detail.html:215
 #: templates/telemeta_default/profile_detail.html:63
 msgid "Edit"
 msgstr "Editer"
 
 #: templates/telemeta_default/collection_detail.html:65
-#: templates/telemeta_default/mediaitem_detail.html:78
+#: templates/telemeta_default/mediaitem_detail.html:77
 msgid "Copy"
 msgstr "Copier"
 
@@ -742,64 +717,63 @@ msgid "Add item"
 msgstr "Ajouter item"
 
 #: templates/telemeta_default/collection_detail.html:69
-#: templates/telemeta_default/mediaitem_detail.html:81
+#: templates/telemeta_default/mediaitem_detail.html:80
 msgid "Add to playlist"
 msgstr "Ajouter à la liste"
 
-#: templates/telemeta_default/collection_detail.html:81
+#: templates/telemeta_default/collection_detail.html:82
 msgid "Listen to this collection"
 msgstr "Écouter la collection"
 
-#: templates/telemeta_default/collection_detail.html:113
-msgid "Recording year"
-msgstr "Année d'enregistrement"
+#: templates/telemeta_default/collection_detail.html:115
+msgid "Recording period"
+msgstr "Période d'enregistrement"
 
-#: templates/telemeta_default/collection_detail.html:122
-#: templates/telemeta_default/mediaitem_detail.html:161
+#: templates/telemeta_default/collection_detail.html:124
+#: templates/telemeta_default/mediaitem_detail.html:160
 msgid "Geographic and cultural informations"
 msgstr "Indications géographiques et culturelles"
 
-#: templates/telemeta_default/collection_detail.html:140
+#: templates/telemeta_default/collection_detail.html:142
 #: templates/telemeta_default/home.html:49
 #: templates/telemeta_default/inc/collection_list.html:16
 #: templates/telemeta_default/inc/mediaitem_list.html:16
 msgid "Recordist"
 msgstr "Collecteur"
 
-#: templates/telemeta_default/collection_detail.html:149
+#: templates/telemeta_default/collection_detail.html:151
 msgid "Bibliographic references"
 msgstr "Références bibliographiques"
 
-#: templates/telemeta_default/collection_detail.html:162
-#: templates/telemeta_default/mediaitem_detail.html:233
+#: templates/telemeta_default/collection_detail.html:164
+#: templates/telemeta_default/mediaitem_detail.html:232
 msgid "Archiving data"
 msgstr "Données d'archivage"
 
-#: templates/telemeta_default/collection_detail.html:168
+#: templates/telemeta_default/collection_detail.html:170
 msgid "Related documentation"
 msgstr "Documentation associée"
 
-#: templates/telemeta_default/collection_detail.html:172
-#: templates/telemeta_default/mediaitem_detail.html:169
+#: templates/telemeta_default/collection_detail.html:174
 msgid "Comments"
 msgstr "Commentaires"
 
-#: templates/telemeta_default/collection_detail.html:186
-#: templates/telemeta_default/mediaitem_detail.html:249
+#: templates/telemeta_default/collection_detail.html:188
+#: templates/telemeta_default/mediaitem_detail.html:248
 msgid "Technical data"
 msgstr "Données techniques"
 
-#: templates/telemeta_default/collection_detail.html:191
-#: templates/telemeta_default/mediaitem_detail.html:252
+#: templates/telemeta_default/collection_detail.html:193
+#: templates/telemeta_default/mediaitem_detail.html:251
 msgid "Media type"
 msgstr "Type de media"
 
-#: templates/telemeta_default/collection_detail.html:191
-#: templates/telemeta_default/mediaitem_detail.html:252
+#: templates/telemeta_default/collection_detail.html:193
+#: templates/telemeta_default/mediaitem_detail.html:251
 msgid "Audio"
 msgstr "Audio"
 
-#: templates/telemeta_default/collection_detail.html:196
+#: templates/telemeta_default/collection_detail.html:198
 #: templates/telemeta_default/geo_countries.html:16
 msgid "Number of items"
 msgstr "Nombre d'items"
@@ -861,7 +835,7 @@ msgstr "Ajouter une entrée"
 #: templates/telemeta_default/enumeration_edit.html:14
 #: templates/telemeta_default/enumeration_edit.html:28
 #: templates/telemeta_default/enumeration_edit_value.html:14
-#: templates/telemeta_default/mediaitem_detail.html:121
+#: templates/telemeta_default/mediaitem_detail.html:120
 msgid "Value"
 msgstr "Valeur"
 
@@ -929,7 +903,7 @@ msgid "Playlists"
 msgstr "Listes de lecture"
 
 #: templates/telemeta_default/home.html:35
-#: templates/telemeta_default/mediaitem_detail.html:263
+#: templates/telemeta_default/mediaitem_detail.html:262
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -1006,62 +980,66 @@ msgstr "Mot de passe oublié"
 msgid "Item"
 msgstr "Item"
 
-#: templates/telemeta_default/mediaitem_detail.html:83
+#: templates/telemeta_default/mediaitem_detail.html:82
 #: templates/telemeta_default/paginator.html:5
 msgid "Previous"
 msgstr "Précédent"
 
-#: templates/telemeta_default/mediaitem_detail.html:84
+#: templates/telemeta_default/mediaitem_detail.html:83
 #: templates/telemeta_default/paginator.html:23
 msgid "Next"
 msgstr "Suivant"
 
-#: templates/telemeta_default/mediaitem_detail.html:110
+#: templates/telemeta_default/mediaitem_detail.html:109
 msgid "Analysis"
 msgstr "Analyse"
 
-#: templates/telemeta_default/mediaitem_detail.html:112
+#: templates/telemeta_default/mediaitem_detail.html:111
 msgid "Markers"
 msgstr "Marqueurs"
 
-#: templates/telemeta_default/mediaitem_detail.html:120
+#: templates/telemeta_default/mediaitem_detail.html:119
 msgid "Property"
 msgstr "Propriété"
 
-#: templates/telemeta_default/mediaitem_detail.html:122
+#: templates/telemeta_default/mediaitem_detail.html:121
 msgid "Unit"
 msgstr "Unité"
 
-#: templates/telemeta_default/mediaitem_detail.html:130
+#: templates/telemeta_default/mediaitem_detail.html:129
 msgid "Download:"
 msgstr "Téléchargement:"
 
-#: templates/telemeta_default/mediaitem_detail.html:151
+#: templates/telemeta_default/mediaitem_detail.html:150
 msgid "Recording date"
 msgstr "Date d'enregistrement"
 
-#: templates/telemeta_default/mediaitem_detail.html:163
+#: templates/telemeta_default/mediaitem_detail.html:162
 #: templates/telemeta_default/inc/mediaitem_list.html:18
 msgid "Location"
 msgstr "Lieu"
 
-#: templates/telemeta_default/mediaitem_detail.html:182
+#: templates/telemeta_default/mediaitem_detail.html:168
+msgid "Comments / ethnographic context"
+msgstr "Commentaires / contexte ethnographique"
+
+#: templates/telemeta_default/mediaitem_detail.html:181
 msgid "Musical informations"
 msgstr "Informations sur la musique"
 
-#: templates/telemeta_default/mediaitem_detail.html:216
+#: templates/telemeta_default/mediaitem_detail.html:215
 msgid "performance"
 msgstr "composition"
 
-#: templates/telemeta_default/mediaitem_detail.html:221
+#: templates/telemeta_default/mediaitem_detail.html:220
 msgid "General informations"
 msgstr "Informations générales"
 
-#: templates/telemeta_default/mediaitem_detail.html:223
+#: templates/telemeta_default/mediaitem_detail.html:222
 msgid "Remarks"
 msgstr "Remarques"
 
-#: templates/telemeta_default/mediaitem_detail.html:239
+#: templates/telemeta_default/mediaitem_detail.html:238
 msgid "Published references"
 msgstr "Références éditées"
 
@@ -1182,7 +1160,8 @@ msgstr "Etat/Continent"
 msgid "No item"
 msgstr "Aucun item"
 
-#: templates/telemeta_default/inc/module_revisions.html:7 web/base.py:1099
+#: templates/telemeta_default/inc/module_revisions.html:7 web/base.py:1083
+#: web/base.py:1197
 msgid "Last changes"
 msgstr "Dernières modifications"
 
@@ -1362,11 +1341,11 @@ msgid_plural "%(count)d collections"
 msgstr[0] "%(count)d collection"
 msgstr[1] "%(count)d collections"
 
-#: web/base.py:1110
+#: web/base.py:1094
 msgid "Access not allowed"
 msgstr "Accès non autorisé"
 
-#: web/base.py:1112
+#: web/base.py:1096
 msgid ""
 "Please login or contact the website administator to get admin or private "
 "access."
@@ -1374,6 +1353,25 @@ msgstr ""
 "Connectez-vous s'il vous plaît ou bien contactez l'administrateur du site "
 "pour obtenir un accès privé."
 
+#~ msgid "username"
+#~ msgstr "nom d'utilisateur"
+
+#~ msgid "level"
+#~ msgstr "niveau"
+
+#~ msgid "first name"
+#~ msgstr "prénom"
+
+#~ msgid "last name"
+#~ msgstr "nom de famille"
+
+#~ msgid "phone"
+#~ msgstr "téléphone"
+
+#, fuzzy
+#~ msgid "email"
+#~ msgstr "Courriel"
+
 #~ msgid "Conservation site"
 #~ msgstr "Lieu de conservation"
 

diff --git a/telemeta/templates/telemeta_default/base.html b/telemeta/templates/telemeta_default/base.html
index 5c28ef7f052b4a1e785fc101161c5d95b4e24187..65160a031ec3c8dad6918a1bd3372357886faf1f 100644 (file)
--- a/telemeta/templates/telemeta_default/base.html
+++ b/telemeta/templates/telemeta_default/base.html
@@ -83,7 +83,7 @@
  <a href="{% url telemeta-items %}" class="green">{% trans "Items" %}</a>
  <a href="{% url telemeta-geo-continents %}" class="yellow">{% trans "Geo Navigator" %}</a>
  <a href="{% url telemeta-search-criteria %}" class="orange">{% trans "Advanced search" %}</a>
- {% if user.is_staff %}
+ {% if user.is_staff or user.is_superuser %}
  <a href="{% url telemeta-admin %}" class="red">{% trans "Admin" %}</a>
  {% endif %}
 

diff --git a/telemeta/templates/telemeta_default/collection_detail.html b/telemeta/templates/telemeta_default/collection_detail.html
index 95d8bb99663cb0843da9e768b4cd141f6eae25b0..9c2eb46f40d12cd7f76005c3a1a173faae36dd72 100644 (file)
--- a/telemeta/templates/telemeta_default/collection_detail.html
+++ b/telemeta/templates/telemeta_default/collection_detail.html
@@ -112,8 +112,8 @@
                 {% dl_field collection "alt_title" %}
                 {% dl_field collection "creator" placeholder %}
                 {% dl_field collection "recording_context" %}
-                <dt>{% trans "Recording year" %}</dt>
-                    <dd>{% if collection.recorded_from_year %}{{ collection.recorded_from_year|default:'' }} {{ collection.recorded_to_year|prepend:" - "  }}{% endif %}</dd>
+                <dt>{% trans "Recording period" %}</dt>
+                    <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 %}
             </dl>
         {% endblock general_info %}

diff --git a/telemeta/templates/telemeta_default/mediaitem_detail.html b/telemeta/templates/telemeta_default/mediaitem_detail.html
index 6454b9388df743aed2397f13262f33078741c616..a2fcc37f1bdd721e306b721ea47b1c51e7ad21a4 100644 (file)
--- a/telemeta/templates/telemeta_default/mediaitem_detail.html
+++ b/telemeta/templates/telemeta_default/mediaitem_detail.html
@@ -151,7 +151,7 @@
             <dd><a href="{% url telemeta-collection-detail item.collection.public_id %}">{{ item.collection }}</a></dd>
             <dt>{% trans "Recording date" %}</dt>
 
-            <dd>{% if item.recorded_from_date %}{{ item.recorded_from_date }} {{ item.recorded_to_date|prepend:" - "  }}{% endif %}</dd>
+            <dd>{% if item.recorded_from_date %}{{ item.recorded_from_date }}{% endif %}{% if item.recorded_from_date and item.recorded_to_date%} - {% endif %}{% if item.recorded_to_date %}{{ item.recorded_to_date}}{% endif %}</dd>
 
         </dl>
         {% endblock general_info %}
@@ -167,7 +167,7 @@
                 {% dl_field item "cultural_area" %}
                 {% dl_field item "language" %}
                 {% dl_field item "ethnic_group" placeholder %}
-                <dt>{% trans "Comments" %}</dt>
+                <dt>{% trans "Comments / ethnographic context" %}</dt>
                 <dd>{{ item.context_comment|html_line_break|safe }}</dd>
                 {% dl_field item "keywords" join with ", " %}
             </dl>

diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index 573a8a8d2e81830c3fcbe6ccaf08af51483fd550..f09d62a1d1f2ad4e4dc9b029fe9a62e795936747 100644 (file)
--- a/telemeta/web/base.py
+++ b/telemeta/web/base.py
@@ -131,7 +131,7 @@ class WebView(object):
         
     def collection_detail(self, request, public_id, template='telemeta/collection_detail.html'):
         collection = MediaCollection.objects.get(public_id=public_id)
-        if collection.public_access == 'none' and not request.user.is_staff:
+        if collection.public_access == 'none' and not (request.user.is_staff or request.user.is_superuser):
             return HttpResponseRedirect('not_allowed/')
         public_access = self.get_public_access(collection.public_access, collection.recorded_from_year, 
                                                 collection.recorded_to_year)
@@ -233,7 +233,8 @@ class WebView(object):
         else:
             item = MediaItem.objects.get(public_id=public_id)
         
-        if (item.public_access == 'none' or item.collection.public_access == 'none') and not request.user.is_staff:
+        item_public_access = item.public_access == 'none' or item.collection.public_access == 'none'
+        if item_public_access and not (request.user.is_staff or request.user.is_superuser):
             return HttpResponseRedirect('not_allowed/')
             
         # Get TimeSide processors
@@ -263,26 +264,25 @@ class WebView(object):
                     'public_access': public_access, 'width': width, 'height': height, 
                     })
     
-    def get_public_access(self, access, year_from, year_to):
+    def get_public_access(self, access, year_from=None, year_to=None):
         # Rolling publishing date : public access is given when time between recorded year 
         # and current year is over the settings value PUBLIC_ACCESS_PERIOD
-        if year_to:
-            year = year_to
-        elif year_from:
+        if year_from and not year_from == 0:
             year = year_from
+        elif year_to and not year_to == 0:
+            year = year_to
         else:
-            year = False
+            year = 0
         if access == 'full':
             public_access = True
         else:
             public_access = False
-        if year and not year == 'None':
-            year_now = datetime.datetime.now().strftime("%Y")
-            if int(year_now) - int(year) >= settings.TELEMETA_PUBLIC_ACCESS_PERIOD:
-                public_access = True
-        else:
-            public_access = False
-        
+            if year and not year == 'None':
+                year_now = datetime.datetime.now().strftime("%Y")
+                if int(year_now) - int(year) >= settings.TELEMETA_PUBLIC_ACCESS_PERIOD:
+                    public_access = True
+            else:
+                public_access = False        
         return public_access
         
     @method_decorator(permission_required('telemeta.change_mediaitem'))
@@ -1108,7 +1108,7 @@ class WebView(object):
         return render(request, template, {'profile' : profile, 'usr': user, 'playlists': playlists})
         
     def profile_edit(self, request, username, template='telemeta/profile_edit.html'):
-        if request.user.is_staff:
+        if request.user.is_superuser:
             user_hidden_fields = ['profile-user', 'user-password', 'user-last_login', 'user-date_joined']
         else:
             user_hidden_fields = ['user-username', 'user-is_staff', 'profile-user', 'user-is_active',