Merge branch 'master' into saclay

Conflicts:
	chimere/admin.py
	chimere/fixtures/initial_data.json
	chimere/forms.py
	chimere/locale/fr/LC_MESSAGES/django.po
	chimere/models.py
	chimere/static/chimere/css/styles.css
	chimere/templates/chimere/detail.html
	chimere/templatetags/chimere_tags.py
	chimere/views.py
	chimere/widgets.py

1 files changed, 42 insertions, 0 deletions

diff --git a/example_project/local_settings.py.pip.sample b/example_project/local_settings.py.pip.sample
new file mode 100644
index 0000000..6b6cffc
--- /dev/null
+++ b/example_project/local_settings.py.pip.sample
@@ -0,0 +1,42 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# rename this file to local_settings.py and overload settings in this file
+
+import os
+
+STATIC_URL = '/static/'
+
+CHIMERE_OSM_API_URL = 'api06.dev.openstreetmap.org' # test URL
+CHIMERE_OSM_USER = 'osm_user'
+CHIMERE_OSM_PASSWORD = 'osm_pass'
+
+# Make this string unique, and don't share it with anybody.
+SECRET_KEY = ''
+
+ADMINS = (
+    # ('Your Name', 'your_email@domain.com'),
+)
+
+MANAGERS = ADMINS
+
+DATABASES = {
+    'default': {
+        'NAME': 'chimere',
+        'ENGINE': 'django.contrib.gis.db.backends.postgis',
+        'HOST': 'localhost',
+        'PORT': '5432',
+        'USER': 'postgres',
+        'PASSWORD': '',
+    },
+}
+
+ROOT_URLCONF = 'example_project.urls'
+
+INSTALLED_APPS += ['django_extensions',
+                   'tinymce']
+
+TINYMCE_URL = '%stiny_mce/' % STATIC_URL
+JQUERY_JS_URLS = ('%sjquery/jquery.js' % STATIC_URL,
+                  'http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.23/jquery-ui.min.js')
+JQUERY_CSS_URLS = ('https://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/base/jquery-ui.css')