]> git.parisson.com Git - mezzo.git/commitdiff
Reorganize settings
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 22 Mar 2017 23:33:33 +0000 (00:33 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 22 Mar 2017 23:33:33 +0000 (00:33 +0100)
app/local_settings.py
app/settings.py
lib/mezzanine-agenda

index 8ee6dc75350920776379c13eeeefc0698463f4af..ac9f6c4b151d960896fabedef1e6c7a342fb0aec 100644 (file)
@@ -34,220 +34,19 @@ ADMINS = (
 SECRET_KEY = "j1qa@u$5kzeofiheoppoh@-j@*-80t$)ht!4-=ybz1xc%@3+r(r&tzefoih"
 NEVERCACHE_KEY = "m)u^%r@uez$ze##$1ogx)uy4hv93dbzt%c3@xi=^gifoj8paozijdihazefd"
 
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.postgresql_psycopg2',
-        'NAME': 'postgres',
-        'USER': 'postgres',
-        'PASSWORD': os.environ.get('DB_ENV_POSTGRES_PASSWORD'),
-        'HOST': 'db',
-        'PORT': '5432',
-    },
-}
-
-# EXTENSIONS AND FORMATS
-# Allowed Extensions for File Upload. Lower case is important.
-FILEBROWSER_EXTENSIONS = {
-    'Folder': [''],
-    'Image': ['.jpg', '.jpeg', '.gif', '.png', '.tif', '.tiff'],
-    'Document': ['.pdf', '.doc', '.rtf', '.txt', '.xls', '.csv', '.docx'],
-    'Video': ['.mov', '.wmv', '.mpeg', '.mpg', '.avi', '.rm'],
-    'Audio': ['.mp3', '.mp4', '.wav', '.aiff', '.midi', '.m4p']
-    }
-
-# Define different formats for allowed selections.
-# This has to be a subset of EXTENSIONS.
-# e.g., add ?type=image to the browse-URL ...
-FILEBROWSER_SELECT_FORMATS = {
-    'File': ['Folder', 'Document'],
-    'Image': ['Image'],
-    'Media': ['Video', 'Audio'],
-    'Audio': ['Audio'],
-    'Document': ['Document'],
-    # for TinyMCE we can also define lower-case items
-    'image': ['Image'],
-    'file': ['Folder', 'Image', 'Document'],
-    'media': ['Video', 'Audio'],
-    'audio': ['Audio'],
-}
-
 EMAIL_HOST = 'smtp.ircam.fr'
 EMAIL_PORT = '25'
 DEFAULT_FROM_EMAIL = 'vertigo@iuk.fraunhofer.de'
 DEFAULT_TO_EMAIL = 'vertigo@iuk.fraunhofer.de'
