diff options
| author | Fabio Comuni <fabrix.xm@gmail.com> | 2011-02-17 14:14:06 +0100 |
|---|---|---|
| committer | Fabio Comuni <fabrix.xm@gmail.com> | 2011-02-17 14:14:06 +0100 |
| commit | 3d69e2a50c432421fb417e748a28d2cafd707b1f (patch) | |
| tree | c01ed05d84ac450300bd761339fe0fc09c8c4bfc /view/en | |
| parent | dc15e8640de0fcd77bf91b97aee6f890b34ba6cb (diff) | |
| parent | c948ab8f211c54ca73643ba23ddcde3da0c256a3 (diff) | |
| download | volse-hubzilla-3d69e2a50c432421fb417e748a28d2cafd707b1f.tar.gz volse-hubzilla-3d69e2a50c432421fb417e748a28d2cafd707b1f.tar.bz2 volse-hubzilla-3d69e2a50c432421fb417e748a28d2cafd707b1f.zip | |
Merge branch 'master' into themetests
Diffstat (limited to 'view/en')
| -rw-r--r-- | view/en/mail_received_eml.tpl | 47 | ||||
| -rw-r--r-- | view/en/mail_received_html_body_eml.tpl | 25 | ||||
| -rw-r--r-- | view/en/mail_received_text_body_eml.tpl | 10 | ||||
| -rw-r--r-- | view/en/wallwall_item.tpl | 1 |
4 files changed, 43 insertions, 40 deletions
diff --git a/view/en/mail_received_eml.tpl b/view/en/mail_received_eml.tpl index 802280052..99eb14391 100644 --- a/view/en/mail_received_eml.tpl +++ b/view/en/mail_received_eml.tpl @@ -1,47 +1,14 @@ --$mimeboundary -Content-Type: text/plain; charset=utf-8 -Content-Transfer-Encoding: 8bit +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: base64 -$from sent you a new private message at $siteName. - -$title - -$textversion - -Please login at $siteurl to read and reply to your private messages. - -Thank you, -$siteName administrator +$textbody --$mimeboundary -Content-Type: text/html; charset=utf-8 -Content-Transfer-Encoding: 8bit - -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN"> -<html> -<head> - <title>Friendika Message</title> - <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> -</head> -<body> -<table style="border:1px solid #ccc"> - <tbody> - <tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$hostname/images/ff-32.jpg'><span style="padding:7px;">Friendika</span></td></tr> - - <tr><td style="padding-top:22px;" colspan="2">$from sent you a new private message at $siteName.</td></tr> - - - <tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td> - <td style="padding-top:22px;"><a href="$url">$from</a></td></tr> - <tr><td style="font-weight:bold;padding-bottom:5px;">$title</td></tr> - <tr><td style="padding-right:22px;">$htmlversion</td></tr> - <tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Please login at $siteurl to read and reply to your private messages.</td></tr> - <tr><td></td><td>Thank You,</td></tr> - <tr><td></td><td>$siteName Administrator</td></tr> - </tbody> -</table> -</body> -</html> +Content-Type: text/html; charset=UTF-8 +Content-Transfer-Encoding: base64 +$htmlbody + --$mimeboundary-- diff --git a/view/en/mail_received_html_body_eml.tpl b/view/en/mail_received_html_body_eml.tpl new file mode 100644 index 000000000..56cbf1d7c --- /dev/null +++ b/view/en/mail_received_html_body_eml.tpl @@ -0,0 +1,25 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN"> +<html> +<head> + <title>Friendika Message</title> + <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> +</head> +<body> +<table style="border:1px solid #ccc"> + <tbody> + <tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$siteurl/images/ff-32.jpg'><span style="padding:7px;">Friendika</span></td></tr> + + <tr><td style="padding-top:22px;" colspan="2">$from sent you a new private message at $siteName.</td></tr> + + + <tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td> + <td style="padding-top:22px;"><a href="$url">$from</a></td></tr> + <tr><td style="font-weight:bold;padding-bottom:5px;">$title</td></tr> + <tr><td style="padding-right:22px;">$htmlversion</td></tr> + <tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Please login at <a href="$siteurl">$siteurl</a> to read and reply to your private messages.</td></tr> + <tr><td></td><td>Thank You,</td></tr> + <tr><td></td><td>$siteName Administrator</td></tr> + </tbody> +</table> +</body> +</html>
\ No newline at end of file diff --git a/view/en/mail_received_text_body_eml.tpl b/view/en/mail_received_text_body_eml.tpl new file mode 100644 index 000000000..023867304 --- /dev/null +++ b/view/en/mail_received_text_body_eml.tpl @@ -0,0 +1,10 @@ +$from sent you a new private message at $siteName. + +$title + +$textversion + +Please login at $siteurl to read and reply to your private messages. + +Thank you, +$siteName administrator diff --git a/view/en/wallwall_item.tpl b/view/en/wallwall_item.tpl index f8affd1c5..9c6ad6070 100644 --- a/view/en/wallwall_item.tpl +++ b/view/en/wallwall_item.tpl @@ -21,6 +21,7 @@ <div class="wall-item-title" id="wall-item-title-$id">$title</div> <div class="wall-item-body" id="wall-item-body-$id" >$body</div> </div> + $plink $drop </div> <div class="wall-item-wrapper-end"></div> |