diff --git a/apps/reader/views.py b/apps/reader/views.py index 3c4217658..80cb1b1a0 100644 --- a/apps/reader/views.py +++ b/apps/reader/views.py @@ -1423,6 +1423,7 @@ def send_story_email(request): comments = request.POST['comments'] comments = comments[:2048] # Separated due to PyLint from_address = 'share@newsblur.com' + share_user_profile = MSocialProfile.get_user(request.user.pk) if not to_addresses: code = -1 diff --git a/templates/mail/email_base.xhtml b/templates/mail/email_base.xhtml index c5ed61894..5b0563f78 100644 --- a/templates/mail/email_base.xhtml +++ b/templates/mail/email_base.xhtml @@ -72,7 +72,7 @@ - NewsBlur + NewsBlur diff --git a/templates/mail/email_story_html.xhtml b/templates/mail/email_story_html.xhtml index 659eb4f90..a099875ad 100644 --- a/templates/mail/email_story_html.xhtml +++ b/templates/mail/email_story_html.xhtml @@ -1,18 +1,23 @@ -

Hello there! {{ from_name }} is sharing a story with you entitled "{{ story.story_title }}" from {{ feed.feed_title }}.

+{% extends "mail/email_base.xhtml" %} +{% load social_tags %} -{% if comments %} -

{{ from_name }} writes:
-{{ comments }}

-{% endif %} +{% block body %} + +

+ {{ from_name }} is sharing a story with you entitled "{{ story.story_title }}"{% if feed %} from {{ feed.feed_title }}{% endif %}: +

+ + {% if comments %} +

{{ from_name }} writes:
+ {{ comments }}

+ {% endif %} + +
-

--

+

{{ story.story_title }}

-

{{ story.story_title }}

+ {{ story.story_permalink|safe }} -{{ story.story_permalink|safe }} - -

{{ story.story_content|safe }}

- -

--

- -

Sent from NewsBlur - www.newsblur.com - a visual feed reader with intelligence.

\ No newline at end of file +

{{ story.story_content|safe }}

+ +{% endblock %} \ No newline at end of file