3 files changed, 15 insertions, 25 deletions
diff --git a/example_project/local_settings.py.sample b/example_project/local_settings.py.sample
index dae6f98b5..ee5338801 100644
--- a/example_project/local_settings.py.sample
+++ b/example_project/local_settings.py.sample
@@ -34,13 +34,14 @@ DEBUG_TOOLBAR = False
 TEMPLATE_DEBUG = DEBUG
 SQL_DEBUG = False
 
+# important to change on a server hosting multiple ishtar instances
 PROJECT_SLUG = "my-project"
 
 # complete with host/domain names that this website can serve
 ALLOWED_HOSTS = []
 
 # if your installation uses a prefix after the domain name modify and uncomment
-# theses lines
+# these lines
 # DOMAIN_PREFIX = "/ishtar-test"
 # LOGIN_URL = DOMAIN_PREFIX + '/accounts/login/'
 # LOGIN_REDIRECT_URL = DOMAIN_PREFIX + '/accounts/profile/'
@@ -51,12 +52,3 @@ SRID = 27572
 ENCODING = ''  # specific encoding for CSV export - default to utf-8
 SURFACE_UNIT = 'square-metre'
 SURFACE_UNIT_LABEL = u'm²'
-
-# choose the extensions to install
-# you can remove lines according to the comments but don't change the order
-EXTRA_APPS = [
-    'archaeological_files',
-    'archaeological_context_records',
-    'archaeological_warehouse',  # need archaeological_finds
-    'archaeological_finds',  # need archaeological_context_records
-]
diff --git a/example_project/settings.py b/example_project/settings.py
index e124198aa..98eb14e9e 100644
--- a/example_project/settings.py
+++ b/example_project/settings.py
@@ -104,6 +104,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     "django.core.context_processors.i18n",
     "django.core.context_processors.media",
     "django.core.context_processors.static",
+    "django.core.context_processors.request",
 )
 
 ROOT_URLCONF = 'example_project.urls'
@@ -125,11 +126,18 @@ INSTALLED_APPS = [
     'django.contrib.gis',
     'django.contrib.staticfiles',
     'django.contrib.formtools',
+    'django.contrib.messages',
     'south',
     'registration',
     # 'geodjangofla',
+    'ishtar_pdl',
     'ishtar_common',
-    'archaeological_operations',  # mandatory app to run ishtar
+    'archaeological_files_pdl',
+    'archaeological_files',
+    'archaeological_operations',
+    'archaeological_context_records',
+    'archaeological_warehouse',
+    'archaeological_finds',
     # 'django_extensions',
     # 'debug_toolbar',
 ]
@@ -214,16 +222,6 @@ except ImportError, e:
 if 'test' in sys.argv:
     SOUTH_TESTS_MIGRATE = False
 
-for app in PRE_APPS:
-    INSTALLED_APPS.insert(INSTALLED_APPS.index('ishtar_common'), app)
-
-if 'archaeological_files' in EXTRA_APPS:
-    EXTRA_APPS.pop(EXTRA_APPS.index('archaeological_files'))
-    INSTALLED_APPS.insert(INSTALLED_APPS.index('archaeological_operations'),
-                          'archaeological_files')
-
-INSTALLED_APPS += EXTRA_APPS
-
 PROJECT_SLUG = locals().get('PROJECT_SLUG', 'default')
 
 if LOGFILE:
diff --git a/example_project/urls.py b/example_project/urls.py
index 203c44d4d..62a6b1e04 100644
--- a/example_project/urls.py
+++ b/example_project/urls.py
@@ -14,10 +14,10 @@ APP_LIST = ['archaeological_files_pdl', 'archaeological_files',
             'archaeological_operations', 'archaeological_context_records',
             'archaeological_warehouse', 'archaeological_finds']
 for app in APP_LIST:
-    if app in settings.INSTALLED_APPS:
-        urlpatterns += patterns(
-            '', ('', include(app + '.urls')),
-        )
+    # filter by activated apps?
+    urlpatterns += patterns(
+        '', ('', include(app + '.urls')),
+    )
 
 urlpatterns += patterns(
     '', ('', include('ishtar_common.urls')),