diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/de/cmnt_received_html_body_eml.tpl | 12 | ||||
| -rw-r--r-- | view/de/mail_received_html_body_eml.tpl | 11 | ||||
| -rw-r--r-- | view/de/wall_received_html_body_eml.tpl | 24 | ||||
| -rw-r--r-- | view/de/wall_received_text_body_eml.tpl | 18 | ||||
| -rw-r--r-- | view/email_notify_html.tpl | 27 | ||||
| -rw-r--r-- | view/email_notify_text.tpl | 13 | ||||
| -rw-r--r-- | view/en/mail_received_html_body_eml.tpl | 2 | ||||
| -rw-r--r-- | view/intros.tpl | 1 | ||||
| -rw-r--r-- | view/suggestions.tpl | 1 |
9 files changed, 97 insertions, 12 deletions
diff --git a/view/de/cmnt_received_html_body_eml.tpl b/view/de/cmnt_received_html_body_eml.tpl index 3904b5f57..db7f829bc 100644 --- a/view/de/cmnt_received_html_body_eml.tpl +++ b/view/de/cmnt_received_html_body_eml.tpl @@ -1,25 +1,25 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN"> <html> <head> - <title>Friendika Mitteilung</title> + <title>Friendica Nachricht</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/friendika-32.png'><span style="padding:7px;">Friendika</span></td></tr> + <tr><td colspan="2" style="background:#084769; 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; float:left;" src='$siteurl/images/friendica-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">Friendica</div><div style="clear: both;"></div></td></tr> - <tr><td style="padding-top:22px;" colspan="2">$from hat einen Pinnwandeintrag kommentiert dem du auch folgst.</td></tr> + <tr><td style="padding-top:22px;" colspan="2">$from hat einen Beitrag kommentiert dem du auch folgst.</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="padding-bottom:5px;"></td></tr> <tr><td style="padding-right:22px;">$body</td></tr> - <tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2"><a href="$display">Um die gesamte Konversation zu sehen melde dich bitte bei $siteurl an</a>.</td></tr> - <tr><td></td><td>Danke für die Aufmerksamkeit</td></tr> + <tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Bitte melde dich an um <a href="$display">die komplette Unterhaltung anzuzeigen</a>.</td></tr> + <tr><td></td><td>Beste Grüße,</td></tr> <tr><td></td><td>$sitename Administrator</td></tr> </tbody> </table> </body> -</html>
\ No newline at end of file +</html> diff --git a/view/de/mail_received_html_body_eml.tpl b/view/de/mail_received_html_body_eml.tpl index 9d0ecf7ae..34eea59da 100644 --- a/view/de/mail_received_html_body_eml.tpl +++ b/view/de/mail_received_html_body_eml.tpl @@ -1,23 +1,24 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN"> <html> <head> - <title>Friendika Nachricht</title> + <title>Friendica Nachricht</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/freindika-32.png'><span style="padding:7px;">Friendika</span></td></tr> + <tr><td colspan="2" style="background:#084769; 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; float:left;" src='$siteurl/images/friendica-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">Friendica</div><div style="clear: both;"></div></td></tr> - <tr><td style="padding-top:22px;" colspan="2">Du hast eine neue private Nachricht von '$from' auf '$siteName' erhhalten.</td></tr> + + <tr><td style="padding-top:22px;" colspan="2">$fromi hat dir eine private Nachricht auf $siteName gesendet.</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">Bitte melde dich unter <a href="$siteurl"$siteurl</a> an um deine privaten Nachrichte zu lesen und zu beantworten.</td></tr> - <tr><td></td><td>Viele Grüße,</td></tr> + <tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Bitte melde dich auf <a href="$siteurl/message">$siteurl/message</a> an um die Nachricht zu bearbeiten.</td></tr> + <tr><td></td><td>Beste Grüße,</td></tr> <tr><td></td><td>$siteName Administrator</td></tr> </tbody> </table> diff --git a/view/de/wall_received_html_body_eml.tpl b/view/de/wall_received_html_body_eml.tpl new file mode 100644 index 000000000..407e4fdce --- /dev/null +++ b/view/de/wall_received_html_body_eml.tpl @@ -0,0 +1,24 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN"> +<html> +<head> + <title>Friendica Nachricht</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:#084769; 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; float:left;" src='$siteurl/images/friendica-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">Friendica</div><div style="clear: both;"></div></td></tr> + + <tr><td style="padding-top:22px;" colspan="2">$from hat etwas auf deine Pinnwand gepostet.</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="padding-right:22px;">$body</td></tr> + <tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Bitte melde dich auf <a href="$siteurl">$siteurl</a> an um <a href="$display">den Eintrag anzusehen oder ihn zu löschen</a>.</td></tr> + <tr><td></td><td>Beste Grüße,</td></tr> + <tr><td></td><td>$sitename Administrator</td></tr> + </tbody> +</table> +</body> +</html> diff --git a/view/de/wall_received_text_body_eml.tpl b/view/de/wall_received_text_body_eml.tpl new file mode 100644 index 000000000..c627b0c7e --- /dev/null +++ b/view/de/wall_received_text_body_eml.tpl @@ -0,0 +1,18 @@ + +Hallo $username, + + '$from' hat etwas auf deiner Pinnwand gepostet. + +----- +$body +----- + +Bitte melde dich auf $siteurl an um den Beitrag anzusehen oder ihn zu löschen: + +$display + +Besten Dank! + $sitename Administrator + + + diff --git a/view/email_notify_html.tpl b/view/email_notify_html.tpl new file mode 100644 index 000000000..b302c2149 --- /dev/null +++ b/view/email_notify_html.tpl @@ -0,0 +1,27 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN"> +<html> +<head> + <title>$banner</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:#084769; 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; float:left;" src='$siteurl/images/friendica-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">$product</div><div style="clear: both;"></div></td></tr> + + + <tr><td style="padding-top:22px;" colspan="2">$preamble</td></tr> + + + <tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$source_link"><img style="border:0px;width:48px;height:48px;" src="$source_photo"></a></td> + <td style="padding-top:22px;"><a href="$source_link">$source_name</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;" colspan="2">$hsitelink</td></tr> + <tr><td style="padding-bottom:11px;" colspan="2">$itemlink</td></tr> + <tr><td></td><td>$thanks</td></tr> + <tr><td></td><td>$site_admin</td></tr> + </tbody> +</table> +</body> +</html> diff --git a/view/email_notify_text.tpl b/view/email_notify_text.tpl new file mode 100644 index 000000000..f7f5a4c68 --- /dev/null +++ b/view/email_notify_text.tpl @@ -0,0 +1,13 @@ + +$preamble + +$title + +$textversion + +$tsitelink +$itemlink + +$thanks +$site_admin + diff --git a/view/en/mail_received_html_body_eml.tpl b/view/en/mail_received_html_body_eml.tpl index 23d9ac4c2..bd105a61b 100644 --- a/view/en/mail_received_html_body_eml.tpl +++ b/view/en/mail_received_html_body_eml.tpl @@ -17,7 +17,7 @@ <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 style="padding-top:11px;padding-bottom:11px;" colspan="2">Please login at <a href="$siteurl/message">$siteurl/message</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> diff --git a/view/intros.tpl b/view/intros.tpl index d52c3a7aa..d02fd57e6 100644 --- a/view/intros.tpl +++ b/view/intros.tpl @@ -14,6 +14,7 @@ <div class="intro-form-end"></div> <form class="intro-approve-form" action="dfrn_confirm" method="post"> +{{inc field_checkbox.tpl with $field=$hidden }}{{endinc}} <input type="hidden" name="dfrn_id" value="$dfrn_id" > <input type="hidden" name="intro_id" value="$intro_id" > <input type="hidden" name="contact_id" value="$contact_id" > diff --git a/view/suggestions.tpl b/view/suggestions.tpl index dae551849..656336496 100644 --- a/view/suggestions.tpl +++ b/view/suggestions.tpl @@ -14,6 +14,7 @@ <div class="intro-form-end"></div> <form class="intro-approve-form" action="$request" method="get"> +{{inc field_checkbox.tpl with $field=$hidden }}{{endinc}} <input class="intro-submit-approve" type="submit" name="submit" value="$approve" /> </form> </div> |