diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2012-03-23 02:49:29 -0400 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2012-03-23 02:49:29 -0400 |
| commit | dfd883a85323305e12e9e900796410067fa91240 (patch) | |
| tree | 55d4f2003e9c6f92b0b36f18569cbad27119290c | |
| parent | b71ded882d8af28d9d836142a4463b23540a1431 (diff) | |
| download | askbot-dfd883a85323305e12e9e900796410067fa91240.tar.gz askbot-dfd883a85323305e12e9e900796410067fa91240.tar.bz2 askbot-dfd883a85323305e12e9e900796410067fa91240.zip | |
hopefully fixed the urls in the email
| -rw-r--r-- | askbot/models/__init__.py | 5 | ||||
| -rw-r--r-- | askbot/skins/default/templates/instant_notification.html | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/askbot/models/__init__.py b/askbot/models/__init__.py index 8d4432aa..b78864e6 100644 --- a/askbot/models/__init__.py +++ b/askbot/models/__init__.py @@ -2399,9 +2399,10 @@ def format_instant_notification_email( else: raise ValueError('unrecognized post type') - post_url = strip_path(site_url) + post.get_absolute_url(), + post_url = strip_path(site_url) + post.get_absolute_url() + user_url = strip_path(site_url) + from_user.get_absolute_url() user_action = user_action % { - 'user': from_user.username, + 'user': '<a href="%s">%s</a>' % (user_url, from_user.username), 'post_link': '<a href="%s">%s</a>' % (post_url, _(post.post_type)) } diff --git a/askbot/skins/default/templates/instant_notification.html b/askbot/skins/default/templates/instant_notification.html index e5cde3a9..cd6e5427 100644 --- a/askbot/skins/default/templates/instant_notification.html +++ b/askbot/skins/default/templates/instant_notification.html @@ -1,5 +1,5 @@ {{ reply_separator }} -<div>{{content_preview}}</div> +<div>{{ content_preview }}</div> {% trans %} <p>Please note - you can easily <a href="{{user_subscriptions_url}}">change</a> how often you receive these notifications or unsubscribe. Thank you for your interest in our forum!</p> |