WIP notelemeta

diff --git a/teleforma/locale/fr/LC_MESSAGES/django.po b/teleforma/locale/fr/LC_MESSAGES/django.po
index b74d34d51510d2d367f5ac479c6071de2a7bd21c..31388ce5b28c1ec143f85ac7d3bae19375b8c63c 100644 (file)
--- a/teleforma/locale/fr/LC_MESSAGES/django.po
+++ b/teleforma/locale/fr/LC_MESSAGES/django.po
@@ -2387,3 +2387,1456 @@ msgstr "Vous avez soumis votre évaluation avec succès"
 
 #~ msgid "course types"
 #~ msgstr "types de matières"
+
+#: templates/quiz/quiz_detail.html:16
+msgid "Start quiz"
+msgstr "Démarrer le quiz"
+
+msgid "Your answer was"
+msgstr "Votre réponse est"
+
+#: models/core.py:150
+msgid "Enter a valid duration in HH:MM[:ss] format."
+msgstr "Entrez une durée valide au format HH:MM[:ss]"
+
+#: models/enum.py:59 models/media.py:261
+msgid "archive format"
+msgstr "format du support"
+
+#: models/enum.py:66 models/media.py:243
+msgid "secondary edition"
+msgstr "réédition"
+
+#: models/enum.py:73 models/media.py:237
+msgid "mode of acquisition"
+msgstr "mode d'acquisition"
+
+#: models/enum.py:81 models/media.py:240
+msgid "record author"
+msgstr "rédacteur fiche"
+
+#: models/enum.py:88 models/media.py:247
+msgid "record writer"
+msgstr "saisie fiche"
+
+#: models/enum.py:95 models/media.py:233
+msgid "legal rights"
+msgstr "droit d'utilisation"
+
+#: models/enum.py:102 models/media.py:211
+msgid "recording context"
+msgstr "contexte d'enregistrement"
+
+#: models/enum.py:109
+msgid "A/D conversion"
+msgstr "Conversion A/N"
+
+#: models/enum.py:116 models/media.py:377
+msgid "vernacular style"
+msgstr "style vernaculaire"
+
+#: models/enum.py:123 models/media.py:379
+msgid "generic style"
+msgstr "style générique"
+
+#: models/enum.py:130 models/media.py:534
+msgid "keyword"
+msgstr "Mot-clé"
+
+#: models/enum.py:137 models/media.py:222
+msgid "publisher / status"
+msgstr "éditeur / statut"
+
+#: models/enum.py:143
+msgid "publisher"
+msgstr "éditeur"
+
+#: models/enum.py:159 models/enum.py:165 models/media.py:367
+msgid "population / social group"
+msgstr "population / groupe social"
+
+#: models/enum.py:180 models/format.py:77
+msgid "tape wheel diameter (cm)"
+msgstr "diamètre de bobine (cm)"
+
+#: models/enum.py:187
+msgid "tape length (cm)"
+msgstr "longueur de bande (cm)"
+
+#: models/enum.py:194
+msgid "tape width (inch)"
+msgstr "largeur de bande (pouce)"
+
+#: models/enum.py:201 models/format.py:80
+msgid "tape speed (cm/s)"
+msgstr "vitesse de bande (cm/s)"
+
+#: models/enum.py:208 models/format.py:82
+msgid "tape vendor"
+msgstr "marque de bande"
+
+#: models/enum.py:215 models/format.py:71
+msgid "number of channels"
+msgstr "Nombre de pistes"
+
+#: models/enum.py:229 models/media.py:388
+msgid "rights"
+msgstr "droits"
+
+#: models/enum.py:236 models/media.py:358
+msgid "topic"
+msgstr "discipline"
+
+#: models/format.py:58 models/media.py:447 models/media.py:506
+#: models/media.py:533 models/media.py:544 models/media.py:560
+#: models/media.py:581 models/media.py:627 models/media.py:652
+#: models/media.py:686
+msgid "item"
+msgstr "item"
+
+#: models/format.py:61
+msgid "physical format"
+msgstr "nature du support original"
+
+#: models/format.py:62 models/media.py:393
+msgid "original code"
+msgstr "cote originale"
+
+#: models/format.py:63
+msgid "original number"
+msgstr "numéro de support"
+
+#: models/format.py:64
+msgid "original status"
+msgstr "statut de l'original"
+
+#: models/format.py:65
+msgid "technical properties / conservation state"
+msgstr "état de conservation"
+
+#: models/format.py:66
+msgid "comments / notes"
+msgstr "commentaires / notes"
+
+#: models/format.py:68
+msgid "original location"
+msgstr "lieu d'archivage"
+
+#: models/format.py:72
+msgid "audio quality"
+msgstr "qualité audio"
+
+#: models/format.py:73
+msgid "recording system"
+msgstr "système d'enregistrement"
+
+#: models/format.py:78
+msgid "tape thickness (um)"
+msgstr "épaisseur de bande (um)"
+
+#: models/format.py:83
+msgid "tape reference"
+msgstr "référence de bande"
+
+#: models/format.py:84
+msgid "sticker presence"
+msgstr "présence de collants"
+
+#: models/format.py:88
+msgid "format"
+msgstr "format"
+
+#: models/instrument.py:57
+msgid "instrument aliases"
+msgstr "instrument aliases"
+
+#: models/instrument.py:65 models/instrument.py:82
+msgid "instrument"
+msgstr "instrument"
+
+#: models/instrument.py:67
+msgid "parent instrument"
+msgstr "instrument parent"
+
+#: models/instrument.py:80 models/location.py:171
+msgid "alias"
+msgstr "alias"
+
+#: models/language.py:48 models/location.py:157
+msgid "identifier"
+msgstr "identifiant"
+
+#: models/language.py:49
+msgid "equivalent ISO 639-2 identifier (bibliographic)"
+msgstr "identifiant ISO 639-2 équivalent (bibliographique)"
+
+#: models/language.py:50
+msgid "equivalent ISO 639-2 identifier (terminologic)"
+msgstr "identifiant ISO 639-2 équivalent (terminologique)"
+
+#: models/language.py:51
+msgid "equivalent ISO 639-1 identifier"
+msgstr "identifiant ISO 639-1 équivalent"
+
+#: models/language.py:52
+msgid "scope"
+msgstr "cadre"
+
+#: models/language.py:63
+msgid "languages"
+msgstr "langues"
+
+#: models/location.py:49
+msgid "country"
+msgstr "état/nation"
+
+#: models/location.py:49
+msgid "continent"
+msgstr "continent"
+
+#: models/location.py:53
+msgid "complete type"
+msgstr "type complet"
+
+#: models/location.py:55
+msgid "current location"
+msgstr "lieu actuel"
+
+#: models/location.py:58 models/location.py:172 models/location.py:188
+msgid "authoritative"
+msgstr "officiel"
+
+#: models/location.py:112 models/location.py:170 models/location.py:185
+#: models/media.py:363
+msgid "location"
+msgstr "lieu"
+
+#: models/location.py:113
+msgid "locations"
+msgstr "lieux"
+
+#: models/location.py:166
+msgid "location types"
+msgstr "types de lieux"
+
+#: models/location.py:180
+msgid "location aliases"
+msgstr "lieux alias"
+
+#: models/location.py:186
+msgid "ancestor location"
+msgstr "lieu ancêtre"
+
+#: models/location.py:194
+msgid "location relations"
+msgstr "lieux relations"
+
+#: models/media.py:78 models/media.py:81 models/media.py:441
+msgid "none"
+msgstr "accès réservé"
+
+#: models/media.py:78 models/media.py:81
+msgid "metadata"
+msgstr "métadonnées"
+
+#: models/media.py:79
+msgid "mixed"
+msgstr "mixte"
+
+#: models/media.py:79 models/media.py:82
+msgid "full"
+msgstr "complet"
+
+#: models/media.py:84
+msgid "broken"
+msgstr "cassé"
+
+#: models/media.py:84
+msgid "processing"
+msgstr "en cours"
+
+#: models/media.py:85
+msgid "done"
+msgstr "fait"
+
+#: models/media.py:85
+msgid "ready"
+msgstr "prêt"
+
+#: models/media.py:102
+msgid "Metadata only"
+msgstr "Métadonnées uniquement"
+
+#: models/media.py:104
+msgid "Sound and metadata"
+msgstr "Son et métadonnées"
+
+#: models/media.py:106
+msgid "Private data"
+msgstr "Données privées"
+
+#: models/media.py:107 models/media.py:126
+msgid "public access"
+msgstr "accès public"
+
+#: models/media.py:153 models/media.py:631 models/media.py:654
+#: models/media.py:688 models/system.py:116
+msgid "date"
+msgstr ""
+
+#: models/media.py:155 models/media.py:653 models/media.py:687
+msgid "mime_type"
+msgstr "type mime"
+
+#: models/media.py:156
+msgid "url"
+msgstr ""
+
+#: models/media.py:206
+msgid "reference"
+msgstr "référence"
+
+#: models/media.py:208 models/media.py:351
+msgid "original title / translation"
+msgstr "titre original / traduction"
+
+#: models/media.py:209
+msgid "depositor / contributor"
+msgstr "déposant / contributeur"
+
+#: models/media.py:212 models/media.py:770
+msgid "recording year (from)"
+msgstr "année d'enregistrement (depuis)"
+
+#: models/media.py:213 models/media.py:771
+msgid "recording year (until)"
+msgstr "année d'enregistrement (jusqu'à)"
+
+#: models/media.py:214
+msgid "year published"
+msgstr "année de parution"
+
+#: models/media.py:220 models/media.py:395
+msgid "recordist"
+msgstr "collecteur"
+
+#: models/media.py:224
+msgid "publisher collection"
+msgstr "collection éditeur"
+
+#: models/media.py:225
+msgid "publisher serial number"
+msgstr "numéro dans la série"
+
+#: models/media.py:226
+msgid "author of published notice"
+msgstr "auteur de la notice éditée"
+
+#: models/media.py:227
+msgid "bibliographic references"
+msgstr "références bibliographiques"
+
+#: models/media.py:229 models/media.py:385
+msgid "access status"
+msgstr "statut d'accès"
+
+#: models/media.py:231 models/media.py:389
+msgid "automatic access after a rolling period"
+msgstr "Accès automatique après la data glissante"
+
+#: models/media.py:238
+msgid "CNRS depositor"
+msgstr "déposant CNRS"
+
+#: models/media.py:241
+msgid "related documentation"
+msgstr "documentation associée"
+
+#: models/media.py:244
+msgid "copies"
+msgstr "autres exemplaires"
+
+#: models/media.py:248
+msgid "archiver notes"
+msgstr "notes de l'archiviste"
+
+#: models/media.py:249
+msgid "items finished"
+msgstr "fiches items faites"
+
+#: models/media.py:250
+msgid "recordist identical to depositor"
+msgstr "collecteur identique au déposant"
+
+#: models/media.py:252
+msgid "conservation site"
+msgstr "lieu de conservation"
+
+#: models/media.py:257
+msgid "old code"
+msgstr "ancienne cote"
+
+#: models/media.py:259
+msgid "number of components (medium / piece)"
+msgstr "nb de composants (support / pièce)"
+
+#: models/media.py:263
+msgid "digitization"
+msgstr "numérisation"
+
+#: models/media.py:265
+msgid "a_informer_07_03"
+msgstr "a_informer_07_03"
+
+#: models/media.py:300
+msgid "states / nations"
+msgstr "états / nations"
+
+#: models/media.py:314
+msgid "populations / social groups"
+msgstr "populations / groupes sociaux"
+
+#: models/media.py:322 models/media.py:473
+msgid "computed duration"
+msgstr "durée calculée"
+
+#: models/media.py:330 models/media.py:336 models/media.py:353
+msgid "collection"
+msgstr "collection"
+
+#: models/media.py:340 models/media.py:341
+msgid "collection related media"
+msgstr "média associés à la collection"
+
+#: models/media.py:354
+msgid "recording date (from)"
+msgstr "date d'enregistrement (depuis)"
+
+#: models/media.py:355
+msgid "recording date (until)"
+msgstr "date d'enregistrement (jusqu'à)"
+
+#: models/media.py:357
+msgid "scientist"
+msgstr "reponsable scientifique"
+
+#: models/media.py:359
+msgid "summary"
+msgstr "résumé"
+
+#: models/media.py:360
+msgid "remarks"
+msgstr "remarques"
+
+#: models/media.py:364
+msgid "location details"
+msgstr "précisions lieu"
+
+#: models/media.py:365
+msgid "cultural area"
+msgstr "aire culturelle"
+
+#: models/media.py:368
+msgid "language"
+msgstr "langue"
+
+#: models/media.py:370
+msgid "ISO language"
+msgstr "Langue ISO"
+
+#: models/media.py:372
+msgid "comments / ethnographic context"
+msgstr "commentaires / contexte ethnographique"
+
+#: models/media.py:373
+msgid "moda_execut"
+msgstr "moda_execut"
+
+#: models/media.py:380
+msgid "author / compositor"
+msgstr "auteur / compositeur"
+
+#: models/media.py:381
+msgid "contributor"
+msgstr "intervenant"
+
+#: models/media.py:387
+msgid "depositor"
+msgstr "déposant"
+
+#: models/media.py:394
+msgid "item number"
+msgstr "n° de l'item"
+
+#: models/media.py:396
+msgid "digitalist"
+msgstr "opérateur de numérisation"
+
+#: models/media.py:397
+msgid "collector"
+msgstr "collecteur"
+
+#: models/media.py:398
+msgid "collector selection"
+msgstr "sélection collecteur"
+
+#: models/media.py:399
+msgid "collector as in collection"
+msgstr "collecteur identique à la collection"
+
+#: models/media.py:400
+msgid "digitization date"
+msgstr "date de numérisation"
+
+#: models/media.py:401
+msgid "publishing date"
+msgstr "date de création du support édité"
+
+#: models/media.py:402
+msgid "creator reference"
+msgstr "référence"
+
+#: models/media.py:403
+msgid "published references"
+msgstr "références éditées"
+
+#: models/media.py:405
+msgid "copy of"
+msgstr "copie de"
+
+#: models/media.py:500
+msgid "instruments"
+msgstr "instruments"
+
+#: models/media.py:527 models/media.py:528
+msgid "item related media"
+msgstr "média associés à l'item"
+
+#: models/media.py:546
+msgid "composition"
+msgstr "Voix / Instruments"
+
+#: models/media.py:548
+msgid "vernacular name"
+msgstr "nom vernaculaire"
+
+#: models/media.py:550
+msgid "interprets"
+msgstr "interprètes"
+
+#: models/media.py:561
+msgid "id"
+msgstr ""
+
+#: models/media.py:564
+msgid "unit"
+msgstr "unité"
+
+#: models/media.py:583
+msgid "start"
+msgstr "début"
+
+#: models/media.py:584
+msgid "end"
+msgstr "fin"
+
+#: models/media.py:588
+msgid "item part"
+msgstr "partie"
+
+#: models/media.py:614
+msgid "playlist"
+msgstr "liste de lecture"
+
+#: models/media.py:615
+msgid "resource_type"
+msgstr "type de ressource"
+
+#: models/media.py:616
+msgid "resource_id"
+msgstr "ressource"
+
+#: models/media.py:629
+msgid "time (s)"
+msgstr "temps (s)"
+
+#: models/media.py:689
+msgid "transcoded"
+msgstr "transcodé"
+
+#: models/media.py:769
+msgid "collections"
+msgstr "collections"
+
+#: models/media.py:781 models/media.py:782 models/media.py:792
+#: models/media.py:809
+msgid "corpus"
+msgstr "corpus"
+
+#: models/media.py:802 models/media.py:803 models/media.py:820
+msgid "fonds"
+msgstr "fonds"
+
+#: models/media.py:813 models/media.py:814
+msgid "corpus related media"
+msgstr "média associés"
+
+#: models/media.py:824 models/media.py:825
+msgid "fonds related media"
+msgstr "média associés"
+
+#: models/system.py:52
+msgid "element type"
+msgstr "type d'élément"
+
+#: models/system.py:53
+msgid "element identifier"
+msgstr "identifiant de l'élément"
+
+#: models/system.py:54
+msgid "modification type"
+msgstr "type de modification"
+
+#: models/system.py:55
+msgid "time"
+msgstr "heure"
+
+#: models/system.py:87 templates/telemeta/profile_detail.html:46
+msgid "Attachment"
+msgstr "Rattachement"
+
+#: models/system.py:88 templates/telemeta/profile_detail.html:45
+msgid "Function"
+msgstr "Fonction"
+
+#: models/system.py:103
+msgid "key"
+msgstr "clé"
+
+#: models/system.py:119
+msgid "criteria"
+msgstr "critères"
+
+#: templates/admin/base_site.html:4
+msgid "Telemta site admin"
+msgstr ""
+
+#: templates/admin/base_site.html:7
+msgid "Telemeta administration"
+msgstr "Administration Telemeta"
+
+#: templates/postman/email_user.txt:1
+msgid "Dear user,"
+msgstr ""
+
+#: templates/telemeta/admin_enumerations.html:6
+#: templates/telemeta/base.html:118 templates/telemeta/enumeration_edit.html:7
+msgid "Enumerations"
+msgstr "Énumérations"
+
+#: templates/telemeta/admin_enumerations.html:24
+msgid "No enumerations"
+msgstr "Aucune énumération"
+
+#: templates/telemeta/base.html:55
+msgid "Welcome"
+msgstr "Bienvenue"
+
+#: templates/telemeta/base.html:101 templates/telemeta/breadcrumbs.html:4
+#: templates/telemeta/inc/breadcrumbs.html:5
+msgid "Fonds"
+msgstr ""
+
+#: templates/telemeta/base.html:102 templates/telemeta/breadcrumbs.html:5
+#: templates/telemeta/inc/breadcrumbs.html:6
+msgid "Corpus"
+msgstr ""
+
+#: templates/telemeta/base.html:103 templates/telemeta/breadcrumbs.html:6
+#: templates/telemeta/inc/breadcrumbs.html:7
+msgid "Collections"
+msgstr "Collections"
+
+#: templates/telemeta/base.html:104 templates/telemeta/breadcrumbs.html:7
+#: templates/telemeta/inc/breadcrumbs.html:8
+msgid "Items"
+msgstr "Items"
+
+#: templates/telemeta/base.html:108 templates/telemeta/home.html:25
+msgid "Geo Navigator"
+msgstr "Géo-Navigateur"
+
+#: templates/telemeta/base.html:110
+msgid "Advanced search"
+msgstr "Recherche avancée"
+
+#: templates/telemeta/base.html:119 templates/telemeta/instrument_edit.html:4
+#: templates/telemeta/instrument_edit.html:7
+#: templates/telemeta/instrument_edit_value.html:24
+msgid "Instruments"
+msgstr "Instruments"
+
+#: templates/telemeta/base.html:156
+msgid "By"
+msgstr "Par"
+
+#: templates/telemeta/base.html:161
+msgid ""
+"Usage of the archives in the respect of cultural heritage of the original "
+"communities."
+msgstr ""
+"Usage des archives réservé dans le respect du patrimoine culturel des "
+"communautés d'origine."
+
+#: templates/telemeta/collection_add.html:10
+#: templates/telemeta/collection_add.html:32
+#: templates/telemeta/collection_edit.html:9
+#: templates/telemeta/collection_edit.html:35
+#: templates/telemeta/collection_related_edit.html:12
+#: templates/telemeta/collection_related_edit.html:41
+#: templates/telemeta/enumeration_edit_value.html:37
+#: templates/telemeta/enumeration_edit_value.html:59
+#: templates/telemeta/instrument_edit_value.html:38
+#: templates/telemeta/instrument_edit_value.html:60
+#: templates/telemeta/mediaitem_add.html:14
+#: templates/telemeta/mediaitem_add.html:50
+#: templates/telemeta/mediaitem_copy.html:16
+#: templates/telemeta/mediaitem_copy.html:58
+#: templates/telemeta/mediaitem_edit.html:11
+#: templates/telemeta/mediaitem_edit.html:70
+#: templates/telemeta/mediaitem_keywords_edit.html:12
+#: templates/telemeta/mediaitem_keywords_edit.html:40
+#: templates/telemeta/mediaitem_performances_edit.html:12
+#: templates/telemeta/mediaitem_performances_edit.html:44
+#: templates/telemeta/mediaitem_related_edit.html:12
+#: templates/telemeta/mediaitem_related_edit.html:40
+#: templates/telemeta/profile_edit.html:6
+#: templates/telemeta/profile_edit.html:29
+#: templates/telemeta/resource_add.html:10
+#: templates/telemeta/resource_add.html:35
+#: templates/telemeta/resource_edit.html:9
+#: templates/telemeta/resource_edit.html:36
+#: templates/telemeta/resource_related_edit.html:12
+#: templates/telemeta/resource_related_edit.html:40
+msgid "Cancel"
+msgstr "Annuler"
+
+#: templates/telemeta/collection_add.html:12
+#: templates/telemeta/collection_add.html:34
+#: templates/telemeta/collection_edit.html:11
+#: templates/telemeta/collection_edit.html:37
+#: templates/telemeta/collection_related_edit.html:14
+#: templates/telemeta/collection_related_edit.html:43
+#: templates/telemeta/enumeration_edit_value.html:35
+#: templates/telemeta/instrument_edit_value.html:36
+#: templates/telemeta/mediaitem_add.html:16
+#: templates/telemeta/mediaitem_add.html:53
+#: templates/telemeta/mediaitem_copy.html:18
+#: templates/telemeta/mediaitem_copy.html:59
+#: templates/telemeta/mediaitem_edit.html:13
+#: templates/telemeta/mediaitem_edit.html:72
+#: templates/telemeta/mediaitem_keywords_edit.html:13
+#: templates/telemeta/mediaitem_keywords_edit.html:41
+#: templates/telemeta/mediaitem_performances_edit.html:13
+#: templates/telemeta/mediaitem_performances_edit.html:45
+#: templates/telemeta/mediaitem_related_edit.html:13
+#: templates/telemeta/mediaitem_related_edit.html:41
+#: templates/telemeta/profile_edit.html:31
+#: templates/telemeta/resource_add.html:12
+#: templates/telemeta/resource_add.html:37
+#: templates/telemeta/resource_edit.html:11
+#: templates/telemeta/resource_edit.html:38
+#: templates/telemeta/resource_related_edit.html:13
+#: templates/telemeta/resource_related_edit.html:41
+msgid "Save"
+msgstr "Enregistrer"
+
+#: templates/telemeta/collection_detail.html:5
+#: templates/telemeta/collection_detail_dc.html:5 views/collection.py:50
+msgid "Collection"
+msgstr "Collection"
+
+#: templates/telemeta/collection_detail.html:45
+#: templates/telemeta/mediaitem_detail.html:96
+#: templates/telemeta/resource_detail.html:46
+msgid "Copy"
+msgstr "Copier"
+
+#: templates/telemeta/collection_detail.html:46
+msgid "Add item"
+msgstr "Ajouter item"
+
+#: templates/telemeta/collection_detail.html:49
+#: templates/telemeta/mediaitem_detail.html:99
+#: templates/telemeta/resource_detail.html:49
+msgid "Add to playlist"
+msgstr "Ajouter à la liste"
+
+#: templates/telemeta/collection_detail.html:60
+msgid "Listen to this collection"
+msgstr "Écouter la collection"
+
+#: templates/telemeta/collection_detail.html:109
+#: templates/telemeta/mediaitem_detail.html:216
+msgid "Geographic and cultural informations"
+msgstr "Indications géographiques et culturelles"
+
+#: templates/telemeta/collection_detail.html:136
+msgid "Bibliographic references"
+msgstr "Références bibliographiques"
+
+#: templates/telemeta/collection_detail.html:151
+#: templates/telemeta/mediaitem_detail.html:276
+msgid "Archiving data"
+msgstr "Données d'archivage"
+
+#: templates/telemeta/collection_detail.html:157
+msgid "Related documentation"
+msgstr "Documentation associée"
+
+#: templates/telemeta/collection_detail.html:175
+#: templates/telemeta/mediaitem_detail.html:293
+msgid "Technical data"
+msgstr "Données techniques"
+
+#: templates/telemeta/collection_detail.html:180
+#: templates/telemeta/mediaitem_detail.html:296
+msgid "Media type"
+msgstr "Type de media"
+
+#: templates/telemeta/collection_detail.html:185
+#: templates/telemeta/geo_countries.html:16
+msgid "Number of items"
+msgstr "Nombre d'items"
+
+#: templates/telemeta/collection_detail_dc.html:12
+#: templates/telemeta/collection_detail_dc.html:22
+#: templates/telemeta/mediaitem_detail_dc.html:17
+#: templates/telemeta/resource_detail_dc.html:14
+msgid "Normal View"
+msgstr "Vue normale"
+
+#: templates/telemeta/collection_detail_dc.html:30
+msgid "No such collection"
+msgstr "Aucune collection de ce type"
+
+#: templates/telemeta/collection_edit.html:30
+#: templates/telemeta/mediaitem_edit.html:61
+#: templates/telemeta/resource_edit.html:31
+#: templates/telemeta/inc/collection_related.html:6
+#: templates/telemeta/inc/mediaitem_related.html:6
+#: templates/telemeta/inc/resource_related.html:6
+msgid "Related media"
+msgstr "Média associés"
+
+#: templates/telemeta/collection_edit.html:31
+#: templates/telemeta/mediaitem_edit.html:62
+#: templates/telemeta/resource_edit.html:32
+msgid "related media"
+msgstr "média associés"
+
+#: templates/telemeta/collection_list.html:5
+#: templates/telemeta/collection_list.html:8
+msgid "Media Collections"
+msgstr "Collections"
+
+#: templates/telemeta/collection_list.html:13
+#: templates/telemeta/mediaitem_list.html:13
+msgid "Unpublished"
+msgstr "Inédites"
+
+#: templates/telemeta/collection_list.html:14
+#: templates/telemeta/mediaitem_list.html:14
+msgid "Published"
+msgstr "Éditées"
+
+#: templates/telemeta/collection_list.html:15
+#: templates/telemeta/mediaitem_list.html:15
+#: templates/telemeta/search_results.html:14
+#: templates/telemeta/search_results.html:18
+msgid "Sounds"
+msgstr "Sonores"
+
+#: templates/telemeta/collection_related_edit.html:25
+#: templates/telemeta/mediaitem_related_edit.html:24
+#: templates/telemeta/resource_related_edit.html:24
+#: templates/telemeta/inc/collection_related.html:12
+#: templates/telemeta/inc/mediaitem_related.html:12
+#: templates/telemeta/inc/resource_related.html:12
+msgid "Media"
+msgstr "Média"
+
+#: templates/telemeta/country_info.html:9
+msgid "in"
+msgstr "dans"
+
+#: templates/telemeta/country_info.html:18
+msgid "Populations / Social groups"
+msgstr "Populations / Groupes sociaux"
+
+#: templates/telemeta/enumeration_edit.html:4
+msgid "Enumeration"
+msgstr "Enumération"
+
+#: templates/telemeta/enumeration_edit.html:15
+#: templates/telemeta/instrument_edit.html:14
+msgid "Add entry"
+msgstr "Ajouter une entrée"
+
+#: templates/telemeta/enumeration_edit.html:51
+msgid "This enumeration is empty"
+msgstr "Cette énumération est vide"
+
+#: templates/telemeta/enumeration_edit_value.html:28
+#: templates/telemeta/instrument_edit_value.html:28
+msgid "Modify an entry"
+msgstr "Modification d'une entrée"
+
+#: templates/telemeta/enumeration_edit_value.html:45
+#: templates/telemeta/instrument_edit_value.html:46
+msgid "Replace by"
+msgstr "Remplacer par"
+
+#: templates/telemeta/enumeration_edit_value.html:52
+#: templates/telemeta/instrument_edit_value.html:53
+msgid "delete value after replacing"
+msgstr "effacer la valeur après remplacement"
+
+#: templates/telemeta/enumeration_edit_value.html:57
+#: templates/telemeta/instrument_edit_value.html:58
+msgid "Replace"
+msgstr "Remplacement"
+
+#: templates/telemeta/geo_continents.html:5
+#: templates/telemeta/geo_continents.html:20
+#: templates/telemeta/geo_countries.html:5
+#: templates/telemeta/geo_country_collections.html:5
+#: templates/telemeta/geo_country_items.html:5
+msgid "Geographic Navigator"
+msgstr "Navigateur géographique"
+
+#: templates/telemeta/geo_continents.html:25
+msgid "Map"
+msgstr "Carte"
+
+#: templates/telemeta/geo_continents.html:26
+msgid "List"
+msgstr "Liste"
+
+#: templates/telemeta/geo_countries.html:8
+#: templates/telemeta/geo_country_collections.html:8
+#: templates/telemeta/geo_country_items.html:8
+msgid "World"
+msgstr "Monde"
+
+#: templates/telemeta/geo_countries.html:15
+msgid "Number of collections"
+msgstr "Nombre de collections"
+
+#: templates/telemeta/geo_countries.html:24
+#, python-format
+msgid "1 collection"
+msgid_plural "%(counter)s collections"
+msgstr[0] "1 collection"
+msgstr[1] "%(counter)s collections"
+
+#: templates/telemeta/geo_countries.html:31
+#, python-format
+msgid "1 item"
+msgid_plural "%(counter)s items "
+msgstr[0] "1 item"
+msgstr[1] "%(counter)s items "
+
+#: templates/telemeta/home.html:14 templates/telemeta/home.html.py:62
+msgid "Musical selection"
+msgstr "Sélection musicale"
+
+#: templates/telemeta/home.html:28
+msgid "Open the geographic navigator"
+msgstr "Accéder au navigateur géographique"
+
+#: templates/telemeta/home.html:39
+msgid "Partners"
+msgstr "Partenaires"
+
+#: templates/telemeta/instrument_edit.html:16
+#: templates/telemeta/instrument_edit.html:30
+#: templates/telemeta/instrument_edit_value.html:30
+msgid "Name"
+msgstr "Nom"
+
+#: templates/telemeta/instrument_edit.html:48
+msgid "This instrument list is empty"
+msgstr "Cette énumération est vide"
+
+#: templates/telemeta/mediaitem_add.html:5
+#: templates/telemeta/mediaitem_copy.html:5
+#: templates/telemeta/mediaitem_detail.html:5 views/item.py:111
+msgid "Item"
+msgstr "Item"
+
+#: templates/telemeta/mediaitem_add.html:38
+#: templates/telemeta/mediaitem_copy.html:44
+#: templates/telemeta/mediaitem_edit.html:42
+msgid "Collection access status"
+msgstr "Statut d'accès de la collection"
+
+#: templates/telemeta/mediaitem_add.html:39
+#: templates/telemeta/mediaitem_copy.html:45
+#: templates/telemeta/mediaitem_edit.html:43
+msgid "Context access status"
+msgstr "Statut d'accès selon le profil"
+
+#: templates/telemeta/mediaitem_add.html:40
+#: templates/telemeta/mediaitem_copy.html:46
+#: templates/telemeta/mediaitem_edit.html:44
+msgid "Item access status"
+msgstr "Statut d'accès de l'item"
+
+#: templates/telemeta/mediaitem_detail.html:101
+#: templates/telemeta/paginator.html:5
+msgid "Previous"
+msgstr "Précédent"
+
+#: templates/telemeta/mediaitem_detail.html:102
+#: templates/telemeta/paginator.html:23
+msgid "Next"
+msgstr "Suivant"
+
+#: templates/telemeta/mediaitem_detail.html:152
+msgid "Analysis"
+msgstr "Analyse"
+
+#: templates/telemeta/mediaitem_detail.html:154
+msgid "Markers"
+msgstr "Marqueurs"
+
+#: templates/telemeta/mediaitem_detail.html:162
+msgid "Property"
+msgstr "Propriété"
+
+#: templates/telemeta/mediaitem_detail.html:164
+msgid "Unit"
+msgstr "Unité"
+
+#: templates/telemeta/mediaitem_detail.html:172
+msgid "Download:"
+msgstr "Téléchargement:"
+
+#: templates/telemeta/mediaitem_detail.html:185
+msgid "You don't have access to the media of this item."
+msgstr "Vous n'avez pas accès aux médias de cet item."
+
+#: templates/telemeta/mediaitem_detail.html:185
+msgid "Please contact the administrators to get more rights."
+msgstr "Contactez les administrateurs du site pour obtenir plus de droits."
+
+#: templates/telemeta/mediaitem_detail.html:201
+msgid "Recording date"
+msgstr "Date d'enregistrement"
+
+#: templates/telemeta/mediaitem_detail.html:218
+#: templates/telemeta/inc/mediaitem_list.html:18
+msgid "Location"
+msgstr "Lieu"
+
+#: templates/telemeta/mediaitem_detail.html:224
+msgid "Language ISO"
+msgstr "Langue ISO"
+
+#: templates/telemeta/mediaitem_detail.html:228
+msgid "Ethnographic context"
+msgstr "Contexte ethnographique"
+
+#: templates/telemeta/mediaitem_detail.html:239
+msgid "Musical informations"
+msgstr "Informations sur la musique"
+
+#: templates/telemeta/mediaitem_detail.html:282
+msgid "Published references"
+msgstr "Références éditées"
+
+#: templates/telemeta/mediaitem_detail.html:284
+msgid "Remarks"
+msgstr "Remarques"
+
+#: templates/telemeta/mediaitem_detail_dc.html:13
+msgid "No such item"
+msgstr "Item introuvable"
+
+#: templates/telemeta/mediaitem_edit.html:53
+msgid "Keywords"
+msgstr "Mots-clés"
+
+#: templates/telemeta/mediaitem_edit.html:57
+#: templates/telemeta/mediaitem_performances_edit.html:25
+msgid "Performance"
+msgstr "Composition"
+
+#: templates/telemeta/mediaitem_edit.html:58
+msgid "performance"
+msgstr "composition"
+
+#: templates/telemeta/mediaitem_keywords_edit.html:24
+msgid "Keyword"
+msgstr "Mot-clé"
+
+#: templates/telemeta/mediaitem_list.html:5
+#: templates/telemeta/mediaitem_list.html:8
+msgid "Media Items"
+msgstr "Items"
+
+#: templates/telemeta/profile_detail.html:16
+msgid "Playlists"
+msgstr "Listes de lecture"
+
+#: templates/telemeta/profile_detail.html:51
+msgid "Is staff"
+msgstr "Statut équipe"
+
+#: templates/telemeta/profile_detail.html:52
+msgid "Is superuser"
+msgstr "Statut super-utilisateur"
+
+#: templates/telemeta/resource_add.html:6
+msgid "New"
+msgstr "Nouveau"
+
+#: templates/telemeta/resource_detail.html:109
+#: templates/telemeta/resource_detail_dc.html:22
+msgid "No such resource"
+msgstr "Aucune ressource de ce type"
+
+#: templates/telemeta/search_results.html:5
+#: templates/telemeta/search_results.html:8
+msgid "Search Results"
+msgstr "Résultats de recherche"
+
+#: templates/telemeta/search_results.html:26
+msgid "Search pattern"
+msgstr "Mots clés"
+
+#: templates/telemeta/inc/children_list.html:8
+#, python-format
+msgid ""
+"%(resource.children_type|capitalize)s %(first_on_page)s to %(last_on_page)s "
+"on %(hits)s"
+msgstr ""
+"%(resource.children_type|capitalize)s %(first_on_page)s à %(last_on_page)s "
+"sur %(hits)s"
+
+#: templates/telemeta/inc/children_list.html:18
+#: templates/telemeta/inc/resource_list.html:16
+msgid "Reference"
+msgstr "Référence"
+
+#: templates/telemeta/inc/children_list.html:41
+#: templates/telemeta/inc/resource_list.html:30
+msgid "No resource"
+msgstr "Aucune ressource"
+
+#: templates/telemeta/inc/collection_list.html:7
+#, python-format
+msgid "Collections %(first_on_page)s to %(last_on_page)s on %(hits)s"
+msgstr "Collections %(first_on_page)s à %(last_on_page)s sur %(hits)s"
+
+#: templates/telemeta/inc/collection_list.html:47
+msgid "No collection"
+msgstr "Aucune collection"
+
+#: templates/telemeta/inc/collection_related.html:13
+#: templates/telemeta/inc/mediaitem_related.html:13
+#: templates/telemeta/inc/resource_related.html:13
+msgid "Preview"
+msgstr "Prévisualisation"
+
+#: templates/telemeta/inc/collection_related.html:41
+#: templates/telemeta/inc/mediaitem_related.html:41
+#: templates/telemeta/inc/resource_related.html:41
+msgid "Credits"
+msgstr "Crédits"
+
+#: templates/telemeta/inc/dublincore.html:4
+msgid "Dublin Core Metadata"
+msgstr "Métadonnées Dublin Core"
+
+#: templates/telemeta/inc/mediaitem_list.html:7
+#, python-format
+msgid "Items %(first_on_page)s to %(last_on_page)s on %(hits)s"
+msgstr "Items %(first_on_page)s à %(last_on_page)s sur %(hits)s"
+
+#: templates/telemeta/inc/mediaitem_list.html:20
+msgid "Country/Continent"
+msgstr "Etat/Continent"
+
+#: templates/telemeta/inc/mediaitem_list.html:58
+msgid "No item"
+msgstr "Aucun item"
+
+#: templates/telemeta/inc/resource_list.html:7
+#, python-format
+msgid " from %(first_on_page)s to %(last_on_page)s on %(hits)s"
+msgstr " de %(first_on_page)s à %(last_on_page)s sur %(hits)s"
+
+#: templates/telemeta/inc/user_list.html:10
+msgid "Groups"
+msgstr "Groupes"
+
+#: templates/telemeta/registration/logged_out.html:6
+msgid "Thanks for spending some quality time with the Web site today."
+msgstr ""
+
+#: templates/telemeta/registration/logged_out.html:8
+msgid "Log in again"
+msgstr ""
+
+#: templates/telemeta/registration/password_change_done.html:3
+#: templates/telemeta/registration/password_change_form.html:4
+msgid "Documentation"
+msgstr "Documentation associée"
+
+#: templates/telemeta/registration/password_change_done.html:3
+#: templates/telemeta/registration/password_change_form.html:4
+msgid "Log out"
+msgstr "Déconnexion"
+
+#: templates/telemeta/registration/password_change_done.html:5
+msgid "Password change successful"
+msgstr ""
+
+#: templates/telemeta/registration/password_change_done.html:9
+msgid "Your password was changed."
+msgstr ""
+
+#: templates/telemeta/registration/password_change_form.html:6
+msgid "Password change"
+msgstr "Modification de mot de passe"
+
+#: templates/telemeta/registration/password_change_form.html:14
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/telemeta/registration/password_change_form.html:18
+msgid ""
+"Please enter your old password, for security's sake, and then enter your new "
+"password twice so we can verify you typed it in correctly."
+msgstr ""
+
+#: templates/telemeta/registration/password_change_form.html:24
+msgid "Old password"
+msgstr ""
+
+#: templates/telemeta/registration/password_change_form.html:29
+msgid "New password"
+msgstr ""
+
+#: templates/telemeta/registration/password_change_form.html:34
+msgid "Password (again)"
+msgstr "Mot de passe (encore)"
+
+#: templates/telemeta/registration/password_change_form.html:42
+#: templates/telemeta/registration/password_reset_confirm.html:20
+msgid "Change my password"
+msgstr ""
+
+#: templates/telemeta/registration/password_reset_complete.html:7
+msgid "Your password has been set.  You may go ahead and log in now."
+msgstr ""
+
+#: templates/telemeta/registration/password_reset_complete.html:10
+msgid "Log in"
+msgstr ""
+
+#: templates/telemeta/registration/password_reset_confirm.html:8
+msgid ""
+"Please enter your new password twice so we can verify you typed it in "
+"correctly."
+msgstr ""
+
+#: templates/telemeta/registration/password_reset_confirm.html:14
+msgid "New password:"
+msgstr ""
+
+#: templates/telemeta/registration/password_reset_confirm.html:16
+msgid "Confirm password:"
+msgstr ""
+
+#: templates/telemeta/registration/password_reset_confirm.html:24
+msgid "Password reset unsuccessful"
+msgstr ""
+
+#: templates/telemeta/registration/password_reset_confirm.html:25
+msgid ""
+"The password reset link was invalid, possibly because it has already been "
+"used.  Please request a new password reset."
+msgstr ""
+
+#: templates/telemeta/registration/password_reset_done.html:4
+msgid "Password reset successful"
+msgstr "Demande de réinitialisation de mot de passe envoyée"
+
+#: templates/telemeta/registration/password_reset_done.html:7
+msgid ""
+"We've e-mailed you instructions for setting your password to the e-mail "
+"address you submitted. You should be receiving it shortly."
+msgstr ""
+
+#: templates/telemeta/registration/password_reset_email.html:3
+msgid "You're receiving this e-mail because you requested a password reset"
+msgstr ""
+"Vous recevez cet e-mail car vous avez fait une demande de réinitialisation "
+"du mot de passe"
+
+#: templates/telemeta/registration/password_reset_email.html:4
+#, python-format
+msgid "for your user account at %(site_name)s"
+msgstr "de votre compte utilisateur du site %(site_name)s"
+
+#: templates/telemeta/registration/password_reset_email.html:6
+msgid "Please go to the following page and choose a new password:"
+msgstr ""
+
+#: templates/telemeta/registration/password_reset_email.html:10
+msgid "Your username, in case you've forgotten:"
+msgstr ""
+
+#: templates/telemeta/registration/password_reset_form.html:7
+msgid ""
+"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"instructions for setting a new one."
+msgstr ""
+
+#: templates/telemeta/registration/password_reset_form.html:11
+msgid "E-mail address:"
+msgstr ""
+
+#: templates/telemeta/registration/password_reset_form.html:11
+msgid "Reset my password"
+msgstr ""
+
+#: templatetags/telemeta_utils.py:259
+#, python-format
+msgid "%(count)d item"
+msgid_plural "%(count)d items"
+msgstr[0] "%(count)d item"
+msgstr[1] "%(count)d items"
+
+#: templatetags/telemeta_utils.py:262
+#, python-format
+msgid "%(count)d collection"
+msgid_plural "%(count)d collections"
+msgstr[0] "%(count)d collection"
+msgstr[1] "%(count)d collections"
+
+#: util/locale_fix.py:5
+msgid "My last changes"
+msgstr "Mes dernières modifications"
+
+#: util/locale_fix.py:6
+msgid "All last changes"
+msgstr "Toutes les dernières modifications"
+
+#: util/locale_fix.py:7
+msgid "My searches"
+msgstr "Mes recherches"
+
+#: util/locale_fix.py:8
+msgid "Children"
+msgstr "Enfants"
+
+#: util/locale_fix.py:9
+msgid "pattern"
+msgstr "mots clés"
+
+#: views/collection.py:49 views/home.py:90 views/item.py:110 views/item.py:488
+#: views/profile.py:68
+msgid "Access not allowed"
+msgstr "Accès non autorisé"
+
+#: views/feed.py:45
+msgid "Last changes"
+msgstr "Dernières modifications"
+
+#~ msgid "General informations"
+#~ msgstr "Informations générales"
+
+#~ msgid "attachment"
+#~ msgstr "rattachement"
+
+#, fuzzy
+#~ msgid "lieux types"
+#~ msgstr "lieux types"
+
+#~ msgid "domain"
+#~ msgstr "discipline"
+
+#, fuzzy
+#~ msgid "channel number"
+#~ msgstr "n° de l'item"
+
+#~ msgid "original format"
+#~ msgstr "support original"
+
+#, fuzzy
+#~ msgid "Password initialization"
+#~ msgstr "Mot de passe (encore)"
+
+#~ msgid "support number"
+#~ msgstr "n° du support"
+
+#~ msgid "General administration"
+#~ msgstr "Administration générale"
+
+#~ msgid "link"
+#~ msgstr "lien"
+
+#~ msgid "related"
+#~ msgstr "associés"
+
+#~ msgid "File"
+#~ msgstr "Fichier"
+
+#~ msgid "Comments / ethnographic context"
+#~ msgstr "Commentaires / contexte ethnographique"
+
+#~ msgid "Account"
+#~ msgstr "Compte"
+
+#~ 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"
+
+#~ msgid "Locations"
+#~ msgstr "Lieux"
+
+#~ msgid "resource type"
+#~ msgstr "type de ressource"
+
+#~ msgid "Visit the Telemeta open source project at"
+#~ msgstr "Visitez le projet libre Telemeta"
+
+#~ msgid "Marker"
+#~ msgstr "Marqueur"
+
+#~ msgid "item added to the selected playlist"
+#~ msgstr "item ajouté à la liste de lecture sélectionnée"

