summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNoahY <yuttadhammo@yahoo.com>2011-07-27 08:36:21 +0530
committerNoahY <yuttadhammo@yahoo.com>2011-07-27 08:36:21 +0530
commit9fe72849b00e188c1824d615d0d45f993fc2f777 (patch)
treedbe9e32ab7ad95bfafc75d837cbef64029dce616
parentbb2d38f15524f1565bcc1babb5a674fcd3514dcd (diff)
downloadaskbot-9fe72849b00e188c1824d615d0d45f993fc2f777.tar.gz
askbot-9fe72849b00e188c1824d615d0d45f993fc2f777.tar.bz2
askbot-9fe72849b00e188c1824d615d0d45f993fc2f777.zip
added hook to call sidebar settings, removed duplicate setting
-rw-r--r--askbot/conf/__init__.py1
-rw-r--r--askbot/conf/skin_general_settings.py13
2 files changed, 1 insertions, 13 deletions
diff --git a/askbot/conf/__init__.py b/askbot/conf/__init__.py
index f6f93f2f..46ee81b0 100644
--- a/askbot/conf/__init__.py
+++ b/askbot/conf/__init__.py
@@ -9,6 +9,7 @@ import askbot.conf.flatpages
import askbot.conf.site_settings
import askbot.conf.external_keys
import askbot.conf.skin_general_settings
+import askbot.conf.sidebar_settings
import askbot.conf.user_settings
import askbot.conf.markup
import askbot.conf.social_sharing
diff --git a/askbot/conf/skin_general_settings.py b/askbot/conf/skin_general_settings.py
index 30bb01a6..5bb0b296 100644
--- a/askbot/conf/skin_general_settings.py
+++ b/askbot/conf/skin_general_settings.py
@@ -210,19 +210,6 @@ settings.register(
settings.register(
values.BooleanValue(
GENERAL_SKIN_SETTINGS,
- 'SIDEBAR_SHOW_AVATARS',
- description = _('Show avatar block in sidebar'),
- help_text = _(
- 'Uncheck this if you want to hide the avatar '
- 'block from the sidebar '
- ),
- default = True
- )
-)
-
-settings.register(
- values.BooleanValue(
- GENERAL_SKIN_SETTINGS,
'USE_CUSTOM_CSS',
description = _('Apply custom style sheet (CSS)'),
help_text = _(