-EMAIL_SUBJECT_PREFIX = '[Vertigo]'
-
-SITE_TITLE = 'IRCAM'
-SITE_TAGLINE = 'Institut de Recherche et de Coordination Acoustique et Musique'
-
-SILENCED_SYSTEM_CHECKS = ['fields.W342',]
-
-ADMIN_MENU_ORDER = (
-    (_('Pages'), ('pages.Page', 'organization-pages.Home',
-                 'organization-core.LinkType')),
-    (_('Media'), ('organization-media.Media',
-                  'organization-media.Playlist',
-                  'organization-media.LiveStreaming',
-                 'organization-media.MediaCategory',
-                 (_('Media Library'), 'fb_browse'),
-                 )),
-    (_('Events'), ('mezzanine_agenda.Event',
-                  'mezzanine_agenda.EventLocation',
-                  'mezzanine_agenda.EventPrice',
-                  'mezzanine_agenda.EventCategory',
-                  'organization-agenda.EventPublicType',
-                  'organization-agenda.EventTrainingLevel',
-                  'generic.Keyword',
-                  )),
-    (_('Magazine'), ('organization-magazine.Article',
-                    'organization-magazine.Brief',)),
-    (_('Network'), ('organization-network.Organization',
-                    'organization-network.OrganizationLinked',
-                    'organization-network.Department',
-                    'organization-network.Team',
-                    'organization-network.Person',
-                    'organization-network.Activity',
-                    'organization-network.OrganizationType',
-                    'organization-network.PersonListBlock',
-                    )),
-    (_('Activity'), ('organization-network.PersonActivity',
-                    'organization-network.ActivityStatusFamily',
-                    'organization-network.ActivityStatus',
-                    'organization-network.ActivityGrade',
-                    'organization-network.ActivityFramework',
-                    'organization-network.ActivityFunction',
-                    'organization-network.TrainingType',
-                    'organization-network.TrainingTopic',
-                    'organization-network.TrainingLevel',
-                    'organization-network.TrainingSpeciality',
-                    )),
-    (_('Timesheet'), ('organization-network.ActivityWeeklyHourVolume',
-                     'organization-network.PersonActivityTimeSheet'
-                    )),
-    (_('Projects'), ('organization-projects.Project',
-                    'organization-projects.ProjectCall',
-                    'organization-projects.ProjectProgram',
-                    'organization-projects.ProjectProgramType',
-                    'organization-projects.ProjectTopic',
-                    'organization-projects.ProjectProgramType',
-                    'organization-projects.ProjectDemo',
-                    'organization-projects.Repository',
-                    'organization-projects.RepositorySystem',
-                    'organization-projects.ProjectWorkPackage'
-                    )),
-    (_('Shop'), ('shop.Product',
-                    'organization-shop.ProductList',
-                    'shop.Order',
-                    'shop.DiscountCode',
-                    'shop.Sale',
-                    )),
-    (_('Jobs'), ('organization-job.JobOffer','organization-job.Candidacy')),
-    (_('Users'), ('auth.User', 'auth.Group',)),
-    (_('Site'), ('sites.Site', 'redirects.Redirect', 'conf.Setting')),
-)
-
-DASHBOARD_TAGS = ( ("mezzanine_tags.app_list",), (), ("mezzanine_tags.recent_actions",), )
-
-GRAPPELLI_ADMIN_TITLE = 'IRCAM Admin'
-
-SEARCH_MODEL_CHOICES = ('organization-pages.CustomPage',
-                        'organization-network.DepartmentPage',
-                        'organization-network.TeamPage',
-                        'organization-network.Person',
-                        'organization-projects.ProjectTopicPage',
-                        'pages.Page',
-                        'organization-media.Playlist',
-                        'mezzanine_agenda.Event',
-                        'organization-projects.Project',
-                        'shop.Product')
-
-
-PAGES_MODELS = ('organization-pages.CustomPage',
-                'organization-magazine.Topic',
-                'organization-network.DepartmentPage',
-                'organization-network.TeamPage',
-                'organization-projects.ProjectTopicPage',
-                'shop.Product')
-
-PAGES_PUBLISHED_INCLUDE_LOGIN_REQUIRED = True
+EMAIL_SUBJECT_PREFIX = '[VERTIGO]'
 
-SEARCH_PER_PAGE = 10
-MAX_PAGING_LINKS = 10
-DAL_MAX_RESULTS = 20
+SITE_TITLE = 'VERTIGO'
+SITE_TAGLINE = 'VERTIGO / STARTS'
 
-RATINGS_ACCOUNT_REQUIRED = True
-
-import warnings
-warnings.filterwarnings(
-        'ignore', r"DateTimeField .* received a naive datetime",
-        RuntimeWarning, r'django\.db\.models\.fields')
-
-EVENT_SLUG = 'agenda'
-EVENT_GOOGLE_MAPS_DOMAIN = 'maps.google.fr'
-EVENT_PER_PAGE = 50
-EVENT_USE_FEATURED_IMAGE = True
 EVENT_DOMAIN = "//eve.ircam.fr"
 EVENT_SHOP_URL = EVENT_DOMAIN+"/pub.php/event/%d/edit"
 EVENT_PASS_URL = EVENT_DOMAIN+"/pub.php/pass/"
 EVENT_CONFIRMATION_URL = EVENT_DOMAIN+"/pub.php/cart/done?transaction_id=%s"