diff --git a/teleforma/locale/fr/LC_MESSAGES/djangojs.po b/teleforma/locale/fr/LC_MESSAGES/djangojs.po
index 3437005f8ff577b167a18470f5f25550a48abc25..9694f77ac42a234c2e6ac1fcc2487429a063beb9 100644 (file)
--- a/teleforma/locale/fr/LC_MESSAGES/djangojs.po
+++ b/teleforma/locale/fr/LC_MESSAGES/djangojs.po
@@ -29,3 +29,62 @@ msgstr "Vous devez atteindre le nombre de caractères requis."
 
 msgid "Characters"
 msgstr "Caractères"
+#: static/telemeta/js/locale.js:2
+msgid "title"
+msgstr "titre"
+
+#: static/telemeta/js/locale.js:3
+msgid "description"
+msgstr "description"
+
+#: static/telemeta/js/locale.js:4
+msgid "delete the marker permanently?"
+msgstr "supprimer le marqueur définitivement ?"
+
+#: static/telemeta/js/locale.js:5
+msgid "marker added to the selected playlist"
+msgstr "marqueur ajouté à la liste de lecture"
+
+#: static/telemeta/js/locale.js:6
+msgid "item added to the selected playlist"
+msgstr "item ajouté à la liste de lecture"
+
+#: static/telemeta/js/locale.js:7
+msgid "collection added to the selected playlist"
+msgstr "collection ajoutée à la liste de lecture"
+
+#: static/telemeta/js/locale.js:8
+msgid "resource added to the selected playlist"
+msgstr "ressource ajoutée à la liste de lecture"
+
+#: static/telemeta/js/locale.js:9
+msgid "there are unsaved or modified markers"
+msgstr "il y a des marqueurs modifiés ou non sauvegardés"
+
+#: static/telemeta/js/locale.js:10
+msgid "If you exit the page you will loose your changes"
+msgstr "Si vous sortez de la page, vous perdrez vos modifications"
+
+#: static/telemeta/js/locale.js:11
+msgid "author"
+msgstr "auteur"
+
+#: static/telemeta/js/locale.js:12
+msgid "Paste HTML to embed player in website"
+msgstr "Coller le code HTML pour inclure le lecteur dans un site"
+
+#: static/telemeta/js/locale.js:13
+msgid "delete the item permanently?"
+msgstr "supprimer l'item définitivement ?"
+
+#: static/telemeta/js/locale.js:14
+msgid "delete the collection permanently?"
+msgstr "supprimer la collection définitivement ?"
+
+#: static/telemeta/js/locale.js:15
+msgid "delete the playlist permanently?"
+msgstr "supprimer la liste de lecture définitivement ?"
+
+#: static/telemeta/js/locale.js:16
+msgid "delete the resource from the playlist permanently?"
+msgstr "supprimer la ressource de la liste de lecture définitivement ?"

