From cdef5276a8de3356b26cfafe9e1b0c1d0a528475 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Tue, 22 Dec 2015 01:29:54 +0100 Subject: [PATCH] add CREM special parameters --- app/sandbox/settings.py | 17 +++++++++-------- telemeta/pages | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/app/sandbox/settings.py b/app/sandbox/settings.py index d86be712..5ec17b94 100644 --- a/app/sandbox/settings.py +++ b/app/sandbox/settings.py @@ -184,10 +184,11 @@ AUTHENTICATION_BACKENDS = ( SESSION_ENGINE = "django.contrib.sessions.backends.signed_cookies" -TELEMETA_ORGANIZATION = 'Telemeta' -TELEMETA_SUBJECTS = ('Telemeta', 'web', 'platform', 'audio', 'semantics') -TELEMETA_DESCRIPTION = "Open web audio platform with semantics" -TELEMETA_LOGO = STATIC_URL + 'telemeta/images/logo_telemeta_2.png' + +TELEMETA_ORGANIZATION = 'CREM-CNRS' +TELEMETA_SUBJECTS = ('Ethnomusicology', 'Research') +TELEMETA_DESCRIPTION = "Sound archives of the CNRS and the Musee de l'Homme. Research Centre of Ethnomusicology (CREM), University of Paris 10" +TELEMETA_LOGO = STATIC_URL + 'telemeta/images/logo_crem.png' TELEMETA_GMAP_KEY = 'ABQIAAAArg7eSfnfTkBRma8glnGrlxRVbMrhnNNvToCbZQtWdaMbZTA_3RRGObu5PDoiBImgalVnnLU2yN4RMA' @@ -203,10 +204,10 @@ TELEMETA_DOWNLOAD_FORMATS = ('wav', 'mp3', 'ogg', 'flac') TELEMETA_PUBLIC_ACCESS_PERIOD = 51 TELEMETA_STRICT_CODE = False -COLLECTION_PUBLISHED_CODE_REGEX = '*' -COLLECTION_UNPUBLISHED_CODE_REGEX = '*' -ITEM_PUBLISHED_CODE_REGEX = COLLECTION_PUBLISHED_CODE_REGEX + '' -ITEM_UNPUBLISHED_CODE_REGEX = COLLECTION_UNPUBLISHED_CODE_REGEX + '' +COLLECTION_PUBLISHED_CODE_REGEX = 'CNRSMH_E_[0-9]{4}(?:_[0-9]{3}){2}' +COLLECTION_UNPUBLISHED_CODE_REGEX = 'CNRSMH_I_[0-9]{4}_[0-9]{3}' +ITEM_PUBLISHED_CODE_REGEX = COLLECTION_PUBLISHED_CODE_REGEX + '(?:_[0-9]{2,3}){1,2}' +ITEM_UNPUBLISHED_CODE_REGEX = COLLECTION_UNPUBLISHED_CODE_REGEX + '_[0-9]{2,3}(?:_[0-9]{2,3}){0,2}' AUTH_PROFILE_MODULE = 'telemeta.userprofile' SESSION_EXPIRE_AT_BROWSER_CLOSE = False diff --git a/telemeta/pages b/telemeta/pages index db808781..4fcb6022 160000 --- a/telemeta/pages +++ b/telemeta/pages @@ -1 +1 @@ -Subproject commit db808781ec542f93af7d4be788b75a8cd1bddb1b +Subproject commit 4fcb6022f8a1cf0780fc526737e84b8e690c1f88 -- 2.39.5