public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-09-18 21:50:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into offline

Browse source 
* master:
  Re-designed shared story email.
This commit is contained in:
Samuel Clay 2013-06-13 12:05:15 -07:00
commit 7570dc3229
6 changed files with 47 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/reader/views.py
View file

@ -1514,9 +1514,9 @@ def send_story_email(request):
"feed": feed,
"share_user_profile": share_user_profile,
}
text = render_to_string('mail/email_story_text.xhtml', params)
html = render_to_string('mail/email_story_html.xhtml', params)
subject = '%s is sharing a story with you: "%s"' % (from_name, story['story_title'])
text = render_to_string('mail/email_story.txt', params)
html = render_to_string('mail/email_story.xhtml', params)
subject = '%s shares "%s"' % (from_name, story['story_title'])
cc = None
if email_cc:
cc = ['%s <%s>' % (from_name, from_email)]

2
templates/mail/email_base.xhtml
View file

@ -26,6 +26,7 @@
</td>
</tr>
{% block footer %}
<tr>
<td style="border-top: 3px solid #404040; padding-top: 4px;" align="left">
<table>
@ -72,6 +73,7 @@
</table>
</td>
</tr>
{% endblock footer %}
<tr>
<td align="center" style="padding-top: 12px;">
<a href="http://{% current_domain %}{{ user.profile.autologin_url }}"><img alt="NewsBlur" src="http://{% current_domain %}/media/img/logo_newsblur.png" title="NewsBlur" style="width:312px;height:60px;border: none;"></a>

16
templates/mail/email_story.txt Normal file
View file

@ -0,0 +1,16 @@
{{ from_name }} shares "{{ story.story_title }}" from {{ feed.feed_title }}{% if comments %}:
{{ comments }}
{% else %}.{% endif %}
---------------------------------------------------------------------------
{{ story.story_title }}
{{ story.story_permalink|safe }}
{{ story.text|safe }}
---------------------------------------------------------------------------
Sent from NewsBlur - www.newsblur.com - a personal news reader bringing people together to talk about the world.

26
templates/mail/email_story.xhtml Normal file
View file

@ -0,0 +1,26 @@
{% extends "mail/email_base.xhtml" %}
{% load social_tags %}
{% block header %}{% endblock %}
{% block body %}
<p style="font-size: 18px; color:#555555; margin-top: 0;margin-bottom: 10px;padding-top:0px;line-height: 28px;">
<a href="{{ share_user_profile.blurblog_url }}"><img src="{{ share_user_profile.email_photo_url }}" style="width: 36px; height: 36px;margin: 0 12px 0 0;border-radius: 1px;border: none;float: left;vertical-align: middle"></a> {{ from_name }} shares "<a href="{{ story.story_permalink|safe }}">{{ story.story_title }}</a>"{% if feed %} from <img src="{{ feed.favicon_url_fqdn }}" style="width: 16px;height: 16px;vertical-align: middle"> {{ feed.feed_title }}{% endif %}{% if comments %}:</p>
<p>{{ comments }}
{% endif %}
</p>
<div style="margin: 24px 0 12px; border-top: 3px solid #404040; padding: 4px 0;"></div>
<h2>{{ story.story_title }}</h2>
<a href="{{ story.story_permalink|safe }}">{{ story.story_permalink|safe }}</a>
<p>{{ story.story_content|safe }}</p>
<div style="margin: 24px 0 12px; border-top: 3px solid #404040; padding: 4px 0;"></div>
{% endblock %}
{% block footer %}{% endblock footer %}

25
templates/mail/email_story_html.xhtml
View file

@ -1,25 +0,0 @@
{% extends "mail/email_base.xhtml" %}
{% load social_tags %}
{% block header %}{% endblock %}
{% block body %}
<p style="font-size: 24px; color:#555555; margin-top: 0;margin-bottom: 10px;padding-top:0px;line-height: 28px;">
<a href="{{ share_user_profile.blurblog_url }}"><img src="{{ share_user_profile.email_photo_url }}" style="width: 48px; height: 48px;margin: 0 12px 0 0;border-radius: 3px;border: none;float: left"></a> {{ from_name }} is sharing a story with you entitled "<a href="{{ story.story_permalink|safe }}">{{ story.story_title }}</a>"{% if feed %} from <img src="{{ feed.favicon_url_fqdn }}" style="width: 16px;height: 16px;vertical-align: middle"> {{ feed.feed_title }}{% endif %}
</p>
{% if comments %}
<p>{{ from_name }} writes:<br />
{{ comments }}</p>
{% endif %}
<div style="margin: 24px 0 12px; border-top: 3px solid #404040; padding: 4px 0;"></div>
<h2>{{ story.story_title }}</h2>
<a href="{{ story.story_permalink|safe }}">{{ story.story_permalink|safe }}</a>
<p>{{ story.story_content|safe }}</p>
{% endblock %}

16
templates/mail/email_story_text.xhtml
View file

@ -1,16 +0,0 @@
Hello there! {{ from_name }} is sharing a story with you entitled "{{ story.story_title }}" from {{ feed.feed_title }}.
{% if comments %}
{{ from_name }} writes:
{{ comments }}
{% endif %}
--
{{ story.story_title }}
{{ story.story_permalink|safe }}
{{ story.text|safe }}
--
Sent from NewsBlur - www.newsblur.com - a personal news reader bringing people together to talk about the world.