-EVENT_EXCLUDE_TAG_LIST = [ ]
-PAST_EVENTS = True
-
-TINYMCE_SETUP_JS = "/static/js/tinymce_setup.js"
-
-SLUGIFY = 'django.template.defaultfilters.slugify'
-
-BLOG_SLUG = 'article'
-BLOG_POST_PER_PAGE = 200
-ARTICLE_PER_PAGE = 10
-MEDIA_PER_PAGE = 9
-
-# The numeric mode to set newly-uploaded files to. The value should be
-# a mode you'd pass directly to os.chmod.
-FILE_UPLOAD_PERMISSIONS = 0o664
-FILE_UPLOAD_TEMP_DIR = '/srv/media/uploads/tmp/'
-if not os.path.exists(FILE_UPLOAD_TEMP_DIR):
-    os.makedirs(FILE_UPLOAD_TEMP_DIR)
-
-MAX_UPLOAD_SIZE = 512000000
-MAX_UPLOAD_SIZE_FRONT = 10485760
-FILEBROWSER_MAX_UPLOAD_SIZE = 512000000
-
-if DEBUG:
-    DEBUG_TOOLBAR_CONFIG = {
-        'SHOW_TOOLBAR_CALLBACK': lambda x : True
-    }
-DEBUG_TOOLBAR_PATCH_SETTINGS = False
-DEBUG_TOOLBAR_PANELS = [
-    'debug_toolbar.panels.versions.VersionsPanel',
-    'debug_toolbar.panels.timer.TimerPanel',
-    'debug_toolbar.panels.settings.SettingsPanel',
-    'debug_toolbar.panels.headers.HeadersPanel',
-    'debug_toolbar.panels.request.RequestPanel',
-    'debug_toolbar.panels.sql.SQLPanel',
-    'debug_toolbar.panels.staticfiles.StaticFilesPanel',
-    'debug_toolbar.panels.templates.TemplatesPanel',
-    'debug_toolbar.panels.cache.CachePanel',
-    'debug_toolbar.panels.signals.SignalsPanel',
-    'debug_toolbar.panels.logging.LoggingPanel',
-    'debug_toolbar.panels.redirects.RedirectsPanel',
-]
-
-GRAPPELLI_INSTALLED = True
-# JQUERY_FILENAME = 'jquery-3.1.0.min.js'
-JQUERY_UI_FILENAME = 'jquery-ui-1.9.2.min.js'
-
-#SHOP_CURRENCY_LOCALE = ''
-SHOP_USE_VARIATIONS = False
-SHOP_USE_RATINGS = False
-
-PROJECT_DEMOS_DIR = '/srv/media/projects/demos/'
-if not os.path.exists(PROJECT_DEMOS_DIR):
-    os.makedirs(PROJECT_DEMOS_DIR)
-
-FORMAT_MODULE_PATH = [
-    'organization.formats',
-]
 
 # FIGGO API - Lucca
 FIGGO_API_URL_PROD='https://ircam.ilucca.net/'
index 92412522eea90347549fb76101e08afa20a1e476..25eb7c68150127f45404b4b84e513e29ab648b0d 100644 (file)
@@ -26,6 +26,13 @@ from django.utils.translation import ugettext_lazy as _
 
 DEBUG = True if os.environ.get('DEBUG') == 'True' else False
 
+import warnings
+warnings.filterwarnings(
+        'ignore', r"DateTimeField .* received a naive datetime",
+        RuntimeWarning, r'django\.db\.models\.fields')
+
+SILENCED_SYSTEM_CHECKS = ['fields.W342',]
+
 ######################
 # MEZZANINE SETTINGS #
 ######################
@@ -101,6 +108,7 @@ USE_MODELTRANSLATION = True
 # SEARCH_MODEL_CHOICES = ('shop.Product',)
 
 COMMENTS_ACCOUNT_REQUIRED = True
+RATINGS_ACCOUNT_REQUIRED = True
 
 ########################
 # MAIN DJANGO SETTINGS #
@@ -152,20 +160,14 @@ AUTHENTICATION_BACKENDS = ("mezzanine.core.auth_backends.MezzanineBackend",)
 #############
 
 DATABASES = {
-    "default": {
-        # Ends with "postgresql_psycopg2", "mysql", "sqlite3" or "oracle".
-        "ENGINE": "django.db.backends.sqlite3",
-        # DB name or path to database file if using sqlite3.
-        "NAME": "dev.db",
-        # Not used with sqlite3.
-        "USER": "",
-        # Not used with sqlite3.
-        "PASSWORD": "",
-        # Set to empty string for localhost. Not used with sqlite3.
-        "HOST": "",
-        # Set to empty string for default. Not used with sqlite3.
-        "PORT": "",
-    }
+    'default': {
+        'ENGINE': 'django.db.backends.postgresql_psycopg2',
+        'NAME': 'postgres',
+        'USER': 'postgres',
+        'PASSWORD': os.environ.get('DB_ENV_POSTGRES_PASSWORD'),
+        'HOST': 'db',
+        'PORT': '5432',
+    },
 }
 
 #########