diff --git a/teleforma/management/commands/teleforma-export-professors.py b/teleforma/management/commands/teleforma-export-professors.py
index 8ae5f4224445c34e8d44f2a7b79287dd008d2701..4b7d620b0a441718f0d783cef940d77ff4d77d0f 100644 (file)
--- a/teleforma/management/commands/teleforma-export-professors.py
+++ b/teleforma/management/commands/teleforma-export-professors.py
@@ -3,8 +3,6 @@ from django.conf import settings
 from django.core.management.base import BaseCommand, CommandError
 from django.contrib.auth.models import User
 from django.template.defaultfilters import slugify
-from telemeta.models import *
-from telemeta.util.unaccent import unaccent
 from teleforma.models import *
 import logging
 import json

diff --git a/teleforma/management/commands/teleforma-export-stream-m-slugs.py b/teleforma/management/commands/teleforma-export-stream-m-slugs.py
index ddb4a3e8d86b321a4222be1b4a7fa12cb9bcec2d..57f2a61366f754290fcee2e5b0074310a877972b 100644 (file)
--- a/teleforma/management/commands/teleforma-export-stream-m-slugs.py
+++ b/teleforma/management/commands/teleforma-export-stream-m-slugs.py
@@ -3,8 +3,6 @@ from django.conf import settings
 from django.core.management.base import BaseCommand, CommandError
 from django.contrib.auth.models import User
 from django.template.defaultfilters import slugify
