Changeset 9139

Timestamp:

May 2, 2011, 3:06:13 PM (14 years ago)

Author:

dennisw

Message:

Structure overhaul part 2; added website folder with the template, changes to urls.py and settings.py.

Location:

src/django_gheat

Files:

• settings.py (modified) (3 diffs)
• urls.py (added)
• website (added)
• website/__init__.py (added)
• website/static (added)
• website/static/OpenLayers.js (added)
• website/static/OpenStreetMap.js (added)
• website/static/heatmap.js (added)
• website/static/img (added)
• website/static/img/east-mini.png (added)
• website/static/img/layer-switcher-maximize.png (added)
• website/static/img/layer-switcher-minimize.png (added)
• website/static/img/north-mini.png (added)
• website/static/img/slider.png (added)
• website/static/img/south-mini.png (added)
• website/static/img/west-mini.png (added)
• website/static/img/zoom-minus-mini.png (added)
• website/static/img/zoom-plus-mini.png (added)
• website/static/img/zoombar.png (added)
• website/static/theme (added)
• website/static/theme/default (added)
• website/static/theme/default/style.css (added)
• website/templates (added)
• website/templates/home.html (added)
• website/urls.py (added)

src/django_gheat/settings.py

@@ -55 +55 @@
 ADMIN_MEDIA_PREFIX = '/media/'
 
+# Absolute path to the directory static files should be collected to.
+# Don't put anything in this directory yourself; store your static files
+# in apps' "static/" subdirectories and in STATICFILES_DIRS.
+# Example: "/home/media/media.lawrence.com/static/"
+STATIC_ROOT = ''
+
+# URL prefix for static files.
+# Example: "http://media.lawrence.com/static/"
+STATIC_URL = '/static/'
+
+# URL prefix for admin static files -- CSS, JavaScript and images.
+# Make sure to use a trailing slash.
+# Examples: "http://foo.com/static/admin/", "/static/admin/".
+ADMIN_MEDIA_PREFIX = '/static/admin/'
+
+# Additional locations of static files
+STATICFILES_DIRS = (
+    PROJECT_HOME + '/static',
+    # Put strings here, like "/home/html/static" or "C:/www/django/static".
+    # Always use forward slashes, even on Windows.
+    # Don't forget to use absolute paths, not relative paths.
+)
+
+# List of finder classes that know how to find static files in
+# various locations.
+STATICFILES_FINDERS = (
+    'django.contrib.staticfiles.finders.FileSystemFinder',
+    'django.contrib.staticfiles.finders.AppDirectoriesFinder',
+#    'django.contrib.staticfiles.finders.DefaultStorageFinder',
+)
+
 # Make this unique, and don't share it with anybody.
 SECRET_KEY = '=wg@x19kr@26sibiaynb9ax5ddp1&yu^+$3n++^_lz1ms80syb'
@@ -71 +102 @@
 )
 
-ROOT_URLCONF = 'django_gheat.gheat.urls'
+ROOT_URLCONF = 'urls'
 
 TEMPLATE_DIRS = (
@@ -87 +118 @@
     'django.contrib.sites',
     'django_extensions',
-    'django_gheat.gheat',
+    'gheat',
+    'website',
 )
-
-# XXX: Make me dynamic based on the calling location
-#GOOGLE_MAPS_KEY = 'ABQIAAAA2icoFs7d_hisx8EBdZy-mxQF3fr7joqA35-x6JbT4Kx-pk-_6xRkPVambEqUO33n_8g9KWVaLKq8UA' # localhost
-#GOOGLE_MAPS_KEY = 'ABQIAAAAnfs7bKE82qgb3Zc2YyS-oBT2yXp_ZAY8_ufC3CFXhHIE1NvwkxSySz_REpPq-4WZA27OwgbtyR3VcA' # external ip
-GOOGLE_MAPS_KEY = 'ABQIAAAA6NuvWGazX80RVrkSkvrUXBTpH3CbXHjuCVmaTc5MkkU4wO1RRhSZXiYEMqjgwJ9gi_PC8AA-dDGz6g' # 127.0.0.1:8000
-
-
-