Large reorganization (refs #316), south migration script to new model names (refs #319)

1 files changed, 24 insertions, 136 deletions

diff --git a/chimere/default_settings.py b/chimere/default_settings.py
index 5a1d1fe..fc5177a 100644
--- a/chimere/default_settings.py
+++ b/chimere/default_settings.py
@@ -1,158 +1,46 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
-
-# Django settings for chimere project.
-PROJECT_NAME = u'Chimère'
-
-ROOT_PATH = '/var/local/django/chimere/'
-
-SERVER_URL = "http://www.peacefrogs.net/"
-EXTRA_URL = 'chimere/'
-BASE_URL = SERVER_URL + EXTRA_URL
-EMAIL_HOST = 'localhost'
-
-TINYMCE_URL = SERVER_URL + 'tinymce/'
-JQUERY_URL = SERVER_URL + 'jquery/jquery-1.4.4.min.js'
-GPSBABEL = '/usr/bin/gpsbabel'
-GPSBABEL_OPTIONS = 'simplify,crosstrack,error=0.005k' # simplify with an
-                                                      # error of 5 meters
-#GPSBABEL_OPTIONS = 'simplify,count=100'
-
-## chimere specific ##
-# center of the map
-DEFAULT_CENTER = (-1.679444, 48.114722)
+"""
+Here are the default settings for the Chimere app.
+Feel free to set these settings in your project, they will override these defaults.
+"""
+# The height and width of the POI icons
+CHIMERE_ICON_HEIGHT = 20
+CHIMERE_ICON_WIDTH = 20
+# The offset of the POI icons
+CHIMERE_ICON_OFFSET_X = 0
+CHIMERE_ICON_OFFSET_Y = 0
+
+# default center of the map
+CHIMERE_DEFAULT_CENTER = (2.49, 48.7)
+# Default zoom level
+CHIMERE_DEFAULT_ZOOM = 10
 # projection used by the main map
 # most public map providers use spherical mercator : 900913
-EPSG_PROJECTION = 900913
+CHIMERE_EPSG_PROJECTION = 900913
 # projection displayed to the end user by openlayers
 # chimere use the same projection to save its data in the database
-EPSG_DISPLAY_PROJECTION = 4326
+CHIMERE_EPSG_DISPLAY_PROJECTION = 4326
 # to restrict the map to a defined bounding box set it here
 # (left, bottom, right, top)
-RESTRICTED_EXTENT = None
+CHIMERE_RESTRICTED_EXTENT = None
 # dynamic load of categories on the main map
-DYNAMIC_CATEGORIES = False
+CHIMERE_DYNAMIC_CATEGORIES = False
 # display of shortcuts for areas
-DISPLAY_AREAS = True
+CHIMERE_DISPLAY_AREAS = True
 # specific css for areas
-CSS_AREAS = True
+CHIMERE_CSS_AREAS = False
 # number of day before an event to display
 # if equal to 0: disable event management
 # if you change this value from 0 to a value in a production environnement
 # don't forget to run the upgrade.py script to create appropriate fields in
 # the database
-DAYS_BEFORE_EVENT = 30
+CHIMERE_DAYS_BEFORE_EVENT = 30
 
 # default id category to check on the map
-DEFAULT_CATEGORIES = [1]
+CHIMERE_DEFAULT_CATEGORIES = [1]
 
 # JS definition of the main map cf. OpenLayers documentation for more details
 #MAP_LAYER = '''new OpenLayers.Layer.OSM.CycleMap("Cycle map", {
 #displayOutsideMaxExtent: true, wrapDateLine: true})''' # OSM cyclemap
-MAP_LAYER = "new OpenLayers.Layer.OSM.Mapnik('Mapnik')" # OSM mapnik map
-
-DEBUG = True
-TEMPLATE_DEBUG = DEBUG
-
-ADMINS = (
-    # ('Your Name', 'your_email@domain.com'),
-)
-
-MANAGERS = ADMINS
-
-DATABASES = {
-    'default': {
-        'NAME': 'ratatouille',
-        'ENGINE': 'django.contrib.gis.db.backends.postgis',
-        'HOST': 'localhost',
-        'PORT': '5432',
-        'USER': 'ratatouille',
-        'PASSWORD': 'wiki',
-    },
-}
-
-# Local time zone for this installation. Choices can be found here:
-# http://www.postgresql.org/docs/8.1/static/datetime-keywords.html#DATETIME-TIMEZONE-SET-TABLE
-# although not all variations may be possible on all operating systems.
-# If running in a Windows environment this must be set to the same as your
-# system time zone.
-TIME_ZONE = 'Europe/Paris'
-
-# Language code for this installation. All choices can be found here:
-# http://www.w3.org/TR/REC-html40/struct/dirlang.html#langcodes
-# http://blogs.law.harvard.edu/tech/stories/storyReader$15
-LANGUAGE_CODE = 'fr-fr'
-
-SITE_ID = 1
-
-# If you set this to False, Django will make some optimizations so as not
-# to load the internationalization machinery.
-USE_I18N = True
-USE_L10N = True
-
-# Absolute path to the directory that holds media.
-# Example: "/home/media/media.lawrence.com/"
-MEDIA_ROOT = ROOT_PATH + 'static/'
-
-# URL that handles the media served from MEDIA_ROOT.
-# Example: "http://media.lawrence.com"
-MEDIA_URL = '/' + EXTRA_URL + 'static/'
-
-# share with
-SHARE_NETWORKS = (
-("Email", 'mailto:?subject=%(text)s&body=%(url)s',
-             MEDIA_URL + 'icons/email.png'),
-("Facebook", 'http://www.facebook.com/sharer.php?t=%(text)s&u=%(url)s',
-             MEDIA_URL + 'icons/facebook.png'),
-("Twitter", 'http://twitter.com/home?status=%(text)s %(url)s',
-             MEDIA_URL + 'icons/twitter.png'),
-("Identi.ca", 'http://identi.ca/index.php?action=newnotice&status_textarea=%(text)s %(url)s',
-             MEDIA_URL + 'icons/identica.png'),
-)
-
-# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
-# trailing slash.
-# Examples: "http://foo.com/media/", "/media/".
-ADMIN_MEDIA_PREFIX = '/' + EXTRA_URL + 'media/'
-
-# Make this unique, and don't share it with anybody.
-SECRET_KEY = 'achanger_!ToChange!'
-
-# List of callables that know how to import templates from various sources.
-TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.load_template_source',
-    'django.template.loaders.app_directories.load_template_source',
-#     'django.template.loaders.eggs.load_template_source',
-)
-
-MIDDLEWARE_CLASSES = (
-    'django.middleware.common.CommonMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.middleware.doc.XViewMiddleware',
-)
-
-ROOT_URLCONF = 'chimere.urls'
-
-TEMPLATE_DIRS = [
-    # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
-    # Always use forward slashes, even on Windows.
-    # Don't forget to use absolute paths, not relative paths.
-    ROOT_PATH + 'templates',
-]
-
-INSTALLED_APPS = (
-    'django.contrib.auth',
-    'django.contrib.admin',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.sites',
-    'chimere.main',
-    # activate it if you want to use migration scripts
-    'chimere.scripts',
-    # activate it if you want to use RSS feeds
-    'chimere.rss'
-)
+CHIMERE_MAP_LAYER = "new OpenLayers.Layer.OSM.Mapnik('Mapnik')" # OSM mapnik map
 
-if 'chimere.rss' in INSTALLED_APPS:
-    TEMPLATE_DIRS.append(ROOT_PATH + 'rss/templates')