-from telemeta.models import *
-from telemeta.util.unaccent import unaccent
 from teleforma.models import *
 import logging
 import json

diff --git a/teleforma/management/commands/teleforma-export-users.py b/teleforma/management/commands/teleforma-export-users.py
index 46ce32ba7077e35c7db08d21df330f5d1ee17b5d..7ec6f204349b05947dbae1597d2411c28973632a 100644 (file)
--- a/teleforma/management/commands/teleforma-export-users.py
+++ b/teleforma/management/commands/teleforma-export-users.py
@@ -3,8 +3,6 @@ from django.conf import settings
 from django.core.management.base import BaseCommand, CommandError
 from django.contrib.auth.models import User
 from django.template.defaultfilters import slugify
-from telemeta.models import *
-from telemeta.util.unaccent import unaccent
 from teleforma.models import *
 import logging
 import codecs

diff --git a/teleforma/management/commands/teleforma-import-courses-xls.py b/teleforma/management/commands/teleforma-import-courses-xls.py
index 755b0658cd37b881a2c94ce1fcca3900397e05e6..67b23b2a07280e55055b099b5b68697c7fadb384 100644 (file)
--- a/teleforma/management/commands/teleforma-import-courses-xls.py
+++ b/teleforma/management/commands/teleforma-import-courses-xls.py
@@ -3,8 +3,6 @@ from django.conf import settings
 from django.core.management.base import BaseCommand, CommandError
 from django.contrib.auth.models import User
 from django.template.defaultfilters import slugify
