Accepting incoming merge of the jambazov feature branch. Mostly includes new bug...

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

diff --git a/forum/settings/__init__.py b/forum/settings/__init__.py
index 95f2441641dc56aca0da2a165ab704c38fda916b..e10fc76b0f6f1fb0a3ddb6dcce1a3b3e3a103d9a 100644 (file)
--- a/forum/settings/__init__.py
+++ b/forum/settings/__init__.py
@@ -1,6 +1,5 @@
 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 _


@@ -14,9 +13,15 @@ MAINTAINANCE_MODE = Setting('MAINTAINANCE_MODE', None)
 
 SETTINGS_PACK = Setting('SETTINGS_PACK', "default")
 DJSTYLE_ADMIN_INTERFACE = Setting('DJSTYLE_ADMIN_INTERFACE', True)
 
 SETTINGS_PACK = Setting('SETTINGS_PACK', "default")
 DJSTYLE_ADMIN_INTERFACE = Setting('DJSTYLE_ADMIN_INTERFACE', True)

+NODE_MAN_FILTERS = Setting('NODE_MAN_FILTERS', [])

 
 APP_URL = djsettings.APP_URL
 
 APP_URL = djsettings.APP_URL

-FORUM_SCRIPT_ALIAS = djsettings.FORUM_SCRIPT_ALIAS
+APP_BASE_URL = djsettings.APP_BASE_URL
+FORCE_SCRIPT_NAME = djsettings.FORCE_SCRIPT_NAME
+OSQA_SKIN = djsettings.OSQA_DEFAULT_SKIN
+LANGUAGE_CODE = djsettings.LANGUAGE_CODE
+ADMIN_MEDIA_PREFIX = djsettings.ADMIN_MEDIA_PREFIX
+ONLINE_USERS = Setting('ONLINE_USERS', {})

 
 
 from basic import *
 
 
 from basic import *


@@ -30,8 +35,12 @@ from upload import *
 from about import *
 from faq import *
 from form import *
 from about import *
 from faq import *
 from form import *

+from view import *

 from moderation import *
 from users 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)