Simplify project layout

13 files changed, 7 insertions, 9 deletions

diff --git a/chimere_example_project/project_static/.project_static b/chimere_example_project/project_static/.project_static
deleted file mode 100644
index e69de29..0000000
--- a/chimere_example_project/project_static/.project_static
+++ /dev/null
diff --git a/chimere_example_project/chimere_example_static/chimere/css/form-compat.css b/chimere_example_project/static/chimere/css/form-compat.css
index f83672f..f83672f 100644
--- a/chimere_example_project/chimere_example_static/chimere/css/form-compat.css
+++ b/chimere_example_project/static/chimere/css/form-compat.css
diff --git a/chimere_example_project/chimere_example_static/chimere/img/layer-switcher-maximize.png b/chimere_example_project/static/chimere/img/layer-switcher-maximize.png
index 326f243..326f243 100644
--- a/chimere_example_project/chimere_example_static/chimere/img/layer-switcher-maximize.png
+++ b/chimere_example_project/static/chimere/img/layer-switcher-maximize.png
diff --git a/chimere_example_project/chimere_example_static/chimere/img/logo.jpg b/chimere_example_project/static/chimere/img/logo.jpg
index cc2ff36..cc2ff36 100644
--- a/chimere_example_project/chimere_example_static/chimere/img/logo.jpg
+++ b/chimere_example_project/static/chimere/img/logo.jpg
diff --git a/chimere_example_project/chimere_example_static/chimere/img/minus.png b/chimere_example_project/static/chimere/img/minus.png
index e8ebf51..e8ebf51 100755
--- a/chimere_example_project/chimere_example_static/chimere/img/minus.png
+++ b/chimere_example_project/static/chimere/img/minus.png
diff --git a/chimere_example_project/chimere_example_static/chimere/img/plus.png b/chimere_example_project/static/chimere/img/plus.png
index b26a6f9..b26a6f9 100755
--- a/chimere_example_project/chimere_example_static/chimere/img/plus.png
+++ b/chimere_example_project/static/chimere/img/plus.png
diff --git a/chimere_example_project/chimere_example_static/chimere/js/interface.js b/chimere_example_project/static/chimere/js/interface.js
index c0c00bf..c0c00bf 100644
--- a/chimere_example_project/chimere_example_static/chimere/js/interface.js
+++ b/chimere_example_project/static/chimere/js/interface.js
diff --git a/chimere_example_project/chimere_example_static/fonts/glyphicons-halflings-regular.eot b/chimere_example_project/static/fonts/glyphicons-halflings-regular.eot
index 4a4ca86..4a4ca86 100644
--- a/chimere_example_project/chimere_example_static/fonts/glyphicons-halflings-regular.eot
+++ b/chimere_example_project/static/fonts/glyphicons-halflings-regular.eot
diff --git a/chimere_example_project/chimere_example_static/fonts/glyphicons-halflings-regular.svg b/chimere_example_project/static/fonts/glyphicons-halflings-regular.svg
index 89d2909..89d2909 100644
--- a/chimere_example_project/chimere_example_static/fonts/glyphicons-halflings-regular.svg
+++ b/chimere_example_project/static/fonts/glyphicons-halflings-regular.svg
diff --git a/chimere_example_project/chimere_example_static/fonts/glyphicons-halflings-regular.ttf b/chimere_example_project/static/fonts/glyphicons-halflings-regular.ttf
index 67fa00b..67fa00b 100644
--- a/chimere_example_project/chimere_example_static/fonts/glyphicons-halflings-regular.ttf
+++ b/chimere_example_project/static/fonts/glyphicons-halflings-regular.ttf
diff --git a/chimere_example_project/chimere_example_static/fonts/glyphicons-halflings-regular.woff b/chimere_example_project/static/fonts/glyphicons-halflings-regular.woff
index 8c54182..8c54182 100644
--- a/chimere_example_project/chimere_example_static/fonts/glyphicons-halflings-regular.woff
+++ b/chimere_example_project/static/fonts/glyphicons-halflings-regular.woff
diff --git a/local_settings.py.sample b/local_settings.py.sample
index 33a4989..385a774 100644
--- a/local_settings.py.sample
+++ b/local_settings.py.sample
@@ -3,9 +3,6 @@
 
 # rename this file to local_settings.py and overload settings in this file
 
-
-ROOT_URLCONF = 'chimere_example_project.urls'
-
 STATIC_URL = '/static/'
 
 CHIMERE_OSM_API_URL = 'api06.dev.openstreetmap.org'  # test URL
diff --git a/settings.py b/settings.py
index 7e7d85c..a65a1b1 100644
--- a/settings.py
+++ b/settings.py
@@ -23,10 +23,6 @@ CONTACT_EMAIL = ''
 STATIC_URL = '/static/'
 STATIC_ROOT = ROOT_PATH + 'static/'
 
-STATICFILES_DIRS = (
-    os.path.join(ROOT_PATH, "chimere_example_project/chimere_example_static"),
-)
-
 TINYMCE_URL = ''
 JQUERY_JS_URLS = ('/javascript/jquery/jquery.js',
                   '/javascript/jquery-ui/jquery-ui.js',)
@@ -231,8 +227,6 @@ MIDDLEWARE_CLASSES = [
     'django.contrib.messages.middleware.MessageMiddleware'
 ]
 
-ROOT_URLCONF = 'chimere_example_project.urls'
-
 TEMPLATE_DIRS = [
     ROOT_PATH + 'templates',
 ]
@@ -275,12 +269,19 @@ INSTALLED_APPS += [
 LOG_PATH = '/var/log/django/'
 MOBILE_DOMAINS = []  # if you have specific domains for mobile access
 
+PROJECT_APP = 'chimere_example_project'
+
 LOGFILE_NAME = ""
 try:
     from local_settings import *
 except ImportError as e:
     print('Unable to load local_settings.py:', e)
 
+
+ROOT_URLCONF = PROJECT_APP + '.urls'
+
+INSTALLED_APPS.insert(INSTALLED_APPS.index('chimere'), PROJECT_APP)
+
 if CHIMERE_SEARCH_ENGINE:
     INSTALLED_APPS.append('haystack')