Removes a few remaining usages of old django decorators and replace them by OSQA...

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

diff --git a/forum/settings/__init__.py b/forum/settings/__init__.py
index 2446496edf195c94707f70c01b9896bd9dc0bc43..32f11ee483bfbb023ebf76c3eacab9baf46ca041 100644 (file)
--- a/forum/settings/__init__.py
+++ b/forum/settings/__init__.py
@@ -1,21 +1,43 @@
 import os.path
 from base import Setting, SettingSet
 import os.path
 from base import Setting, SettingSet

-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
+from django.utils.version import get_svn_revision
+
+OSQA_VERSION = "Development Build"
+SVN_REVISION = get_svn_revision(djsettings.SITE_SRC_ROOT)
+
+MAINTAINANCE_MODE = Setting('MAINTAINANCE_MODE', None)

 
 

-INTERNAL_VERSION = Setting('INTERNAL_VERSION', "56")

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

+DJSTYLE_ADMIN_INTERFACE = Setting('DJSTYLE_ADMIN_INTERFACE', True)
+
+APP_URL = djsettings.APP_URL
+FORUM_SCRIPT_ALIAS = djsettings.FORUM_SCRIPT_ALIAS
+OSQA_SKIN = djsettings.OSQA_DEFAULT_SKIN
+LANGUAGE_CODE = djsettings.LANGUAGE_CODE
+ADMIN_MEDIA_PREFIX = djsettings.ADMIN_MEDIA_PREFIX
+

 
 from basic import *
 
 from basic import *

+from sidebar import *

 from email import *
 from extkeys import *
 from minrep import *
 from repgain import *
 from voting import *
 from upload import *
 from email import *
 from extkeys import *
 from minrep import *
 from repgain import *
 from voting import *
 from upload import *

-from pages import *
+from about import *
+from faq import *
+from form import *
+from view import *
+from moderation import *
+from users import *
+from static import *
+from urls import *
+from accept 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)