From 0269c45846625b762aee1d3d98be236dba119594 Mon Sep 17 00:00:00 2001 From: Adolfo Fitoria Date: Thu, 29 Sep 2011 10:11:03 -0300 Subject: adding capacity to load from common --- askbot/skins/utils.py | 5 +++-- 1 file 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 -- cgit v1.2.3-1-g7c22