From: yomguy <yomguy@3bf09e05-f825-4182-b9bc-eedd7160adf0>
Date: Tue, 17 May 2011 08:41:53 +0000 (+0000)
Subject: update crem settings and pages
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=88946f24c2dc275f1ae4beadac368992e50d76b4;p=telemeta-data.git

update crem settings and pages



git-svn-id: http://svn.parisson.org/svn/crem@181 3bf09e05-f825-4182-b9bc-eedd7160adf0
---

diff --git a/trunk/django/settings.py b/trunk/django/settings.py
index dfd460f..834d4ec 100644
--- a/trunk/django/settings.py
+++ b/trunk/django/settings.py
@@ -115,11 +115,11 @@ LOCALE_PATHS = (
 )
 
 
-TELEMETA_ORGANIZATION = 'Parisson'
-TELEMETA_SUBJECTS = ('telemeta', 'tests')
+TELEMETA_ORGANIZATION = 'CREM'
+TELEMETA_SUBJECTS = ('Ethnomusicology', 'Research')
 #TELEMETA_GMAP_KEY = 'ABQIAAAArg7eSfnfTkBRma8glnGrlxTTmRMP7-eYZsBYJ-PvZl_yIepBeRTkyT5vhsplIufBBcU2b3jjLSsn2A'
 TELEMETA_GMAP_KEY = 'ABQIAAAArg7eSfnfTkBRma8glnGrlxRVbMrhnNNvToCbZQtWdaMbZTA_3RRGObu5PDoiBImgalVnnLU2yN4RMA'
-TELEMETA_DOWNLOAD_ENABLED = False
+TELEMETA_DOWNLOAD_ENABLED = True
 TELEMETA_STREAMING_FORMATS = ('mp3', 'ogg')
 TELEMETA_PUBLIC_ACCESS_PERIOD = 51
 AUTH_PROFILE_MODULE = 'telemeta.userprofile'
diff --git a/trunk/django/telemeta-pages/en/legal_notices.rst b/trunk/django/telemeta-pages/en/legal_notices.rst
new file mode 100644
index 0000000..277d93d
--- /dev/null
+++ b/trunk/django/telemeta-pages/en/legal_notices.rst
@@ -0,0 +1,36 @@
+=====================
+Legal Notices
+=====================
+
+**Site editor:**
+
+ | Centre de Recherche en Ethnomusicologie (CREM - LESC UMR 7186 CNRS) 
+ | MAE - 21, allée de l'Université
+ | 2023 Nanterre cedex
+ | France
+
+**Managing editor:**
+
+ | Jean Lambert (director du CREM)
+ | e-mail : lambert (at) mnhn.fr
+
+**Design and project manager:**
+
+ | Joséphine Simonnot (CREM)
+ | e-mail : josephine.simonnot (at) mae.u-paris10.fr
+ 
+**Head of archives at CREM :**
+
+ | Aude Da Cruz-Lima (CREM)
+ | e-mail : aude.da-cruz-lima (at) mae.u-paris10.fr
+ 
+**Design and head of development:**
+
+ | Guillaume Pellerin (`Parisson <http://parisson.com>`_)
+ | e-mail : guillaume.pellerin (at) parisson.com
+
+| **AUDIO FILE COPYING FORBIDDEN IF NOT EXPLICITLY ALLOWED**
+| **COMMERCIAL USING OF THE ARCHIVES FORBIDDEN IF NOT EXPLICITLY ALLOWED**
+
+
+
diff --git a/trunk/django/telemeta-pages/fr/legal_notices.rst b/trunk/django/telemeta-pages/fr/legal_notices.rst
index 39bfa8a..8efa86b 100644
--- a/trunk/django/telemeta-pages/fr/legal_notices.rst
+++ b/trunk/django/telemeta-pages/fr/legal_notices.rst
@@ -7,6 +7,7 @@ Mentions Légales
  | Centre de Recherche en Ethnomusicologie (CREM - LESC UMR 7186 CNRS) 
  | MAE - 21, allée de l'Université
  | 2023 Nanterre cedex
+ | France
 
 **Directeur de publication :**
 
@@ -28,8 +29,8 @@ Mentions Légales
  | Guillaume Pellerin (`Parisson <http://parisson.com>`_)
  | e-mail : guillaume.pellerin (at) parisson.com
 
-| **COPIE DES ARCHIVES SONORES INTERDITE**
-| **UTILISATION COMMERCIALE DES ARCHIVES SONORES INTERDITE**
+| **COPIE DES ARCHIVES SONORES INTERDITE SI PAS EXPLICITEMENT AUTORISÉ**
+| **UTILISATION COMMERCIALE DES ARCHIVES SONORES INTERDITE SI PAS EXPLICITEMENT AUTORISÉ**