@@ -212,9 +214,9 @@ ROOT_URLCONF = "urls"
 ################
 
 INSTALLED_APPS = [
-    "themes.base",
-    "themes.starts_eu",
+    "themes.vertigo_ircam_fr",
     'themes.vertigo_starts_eu',
+    "themes.starts_eu",
 
     "modeltranslation",
     "dal",
@@ -356,6 +358,175 @@ GRAPH_MODELS = {
   'group_models': True,
 }
 
+SLUGIFY = 'django.template.defaultfilters.slugify'
+
+#########################
+# FILE BROWSER          #
+#########################
+
+# The numeric mode to set newly-uploaded files to. The value should be
+# a mode you'd pass directly to os.chmod.
+FILE_UPLOAD_PERMISSIONS = 0o664
+FILE_UPLOAD_TEMP_DIR = '/srv/media/uploads/tmp/'
+if not os.path.exists(FILE_UPLOAD_TEMP_DIR):
+    os.makedirs(FILE_UPLOAD_TEMP_DIR)
+
+MAX_UPLOAD_SIZE = 512000000
+MAX_UPLOAD_SIZE_FRONT = 10485760
+FILEBROWSER_MAX_UPLOAD_SIZE = 512000000
+
+
+# EXTENSIONS AND FORMATS
+# Allowed Extensions for File Upload. Lower case is important.
+FILEBROWSER_EXTENSIONS = {
+    'Folder': [''],
+    'Image': ['.jpg', '.jpeg', '.gif', '.png', '.tif', '.tiff'],
+    'Document': ['.pdf', '.doc', '.rtf', '.txt', '.xls', '.csv', '.docx'],
+    'Video': ['.mov', '.wmv', '.mpeg', '.mpg', '.avi', '.rm'],
+    'Audio': ['.mp3', '.mp4', '.wav', '.aiff', '.midi', '.m4p']
+    }
+
+
+# Define different formats for allowed selections.
+# This has to be a subset of EXTENSIONS.
+# e.g., add ?type=image to the browse-URL ...
+FILEBROWSER_SELECT_FORMATS = {
+    'File': ['Folder', 'Document'],
+    'Image': ['Image'],
+    'Media': ['Video', 'Audio'],
+    'Audio': ['Audio'],
+    'Document': ['Document'],
+    # for TinyMCE we can also define lower-case items
+    'image': ['Image'],
+    'file': ['Folder', 'Image', 'Document'],
+    'media': ['Video', 'Audio'],
+    'audio': ['Audio'],
+}
+
+#########################
+# ADMIN MENU            #
+#########################
+
+GRAPPELLI_INSTALLED = True
+# JQUERY_FILENAME = 'jquery-3.1.0.min.js'
+JQUERY_UI_FILENAME = 'jquery-ui-1.9.2.min.js'
+TINYMCE_SETUP_JS = "/static/js/tinymce_setup.js"
+
+ADMIN_MENU_ORDER = (
+    (_('Pages'), ('pages.Page', 'organization-pages.Home',
+                 'organization-core.LinkType')),
+    (_('Media'), ('organization-media.Media',
+                  'organization-media.Playlist',
+                  'organization-media.LiveStreaming',
+                 'organization-media.MediaCategory',
+                 (_('Media Library'), 'fb_browse'),
+                 )),
+    (_('Events'), ('mezzanine_agenda.Event',
+                  'mezzanine_agenda.EventLocation',
+                  'mezzanine_agenda.EventPrice',
+                  'mezzanine_agenda.EventCategory',
+                  'organization-agenda.EventPublicType',
+                  'organization-agenda.EventTrainingLevel',
+                  'generic.Keyword',
+                  )),
+    (_('Magazine'), ('organization-magazine.Article',
+                    'organization-magazine.Brief',)),
+    (_('Network'), ('organization-network.Organization',
+                    'organization-network.OrganizationLinked',
+                    'organization-network.Department',
+                    'organization-network.Team',
+                    'organization-network.Person',
+                    'organization-network.Activity',
+                    'organization-network.OrganizationType',
+                    'organization-network.PersonListBlock',
+                    )),
+    (_('Activity'), ('organization-network.PersonActivity',
+                    'organization-network.ActivityStatusFamily',
+                    'organization-network.ActivityStatus',
+                    'organization-network.ActivityGrade',
+                    'organization-network.ActivityFramework',
+                    'organization-network.ActivityFunction',
+                    'organization-network.TrainingType',
+                    'organization-network.TrainingTopic',
+                    'organization-network.TrainingLevel',
+                    'organization-network.TrainingSpeciality',
+                    )),
+    (_('Timesheet'), ('organization-network.ActivityWeeklyHourVolume',
+                     'organization-network.PersonActivityTimeSheet'
+                    )),
+    (_('Projects'), ('organization-projects.Project',
+                    'organization-projects.ProjectCall',
+                    'organization-projects.ProjectProgram',
+                    'organization-projects.ProjectProgramType',
+                    'organization-projects.ProjectTopic',
+                    'organization-projects.ProjectProgramType',
+                    'organization-projects.ProjectDemo',
+                    'organization-projects.Repository',
+                    'organization-projects.RepositorySystem',
+                    'organization-projects.ProjectWorkPackage'
+                    )),
+    (_('Shop'), ('shop.Product',
+                    'organization-shop.ProductList',
+                    'shop.Order',
+                    'shop.DiscountCode',
+                    'shop.Sale',
+                    )),
+    (_('Jobs'), ('organization-job.JobOffer','organization-job.Candidacy')),
+    (_('Users'), ('auth.User', 'auth.Group',)),
+    (_('Site'), ('sites.Site', 'redirects.Redirect', 'conf.Setting')),
+)
+
+DASHBOARD_TAGS = ( ("mezzanine_tags.app_list",), (), ("mezzanine_tags.recent_actions",), )
+
+SEARCH_MODEL_CHOICES = ('organization-pages.CustomPage',
+                        'organization-network.DepartmentPage',
+                        'organization-network.TeamPage',
+                        'organization-network.Person',
+                        'organization-projects.ProjectTopicPage',
+                        'pages.Page',
+                        'organization-media.Playlist',
+                        'mezzanine_agenda.Event',
+                        'organization-projects.Project',
+                        'shop.Product')
+
+PAGES_MODELS = ('organization-pages.CustomPage',
+                'organization-magazine.Topic',
+                'organization-network.DepartmentPage',
+                'organization-network.TeamPage',
+                'organization-projects.ProjectTopicPage',
+                'shop.Product')
+
+PAGES_PUBLISHED_INCLUDE_LOGIN_REQUIRED = True
+
+SEARCH_PER_PAGE = 10
+MAX_PAGING_LINKS = 10
+DAL_MAX_RESULTS = 20
+
+EVENT_SLUG = 'agenda'
+EVENT_GOOGLE_MAPS_DOMAIN = 'maps.google.fr'
+EVENT_PER_PAGE = 50
+EVENT_USE_FEATURED_IMAGE = True
+EVENT_EXCLUDE_TAG_LIST = [ ]
+PAST_EVENTS = True
+
+BLOG_SLUG = 'article'
+BLOG_POST_PER_PAGE = 200
+ARTICLE_PER_PAGE = 10
+MEDIA_PER_PAGE = 9
+
+#SHOP_CURRENCY_LOCALE = ''
+SHOP_USE_VARIATIONS = False
+SHOP_USE_RATINGS = False
+
+PROJECT_DEMOS_DIR = '/srv/media/projects/demos/'
+if not os.path.exists(PROJECT_DEMOS_DIR):
+    os.makedirs(PROJECT_DEMOS_DIR)
+
+FORMAT_MODULE_PATH = [
+    'organization.formats',
+]
+
+
 #########################
 # OPTIONAL APPLICATIONS #
 #########################
@@ -370,6 +541,25 @@ OPTIONAL_APPS = (
 
 if DEBUG:
     OPTIONAL_APPS += ("debug_toolbar",)
+    DEBUG_TOOLBAR_CONFIG = {
+        'SHOW_TOOLBAR_CALLBACK': lambda x : True
+    }
+
+DEBUG_TOOLBAR_PATCH_SETTINGS = False
+DEBUG_TOOLBAR_PANELS = [
+    'debug_toolbar.panels.versions.VersionsPanel',
+    'debug_toolbar.panels.timer.TimerPanel',
+    'debug_toolbar.panels.settings.SettingsPanel',
+    'debug_toolbar.panels.headers.HeadersPanel',
+    'debug_toolbar.panels.request.RequestPanel',
+    'debug_toolbar.panels.sql.SQLPanel',
+    'debug_toolbar.panels.staticfiles.StaticFilesPanel',
+    'debug_toolbar.panels.templates.TemplatesPanel',
+    'debug_toolbar.panels.cache.CachePanel',
+    'debug_toolbar.panels.signals.SignalsPanel',
+    'debug_toolbar.panels.logging.LoggingPanel',
+    'debug_toolbar.panels.redirects.RedirectsPanel',
+]
 
 ##################
 # LOCAL SETTINGS #
@@ -385,7 +575,7 @@ except ImportError as e:
         raise e
 
 ####################
-# DYNAMIC S ETTINGS #
+# DYNAMIC SETTINGS #
 ####################
 
 # set_dynamic_settings() will rewrite globals based on what has been
index fc5d200fbb5c8ef1a6058a78c8a80ae34658cfa4..d94d8e658d32c24121f184857e193b5f5fbd2e78 160000 (submodule)
@@ -1 +1 @@
-Subproject commit fc5d200fbb5c8ef1a6058a78c8a80ae34658cfa4
+Subproject commit d94d8e658d32c24121f184857e193b5f5fbd2e78