summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/settings/settings.py3
-rw-r--r--config/settings/settings_dev.py7
2 files changed, 6 insertions, 4 deletions
diff --git a/config/settings/settings.py b/config/settings/settings.py
index 47b5562..13bcb5e 100644
--- a/config/settings/settings.py
+++ b/config/settings/settings.py
@@ -37,7 +37,8 @@ GOOGLE_MAPS_API_KEY = MAP_API_KEY = 'ABQIAAAAEZ0Oz7LFDmdS1OBHm6HLgRQT5Lr-mnFT_29
# API key for Flickr imports
FLICKR_API_KEY = '7b9d978a440c6ab65a545adc0aa0d693'
FLICKR_USER_ID = '85322932@N00'
-
+#root url
+BASE_URL = "http://luxagraf.net/"
#path to the folder that holds the generated html files
FLATFILES_ROOT = os.path.join(PROJ_ROOT, 'site/')
#media and image URLs for the generated html files
diff --git a/config/settings/settings_dev.py b/config/settings/settings_dev.py
index 010ac31..bb7c21b 100644
--- a/config/settings/settings_dev.py
+++ b/config/settings/settings_dev.py
@@ -29,7 +29,7 @@ SITE_URL = 'http://luxagraf.net/'
GRAPPELLI_ADMIN_TITLE = 'Luxagraf Admin'
USE_I18N = False
USE_L10N = True
-USE_TZ = True
+USE_TZ = False
#API key for Google Maps in Admin
MAP_API = "google"
@@ -39,6 +39,7 @@ GOOGLE_MAPS_API_KEY = MAP_API_KEY = 'ABQIAAAAEZ0Oz7LFDmdS1OBHm6HLgRQT5Lr-mnFT_29
FLICKR_API_KEY = '7b9d978a440c6ab65a545adc0aa0d693'
FLICKR_USER_ID = '85322932@N00'
+BASE_URL = "http://127.0.0.1:8000/"
#path to the folder that holds the generated html files
FLATFILES_ROOT = os.path.join(PROJ_ROOT, 'site/')
#media and image URLs for the generated html files
@@ -142,8 +143,8 @@ INSTALLED_APPS = (
'templatetags',
'projects',
'guide',
- 'pages'
-
+ 'pages',
+ 'birds'
)
DEVELOPMENT = True
if DEVELOPMENT: