diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2012-09-22 15:22:17 -0400 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2012-09-22 15:22:17 -0400 |
| commit | 4eeda2172a28df85fa4b795f0648add1f5c27f9c (patch) | |
| tree | 567e181d9b8f5dbda1572438d328674464e928a0 | |
| parent | 83652f3d4ae74ace5fda74eff28ada29cfd85ce4 (diff) | |
| download | askbot-4eeda2172a28df85fa4b795f0648add1f5c27f9c.tar.gz askbot-4eeda2172a28df85fa4b795f0648add1f5c27f9c.tar.bz2 askbot-4eeda2172a28df85fa4b795f0648add1f5c27f9c.zip | |
merged adolfos fixes to the response templates
| -rw-r--r-- | askbot/models/__init__.py | 2 | ||||
| -rw-r--r-- | askbot/templates/email/macros.html | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/askbot/models/__init__.py b/askbot/models/__init__.py index 833809d2..6b571c92 100644 --- a/askbot/models/__init__.py +++ b/askbot/models/__init__.py @@ -2941,7 +2941,7 @@ def format_instant_notification_email( user_url = strip_path(site_url) + from_user.get_absolute_url() user_action = user_action % { 'user': '<a href="%s">%s</a>' % (user_url, from_user.username), - 'post_link': '<a href="%s">%s<a>' % (post_url, _(post.post_type)) + 'post_link': '<a href="%s">%s</a>' % (post_url, _(post.post_type)) #'post_link': '%s <a href="%s">>>></a>' % (_(post.post_type), post_url) } diff --git a/askbot/templates/email/macros.html b/askbot/templates/email/macros.html index 46aa1b90..f1b06fc8 100644 --- a/askbot/templates/email/macros.html +++ b/askbot/templates/email/macros.html @@ -1,4 +1,3 @@ -{% load extra_filters_jinja %} {% macro quoted_post( post = None, quote_level = 0, @@ -29,7 +28,6 @@ {% trans %}Asked by {{ author }}:{% endtrans %} {% endif %} </p> - </p> {% set tag_names = post.get_tag_names() %} {% if tag_names %} <p style="font-size:10px; font-style:italic;"> @@ -72,7 +70,7 @@ {% endif %} </p> {% endif %} - {{ post.html | absolutize_urls}} + {{ post.html|absolutize_urls }} {{ end_quote(quote_level) }} {% endspaceless %} {% endmacro %} |