-from telemeta.models import *
-from telemeta.util.unaccent import unaccent
 from teleforma.models import *
 import logging
 import codecs

diff --git a/teleforma/management/commands/teleforma-import-courses.py b/teleforma/management/commands/teleforma-import-courses.py
index 41d4a3d5b711b17d20dbba2704a9793ebbb842b3..18cd3f07b233bab127158942f5dabf43b94b5fbe 100644 (file)
--- a/teleforma/management/commands/teleforma-import-courses.py
+++ b/teleforma/management/commands/teleforma-import-courses.py
@@ -3,8 +3,6 @@ from django.conf import settings
 from django.core.management.base import BaseCommand, CommandError
 from django.contrib.auth.models import User
 from django.template.defaultfilters import slugify
-from telemeta.models import *
-from telemeta.util.unaccent import unaccent
 from teleforma.models import *
 import logging
 import codecs

diff --git a/teleforma/management/commands/teleforma-import-professors.py b/teleforma/management/commands/teleforma-import-professors.py
index 75ea96c80172ed30cfc7eaa8175d8d0c3420e3a1..c2e6a33b399261e70faff61c00957aa91851ee9e 100644 (file)
--- a/teleforma/management/commands/teleforma-import-professors.py
+++ b/teleforma/management/commands/teleforma-import-professors.py
@@ -3,8 +3,6 @@ from django.conf import settings
 from django.core.management.base import BaseCommand, CommandError
 from django.contrib.auth.models import User
 from django.template.defaultfilters import slugify
-from telemeta.models import *
-from telemeta.util.unaccent import unaccent
 from teleforma.models import *
 import logging
 import json

diff --git a/teleforma/management/commands/teleforma-import-users-pb-debug.py b/teleforma/management/commands/teleforma-import-users-pb-debug.py
index 40f86d79fea4b92ed96b56aaad6ecb8097c1757c..10c5a3c7665904288de676a91d5813ba61b80857 100644 (file)
--- a/teleforma/management/commands/teleforma-import-users-pb-debug.py
+++ b/teleforma/management/commands/teleforma-import-users-pb-debug.py
@@ -3,8 +3,6 @@ from django.conf import settings
 from django.core.management.base import BaseCommand, CommandError
 from django.contrib.auth.models import User
 from django.template.defaultfilters import slugify
-from telemeta.models import *
-from telemeta.util.unaccent import unaccent
 from teleforma.models import *
 import logging
 import codecs

diff --git a/teleforma/management/commands/teleforma-import-users-pb.py b/teleforma/management/commands/teleforma-import-users-pb.py
index 93100089876fd40e8a00c1a8037456e4c85271dd..44802192d3e85cc2c4726c55535b013fe655f6e5 100644 (file)
--- a/teleforma/management/commands/teleforma-import-users-pb.py
+++ b/teleforma/management/commands/teleforma-import-users-pb.py
@@ -3,8 +3,6 @@ from django.conf import settings
 from django.core.management.base import BaseCommand, CommandError
 from django.contrib.auth.models import User
 from django.template.defaultfilters import slugify
-from telemeta.models import *
-from telemeta.util.unaccent import unaccent
 from teleforma.models import *
 import logging
 import codecs

diff --git a/teleforma/management/commands/teleforma-import-users.py b/teleforma/management/commands/teleforma-import-users.py
index b207d8f00af32fc95c193b336e5918cfb4c5c136..54aade8584e946815307e57cfd38eb825f9794a6 100644 (file)
--- a/teleforma/management/commands/teleforma-import-users.py
+++ b/teleforma/management/commands/teleforma-import-users.py
@@ -3,8 +3,6 @@ from django.conf import settings
 from django.core.management.base import BaseCommand, CommandError
 from django.contrib.auth.models import User
 from django.template.defaultfilters import slugify
-from telemeta.models import *
-from telemeta.util.unaccent import unaccent
 from teleforma.models import *
 import logging
 import codecs

diff --git a/teleforma/management/commands/teleforma-reset-all-passwords-with-mail-ae.py b/teleforma/management/commands/teleforma-reset-all-passwords-with-mail-ae.py
index 5eaca1144552f14cb19cbbe5b08f4b903ae038a8..54bd7d8e4b75af4f4c0bde7c520db12bf8b2e946 100644 (file)
--- a/teleforma/management/commands/teleforma-reset-all-passwords-with-mail-ae.py
+++ b/teleforma/management/commands/teleforma-reset-all-passwords-with-mail-ae.py
@@ -8,8 +8,6 @@ from django.template.defaultfilters import slugify
 from django.template.loader import render_to_string
 from django.core.mail import send_mail, mail_admins
 from django.utils import translation
-from telemeta.models import *
-from telemeta.util.unaccent import unaccent
 from teleforma.models import *
 import logging
 from postman import *

diff --git a/teleforma/management/commands/teleforma-reset-all-passwords-with-mail.py b/teleforma/management/commands/teleforma-reset-all-passwords-with-mail.py
index 73773adbbcd1bda6a1fe34db58b1d31d97970670..227955c5c5b8b8bddfae457ef30d8c0832ea1453 100644 (file)
--- a/teleforma/management/commands/teleforma-reset-all-passwords-with-mail.py
+++ b/teleforma/management/commands/teleforma-reset-all-passwords-with-mail.py
@@ -8,8 +8,6 @@ from django.template.defaultfilters import slugify
 from django.template.loader import render_to_string
 from django.core.mail import send_mail, mail_admins
 from django.utils import translation
-from telemeta.models import *
-from telemeta.util.unaccent import unaccent
 from teleforma.models import *
 import logging
 from postman import *

diff --git a/teleforma/management/commands/teleforma-reset-all-passwords.py b/teleforma/management/commands/teleforma-reset-all-passwords.py
index c37ed4d3c70f6054a4bec150168c89d4ecd4b0c4..3c98e7ac5a848525290437f956813823405d58c6 100644 (file)
--- a/teleforma/management/commands/teleforma-reset-all-passwords.py
+++ b/teleforma/management/commands/teleforma-reset-all-passwords.py
@@ -5,8 +5,6 @@ from django.contrib.auth.models import User
 from django.contrib.auth.forms import PasswordResetForm
 from django.contrib.auth.tokens import default_token_generator
 from django.template.defaultfilters import slugify
-from telemeta.models import *
-from telemeta.util.unaccent import unaccent
 from teleforma.models import *
 import logging
 import codecs
@@ -18,7 +16,7 @@ class Command(BaseCommand):
     admin_email = 'webmaster@parisson.com'
     from_email = 'webmaster@parisson.com'
 
-    def reset_password_email(self, email, template='telemeta/registration/password_reset_email.html'):
+    def reset_password_email(self, email, template='teleforma/registration/password_reset_email.html'):
         form = PasswordResetForm({'email': email})
         opts = {'from_email':self.from_email, 'email_template_name':template,
                          'token_generator': default_token_generator }

diff --git a/teleforma/pages/fr/help.rst.bak b/teleforma/pages/fr/help.rst.bak
new file mode 100644 (file)
index 0000000..dda9e6a
--- /dev/null
+++ b/teleforma/pages/fr/help.rst.bak
@@ -0,0 +1,75 @@
+Actualités
+==========
+
+ * 12/08 : MAJ des recommandations, ajout d'un bouton "play" sur les images de prévisualisation
+ * 01/08 : Commentaires ajoutés aux listes de conférences en différé, 10 matières au maximum affichées sur le bureau (utiliser le bloc matières de gauche)
+ * 26/07 : MAJ des recommandations, MAJ de la FAQ pour le téléchargement
+ * 21/07 : Problème de charge téléchargement fluidifié
+
+|
+
+Recommandations
+================
+
+Ce site est conforme aux standards ouverts du web comme le HTML5. Il est donc accessible depuis n'importe quel navigateur de bureau ou mobile.
+
+Néanmoins, le format des flux vidéo n'est peut-être pas compatible avec tous les navigateurs de vos appareils informatiques. Dans ce cas, nous vous conseillons vivement d'installer et d'utiliser le navigateur ouvert et gratuit `Chrome <https://www.google.com/chrome?hl=fr>`_  avec lequel nous garantissons tous nos accès multimédias, en direct, comme en différé. Aussi `Firefox <http://www.mozilla.org/fr/firefox/new/>`_ pourra lire les vidéos mais pas peut-être pas l'audio selon votre installation. Nous y travaillons. Safari, dans l'immédiat, ne vous permet pas de visionner les vidéos.
+
+En attendant que nous puissions convenir à tous les navigateurs demandés et si vous rencontrez des problèmes à la lecture des médias en streaming, nous vous recommandons alors de télécharger les archives à l'aide du boutton "Télécharger" de la conférence vidéo ou audio (voir la FAQ ci-dessous), puis de les relire avec le lecteur libre, gratuit et multi-plateforme : `VLC <http://www.videolan.org/vlc/>`_ (VideoLan). Voir aussi la FAQ ci-après.
+
+Pour la lecture des fichiers MP3 sur des réseaux à faible débit, en mobilité sur votre iPhone ou Android par exemple, tout lecteur audio basique devrait faire l'affaire après téléchargement de l'archive. Pour les vidéos, un lecteur compatible WebM est nécessaire (sur Android : le lecteur natif ou bien MX Player).
+
+Si vous voulez utiliser Internet Explorer, nous vous conseillons vivement de `le mettre à jour en version 9 <http://www.microsoft.com/france/windows/internet-explorer/telecharger-ie9.aspx/>`_ puis d'installer `l'extension WebM <https://tools.google.com/dlpage/webmmf/>`_ qui le rend compatible avec notre format vidéo ouvert.
+
+Enfin, Itunes lit seulement les fichiers audio MP3 téléchargés, pas les vidéos.
+
+|
+
+
+Démonstrations
+==============
+
+|
+
+.. raw:: html
+
+ <iframe width="420" height="315" src="http://www.youtube.com/embed/WEuRXPpT3XQ" frameborder="0" allowfullscreen></iframe>
+
+
+|
+|
+
+FAQ
+====
+
+Pourquoi les flux vidéos ne s'affichent pas correctement dans mon navigateur ?
+-------------------------------------------------------------------------------
+
+Comme expliqué plus haut dans les recommandations nous vous conseillons vivement d'installer et d'utiliser les navigateurs libres et gratuits `Firefox <http://www.mozilla.org/fr/firefox/new/>`_ ou `Chrome <https://www.google.com/chrome?hl=fr>`_ pour lesquels sont garantis tous les accès multi-média. Si vous utilisez Internet Explorer, merci d'installer le plugin libre et gratuit `WebM <https://tools.google.com/dlpage/webmmf/>`_ produit par Google.
+
+NEW : Je n'arrive pas à télécharger un fichier audio ou vidéo !?
+-------------------------------------------------------------------
+
+Pour fluidifier la transmission des fichiers, nous avons été contraints, depsui le 21/07, de désactiver le téléchargement automatique des fichiers lorsqu'on clique sur un bouton téléchargé. Vous pouvez néanmoins les récupérer en toute sécurité en suivant cette démarche :
+
+ * Sur Windows : cliquer sur l'icône "Télécharger" avec le bouton DROIT de la souris puis cliquer avec le bouton GAUCHE sur "Enregistrer la cible du lien sous" pour l'enregistrer dans un dossier.
+ * Sur Mac : appuyer sur CTRL avant de cliquer à l'aide du bouton de la souris sur le bouton "Télécharger"
+ * Sur Linux : procéder comme sur windows
+ * Sur smartphones : un clic long ou court sur le bouton "Télécharger" devrait fonctionner.
+
+Pour lire les videos une fois le téléchargement éffectué, choisissez `VLC <http://www.videolan.org/vlc/>`_.
+
+J'ai perdu mon mot de passe, que dois-je faire ?
+-------------------------------------------------------------------------------
+
+Vous pouvez à tout moment réinitialiser votre mot de passe personnel depuis l'accueil du site en cliquant sur "mot de passe oublié".
+
+|
+
+Support
+========
+
+Pour les questions relatives à votre formation CRFPA, veuillez `contacter un administrateur depuis la messagerie <http://e-learning.crfpa.pre-barreau.com/messages/write/admin-CRFPA>`_ ou bien par mail à l'adresse suivante : `admin-crfpa@pre-bareau.com <mailto:admin-crfpa@pre-bareau.com>`_
+
+Pour obtenir une aide technique, veuillez `contacter un technicien depuis la messagerie <http://e-learning.crfpa.pre-barreau.com/messages/write/admin-tech>`_. Merci de n'envoyer à ce support uniquement des questions relatives à la plateforme e-learning et aux problèmes informatiques. Les questions concernant votre formation ne seraient pas prises en compte. Envoyez un message à admin-CRFPA pour cela.
+

diff --git a/teleforma/static/teleforma/css/base.css b/teleforma/static/teleforma/css/base.css
index b2b51810509feacabf335023884a10cdde456391..3581536e5f17eec407f73c35bebe55d3a39052e8 100644 (file)
--- a/teleforma/static/teleforma/css/base.css
+++ b/teleforma/static/teleforma/css/base.css
@@ -567,8 +567,6 @@ color:#FFF;
 }
 #footer :link, #footer :visited { color: #FFF; }
 #footer hr { display: none }
