summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--askbot/media/style/style.css2
-rw-r--r--askbot/skins/utils.py14
2 files changed, 8 insertions, 8 deletions
diff --git a/askbot/media/style/style.css b/askbot/media/style/style.css
index ea81746f..1f5aabc5 100644
--- a/askbot/media/style/style.css
+++ b/askbot/media/style/style.css
@@ -498,7 +498,7 @@ body.anon #searchBar {
width: 500px;
}
body.anon #searchBar .searchInput {
- width: 440px;
+ width: 435px;
}
body.anon #searchBar .searchInputCancelable {
width: 405px;
diff --git a/askbot/skins/utils.py b/askbot/skins/utils.py
index f0e149d0..e2a815b7 100644
--- a/askbot/skins/utils.py
+++ b/askbot/skins/utils.py
@@ -175,14 +175,14 @@ def update_media_revision(skin = None):
from askbot.conf import settings as askbot_settings
resource_revision = askbot_settings.MEDIA_RESOURCE_REVISION
- if skin:
- if skin in get_skin_choices():
- skin_path = get_path_to_skin(skin)
- else:
- raise MediaNotFound('Skin %s not found' % skin)
+ skin = skin or askbot_settings.ASKBOT_DEFAULT_SKIN
+
+ if skin in get_available_skins().keys():
+ skin_path = get_path_to_skin(skin)
else:
- skin = 'default'
- skin_path = get_path_to_skin(askbot_settings.ASKBOT_DEFAULT_SKIN)
+ assert(skin != 'default')
+ msg = 'Skin "%s" not found. Please check ASKBOT_EXTRA_SKINS_DIR setting'
+ raise MediaNotFound(msg % skin)
media_dirs = [
os.path.join(skin_path, 'media'),