web/ldtplatform/settings.py
changeset 6 6befc470b1e6
parent 4 238f3cd543f2
--- a/web/ldtplatform/settings.py	Sat Oct 15 02:20:18 2011 +0200
+++ b/web/ldtplatform/settings.py	Sat Oct 15 23:41:36 2011 +0200
@@ -1,20 +1,6 @@
 #@PydevCodeAnalysisIgnore
 import os.path
-#import ldtplatform
-VERSION = (0, 3, 0, "final", 0)
-VERSION_STR = unicode(".".join(map(lambda i:"%02d" % (i,), VERSION[:2])))
-def get_version():
-    version = '%s.%s' % (VERSION[0], VERSION[1])
-    if VERSION[2]:
-        version = '%s.%s' % (version, VERSION[2])
-    if VERSION[3:] == ('alpha', 0):
-        version = '%s pre-alpha' % version
-    else:
-        if VERSION[3] != 'final':
-            version = '%s %s %s' % (version, VERSION[3], VERSION[4])
-    return version
-__version__ = get_version()
-
+import ldtplatform
 # Django settings for project.
 
 DEBUG = True
@@ -115,8 +101,7 @@
 )
 
 
-#ROOT_URLCONF = 'ldtplatform.urls'
-ROOT_URLCONF = 'urls'
+ROOT_URLCONF = 'ldtplatform.urls'
 
 TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
@@ -139,7 +124,7 @@
     'django.contrib.messages',
     'django.contrib.admin',
     'django.contrib.staticfiles',
-    #'ldtplatform',
+    'ldtplatform',
     'registration',
     'tagging',
     'ldt',
@@ -217,24 +202,23 @@
 
 AUTO_INDEX_AFTER_SAVE = True
 
-#WEB_VERSION = ldtplatform.get_version()
-WEB_VERSION = get_version()
+WEB_VERSION = ldtplatform.get_version()
 
 from config import *
 
 if not "LOGIN_URL" in locals():
-    LOGIN_URL = BASE_URL + 'accounts/login/'
+    LOGIN_URL = BASE_URL + 'ldtplatform/accounts/login/'
 if not "LOGOUT_URL" in locals():
-    LOGOUT_URL = BASE_URL + 'accounts/disconnect/'
+    LOGOUT_URL = BASE_URL + 'ldtplatform/accounts/disconnect/'
 if not "LOGIN_REDIRECT_URL" in locals():
-    LOGIN_REDIRECT_URL = BASE_URL + 'ldt/'
+    LOGIN_REDIRECT_URL = BASE_URL + 'ldtplatform/ldt/'
 if not "LOGOUT_REDIRECT_URL" in locals():
-    LOGOUT_REDIRECT_URL = BASE_URL + 'accounts/login'
+    LOGOUT_REDIRECT_URL = BASE_URL + 'ldtplatform/accounts/login'
 if not "PROFILE_REDIRECT_URL" in locals():
-    PROFILE_REDIRECT_URL = BASE_URL + 'auth_accounts/create/profile'
+    PROFILE_REDIRECT_URL = BASE_URL + 'ldtplatform/auth_accounts/create/profile'
 
 if not "LOGIN_ERROR_URL" in locals():
-    LOGIN_ERROR_URL = BASE_URL + 'accounts/login'
+    LOGIN_ERROR_URL = BASE_URL + 'ldtplatform/accounts/login'
 
 if not "GLOBAL_LOG_LEVEL" in locals():
     GLOBAL_LOG_LEVEL = LOG_LEVEL