From: yomguy Date: Thu, 23 Jun 2011 20:45:00 +0000 (+0200) Subject: add can_play_all_items permission to mediaitem, use it to restrict playing, fix some... X-Git-Tag: 1.1~69 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=4d0f2d92f4a9f8568316116cdd0a28ca18a6ac9b;p=telemeta.git add can_play_all_items permission to mediaitem, use it to restrict playing, fix some field length, fix more image links --- diff --git a/telemeta/htdocs/css/player.css b/telemeta/htdocs/css/player.css index a8d5d251..3e126a1a 100644 --- a/telemeta/htdocs/css/player.css +++ b/telemeta/htdocs/css/player.css @@ -41,7 +41,6 @@ position: relative; top: -1px; line-height: 1.5em; - } #player_maximized .embed_player_frame:hover, #player_minimized .embed_player_frame:hover { diff --git a/telemeta/locale/de/LC_MESSAGES/django.mo b/telemeta/locale/de/LC_MESSAGES/django.mo index 13a030f6..a7c4cc28 100644 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 93976d6f..6066e062 100644 --- 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-23 15:55+0200\n" +"POT-Creation-Date: 2011-06-23 22:36+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -26,7 +26,7 @@ msgstr "" msgid "Enter a valid duration in HH:MM[:ss] format." msgstr "" -#: models/enum.py:41 models/enum.py:139 models/media.py:374 +#: models/enum.py:41 models/enum.py:139 models/media.py:376 msgid "value" msgstr "" @@ -70,7 +70,7 @@ msgstr "" msgid "generic style" msgstr "" -#: models/enum.py:127 models/media.py:334 +#: models/enum.py:127 models/media.py:336 msgid "keyword" msgstr "" @@ -87,7 +87,7 @@ msgid "population / social group" msgstr "" #: models/enum.py:158 models/instrument.py:43 models/instrument.py:53 -#: models/location.py:51 models/location.py:151 models/media.py:373 +#: models/location.py:51 models/location.py:151 models/media.py:375 msgid "name" msgstr "" @@ -176,8 +176,8 @@ msgstr "" msgid "reference" msgstr "" -#: models/media.py:94 models/media.py:230 models/media.py:389 -#: models/media.py:404 models/media.py:438 +#: models/media.py:94 models/media.py:230 models/media.py:391 +#: models/media.py:406 models/media.py:440 msgid "title" msgstr "" @@ -297,7 +297,7 @@ msgstr "" msgid "populations / social groups" msgstr "" -#: models/media.py:206 models/media.py:314 +#: models/media.py:206 models/media.py:316 msgid "computed duration" msgstr "" @@ -365,85 +365,85 @@ msgstr "" msgid "file" msgstr "" -#: models/media.py:278 models/media.py:471 -#: templates/telemeta_default/mediaitem_detail.html:181 +#: models/media.py:278 models/media.py:473 +#: templates/telemeta_default/mediaitem_detail.html:178 msgid "keywords" msgstr "" -#: models/media.py:333 models/media.py:347 models/media.py:371 -#: models/media.py:388 models/media.py:435 models/media.py:456 +#: models/media.py:335 models/media.py:349 models/media.py:373 +#: models/media.py:390 models/media.py:437 models/media.py:458 msgid "item" msgstr "" -#: models/media.py:349 +#: models/media.py:351 msgid "composition" msgstr "" -#: models/media.py:351 +#: models/media.py:353 msgid "vernacular name" msgstr "" -#: models/media.py:352 +#: models/media.py:354 msgid "number" msgstr "" -#: models/media.py:353 +#: models/media.py:355 msgid "interprets" msgstr "" -#: models/media.py:372 +#: models/media.py:374 msgid "id" msgstr "" -#: models/media.py:375 +#: models/media.py:377 msgid "unit" msgstr "" -#: models/media.py:390 +#: models/media.py:392 msgid "start" msgstr "" -#: models/media.py:391 +#: models/media.py:393 msgid "end" msgstr "" -#: models/media.py:402 models/media.py:421 models/media.py:436 +#: models/media.py:404 models/media.py:423 models/media.py:438 msgid "public_id" msgstr "" -#: models/media.py:405 models/media.py:440 +#: models/media.py:407 models/media.py:442 msgid "description" msgstr "" -#: models/media.py:422 +#: models/media.py:424 msgid "playlist" msgstr "" -#: models/media.py:423 +#: models/media.py:425 msgid "resource_type" msgstr "" -#: models/media.py:424 +#: models/media.py:426 msgid "resource_id" msgstr "" -#: models/media.py:437 models/system.py:54 +#: models/media.py:439 models/system.py:54 msgid "time" msgstr "" -#: models/media.py:439 models/media.py:458 models/media.py:472 +#: models/media.py:441 models/media.py:460 models/media.py:474 msgid "date" msgstr "" -#: models/media.py:441 +#: models/media.py:443 msgid "author" msgstr "" -#: models/media.py:457 +#: models/media.py:459 msgid "mime_type" msgstr "" -#: models/media.py:459 +#: models/media.py:461 msgid "transcoded" msgstr "" @@ -629,7 +629,7 @@ msgid "" msgstr "" #: templates/telemeta_default/base.html:129 -#: templates/telemeta_default/collection_detail.html:118 +#: templates/telemeta_default/collection_detail.html:115 msgid "Legal notices" msgstr "" @@ -672,90 +672,90 @@ msgstr "" msgid "Collection" msgstr "" -#: templates/telemeta_default/collection_detail.html:45 -#: templates/telemeta_default/mediaitem_detail.html:79 -#: templates/telemeta_default/mediaitem_detail.html:181 -#: templates/telemeta_default/mediaitem_detail.html:220 +#: templates/telemeta_default/collection_detail.html:42 +#: templates/telemeta_default/mediaitem_detail.html:75 +#: templates/telemeta_default/mediaitem_detail.html:178 +#: templates/telemeta_default/mediaitem_detail.html:217 #: templates/telemeta_default/profile_detail.html:63 msgid "Edit" msgstr "" -#: templates/telemeta_default/collection_detail.html:46 -#: templates/telemeta_default/mediaitem_detail.html:80 +#: templates/telemeta_default/collection_detail.html:43 +#: templates/telemeta_default/mediaitem_detail.html:76 msgid "Copy" msgstr "" -#: templates/telemeta_default/collection_detail.html:47 +#: templates/telemeta_default/collection_detail.html:44 msgid "Add item" msgstr "" -#: templates/telemeta_default/collection_detail.html:50 -#: templates/telemeta_default/mediaitem_detail.html:83 +#: templates/telemeta_default/collection_detail.html:47 +#: templates/telemeta_default/mediaitem_detail.html:79 msgid "Add to playlist" msgstr "" -#: templates/telemeta_default/collection_detail.html:63 +#: templates/telemeta_default/collection_detail.html:60 msgid "Listen to this collection" msgstr "" -#: templates/telemeta_default/collection_detail.html:96 +#: templates/telemeta_default/collection_detail.html:93 #: templates/telemeta_default/home.html:50 #: templates/telemeta_default/inc/collection_list.html:17 msgid "Recording period" msgstr "" -#: templates/telemeta_default/collection_detail.html:105 -#: templates/telemeta_default/mediaitem_detail.html:165 +#: templates/telemeta_default/collection_detail.html:102 +#: templates/telemeta_default/mediaitem_detail.html:161 msgid "Geographic and cultural informations" msgstr "" -#: templates/telemeta_default/collection_detail.html:123 +#: templates/telemeta_default/collection_detail.html:120 #: 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:132 +#: templates/telemeta_default/collection_detail.html:129 msgid "Bibliographic references" msgstr "" -#: templates/telemeta_default/collection_detail.html:145 -#: templates/telemeta_default/mediaitem_detail.html:237 +#: templates/telemeta_default/collection_detail.html:142 +#: templates/telemeta_default/mediaitem_detail.html:234 msgid "Archiving data" msgstr "" -#: templates/telemeta_default/collection_detail.html:151 +#: templates/telemeta_default/collection_detail.html:148 msgid "Related documentation" msgstr "" -#: templates/telemeta_default/collection_detail.html:155 +#: templates/telemeta_default/collection_detail.html:152 msgid "Comments" msgstr "" -#: templates/telemeta_default/collection_detail.html:169 -#: templates/telemeta_default/mediaitem_detail.html:253 +#: templates/telemeta_default/collection_detail.html:166 +#: templates/telemeta_default/mediaitem_detail.html:250 msgid "Technical data" msgstr "" -#: templates/telemeta_default/collection_detail.html:174 -#: templates/telemeta_default/mediaitem_detail.html:256 +#: templates/telemeta_default/collection_detail.html:171 +#: templates/telemeta_default/mediaitem_detail.html:253 msgid "Media type" msgstr "" -#: templates/telemeta_default/collection_detail.html:174 -#: templates/telemeta_default/mediaitem_detail.html:256 +#: templates/telemeta_default/collection_detail.html:171 +#: templates/telemeta_default/mediaitem_detail.html:253 msgid "Audio" msgstr "" -#: templates/telemeta_default/collection_detail.html:179 +#: templates/telemeta_default/collection_detail.html:176 #: templates/telemeta_default/geo_countries.html:16 msgid "Number of items" msgstr "" -#: templates/telemeta_default/collection_detail.html:206 +#: templates/telemeta_default/collection_detail.html:203 #: templates/telemeta_default/home.html:35 -#: templates/telemeta_default/mediaitem_detail.html:271 +#: templates/telemeta_default/mediaitem_detail.html:268 msgid "Delete" msgstr "" @@ -816,7 +816,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:125 +#: templates/telemeta_default/mediaitem_detail.html:121 msgid "Value" msgstr "" @@ -947,66 +947,66 @@ msgstr "" msgid "Item" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:85 +#: templates/telemeta_default/mediaitem_detail.html:81 #: templates/telemeta_default/paginator.html:5 msgid "Previous" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:86 +#: templates/telemeta_default/mediaitem_detail.html:82 #: templates/telemeta_default/paginator.html:23 msgid "Next" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:114 +#: templates/telemeta_default/mediaitem_detail.html:110 msgid "Analysis" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:116 +#: templates/telemeta_default/mediaitem_detail.html:112 msgid "Markers" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:124 +#: templates/telemeta_default/mediaitem_detail.html:120 msgid "Property" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:126 +#: templates/telemeta_default/mediaitem_detail.html:122 msgid "Unit" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:134 +#: templates/telemeta_default/mediaitem_detail.html:130 msgid "Download:" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:155 +#: templates/telemeta_default/mediaitem_detail.html:151 msgid "Recording date" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:167 +#: templates/telemeta_default/mediaitem_detail.html:163 #: templates/telemeta_default/inc/mediaitem_list.html:18 msgid "Location" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:173 -msgid "Comments / ethnographic context" +#: templates/telemeta_default/mediaitem_detail.html:169 +msgid "Ethnographic context" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:186 +#: templates/telemeta_default/mediaitem_detail.html:183 msgid "Musical informations" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:220 +#: templates/telemeta_default/mediaitem_detail.html:217 msgid "performance" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:225 +#: templates/telemeta_default/mediaitem_detail.html:222 msgid "General informations" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:227 +#: templates/telemeta_default/mediaitem_detail.html:224 msgid "Remarks" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:243 +#: templates/telemeta_default/mediaitem_detail.html:240 msgid "Published references" msgstr "" @@ -1031,7 +1031,7 @@ msgstr "" msgid "User Profile" msgstr "" -#: templates/telemeta_default/profile_detail.html:8 web/base.py:1165 +#: templates/telemeta_default/profile_detail.html:8 web/base.py:1175 msgid "User profile" msgstr "" @@ -1143,7 +1143,7 @@ msgstr "" msgid "No item" msgstr "" -#: templates/telemeta_default/inc/module_revisions.html:7 web/base.py:1196 +#: templates/telemeta_default/inc/module_revisions.html:7 web/base.py:1206 msgid "Last changes" msgstr "" @@ -1330,11 +1330,11 @@ msgid_plural "%(count)d collections" msgstr[0] "" msgstr[1] "" -#: web/base.py:327 web/base.py:463 web/base.py:694 web/base.py:1164 +#: web/base.py:327 web/base.py:463 web/base.py:705 web/base.py:1174 msgid "Access not allowed" msgstr "" -#: web/base.py:329 web/base.py:465 web/base.py:696 web/base.py:1166 +#: web/base.py:329 web/base.py:465 web/base.py:707 web/base.py:1176 msgid "" "Please login or contact the website administator to get a private access." msgstr "" diff --git a/telemeta/locale/fr/LC_MESSAGES/django.mo b/telemeta/locale/fr/LC_MESSAGES/django.mo index e4613baf..e81ec1ae 100644 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 785d882a..e303f2fb 100644 --- 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-23 15:55+0200\n" +"POT-Creation-Date: 2011-06-23 22:36+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Olivier Guilyardi \n" "Language-Team: LANGUAGE \n" @@ -25,7 +25,7 @@ msgstr "Durée" msgid "Enter a valid duration in HH:MM[:ss] format." msgstr "Entrez une durée valide au format HH:MM[:ss]" -#: models/enum.py:41 models/enum.py:139 models/media.py:374 +#: models/enum.py:41 models/enum.py:139 models/media.py:376 msgid "value" msgstr "valeur" @@ -69,7 +69,7 @@ msgstr "style vernaculaire" msgid "generic style" msgstr "style générique" -#: models/enum.py:127 models/media.py:334 +#: models/enum.py:127 models/media.py:336 #, fuzzy msgid "keyword" msgstr "Mot-clé" @@ -87,7 +87,7 @@ msgid "population / social group" msgstr "population / groupe social" #: models/enum.py:158 models/instrument.py:43 models/instrument.py:53 -#: models/location.py:51 models/location.py:151 models/media.py:373 +#: models/location.py:51 models/location.py:151 models/media.py:375 msgid "name" msgstr "nom" @@ -176,8 +176,8 @@ msgstr "accès public" msgid "reference" msgstr "référence" -#: models/media.py:94 models/media.py:230 models/media.py:389 -#: models/media.py:404 models/media.py:438 +#: models/media.py:94 models/media.py:230 models/media.py:391 +#: models/media.py:406 models/media.py:440 msgid "title" msgstr "titre" @@ -297,7 +297,7 @@ msgstr "états / nations" msgid "populations / social groups" msgstr "populations / groupes sociaux" -#: models/media.py:206 models/media.py:314 +#: models/media.py:206 models/media.py:316 msgid "computed duration" msgstr "durée calculée" @@ -365,90 +365,90 @@ msgstr "copie de" msgid "file" msgstr "fichier" -#: models/media.py:278 models/media.py:471 -#: templates/telemeta_default/mediaitem_detail.html:181 +#: models/media.py:278 models/media.py:473 +#: templates/telemeta_default/mediaitem_detail.html:178 msgid "keywords" msgstr "mots-clés" -#: models/media.py:333 models/media.py:347 models/media.py:371 -#: models/media.py:388 models/media.py:435 models/media.py:456 +#: models/media.py:335 models/media.py:349 models/media.py:373 +#: models/media.py:390 models/media.py:437 models/media.py:458 msgid "item" msgstr "item" -#: models/media.py:349 +#: models/media.py:351 msgid "composition" msgstr "Voix / Instruments" -#: models/media.py:351 +#: models/media.py:353 msgid "vernacular name" msgstr "nom vernaculaire" -#: models/media.py:352 +#: models/media.py:354 msgid "number" msgstr "nombre" -#: models/media.py:353 +#: models/media.py:355 msgid "interprets" msgstr "interprètes" -#: models/media.py:372 +#: models/media.py:374 msgid "id" msgstr "" -#: models/media.py:375 +#: models/media.py:377 msgid "unit" msgstr "unité" -#: models/media.py:390 +#: models/media.py:392 msgid "start" msgstr "début" -#: models/media.py:391 +#: models/media.py:393 msgid "end" msgstr "fin" -#: models/media.py:402 models/media.py:421 models/media.py:436 +#: models/media.py:404 models/media.py:423 models/media.py:438 #, fuzzy msgid "public_id" msgstr "édité" -#: models/media.py:405 models/media.py:440 +#: models/media.py:407 models/media.py:442 msgid "description" msgstr "" -#: models/media.py:422 +#: models/media.py:424 msgid "playlist" msgstr "liste de lecture" -#: models/media.py:423 +#: models/media.py:425 #, fuzzy msgid "resource_type" msgstr "type de ressource" -#: models/media.py:424 +#: models/media.py:426 #, fuzzy msgid "resource_id" msgstr "ressource" -#: models/media.py:437 models/system.py:54 +#: models/media.py:439 models/system.py:54 msgid "time" msgstr "heure" -#: models/media.py:439 models/media.py:458 models/media.py:472 +#: models/media.py:441 models/media.py:460 models/media.py:474 msgid "date" msgstr "" -#: models/media.py:441 +#: models/media.py:443 #, fuzzy msgid "author" msgstr "rédacteur fiche" -#: models/media.py:457 +#: models/media.py:459 #, fuzzy msgid "mime_type" msgstr "type" -#: models/media.py:459 +#: models/media.py:461 msgid "transcoded" msgstr "" @@ -637,7 +637,7 @@ msgstr "" "communautés d'origine." #: templates/telemeta_default/base.html:129 -#: templates/telemeta_default/collection_detail.html:118 +#: templates/telemeta_default/collection_detail.html:115 msgid "Legal notices" msgstr "Mentions légales" @@ -680,90 +680,90 @@ msgstr "Enregistrer" msgid "Collection" msgstr "Collection" -#: templates/telemeta_default/collection_detail.html:45 -#: templates/telemeta_default/mediaitem_detail.html:79 -#: templates/telemeta_default/mediaitem_detail.html:181 -#: templates/telemeta_default/mediaitem_detail.html:220 +#: templates/telemeta_default/collection_detail.html:42 +#: templates/telemeta_default/mediaitem_detail.html:75 +#: templates/telemeta_default/mediaitem_detail.html:178 +#: templates/telemeta_default/mediaitem_detail.html:217 #: templates/telemeta_default/profile_detail.html:63 msgid "Edit" msgstr "Editer" -#: templates/telemeta_default/collection_detail.html:46 -#: templates/telemeta_default/mediaitem_detail.html:80 +#: templates/telemeta_default/collection_detail.html:43 +#: templates/telemeta_default/mediaitem_detail.html:76 msgid "Copy" msgstr "Copier" -#: templates/telemeta_default/collection_detail.html:47 +#: templates/telemeta_default/collection_detail.html:44 msgid "Add item" msgstr "Ajouter item" -#: templates/telemeta_default/collection_detail.html:50 -#: templates/telemeta_default/mediaitem_detail.html:83 +#: templates/telemeta_default/collection_detail.html:47 +#: templates/telemeta_default/mediaitem_detail.html:79 msgid "Add to playlist" msgstr "Ajouter à la liste" -#: templates/telemeta_default/collection_detail.html:63 +#: templates/telemeta_default/collection_detail.html:60 msgid "Listen to this collection" msgstr "Écouter la collection" -#: templates/telemeta_default/collection_detail.html:96 +#: templates/telemeta_default/collection_detail.html:93 #: templates/telemeta_default/home.html:50 #: templates/telemeta_default/inc/collection_list.html:17 msgid "Recording period" msgstr "Période d'enregistrement" -#: templates/telemeta_default/collection_detail.html:105 -#: templates/telemeta_default/mediaitem_detail.html:165 +#: templates/telemeta_default/collection_detail.html:102 +#: templates/telemeta_default/mediaitem_detail.html:161 msgid "Geographic and cultural informations" msgstr "Indications géographiques et culturelles" -#: templates/telemeta_default/collection_detail.html:123 +#: templates/telemeta_default/collection_detail.html:120 #: 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:132 +#: templates/telemeta_default/collection_detail.html:129 msgid "Bibliographic references" msgstr "Références bibliographiques" -#: templates/telemeta_default/collection_detail.html:145 -#: templates/telemeta_default/mediaitem_detail.html:237 +#: templates/telemeta_default/collection_detail.html:142 +#: templates/telemeta_default/mediaitem_detail.html:234 msgid "Archiving data" msgstr "Données d'archivage" -#: templates/telemeta_default/collection_detail.html:151 +#: templates/telemeta_default/collection_detail.html:148 msgid "Related documentation" msgstr "Documentation associée" -#: templates/telemeta_default/collection_detail.html:155 +#: templates/telemeta_default/collection_detail.html:152 msgid "Comments" msgstr "Commentaires" -#: templates/telemeta_default/collection_detail.html:169 -#: templates/telemeta_default/mediaitem_detail.html:253 +#: templates/telemeta_default/collection_detail.html:166 +#: templates/telemeta_default/mediaitem_detail.html:250 msgid "Technical data" msgstr "Données techniques" -#: templates/telemeta_default/collection_detail.html:174 -#: templates/telemeta_default/mediaitem_detail.html:256 +#: templates/telemeta_default/collection_detail.html:171 +#: templates/telemeta_default/mediaitem_detail.html:253 msgid "Media type" msgstr "Type de media" -#: templates/telemeta_default/collection_detail.html:174 -#: templates/telemeta_default/mediaitem_detail.html:256 +#: templates/telemeta_default/collection_detail.html:171 +#: templates/telemeta_default/mediaitem_detail.html:253 msgid "Audio" msgstr "Audio" -#: templates/telemeta_default/collection_detail.html:179 +#: templates/telemeta_default/collection_detail.html:176 #: templates/telemeta_default/geo_countries.html:16 msgid "Number of items" msgstr "Nombre d'items" -#: templates/telemeta_default/collection_detail.html:206 +#: templates/telemeta_default/collection_detail.html:203 #: templates/telemeta_default/home.html:35 -#: templates/telemeta_default/mediaitem_detail.html:271 +#: templates/telemeta_default/mediaitem_detail.html:268 msgid "Delete" msgstr "Supprimer" @@ -824,7 +824,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:125 +#: templates/telemeta_default/mediaitem_detail.html:121 msgid "Value" msgstr "Valeur" @@ -956,66 +956,66 @@ msgstr "Mot de passe oublié" msgid "Item" msgstr "Item" -#: templates/telemeta_default/mediaitem_detail.html:85 +#: templates/telemeta_default/mediaitem_detail.html:81 #: templates/telemeta_default/paginator.html:5 msgid "Previous" msgstr "Précédent" -#: templates/telemeta_default/mediaitem_detail.html:86 +#: templates/telemeta_default/mediaitem_detail.html:82 #: templates/telemeta_default/paginator.html:23 msgid "Next" msgstr "Suivant" -#: templates/telemeta_default/mediaitem_detail.html:114 +#: templates/telemeta_default/mediaitem_detail.html:110 msgid "Analysis" msgstr "Analyse" -#: templates/telemeta_default/mediaitem_detail.html:116 +#: templates/telemeta_default/mediaitem_detail.html:112 msgid "Markers" msgstr "Marqueurs" -#: templates/telemeta_default/mediaitem_detail.html:124 +#: templates/telemeta_default/mediaitem_detail.html:120 msgid "Property" msgstr "Propriété" -#: templates/telemeta_default/mediaitem_detail.html:126 +#: templates/telemeta_default/mediaitem_detail.html:122 msgid "Unit" msgstr "Unité" -#: templates/telemeta_default/mediaitem_detail.html:134 +#: templates/telemeta_default/mediaitem_detail.html:130 msgid "Download:" msgstr "Téléchargement:" -#: templates/telemeta_default/mediaitem_detail.html:155 +#: templates/telemeta_default/mediaitem_detail.html:151 msgid "Recording date" msgstr "Date d'enregistrement" -#: templates/telemeta_default/mediaitem_detail.html:167 +#: templates/telemeta_default/mediaitem_detail.html:163 #: templates/telemeta_default/inc/mediaitem_list.html:18 msgid "Location" msgstr "Lieu" -#: templates/telemeta_default/mediaitem_detail.html:173 -msgid "Comments / ethnographic context" -msgstr "Commentaires / contexte ethnographique" +#: templates/telemeta_default/mediaitem_detail.html:169 +msgid "Ethnographic context" +msgstr "Contexte ethnographique" -#: templates/telemeta_default/mediaitem_detail.html:186 +#: templates/telemeta_default/mediaitem_detail.html:183 msgid "Musical informations" msgstr "Informations sur la musique" -#: templates/telemeta_default/mediaitem_detail.html:220 +#: templates/telemeta_default/mediaitem_detail.html:217 msgid "performance" msgstr "composition" -#: templates/telemeta_default/mediaitem_detail.html:225 +#: templates/telemeta_default/mediaitem_detail.html:222 msgid "General informations" msgstr "Informations générales" -#: templates/telemeta_default/mediaitem_detail.html:227 +#: templates/telemeta_default/mediaitem_detail.html:224 msgid "Remarks" msgstr "Remarques" -#: templates/telemeta_default/mediaitem_detail.html:243 +#: templates/telemeta_default/mediaitem_detail.html:240 msgid "Published references" msgstr "Références éditées" @@ -1040,7 +1040,7 @@ msgstr "Formation" msgid "User Profile" msgstr "Profil utilisateur" -#: templates/telemeta_default/profile_detail.html:8 web/base.py:1165 +#: templates/telemeta_default/profile_detail.html:8 web/base.py:1175 msgid "User profile" msgstr "Profil utilisateur" @@ -1152,7 +1152,7 @@ msgstr "Etat/Continent" msgid "No item" msgstr "Aucun item" -#: templates/telemeta_default/inc/module_revisions.html:7 web/base.py:1196 +#: templates/telemeta_default/inc/module_revisions.html:7 web/base.py:1206 msgid "Last changes" msgstr "Dernières modifications" @@ -1345,17 +1345,20 @@ msgid_plural "%(count)d collections" msgstr[0] "%(count)d collection" msgstr[1] "%(count)d collections" -#: web/base.py:327 web/base.py:463 web/base.py:694 web/base.py:1164 +#: web/base.py:327 web/base.py:463 web/base.py:705 web/base.py:1174 msgid "Access not allowed" msgstr "Accès non autorisé" -#: web/base.py:329 web/base.py:465 web/base.py:696 web/base.py:1166 +#: web/base.py:329 web/base.py:465 web/base.py:707 web/base.py:1176 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é." +#~ msgid "Comments / ethnographic context" +#~ msgstr "Commentaires / contexte ethnographique" + #~ msgid "comments" #~ msgstr "commentaires" diff --git a/telemeta/models/media.py b/telemeta/models/media.py index 31164937..d232bf51 100644 --- a/telemeta/models/media.py +++ b/telemeta/models/media.py @@ -285,6 +285,9 @@ class MediaItem(MediaResource): class Meta(MetaCore): db_table = 'media_items' + permissions = ( + ("can_play_all_items", "Can play all media items"), + ) def is_valid_code(self, code): "Check if the item code is well formed" diff --git a/telemeta/templates/telemeta_default/base.html b/telemeta/templates/telemeta_default/base.html index 66a79c94..48f1d9cd 100644 --- a/telemeta/templates/telemeta_default/base.html +++ b/telemeta/templates/telemeta_default/base.html @@ -49,7 +49,7 @@
{% if user.is_authenticated %} -user +user {% trans "Welcome" %}, {% if user.first_name and user.last_name %} {{ user.first_name }} {{ user.last_name }} | @@ -59,7 +59,7 @@ {% trans "Profile" %} | {% trans "Help" %} | {% trans "Sign out" %} -logout +logout {% else %} {% trans "Help" %} | {% trans "Sign in" %} diff --git a/telemeta/templates/telemeta_default/collection_detail.html b/telemeta/templates/telemeta_default/collection_detail.html index 698e0203..5d2401f0 100644 --- a/telemeta/templates/telemeta_default/collection_detail.html +++ b/telemeta/templates/telemeta_default/collection_detail.html @@ -11,8 +11,8 @@ {% endblock %} @@ -54,9 +51,9 @@ {% endblock %} {% block content %} -
+
{% if collection.has_mediafile %} - {% if public_access or user.is_staff or user.is_superuser %} + {% if public_access or perms.telemeta.can_play_all_items %}
diff --git a/telemeta/templates/telemeta_default/home.html b/telemeta/templates/telemeta_default/home.html index 8cc68f8b..735ce7e2 100644 --- a/telemeta/templates/telemeta_default/home.html +++ b/telemeta/templates/telemeta_default/home.html @@ -81,7 +81,7 @@ {% if resource.element.file or resource.element.has_mediafile %} - yes + yes {% endif %} diff --git a/telemeta/templates/telemeta_default/mediaitem_add.html b/telemeta/templates/telemeta_default/mediaitem_add.html index be3eb1a7..005aee31 100644 --- a/telemeta/templates/telemeta_default/mediaitem_add.html +++ b/telemeta/templates/telemeta_default/mediaitem_add.html @@ -6,7 +6,7 @@ {% if item %} {% block title %} - item Item : NEW + item Item : NEW {% endblock %} {% block title_buttons %} @@ -36,7 +36,7 @@ class="component_icon button icon_cancel">{% trans "Cancel" %} {% trans "Save" %} - +
diff --git a/telemeta/templates/telemeta_default/mediaitem_copy.html b/telemeta/templates/telemeta_default/mediaitem_copy.html index 5fee7118..cfdbe6fe 100644 --- a/telemeta/templates/telemeta_default/mediaitem_copy.html +++ b/telemeta/templates/telemeta_default/mediaitem_copy.html @@ -8,7 +8,7 @@ {% endblock %} {% block title %} - item Item : NEW + item Item : NEW {% endblock %} {% block title_buttons %} diff --git a/telemeta/templates/telemeta_default/mediaitem_detail.html b/telemeta/templates/telemeta_default/mediaitem_detail.html index 81da4300..8ae24e34 100644 --- a/telemeta/templates/telemeta_default/mediaitem_detail.html +++ b/telemeta/templates/telemeta_default/mediaitem_detail.html @@ -12,17 +12,13 @@ {% block extra_javascript %} {% if item %} - - -