summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2011-09-01 10:57:58 -0300
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2011-09-01 10:57:58 -0300
commita16a80b5a0ab03340e8b308945ce3dcb733b6ac3 (patch)
treeed60941b355737c751a90aa5293d2895864322e5
parentd5e91577b83893661ef19d258fb8a372e70ef41f (diff)
downloadaskbot-a16a80b5a0ab03340e8b308945ce3dcb733b6ac3.tar.gz
askbot-a16a80b5a0ab03340e8b308945ce3dcb733b6ac3.tar.bz2
askbot-a16a80b5a0ab03340e8b308945ce3dcb733b6ac3.zip
removed printing of log message on missing optional media resources, fixed a layout bug on tags page and incremented revision
-rw-r--r--askbot/__init__.py2
-rw-r--r--askbot/skins/default/templates/tags.html1
-rw-r--r--askbot/skins/utils.py7
3 files changed, 6 insertions, 4 deletions
diff --git a/askbot/__init__.py b/askbot/__init__.py
index b18dac73..8133c74f 100644
--- a/askbot/__init__.py
+++ b/askbot/__init__.py
@@ -9,7 +9,7 @@ import smtplib
import sys
import logging
-VERSION = (0, 7, 21)
+VERSION = (0, 7, 22)
#necessary for interoperability of django and coffin
try:
diff --git a/askbot/skins/default/templates/tags.html b/askbot/skins/default/templates/tags.html
index d37cc9e7..7d9026af 100644
--- a/askbot/skins/default/templates/tags.html
+++ b/askbot/skins/default/templates/tags.html
@@ -31,6 +31,7 @@
<span>{% trans %}Nothing found{% endtrans %}</span>
{% endif %}
{% if tags.object_list %}
+ <div class='clearfix'></div>
<ul class='tags'>
{% for tag in tags.object_list %}
<li>
diff --git a/askbot/skins/utils.py b/askbot/skins/utils.py
index 57acd8ae..e7997f7a 100644
--- a/askbot/skins/utils.py
+++ b/askbot/skins/utils.py
@@ -142,9 +142,10 @@ def get_media_url(url, ignore_missing = False):
try:
use_skin = resolve_skin_for_media(media=url, preferred_skin = use_skin)
except MediaNotFound:
- log_message = 'missing media resource %s in skin %s' \
- % (url, use_skin)
- logging.critical(log_message)
+ if ignore_missing == False:
+ log_message = 'missing media resource %s in skin %s' \
+ % (url, use_skin)
+ logging.critical(log_message)
return None
url = use_skin + '/media/' + url