diff options
author | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-02-01 19:15:32 +0100 |
---|---|---|
committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-02-01 19:15:32 +0100 |
commit | f0f5980a289351f026539043084a2e9fb350ff7f (patch) | |
tree | 139ff8937cbd81caa50a6f6801c327ee3c1a11e8 | |
parent | f07b25fd08431f529b17567ff40a52c1ebbcd71d (diff) | |
download | Chimère-f0f5980a289351f026539043084a2e9fb350ff7f.tar.bz2 Chimère-f0f5980a289351f026539043084a2e9fb350ff7f.zip |
Extract example_project to a new repository - update doc about this change
-rw-r--r-- | docs/en/install.rst | 9 | ||||
-rw-r--r-- | docs/en/upgrade.rst | 9 | ||||
-rw-r--r-- | docs/fr/install.rst | 9 | ||||
-rw-r--r-- | docs/fr/upgrade.rst | 9 | ||||
-rw-r--r-- | example_project/__init__.py | 0 | ||||
-rw-r--r-- | example_project/fixtures/first_data.json | 853 | ||||
-rw-r--r-- | example_project/local_settings.py.pip.sample | 42 | ||||
-rw-r--r-- | example_project/local_settings.py.sample | 32 | ||||
-rwxr-xr-x | example_project/manage.py | 14 | ||||
-rwxr-xr-x | example_project/media/icons/marker.png | bin | 606 -> 0 bytes | |||
-rw-r--r-- | example_project/media/icons/readme | 1 | ||||
-rw-r--r-- | example_project/media/pictures/readme | 1 | ||||
-rw-r--r-- | example_project/media/route_files/readme | 1 | ||||
-rw-r--r-- | example_project/settings.py | 256 | ||||
-rw-r--r-- | example_project/templates/chimere/blocks/overload_templates_here | 0 | ||||
-rw-r--r-- | example_project/templates/chimere/overload_templates_here | 0 | ||||
-rw-r--r-- | example_project/templates/overload_templates_here | 0 | ||||
-rw-r--r-- | example_project/urls.py | 44 |
18 files changed, 24 insertions, 1256 deletions
diff --git a/docs/en/install.rst b/docs/en/install.rst index ff8ac46..0516c90 100644 --- a/docs/en/install.rst +++ b/docs/en/install.rst @@ -141,11 +141,14 @@ Another solution is to get it from the Git repository:: Creating a custom project template ********************************** -There, a default project is provided (*example_project*). Copy and modify -it (or get another project based on Chimère):: +A default project can be found on `Gitorious +<https://gitorious.org/chimere-example-project/chimere-example-project>`_. Get +it and start a new project with it (or get another project based on Chimère):: cd $INSTALL_PATH/chimere - cp -ra example_project mychimere_project + git clone git@gitorious.org:chimere-example-project/chimere-example-project.git + django-admin startproject --template=chimere-example-project mychimere_project + rm -rf chimere-example-project Your project name is used for the name of the Python package of your template. As a Python package it should follow the rule of Python variable name: diff --git a/docs/en/upgrade.rst b/docs/en/upgrade.rst index 6dce286..193e62c 100644 --- a/docs/en/upgrade.rst +++ b/docs/en/upgrade.rst @@ -146,13 +146,16 @@ Version 1.2 -> 2.0 Project template ................ -Create a new project template: +A default project can be found on `Gitorious +<https://gitorious.org/chimere-example-project/chimere-example-project>`_. Get +it and start a new project with it (or get another project based on Chimère):: .. code-block:: bash cd $CHIMERE_PATH - cp -ra $CHIMERE_PATH/example_project $CHIMERE_LOCALNAME - CHIMERE_APP_PATH=$CHIMERE_PATH/$CHIMERE_LOCALNAME + git clone git@gitorious.org:chimere-example-project/chimere-example-project.git + django-admin startproject --template=chimere-example-project mychimere_project + rm -rf chimere-example-project local_settings .............. diff --git a/docs/fr/install.rst b/docs/fr/install.rst index 9a33e7c..234b391 100644 --- a/docs/fr/install.rst +++ b/docs/fr/install.rst @@ -138,11 +138,14 @@ Une autre solution est d'obtenir les sources depuis le dépôt Git : :: Créez un patron pour votre projet ********************************* -Il y a un exemple de projet fourni (*example_project*). Copiez-le et -modifiez-le (ou utilisez un autre projet basé sur Chimère) : :: +Un exemple de projet peut être trouvé sur `Gitorious +<https://gitorious.org/chimere-example-project/chimere-example-project>`_. +Clonez-le et modifiez-le (ou utilisez un autre projet basé sur Chimère) : :: cd $INSTALL_PATH/chimere - cp -ra example_project mychimere_project + git clone git@gitorious.org:chimere-example-project/chimere-example-project.git + django-admin startproject --template=chimere-example-project mychimere_project + rm -rf chimere-example-project Le nom de votre projet est utilisé pour le nom de la bibliothèque Python correspondant à votre projet. diff --git a/docs/fr/upgrade.rst b/docs/fr/upgrade.rst index 32d37b8..788eca7 100644 --- a/docs/fr/upgrade.rst +++ b/docs/fr/upgrade.rst @@ -154,13 +154,16 @@ Version 1.2 -> 2.0 Patron de projet ................ -Créez un nouveau patron de projet : +Un exemple de projet peut être trouvé sur `Gitorious +<https://gitorious.org/chimere-example-project/chimere-example-project>`_. +Clonez-le et modifiez-le (ou utilisez un autre projet basé sur Chimère) : :: .. code-block:: bash cd $CHIMERE_PATH - cp -ra $CHIMERE_PATH/example_project $CHIMERE_LOCALNAME - CHIMERE_APP_PATH=$CHIMERE_PATH/$CHIMERE_LOCALNAME + git clone git@gitorious.org:chimere-example-project/chimere-example-project.git + django-admin startproject --template=chimere-example-project mychimere_project + rm -rf chimere-example-project local_settings .............. diff --git a/example_project/__init__.py b/example_project/__init__.py deleted file mode 100644 index e69de29..0000000 --- a/example_project/__init__.py +++ /dev/null diff --git a/example_project/fixtures/first_data.json b/example_project/fixtures/first_data.json deleted file mode 100644 index 814e8e0..0000000 --- a/example_project/fixtures/first_data.json +++ /dev/null @@ -1,853 +0,0 @@ -[ - { - "pk": 20, - "model": "contenttypes.contenttype", - "fields": { - "model": "area", - "name": "Area", - "app_label": "chimere" - } - }, - { - "pk": 14, - "model": "contenttypes.contenttype", - "fields": { - "model": "category", - "name": "Category", - "app_label": "chimere" - } - }, - { - "pk": 13, - "model": "contenttypes.contenttype", - "fields": { - "model": "color", - "name": "Color", - "app_label": "chimere" - } - }, - { - "pk": 12, - "model": "contenttypes.contenttype", - "fields": { - "model": "colortheme", - "name": "Color theme", - "app_label": "chimere" - } - }, - { - "pk": 6, - "model": "contenttypes.contenttype", - "fields": { - "model": "contenttype", - "name": "content type", - "app_label": "contenttypes" - } - }, - { - "pk": 2, - "model": "contenttypes.contenttype", - "fields": { - "model": "group", - "name": "group", - "app_label": "auth" - } - }, - { - "pk": 15, - "model": "contenttypes.contenttype", - "fields": { - "model": "icon", - "name": "Icon", - "app_label": "chimere" - } - }, - { - "pk": 5, - "model": "contenttypes.contenttype", - "fields": { - "model": "logentry", - "name": "log entry", - "app_label": "admin" - } - }, - { - "pk": 4, - "model": "contenttypes.contenttype", - "fields": { - "model": "message", - "name": "message", - "app_label": "auth" - } - }, - { - "pk": 9, - "model": "contenttypes.contenttype", - "fields": { - "model": "migrationhistory", - "name": "migration history", - "app_label": "south" - } - }, - { - "pk": 10, - "model": "contenttypes.contenttype", - "fields": { - "model": "news", - "name": "News", - "app_label": "chimere" - } - }, - { - "pk": 1, - "model": "contenttypes.contenttype", - "fields": { - "model": "permission", - "name": "permission", - "app_label": "auth" - } - }, - { - "pk": 17, - "model": "contenttypes.contenttype", - "fields": { - "model": "marker", - "name": "Point of interest", - "app_label": "chimere" - } - }, - { - "pk": 22, - "model": "contenttypes.contenttype", - "fields": { - "model": "property", - "name": "Property", - "app_label": "chimere" - } - }, - { - "pk": 21, - "model": "contenttypes.contenttype", - "fields": { - "model": "propertymodel", - "name": "Property model", - "app_label": "chimere" - } - }, - { - "pk": 19, - "model": "contenttypes.contenttype", - "fields": { - "model": "route", - "name": "Route", - "app_label": "chimere" - } - }, - { - "pk": 18, - "model": "contenttypes.contenttype", - "fields": { - "model": "routefile", - "name": "Route file", - "app_label": "chimere" - } - }, - { - "pk": 7, - "model": "contenttypes.contenttype", - "fields": { - "model": "session", - "name": "session", - "app_label": "sessions" - } - }, - { - "pk": 8, - "model": "contenttypes.contenttype", - "fields": { - "model": "site", - "name": "site", - "app_label": "sites" - } - }, - { - "pk": 16, - "model": "contenttypes.contenttype", - "fields": { - "model": "subcategory", - "name": "Subcategory", - "app_label": "chimere" - } - }, - { - "pk": 11, - "model": "contenttypes.contenttype", - "fields": { - "model": "tinyurl", - "name": "TinyUrl", - "app_label": "chimere" - } - }, - { - "pk": 3, - "model": "contenttypes.contenttype", - "fields": { - "model": "user", - "name": "user", - "app_label": "auth" - } - }, - { - "pk": 1, - "model": "sites.site", - "fields": { - "domain": "example.com", - "name": "example.com" - } - }, - { - "pk": 13, - "model": "auth.permission", - "fields": { - "codename": "add_logentry", - "name": "Can add log entry", - "content_type": 5 - } - }, - { - "pk": 14, - "model": "auth.permission", - "fields": { - "codename": "change_logentry", - "name": "Can change log entry", - "content_type": 5 - } - }, - { - "pk": 15, - "model": "auth.permission", - "fields": { - "codename": "delete_logentry", - "name": "Can delete log entry", - "content_type": 5 - } - }, - { - "pk": 4, - "model": "auth.permission", - "fields": { - "codename": "add_group", - "name": "Can add group", - "content_type": 2 - } - }, - { - "pk": 5, - "model": "auth.permission", - "fields": { - "codename": "change_group", - "name": "Can change group", - "content_type": 2 - } - }, - { - "pk": 6, - "model": "auth.permission", - "fields": { - "codename": "delete_group", - "name": "Can delete group", - "content_type": 2 - } - }, - { - "pk": 10, - "model": "auth.permission", - "fields": { - "codename": "add_message", - "name": "Can add message", - "content_type": 4 - } - }, - { - "pk": 11, - "model": "auth.permission", - "fields": { - "codename": "change_message", - "name": "Can change message", - "content_type": 4 - } - }, - { - "pk": 12, - "model": "auth.permission", - "fields": { - "codename": "delete_message", - "name": "Can delete message", - "content_type": 4 - } - }, - { - "pk": 1, - "model": "auth.permission", - "fields": { - "codename": "add_permission", - "name": "Can add permission", - "content_type": 1 - } - }, - { - "pk": 2, - "model": "auth.permission", - "fields": { - "codename": "change_permission", - "name": "Can change permission", - "content_type": 1 - } - }, - { - "pk": 3, - "model": "auth.permission", - "fields": { - "codename": "delete_permission", - "name": "Can delete permission", - "content_type": 1 - } - }, - { - "pk": 7, - "model": "auth.permission", - "fields": { - "codename": "add_user", - "name": "Can add user", - "content_type": 3 - } - }, - { - "pk": 8, - "model": "auth.permission", - "fields": { - "codename": "change_user", - "name": "Can change user", - "content_type": 3 - } - }, - { - "pk": 9, - "model": "auth.permission", - "fields": { - "codename": "delete_user", - "name": "Can delete user", - "content_type": 3 - } - }, - { - "pk": 58, - "model": "auth.permission", - "fields": { - "codename": "add_area", - "name": "Can add Area", - "content_type": 20 - } - }, - { - "pk": 59, - "model": "auth.permission", - "fields": { - "codename": "change_area", - "name": "Can change Area", - "content_type": 20 - } - }, - { - "pk": 60, - "model": "auth.permission", - "fields": { - "codename": "delete_area", - "name": "Can delete Area", - "content_type": 20 - } - }, - { - "pk": 40, - "model": "auth.permission", - "fields": { - "codename": "add_route", - "name": "Can add Route", - "content_type": 14 - } - }, - { - "pk": 41, - "model": "auth.permission", - "fields": { - "codename": "change_route", - "name": "Can change Route", - "content_type": 14 - } - }, - { - "pk": 42, - "model": "auth.permission", - "fields": { - "codename": "delete_route", - "name": "Can delete Route", - "content_type": 14 - } - }, - { - "pk": 37, - "model": "auth.permission", - "fields": { - "codename": "add_marker", - "name": "Can add Point of interest", - "content_type": 13 - } - }, - { - "pk": 38, - "model": "auth.permission", - "fields": { - "codename": "change_marker", - "name": "Can change Point of interest", - "content_type": 13 - } - }, - { - "pk": 39, - "model": "auth.permission", - "fields": { - "codename": "delete_marker", - "name": "Can delete Point of interest", - "content_type": 13 - } - }, - { - "pk": 34, - "model": "auth.permission", - "fields": { - "codename": "add_subcategory", - "name": "Can add Subcategory", - "content_type": 12 - } - }, - { - "pk": 35, - "model": "auth.permission", - "fields": { - "codename": "change_subcategory", - "name": "Can change Subcategory", - "content_type": 12 - } - }, - { - "pk": 36, - "model": "auth.permission", - "fields": { - "codename": "delete_subcategory", - "name": "Can delete Subcategory", - "content_type": 12 - } - }, - { - "pk": 43, - "model": "auth.permission", - "fields": { - "codename": "add_area", - "name": "Can add Area", - "content_type": 15 - } - }, - { - "pk": 44, - "model": "auth.permission", - "fields": { - "codename": "change_area", - "name": "Can change Area", - "content_type": 15 - } - }, - { - "pk": 45, - "model": "auth.permission", - "fields": { - "codename": "delete_area", - "name": "Can delete Area", - "content_type": 15 - } - }, - { - "pk": 49, - "model": "auth.permission", - "fields": { - "codename": "add_property", - "name": "Can add Property", - "content_type": 17 - } - }, - { - "pk": 50, - "model": "auth.permission", - "fields": { - "codename": "change_property", - "name": "Can change Property", - "content_type": 17 - } - }, - { - "pk": 51, - "model": "auth.permission", - "fields": { - "codename": "delete_property", - "name": "Can delete Property", - "content_type": 17 - } - }, - { - "pk": 28, - "model": "auth.permission", - "fields": { - "codename": "add_category", - "name": "Can add Category", - "content_type": 10 - } - }, - { - "pk": 29, - "model": "auth.permission", - "fields": { - "codename": "change_category", - "name": "Can change Category", - "content_type": 10 - } - }, - { - "pk": 30, - "model": "auth.permission", - "fields": { - "codename": "delete_category", - "name": "Can delete Category", - "content_type": 10 - } - }, - { - "pk": 64, - "model": "auth.permission", - "fields": { - "codename": "add_property", - "name": "Can add Property", - "content_type": 22 - } - }, - { - "pk": 65, - "model": "auth.permission", - "fields": { - "codename": "change_property", - "name": "Can change Property", - "content_type": 22 - } - }, - { - "pk": 66, - "model": "auth.permission", - "fields": { - "codename": "delete_property", - "name": "Can delete Property", - "content_type": 22 - } - }, - { - "pk": 61, - "model": "auth.permission", - "fields": { - "codename": "add_propertymodel", - "name": "Can add Property model", - "content_type": 21 - } - }, - { - "pk": 62, - "model": "auth.permission", - "fields": { - "codename": "change_propertymodel", - "name": "Can change Property model", - "content_type": 21 - } - }, - { - "pk": 63, - "model": "auth.permission", - "fields": { - "codename": "delete_propertymodel", - "name": "Can delete Property model", - "content_type": 21 - } - }, - { - "pk": 55, - "model": "auth.permission", - "fields": { - "codename": "add_route", - "name": "Can add Route", - "content_type": 19 - } - }, - { - "pk": 56, - "model": "auth.permission", - "fields": { - "codename": "change_route", - "name": "Can change Route", - "content_type": 19 - } - }, - { - "pk": 57, - "model": "auth.permission", - "fields": { - "codename": "delete_route", - "name": "Can delete Route", - "content_type": 19 - } - }, - { - "pk": 52, - "model": "auth.permission", - "fields": { - "codename": "add_routefile", - "name": "Can add Route file", - "content_type": 18 - } - }, - { - "pk": 53, - "model": "auth.permission", - "fields": { - "codename": "change_routefile", - "name": "Can change Route file", - "content_type": 18 - } - }, - { - "pk": 54, - "model": "auth.permission", - "fields": { - "codename": "delete_routefile", - "name": "Can delete Route file", - "content_type": 18 - } - }, - { - "pk": 46, - "model": "auth.permission", - "fields": { - "codename": "add_propertymodel", - "name": "Can add Property model", - "content_type": 16 - } - }, - { - "pk": 47, - "model": "auth.permission", - "fields": { - "codename": "change_propertymodel", - "name": "Can change Property model", - "content_type": 16 - } - }, - { - "pk": 48, - "model": "auth.permission", - "fields": { - "codename": "delete_propertymodel", - "name": "Can delete Property model", - "content_type": 16 - } - }, - { - "pk": 31, - "model": "auth.permission", - "fields": { - "codename": "add_icon", - "name": "Can add Icon", - "content_type": 11 - } - }, - { - "pk": 32, - "model": "auth.permission", - "fields": { - "codename": "change_icon", - "name": "Can change Icon", - "content_type": 11 - } - }, - { - "pk": 33, - "model": "auth.permission", - "fields": { - "codename": "delete_icon", - "name": "Can delete Icon", - "content_type": 11 - } - }, - { - "pk": 16, - "model": "auth.permission", - "fields": { - "codename": "add_contenttype", - "name": "Can add content type", - "content_type": 6 - } - }, - { - "pk": 17, - "model": "auth.permission", - "fields": { - "codename": "change_contenttype", - "name": "Can change content type", - "content_type": 6 - } - }, - { - "pk": 18, - "model": "auth.permission", - "fields": { - "codename": "delete_contenttype", - "name": "Can delete content type", - "content_type": 6 - } - }, - { - "pk": 19, - "model": "auth.permission", - "fields": { - "codename": "add_session", - "name": "Can add session", - "content_type": 7 - } - }, - { - "pk": 20, - "model": "auth.permission", - "fields": { - "codename": "change_session", - "name": "Can change session", - "content_type": 7 - } - }, - { - "pk": 21, - "model": "auth.permission", - "fields": { - "codename": "delete_session", - "name": "Can delete session", - "content_type": 7 - } - }, - { - "pk": 22, - "model": "auth.permission", - "fields": { - "codename": "add_site", - "name": "Can add site", - "content_type": 8 - } - }, - { - "pk": 23, - "model": "auth.permission", - "fields": { - "codename": "change_site", - "name": "Can change site", - "content_type": 8 - } - }, - { - "pk": 24, - "model": "auth.permission", - "fields": { - "codename": "delete_site", - "name": "Can delete site", - "content_type": 8 - } - }, - { - "pk": 25, - "model": "auth.permission", - "fields": { - "codename": "add_news", - "name": "Can add News", - "content_type": 9 - } - }, - { - "pk": 26, - "model": "auth.permission", - "fields": { - "codename": "change_news", - "name": "Can change News", - "content_type": 9 - } - }, - { - "pk": 27, - "model": "auth.permission", - "fields": { - "codename": "delete_news", - "name": "Can delete News", - "content_type": 9 - } - }, - { - "pk": 1, - "model": "auth.group", - "fields": { - "name": "Moderator", - "permissions": [ - 40, - 41, - 42, - 37, - 38, - 39, - 49, - 50, - 51 - ] - } - }, - { - "pk": 2, - "model": "auth.group", - "fields": { - "name": "Application administrator", - "permissions": [ - 40, - 41, - 42, - 37, - 38, - 39, - 34, - 35, - 36, - 43, - 44, - 45, - 49, - 50, - 51, - 28, - 29, - 30, - 31, - 32, - 33, - 25, - 26, - 27 - ] - } - } -] diff --git a/example_project/local_settings.py.pip.sample b/example_project/local_settings.py.pip.sample deleted file mode 100644 index 6b6cffc..0000000 --- a/example_project/local_settings.py.pip.sample +++ /dev/null @@ -1,42 +0,0 @@ -#!/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') diff --git a/example_project/local_settings.py.sample b/example_project/local_settings.py.sample deleted file mode 100644 index b5939af..0000000 --- a/example_project/local_settings.py.sample +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- - -# rename this file to local_settings.py and overload settings in this file - -import os - -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' diff --git a/example_project/manage.py b/example_project/manage.py deleted file mode 100755 index 301acc2..0000000 --- a/example_project/manage.py +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env python -import os, sys -from django.core.management import execute_manager -sys.path.insert(0, os.path.abspath('./..')) - -try: - import settings # Assumed to be in the same directory. -except ImportError: - import sys - sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__) - sys.exit(1) - -if __name__ == "__main__": - execute_manager(settings) diff --git a/example_project/media/icons/marker.png b/example_project/media/icons/marker.png Binary files differdeleted file mode 100755 index ccd1913..0000000 --- a/example_project/media/icons/marker.png +++ /dev/null diff --git a/example_project/media/icons/readme b/example_project/media/icons/readme deleted file mode 100644 index 560759a..0000000 --- a/example_project/media/icons/readme +++ /dev/null @@ -1 +0,0 @@ -Icons are stored here diff --git a/example_project/media/pictures/readme b/example_project/media/pictures/readme deleted file mode 100644 index c0d20b7..0000000 --- a/example_project/media/pictures/readme +++ /dev/null @@ -1 +0,0 @@ -Pictures are stored here diff --git a/example_project/media/route_files/readme b/example_project/media/route_files/readme deleted file mode 100644 index 90d72ab..0000000 --- a/example_project/media/route_files/readme +++ /dev/null @@ -1 +0,0 @@ -Route files are stored here diff --git a/example_project/settings.py b/example_project/settings.py deleted file mode 100644 index b0839d6..0000000 --- a/example_project/settings.py +++ /dev/null @@ -1,256 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- - -# Don't edit this file: -# overload all theses settings in your local_settings.py file - -import os - -DEBUG = False -TEMPLATE_DEBUG = DEBUG - -# Django settings for chimere project. -PROJECT_NAME = 'Chimere' -ROOT_PATH = os.path.realpath(os.path.dirname(__file__)) + "/" - -EMAIL_HOST = 'localhost' -STATIC_URL = '/static/' -STATIC_ROOT = ROOT_PATH + 'static/' - -TINYMCE_URL = '/tinymce/' -JQUERY_JS_URLS = ('/javascript/jquery/jquery.js', - '/javascript/jquery-ui/jquery-ui.js',) -JQUERY_CSS_URLS = ('/javascript/jquery-ui/css/smoothness/jquery-ui.css', - '/javascript/jquery-ui-themes/base/jquery.ui.all.css') - -OSM_CSS_URLS = ["http://www.openlayers.org/api/theme/default/style.css"] - -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 ## -CHIMERE_DEFAULT_ZOOM = 10 -# center of the map -CHIMERE_DEFAULT_CENTER = (-1.679444, 48.114722) -# projection used by the main map -# most public map providers use spherical mercator : 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 -CHIMERE_EPSG_DISPLAY_PROJECTION = 4326 -# display of shortcuts for areas -CHIMERE_DISPLAY_AREAS = True -# 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 -CHIMERE_DAYS_BEFORE_EVENT = 30 -# allow feeds -CHIMERE_FEEDS = True - -CHIMERE_ICON_WIDTH = 21 -CHIMERE_ICON_HEIGHT = 25 -CHIMERE_ICON_OFFSET_X = -10 -CHIMERE_ICON_OFFSET_Y = -25 - -# display picture inside the description by default or inside a galery? -CHIMERE_MINIATURE_BY_DEFAULT = False - -# JS definition of the default map (for admin and when no map are defined in -# the application) -# cf. OpenLayers documentation for more details -CHIMERE_DEFAULT_MAP_LAYER = "new OpenLayers.Layer.OSM.Mapnik('Mapnik')" # OSM mapnik map - -CHIMERE_XAPI_URL = 'http://open.mapquestapi.com/xapi/api/0.6/' -CHIMERE_OSM_API_URL = 'api06.dev.openstreetmap.org' # test URL -CHIMERE_OSM_USER = 'test' -CHIMERE_OSM_PASSWORD = 'test' - -# as the web server need to be reloaded when property models are changed -# it could be a good idea to hide it to an admin who could'nt do that -CHIMERE_HIDE_PROPERTYMODEL = False - -# encoding for shapefile import -CHIMERE_SHAPEFILE_ENCODING = 'ISO-8859-1' - -# thumbnail -CHIMERE_THUMBS_SCALE_HEIGHT=250 -CHIMERE_THUMBS_SCALE_WIDTH=None - -CHIMERE_CSV_ENCODING = 'ISO-8859-1' - -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 + 'media/' - -# URL that handles the media served from MEDIA_ROOT. -# Example: "http://media.lawrence.com" -MEDIA_URL = '/media/' - -# List of callables that know how to import templates from various sources. -TEMPLATE_LOADERS = ( - 'django.template.loaders.filesystem.Loader', - 'django.template.loaders.app_directories.Loader', -# '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', - 'django.contrib.messages.middleware.MessageMiddleware' -) - -ROOT_URLCONF = 'example_project.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', - ROOT_PATH + '../chimere/templates', -] - -TEMPLATE_CONTEXT_PROCESSORS = ( - "django.contrib.auth.context_processors.auth", - "django.core.context_processors.debug", - "django.core.context_processors.i18n", - "django.core.context_processors.media", - "django.core.context_processors.static", - "django.contrib.messages.context_processors.messages", - "django.core.context_processors.request", -) - -INSTALLED_APPS = [ - 'django.contrib.auth', - 'django.contrib.admin', - 'django.contrib.contenttypes', - 'django.contrib.sessions', - 'django.contrib.sites', - 'django.contrib.gis', - 'django.contrib.staticfiles', -] - -# celery -try: - import djcelery - import kombu - djcelery.setup_loader() - BROKER_URL = 'django://' - INSTALLED_APPS += ['kombu.transport.django', - 'djcelery'] -except ImportError: - # some import and export will not be available - pass - -INSTALLED_APPS += [ - 'south', - 'chimere', -# 'chimere.scripts', # activate it if you want to use old migration scripts -] - -LOGGING = {'version': 1, - 'disable_existing_loggers': False, - 'handlers': { - # Include the default Django email handler for errors - # This is what you'd get without configuring logging at all. - 'mail_admins': { - 'class': 'django.utils.log.AdminEmailHandler', - 'level': 'ERROR', - # But the emails are plain text by default - HTML is nicer - 'include_html': True, - }, - # Log to a text file that can be rotated by logrotate - 'logfile': { - 'class': 'logging.handlers.WatchedFileHandler', - 'filename': '/var/log/django/chimere.log' - }, - }, - 'loggers': { - # Again, default Django configuration to email unhandled exceptions - 'django.request': { - 'handlers': ['mail_admins'], - 'level': 'ERROR', - 'propagate': True, - }, - # Might as well log any errors anywhere else in Django - 'django': { - 'handlers': ['logfile'], - 'level': 'ERROR', - 'propagate': False, - }, - # Your own app - this assumes all your logger names start with "myapp." - 'chimere': { - 'handlers': ['logfile'], - 'level': 'WARNING', # Or maybe INFO or DEBUG - 'propogate': False - }, - }, -} - -try: - from local_settings import * -except ImportError, e: - print 'Unable to load local_settings.py:', e - -if 'CHIMERE_SHARE_NETWORKS' not in globals(): - # after the locals to get the right STATIC_URL - - # share with - global CHIMERE_SHARE_NETWORKS - CHIMERE_SHARE_NETWORKS = ( - ("Email", 'mailto:?subject=%(text)s&body=%(url)s', - STATIC_URL + 'chimere/img/email.png'), - ("Facebook", 'http://www.facebook.com/sharer.php?t=%(text)s&u=%(url)s', - STATIC_URL + 'chimere/img/facebook.png'), - ("Twitter", 'http://twitter.com/home?status=%(text)s %(url)s', - STATIC_URL + 'chimere/img/twitter.png'), - ("Identi.ca", 'http://identi.ca/index.php?action=newnotice&status_textarea=%(text)s %(url)s', - STATIC_URL + 'chimere/img/identica.png'), - ) - -if 'OSM_JS_URLS' not in globals(): - global OSM_JS_URLS - OSM_JS_URLS = [STATIC_URL + "chimere/js/OpenLayers.js", - STATIC_URL + "chimere/js/SimplePanZoom.js", - "http://www.openstreetmap.org/openlayers/OpenStreetMap.js"] - diff --git a/example_project/templates/chimere/blocks/overload_templates_here b/example_project/templates/chimere/blocks/overload_templates_here deleted file mode 100644 index e69de29..0000000 --- a/example_project/templates/chimere/blocks/overload_templates_here +++ /dev/null diff --git a/example_project/templates/chimere/overload_templates_here b/example_project/templates/chimere/overload_templates_here deleted file mode 100644 index e69de29..0000000 --- a/example_project/templates/chimere/overload_templates_here +++ /dev/null diff --git a/example_project/templates/overload_templates_here b/example_project/templates/overload_templates_here deleted file mode 100644 index e69de29..0000000 --- a/example_project/templates/overload_templates_here +++ /dev/null diff --git a/example_project/urls.py b/example_project/urls.py deleted file mode 100644 index fff1366..0000000 --- a/example_project/urls.py +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -# Copyright (C) 2012-2013 Etienne Loks <etienne.loks_AT_peacefrogsDOTnet> - -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -# See the file COPYING for details. - -from django.conf import settings -from django.conf.urls.defaults import * - -from django.contrib import admin -from django.contrib.staticfiles.urls import staticfiles_urlpatterns - -admin.autodiscover() -urlpatterns = patterns('django.views.static', - (r'^%s(?P<path>.*)' % settings.MEDIA_URL[1:], 'serve', - {'document_root': settings.MEDIA_ROOT}), -) - -if "tinymce" in settings.INSTALLED_APPS: - urlpatterns += patterns('django.views.static', - (r'^tinymce/', include('tinymce.urls')),) - -urlpatterns += staticfiles_urlpatterns() - -urlpatterns += patterns('', - (r'^admin/doc/', include('django.contrib.admindocs.urls')), - (r'^admin/', include(admin.site.urls)), - url(r'^', include('chimere.urls', namespace="chimere")), -) - - |