General cleanup. Moved many hardcoded stuff still left in the code to an admin option...

[osqa.git] / forum / settings / __init__.py

diff --git a/forum/settings/__init__.py b/forum/settings/__init__.py
index a8530ee633aa5d99b6deb245173519f7bc6fa259..9ab0c6bf44554aeaedc3ec53ec8bc0f058148e48 100644 (file)
--- a/forum/settings/__init__.py
+++ b/forum/settings/__init__.py
@@ -4,9 +4,13 @@ from forms import ImageFormWidget
 
 from django.forms.widgets import Textarea
 from django.utils.translation import ugettext_lazy as _
 
 from django.forms.widgets import Textarea
 from django.utils.translation import ugettext_lazy as _

+from django.conf import settings as djsettings

 
 

-INTERNAL_VERSION = Setting('INTERNAL_VERSION', "59")
+OSQA_VERSION = Setting('OSQA_VERSION', "Development Version")

 SETTINGS_PACK = Setting('SETTINGS_PACK', "default")
 SETTINGS_PACK = Setting('SETTINGS_PACK', "default")

+APP_URL = djsettings.APP_URL
+FORUM_SCRIPT_ALIAS = djsettings.FORUM_SCRIPT_ALIAS
+

 
 from basic import *
 from email import *
 
 from basic import *
 from email import *


@@ -19,6 +23,7 @@ from about import *
 from faq import *
 from form import *
 from moderation import *
 from faq import *
 from form import *
 from moderation import *

+from users import *

 
 BADGES_SET = SettingSet('badges', _('Badges config'), _("Configure badges on your OSQA site."), 500)
 
 
 BADGES_SET = SettingSet('badges', _('Badges config'), _("Configure badges on your OSQA site."), 500)