summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdolfo Fitoria <adolfo.fitoria@gmail.com>2011-09-29 10:11:03 -0300
committerAdolfo Fitoria <adolfo.fitoria@gmail.com>2011-09-29 10:11:03 -0300
commit0269c45846625b762aee1d3d98be236dba119594 (patch)
treeaa7baf057b5ebe05f4b80d989b083fd95e3f67b2
parentd5e6baa523c4af848755d5fbddcada7722d34303 (diff)
downloadaskbot-0269c45846625b762aee1d3d98be236dba119594.tar.gz
askbot-0269c45846625b762aee1d3d98be236dba119594.tar.bz2
askbot-0269c45846625b762aee1d3d98be236dba119594.zip
adding capacity to load from common
-rw-r--r--askbot/skins/utils.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/askbot/skins/utils.py b/askbot/skins/utils.py
index e7997f7a..da3a8a06 100644
--- a/askbot/skins/utils.py
+++ b/askbot/skins/utils.py
@@ -42,20 +42,21 @@ def get_available_skins(selected=None):
stock_dir = os.path.normpath(os.path.dirname(__file__))
stock_skins = get_skins_from_dir(stock_dir)
default_dir = stock_skins.pop('default')
+ common_dir = stock_skins.pop('common')
skins.update(stock_skins)
-
if selected:
if selected in skins:
selected_dir = skins[selected]
skins.clear()
skins[selected] = selected_dir
else:
- assert(selected == 'default')
+ assert(selected == 'default' or selected == 'common')
skins = SortedDict()
#re-insert default as a last item
skins['default'] = default_dir
+ skins['common'] = common_dir
return skins