diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2013-03-18 00:21:09 -0400 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2013-03-18 00:21:09 -0400 |
| commit | bd0dc34370eaf761afc661e60b61bd915ad582d2 (patch) | |
| tree | bba47f0d4b2bbf60641cf7b242c21486d5de6abe | |
| parent | ae30cfa5de829d14415c5b2deaf1c4e5b808c604 (diff) | |
| download | askbot-bd0dc34370eaf761afc661e60b61bd915ad582d2.tar.gz askbot-bd0dc34370eaf761afc661e60b61bd915ad582d2.tar.bz2 askbot-bd0dc34370eaf761afc661e60b61bd915ad582d2.zip | |
styling changes in the tag selector, added exception handling for skin
| -rw-r--r-- | askbot/media/style/style.less | 7 | ||||
| -rw-r--r-- | askbot/skins/loaders.py | 8 | ||||
| -rw-r--r-- | askbot/templates/widgets/tag_selector.html | 2 |
3 files changed, 11 insertions, 6 deletions
diff --git a/askbot/media/style/style.less b/askbot/media/style/style.less index 64bc584a..e5fdb8fd 100644 --- a/askbot/media/style/style.less +++ b/askbot/media/style/style.less @@ -753,7 +753,7 @@ body.anon { .box { background: #fff; - padding: 4px 0px 10px 0px; + padding: 4px 0px 10px 1px; width:200px; overflow: hidden; @@ -1401,9 +1401,7 @@ ul.tags.marked-tags li, } #tagSelector div.inputs { - clear: both; - float: none; - margin-bottom:10px; + margin: 6px 0 12px 0; } .tags-page ul.tags li, @@ -2944,7 +2942,6 @@ a:hover.medal { } .follow-toggle,.submit { - border:0 !important; font-weight:bold; line-height:26px; margin-top:-2px; diff --git a/askbot/skins/loaders.py b/askbot/skins/loaders.py index 50276f34..c7854a1d 100644 --- a/askbot/skins/loaders.py +++ b/askbot/skins/loaders.py @@ -5,6 +5,7 @@ from django.template import TemplateDoesNotExist from django.http import HttpResponse from django.utils import translation from django.conf import settings as django_settings +from django.core.exceptions import ImproperlyConfigured from coffin.common import CoffinEnvironment from jinja2 import loaders as jinja_loaders from jinja2.exceptions import TemplateNotFound @@ -81,7 +82,12 @@ SKINS = load_skins() def get_skin(request = None): """retreives the skin environment for a given request (request var is not used at this time)""" - return SKINS[askbot_settings.ASKBOT_DEFAULT_SKIN] + skin_name = askbot_settings.ASKBOT_DEFAULT_SKIN + try: + return SKINS[skin_name] + except KeyError: + msg_fmt = 'skin "%s" not found, check value of "ASKBOT_EXTRA_SKINS_DIR"' + raise ImproperlyConfigured(msg_fmt % skin_name) def get_askbot_template(template, request = None): """ diff --git a/askbot/templates/widgets/tag_selector.html b/askbot/templates/widgets/tag_selector.html index 7c6fe92e..ba304d2c 100644 --- a/askbot/templates/widgets/tag_selector.html +++ b/askbot/templates/widgets/tag_selector.html @@ -14,6 +14,7 @@ "remove '%(tag_name)s' from the list of interesting tags"| format(tag_name = tag_name) #} + <div class="clearfix"></div> <div class="inputs"> <input id="interestingTagInput" autocomplete="off" type="text"/> <input id="interestingTagAdd" type="submit" value="{% trans %}add{% endtrans %}"/> @@ -49,6 +50,7 @@ "remove '%(tag_name)s' from the list of ignored tags"| format(tag_name = tag_name) #} + <div class="clearfix"></div> <div class="inputs"> <input id="subscribedTagInput" autocomplete="off" type="text"/> <input id="subscribedTagAdd" type="submit" value="{% trans %}add{% endtrans%}"/> |