mozilla
/
server-share
зеркало из https://github.com/mozilla/server-share.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

improve the email template a bit and hand it off to andy for more

This commit is contained in:
Bryan Clark 2010-11-19 14:34:36 -08:00
Родитель 33e2629624
Коммит 7e048708e5
3 изменённых файлов: 23 добавлений и 84 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

11
linkdrop/lib/oauth/google_.py
Просмотреть файл

@ -51,8 +51,6 @@ from linkdrop.lib.oauth.openidconsumer import ax_attributes, alternate_ax_attrib
from linkdrop.lib.oauth.openidconsumer import OpenIDResponder
from linkdrop.lib.oauth.base import get_oauth_config
re_url = re.compile(r'(http://[^\s]*)')
GOOGLE_OAUTH = 'https://www.google.com/accounts/OAuthGetAccessToken'
domain = 'google.com'
@ -205,14 +203,13 @@ class api():
# insert the url if it is not already in the message
c.longurl = options.get('link')
c.shorturl = options.get('shorturl')
# get the title, or the long url or the short url or nothing
c.title = options.get('title', options.get('link', options.get('shorturl', '')))
c.description = options.get('description', '')
part1 = MIMEText(render('/text_email.mako').encode('utf-8'), 'plain')
part1.set_charset('utf-8')
# if a url is in the text, make it an html link now, this will messup
# if the user has done the html themselves
c.message = re_url.sub(r'<a href="\1">\1</a>', message)
part2 = MIMEText(render('/html_email.mako').encode('utf-8'), 'html')
part2.set_charset('utf-8')
msg.attach(part1)

49
linkdrop/templates/html_email.html
Просмотреть файл

@ -2,49 +2,18 @@
"http://www.w3.org/TR/html4/loose.dtd">
<html lang="en">
<head>
<title>${c.title}</title>
<style>
.message {
margin: 5px;
padding: 5px;
font-family: cursive;
border: 1px solid;
background-color: yellow;
}
.footer {
font-family: fantasy;
border: 1px solid orange;
margin: 5px;
padding: 5px;
background-color: skyblue;
}
.logo {
background-image: url(http://f1.mozillamessaging.com/favicon.ico);
background-repeat: no-repeat;
padding: 10px;
float: left;
}
.footer-text {
padding-left: 30px;
}
</style>
<title>$TITLE</title>
</head>
<body>
<div class="message">
${c.message}
% if c.shorturl and c.longurl:
<br /><a class="link" href="${c.shorturl}">${c.longurl}</a>
% elif c.longurl:
<br /><a class="link" href="${c.longurl}">${c.longurl}</a>
% elif c.shorturl:
<br /><a class="link" href="${c.shorturl}">${c.shorturl}</a>
% endif
<body style="margin: 1em;max-width:600pt;">
<div class="message" style="color:#222;">
$MESSAGE: Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante.
</div>
<div class="footer">
<div class="logo"></div>
<div class="footer-text">
This shared link has been brought to you by <a href="http://f1.mozillamessaging.com/">Mozilla F1</a>.
<div class="share" style="margin:1em 0;max-width:480pt;">
<div class="link" style="">
<a style="font-family:Arial,Helvetica,sans-serif;font-weight:bold;" href="http://f1.mozillamessaging.com/">F1 by Mozilla Messaging</a>
</div>
<div class="description" style="font-family:Arial,Helvetica,sans-serif;font-size:x-small;color:#666;">Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo. Quisque sit amet est et sapien ullamcorper pharetra. Vestibulum erat wisi, condimentum sed, commodo vitae, ornare sit amet, wisi. Aenean fermentum, elit eget tincidunt condimentum, eros ipsum rutrum orci, sagittis tempus lacus enim ac dui. Donec non enim in turpis pulvinar facilisis. Ut felis. Praesent dapibus, neque id cursus faucibus, tortor neque egestas augue, eu vulputate magna eros eu erat. Aliquam erat volutpat. Nam dui mi, tincidunt quis, accumsan porttitor, facilisis luctus, metus.</div>
</div>
<div style="font-family:Arial,Helvetica,sans-serif;font-size:xx-small;color:#999;position:absolute;bottom:0;margin:1em 0;">Jean Reilly is awesome and used <a style="color:#666;" href="http://f1.mozillamessaging.com/">Mozilla F1</a> to share this.</div>
</body>
</html>

47
linkdrop/templates/html_email.mako
Просмотреть файл

@ -3,48 +3,21 @@
<html lang="en">
<head>
<title>${c.subject}</title>
<style>
.message {
margin: 5px;
padding: 5px;
font-family: cursive;
border: 1px solid;
background-color: yellow;
}
.footer {
font-family: fantasy;
border: 1px solid orange;
margin: 5px;
padding: 5px;
background-color: skyblue;
}
.logo {
background-image: url(http://f1.mozillamessaging.com/favicon.ico);
background-repeat: no-repeat;
padding: 10px;
float: left;
}
.footer-text {
padding-left: 30px;
}
</style>
</head>
<body>
<div class="message">
<body style="margin: 1em;max-width:600pt;">
<div class="message" style="color:#222;">
${context.write(c.message)}
% if c.shorturl and c.longurl:
<br /> <a class="link" href="${c.shorturl}">${c.longurl}</a>
</div>
<div class="share" style="margin:1em 0;max-width:480pt;">
<div class="link" style="">
% if c.shorturl:
<a style="font-family:Arial,Helvetica,sans-serif;font-weight:bold;" href="${c.shorturl}">${c.title}</a></div>
% elif c.longurl:
<br /> <a class="link" href="${c.longurl}">${c.longurl}</a>
% elif c.shorturl:
<br /> <a class="link" href="${c.shorturl}">${c.shorturl}</a>
<a style="font-family:Arial,Helvetica,sans-serif;font-weight:bold;" href="${c.longurl}">${c.title}</a>
% endif
</div>
<div class="footer">
<div class="logo"></div>
<div class="footer-text">
This shared link has been brought to you by <a href="http://f1.mozillamessaging.com/">Mozilla F1</a>.
</div>
<div class="description" style="font-family:Arial,Helvetica,sans-serif;font-size:x-small;color:#666;">${c.description}</div>
</div>
<div style="font-family:Arial,Helvetica,sans-serif;font-size:xx-small;color:#999;position:absolute;bottom:0;margin:1em 0;">${c.from_name} is awesome and used <a style="color:#666;" href="http://f1.mozillamessaging.com/">Mozilla F1</a> to share this.</div>
</body>
</html>