-#footer #telemeta_powered { border: 0; float: left }
-#footer #telemeta_powered:hover { background: transparent }
 #footer p { margin: 0; }
 #footer p.left {
     float: left;

diff --git a/teleforma/static/teleforma/css/teleforma.css b/teleforma/static/teleforma/css/teleforma.css
index c79c66a6a4e3dafec851956a8490299d143895b6..c66bd554de5b68064666c6fc66ac37e28308fb1f 100644 (file)
--- a/teleforma/static/teleforma/css/teleforma.css
+++ b/teleforma/static/teleforma/css/teleforma.css
@@ -182,7 +182,6 @@ textarea {
     background-color:#ebebeb;
     background-repeat:repeat; 
        border-top: .25em solid #6a0307;
-/*     background: url("/static/telemeta/images/waves.png") 100% 0% no-repeat; */
 }
 
 #content_header, #header{
@@ -247,7 +246,6 @@ textarea {
 
 #collection_player {
     background: transparent;
-    /*     background-image: url(/static/telemeta/images/grid_bg_2.png); */
 }
 
 #collection_player .title {

diff --git a/teleforma/templates/registration/logged_out.html b/teleforma/templates/registration/logged_out.html
new file mode 100644 (file)
index 0000000..943c28b
--- /dev/null
+++ b/teleforma/templates/registration/logged_out.html
@@ -0,0 +1,10 @@
+{% extends "teleforma/base.html" %}
+{% load i18n %}
+
+{% block content %}
+
+<p>{% trans "Thanks for spending some quality time with the Web site today." %}</p>
+
+<p><a href="../">{% trans 'Log in again' %}</a></p>
+
+{% endblock %}

diff --git a/teleforma/templates/registration/password_change_done.html b/teleforma/templates/registration/password_change_done.html
new file mode 100644 (file)
index 0000000..b39cd4d
--- /dev/null
+++ b/teleforma/templates/registration/password_change_done.html
@@ -0,0 +1,11 @@
+{% extends "teleforma/base.html" %}
+{% load i18n %}
+{% block userlinks %}{% url django-admindocs-docroot as docsroot %}{% if docsroot %}<a href="{{ docsroot }}">{% trans 'Documentation' %}</a> / {% endif %}{% trans 'Change password' %} / <a href="../../logout/">{% trans 'Log out' %}</a>{% endblock %}
+
+{% block title %}<br />{% trans 'Password change successful' %}{% endblock %}
+
+{% block content %}
+
+<p>{% trans 'Your password was changed.' %}</p>
+
+{% endblock %}

diff --git a/teleforma/templates/registration/password_change_form.html b/teleforma/templates/registration/password_change_form.html
new file mode 100644 (file)
index 0000000..0703401
--- /dev/null
+++ b/teleforma/templates/registration/password_change_form.html
@@ -0,0 +1,49 @@
+{% extends "teleforma/base.html" %}
+{% load i18n adminmedia %}
+{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/forms.css" />{% endblock %}
+{% block userlinks %}{% url django-admindocs-docroot as docsroot %}{% if docsroot %}<a href="{{ docsroot }}">{% trans 'Documentation' %}</a> / {% endif %} {% trans 'Change password' %} / <a href="../logout/">{% trans 'Log out' %}</a>{% endblock %}
+
+{% block title %}<br />{% trans 'Password change' %}{% endblock %}
+
+{% block content %}<div id="content-main">
+
+<form id="password_change" action="" method="post">{% csrf_token %}
+<div>
+{% if form.errors %}
+    <p class="errornote">
+    {% blocktrans count form.errors.items|length as counter %}Please correct the error below.{% plural %}Please correct the errors below.{% endblocktrans %}
+    </p>
+{% endif %}
+
+<p>{% trans "Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly." %}</p>
+
+<fieldset class="aligned wide">
+
+<div class="form-row">
+    {{ form.old_password.errors }}
+    <label for="id_old_password" class="required">{% trans 'Old password' %}:</label>{{ form.old_password }}
+</div>
+
+<div class="form-row">
+    {{ form.new_password1.errors }}
+    <label for="id_new_password1" class="required">{% trans 'New password' %}:</label>{{ form.new_password1 }}
+</div>
+
+<div class="form-row">
+{{ form.new_password2.errors }}
+    <label for="id_new_password2" class="required">{% trans 'Password (again)' %}:</label>{{ form.new_password2 }}
+</div>
+
+</fieldset>
+
+<br />
+<div class="submit-row">
+   <a href="#" class="component_icon button icon_save"
+   onclick="document.getElementById('password_change').submit(); return false;">{% trans 'Change my password' %}</a>
+</div>
+
+<script type="text/javascript">document.getElementById("id_old_password").focus();</script>
+</div>
+</form></div>
+
+{% endblock %}

diff --git a/teleforma/templates/registration/password_reset_complete.html b/teleforma/templates/registration/password_reset_complete.html
new file mode 100644 (file)
index 0000000..b2343a3
--- /dev/null
+++ b/teleforma/templates/registration/password_reset_complete.html
@@ -0,0 +1,11 @@
+{% extends "teleforma/base.html" %}
+{% load i18n %}
+
+{% block title %}<br />{% trans 'Password reset complete' %}{% endblock %}
+
+{% block content %}
+<p>{% trans "Your password has been set.  You may go ahead and log in now." %}</p>
+
+<br />
+<p><a href="{{ login_url }}" class="component_icon button icon_login">{% trans "Log in" %}</a></p>
+{% endblock %}

diff --git a/teleforma/templates/registration/password_reset_confirm.html b/teleforma/templates/registration/password_reset_confirm.html
new file mode 100644 (file)
index 0000000..57bea4b
--- /dev/null
+++ b/teleforma/templates/registration/password_reset_confirm.html
@@ -0,0 +1,28 @@
+{% extends "teleforma/base.html" %}
+{% load i18n %}
+
+{% block title %}<br />{% trans 'Password reset' %}{% endblock %}
+
+{% block content %}
+{% if validlink %}
+<p>{% trans "Please enter your new password twice so we can verify you typed it in correctly." %}</p>
+
+<br />
+
+<form id="password_confirm" action="" method="post">{% csrf_token %}
+<table><tr>
+<td>{{ form.new_password1.errors }}<p class="aligned wide"><label for="id_new_password1">{% trans 'New password:' %}</label></td><td>{{ form.new_password1 }}</p></td></tr>
+<tr><td>{{ form.new_password2.errors }}
+<p class="aligned wide"><label for="id_new_password2">{% trans 'Confirm password:' %}</label></td><td>{{ form.new_password2 }}</p></td>
+</tr></table>
+
+<br /><br />
+<p><a href="#" class="component_icon button icon_save" onclick="document.getElementById('password_confirm').submit(); return false;">{% trans 'Change my password' %}</a></p>
+</form>
+
+{% else %}
+<h1>{% trans 'Password reset unsuccessful' %}</h1>
+<p>{% trans "The password reset link was invalid, possibly because it has already been used.  Please request a new password reset." %}</p>
+
+{% endif %}
+{% endblock %}

diff --git a/teleforma/templates/registration/password_reset_done.html b/teleforma/templates/registration/password_reset_done.html
new file mode 100644 (file)
index 0000000..4e538e0
--- /dev/null
+++ b/teleforma/templates/registration/password_reset_done.html
@@ -0,0 +1,8 @@
+{% extends "teleforma/base.html" %}
+{% load i18n %}
+
+{% block title %}<br />{% trans "Password reset successful" %}{% endblock %}
+
+{% block content %}
+<p>{% trans "We've e-mailed you instructions for setting your password to the e-mail address you submitted. You should be receiving it shortly." %}</p>
+{% endblock %}

diff --git a/teleforma/templates/registration/password_reset_email.html b/teleforma/templates/registration/password_reset_email.html
new file mode 100644 (file)
index 0000000..2db4520
--- /dev/null
+++ b/teleforma/templates/registration/password_reset_email.html
@@ -0,0 +1,15 @@
+{% load teleforma_tags %}{% load i18n %}{% autoescape off %}{% trans "Hello" %},
+
+{% trans "You're receiving this e-mail because you requested a password reset" %}
+{% blocktrans %}for your user account at {{ site_name }}{% endblocktrans %}.
+
+{% trans "Please go to the following page and choose a new password:" %}
+{% block reset_link %}
+{{ protocol }}://{{ domain }}{% url teleforma-password-reset-confirm uidb36=uid token=token %}
+{% endblock %}
+{% trans "Your username, in case you've forgotten:" %} {{ user.username }}
+
+{% trans "Best regards" %},
+{% trans "The site administrator" %} {% trans "of the" %} {% organization %}
+
+{% endautoescape %}

diff --git a/teleforma/templates/registration/password_reset_form.html b/teleforma/templates/registration/password_reset_form.html
new file mode 100644 (file)
index 0000000..a297f98
--- /dev/null
+++ b/teleforma/templates/registration/password_reset_form.html
@@ -0,0 +1,13 @@
+{% extends "teleforma/base.html" %}
+{% load i18n %}
+
+{% block title %}<br />{% trans "Password reset" %}{% endblock %}
+
+{% block content %}
+<p>{% trans "Forgotten your password? Enter your e-mail address below, and we'll e-mail instructions for setting a new one." %}</p>
+
+<form id="password_reset" action="" method="post">{% csrf_token %}
+{{ form.email.errors }}
+<p><label for="id_email">{% trans 'E-mail address:' %}</label> {{ form.email }} <a href="#" class="component_icon button icon_ok" onclick="document.getElementById('password_reset').submit(); return false;">{% trans 'Reset my password' %}</a></p>
+</form>
+{% endblock %}

diff --git a/teleforma/templates/teleforma/course.html b/teleforma/templates/teleforma/course.html
index 65d2f05dcc3bfbf87e2a5a05b94d14979d5dc6ec..589539cf99d72d3a88b27d6191e2f813578b48ff 100644 (file)
--- a/teleforma/templates/teleforma/course.html
+++ b/teleforma/templates/teleforma/course.html
@@ -36,7 +36,7 @@
 </tr>
 {% for media in course.media.all %}
 <tr {% if not forloop.counter0|divisibleby:"2" %}class="odd"{% endif %}>
-<td><a href="{% url telemeta-item-detail media.item.public_id %}">{{ media.item.title }}</a></td>
+<td><a href="{% url teleforma-item-detail media.item.public_id %}">{{ media.item.title }}</a></td>
 <td>{{ media.item.description }}</td>
 <td>{{ media.date_added }}</td>
 </tr>

diff --git a/teleforma/templates/teleforma/lists.html b/teleforma/templates/teleforma/lists.html
index e99db614c3222b998de8e2c11df11f2203272741..14f2ef0a754ddde173a233150f87b04b836880b1 100644 (file)
--- a/teleforma/templates/teleforma/lists.html
+++ b/teleforma/templates/teleforma/lists.html
@@ -53,8 +53,8 @@
             <td style="border-bottom:1px solid #6A0307;color:#6A0307;font-size: 100%">{{ playlist.playlist.title }}</td>
             <td style="width:86ex; padding-right: 0; border-bottom:1px solid #6A0307; text-align:right">
             <a href="#" id="{{playlist.playlist.public_id}}" onclick="playlistUtils.showEdit(this, this.id); return false;" class="component_icon button icon_edit">{% trans "Edit" %}</a>
-                <a href="{% url telemeta-playlist-csv-export playlist.playlist.public_id 'collections' %}" class="component_icon button icon_csv">CSV Collections</a>
-                <a href="{% url telemeta-playlist-csv-export playlist.playlist.public_id 'items' %}" class="component_icon button icon_csv">CSV Items</a>
+                <a href="{% url teleforma-playlist-csv-export playlist.playlist.public_id 'collections' %}" class="component_icon button icon_csv">CSV Collections</a>
+                <a href="{% url teleforma-playlist-csv-export playlist.playlist.public_id 'items' %}" class="component_icon button icon_csv">CSV Items</a>
                 <a href="#" id="{{playlist.playlist.public_id}}" onclick="if(confirm(gettrans('delete the playlist permanently?'))){playlistUtils.remove(this.id);};return false;" class="component_icon button icon_cancel">{% trans "Delete" %}</a>
             </td>
         </tr>
@@ -78,16 +78,16 @@
         <tr {% if not forloop.counter0|divisibleby:"2" %}class="odd"{% endif %}>
             <td>
                 {% if resource.type == "item" and not resource.element == None %}
-                <a href="{% url telemeta-item-detail resource.element.public_id %}">{{ resource.element }}</a>
+                <a href="{% url teleforma-item-detail resource.element.public_id %}">{{ resource.element }}</a>
                 {% endif %}
                 {% if resource.type == "collection" and not resource.element == None %}
-                <a href="{% url telemeta-collection-detail resource.element.public_id %}">{% if resource.element.title %}{{ resource.element.title }}{% else %}{{ resource.element }}{% endif %}</a>
+                <a href="{% url teleforma-collection-detail resource.element.public_id %}">{% if resource.element.title %}{{ resource.element.title }}{% else %}{{ resource.element }}{% endif %}</a>
                 {% endif %}
                 {% if resource.type == "marker" and not resource.element == None  %}
-                <a href="{% url telemeta-item-detail-marker resource.element.public_id %}">{{ resource.element }}</a>
+                <a href="{% url teleforma-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>
+                <a href="{% url teleforma-resource-detail resource.type resource.element.public_id %}">{{ resource.element.title }}</a>
                 {% endif %}
                 {% if resource.element == None %}{% trans "deleted" %}{% endif %}
             </td>

diff --git a/teleforma/templates/teleforma/search_criteria.html b/teleforma/templates/teleforma/search_criteria.html
index cbdc0cfecf64e19bbc4cf3adc7bec226dfceb820..d9fcffe840c55e077c791e4fc7884e804639287c 100644 (file)
--- a/teleforma/templates/teleforma/search_criteria.html
+++ b/teleforma/templates/teleforma/search_criteria.html
@@ -5,7 +5,7 @@
 
 {% block stylesheets %}
 {{ block.super }}
-<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}telemeta/css/jquery.autocomplete.css" />
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}teleforma/css/jquery.autocomplete.css" />
 {% endblock %}
 
 {% block extra_javascript %}

diff --git a/teleforma/urls.py b/teleforma/urls.py
index 82ffca49c7cdf0132a1ec47183bdacf8d099eb26..6d8fa13bdb1d08d7505eed273770ee7bf6199ef3 100644 (file)
--- a/teleforma/urls.py
+++ b/teleforma/urls.py
@@ -55,12 +55,27 @@ urlpatterns = patterns('',
     url(r'^$', SeminarsView.as_view(), name="home"),
     url(r'^login/$', 'django.contrib.auth.views.login', {'template_name': 'telemeta/login.html', 'authentication_form': AuthenticationForm },
         name="teleforma-login"),
-    url(r'^accounts/login/$', 'django.contrib.auth.views.login', {'template_name': 'telemeta/login.html', 'authentication_form': AuthenticationForm },
-        name="teleforma-login"),
-#    url(r'^accounts/login/$', 'django.contrib.auth.views.login', {'authentication_form': AuthenticationForm}),
+    url(r'^accounts/login/$', 'django.contrib.auth.views.login', {'template_name': 'teleforma/login.html'},
+        name="auth_login"),
+    url(r'^logout/$', 'django.contrib.auth.views.logout', name="teleforma-logout"),
+
+    url(r'^users/(?P<username>[A-Za-z0-9+@._-]+)/profile/$', profile_view.profile_detail,
+                               name="teleforma-profile-detail"),
+    url(r'^accounts/(?P<username>[A-Za-z0-9+@._-]+)/profile/$', profile_view.profile_detail, name="teleforma-profile-detail"),
+    url(r'^accounts/(?P<username>[A-Za-z0-9+@._-]+)/profile/edit/$', profile_view.profile_edit, name="teleforma-profile-edit"),
+    
+    # Registration
+    url(r'^accounts/password_change/$', 'django.contrib.auth.views.password_change', {'template_name': 'registration/password_change_form.html'}, name="teleforma-password-change"),
+    url(r'^accounts/password_change_done/$', 'django.contrib.auth.views.password_change_done', {'template_name': 'registration/password_change_done.html'}, name="teleforma-password-change-done"),
+
+    url(r'^accounts/password_reset/$', 'django.contrib.auth.views.password_reset', {'template_name': 'registration/password_reset_form.html', 'email_template_name': 'registration/password_reset_email.html'}, name="teleforma-password-reset"),
+    url(r'^accounts/password_reset_done/$', 'django.contrib.auth.views.password_reset_done', {'template_name': 'registration/password_reset_done.html'}, name="teleforma-password-reset-done"),
+    url(r'^accounts/password_reset_confirm/(?P<uidb36>[A-Za-z0-9._-]+)/(?P<token>[A-Za-z0-9._-]+)/$', 'django.contrib.auth.views.password_reset_confirm', {'template_name': 'registration/password_reset_confirm.html'}, name="teleforma-password-reset-confirm"),
+    url(r'^accounts/password_reset_complete/$', 'django.contrib.auth.views.password_reset_complete', {'template_name': 'registration/password_reset_complete.html'}, name="teleforma-password-reset-complete"),
+    url(r'^accounts/password_reset_complete/$', 'django.contrib.auth.views.password_reset_complete', {'template_name': 'registration/password_reset_complete.html'}, name="teleforma-password-reset-complete"),
+
 
-    # Telemeta
-    url(r'^', include('telemeta.urls')),
+    url(r'^captcha/', include('captcha.urls')),
 
     # Help
     url(r'^help/$', HelpView.as_view(), name="teleforma-help"),

diff --git a/teleforma/views/crfpa.py b/teleforma/views/crfpa.py
index e83442f0d8cfb24c95cb27ea4a4f61157967b2da..5e57d9cf6d5c45c31091b0a8dd3114fb11e77c65 100644 (file)
--- a/teleforma/views/crfpa.py
+++ b/teleforma/views/crfpa.py
@@ -112,7 +112,7 @@ def get_crfpa_courses(user, date_order=False, num_order=False):
 class UsersView(ListView):
 
     model = User
-    template_name='telemeta/users.html'
+    template_name='teleforma/users.html'
     context_object_name = 'users'
     #paginate_by = 12
 
@@ -302,3 +302,19 @@ class UsersXLSExport(object):
         self.users = User.objects.filter(student__training__courses__in=course)
         return self.export(request)
 
+    @method_decorator(login_required)
+    def profile_detail(self, request, username, template='teleforma/profile_detail.html'):
+        user = User.objects.get(username=username)
+        try:
+            profile = user.get_profile()
+        except:
+            profile = None
+        student = user.student.all()
+        payment = None
+        if student and (user.username == request.user.username or request.user.is_superuser):
+            student = user.student.get()
+            payment = student.payments.order_by('-id').all()
+            if payment:
+                payment = payment[0]
+
+        return render(request, template, {'profile' : profile, 'usr': user, 'payment':payment})

diff --git a/teleforma/views/profile.py b/teleforma/views/profile.py
index 3ef63a6f4d33233f7b8bb310c978f0cf4162c61a..5e5015d788b2ec67cd5809557b3df957296b0858 100644 (file)
--- a/teleforma/views/profile.py
+++ b/teleforma/views/profile.py
@@ -45,20 +45,17 @@ class ProfileView(object):
     """Provide Collections web UI methods"""
 
     @method_decorator(login_required)
-    def profile_detail(self, request, username, template='telemeta/profile_detail.html'):
+    def profile_detail(self, request, username, template='teleforma/profile_detail.html'):
         user = User.objects.get(username=username)
         try:
             profile = user.get_profile()
         except:
             profile = None
-        playlists = get_playlists(request, user)
-        user_revisions = get_revisions(25, user)
 
-        return render(request, template, {'profile' : profile, 'usr': user, 'playlists': playlists,
-                                          'user_revisions': user_revisions})
+        return render(request, template, {'profile' : profile, 'usr': user})
 
     @method_decorator(login_required)
-    def profile_edit(self, request, username, template='telemeta/profile_edit.html'):
+    def profile_edit(self, request, username, template='teleforma/profile_edit.html'):
         if request.user.is_superuser:
             user_hidden_fields = ['profile-user', 'user-password', 'user-last_login', 'user-date_joined']
         else:
@@ -72,7 +69,7 @@ class ProfileView(object):
             title = ugettext('User profile') + ' : ' + username + ' : ' + mess
             description = ugettext('Please login or contact the website administator to get a private access.')
             messages.error(request, title)
-            return render(request, 'telemeta/messages.html', {'description' : description})
+            return render(request, 'teleforma/messages.html', {'description' : description})
 
         try:
             profile = user.get_profile()
@@ -85,7 +82,7 @@ class ProfileView(object):
             if user_form.is_valid() and profile_form.is_valid():
                 user_form.save()
                 profile_form.save()
-                return redirect('telemeta-desk-profile', username)
+                return redirect('teleforma-desk-profile', username)
         else:
             user_form = UserChangeForm(instance=user, prefix='user')
             profile_form = UserProfileForm(instance=profile, prefix='profile')