aboutsummaryrefslogtreecommitdiffstats
path: root/view/it
diff options
context:
space:
mode:
authorFabio Comuni <fabrix.xm@gmail.com>2011-02-17 14:14:06 +0100
committerFabio Comuni <fabrix.xm@gmail.com>2011-02-17 14:14:06 +0100
commit3d69e2a50c432421fb417e748a28d2cafd707b1f (patch)
treec01ed05d84ac450300bd761339fe0fc09c8c4bfc /view/it
parentdc15e8640de0fcd77bf91b97aee6f890b34ba6cb (diff)
parentc948ab8f211c54ca73643ba23ddcde3da0c256a3 (diff)
downloadvolse-hubzilla-3d69e2a50c432421fb417e748a28d2cafd707b1f.tar.gz
volse-hubzilla-3d69e2a50c432421fb417e748a28d2cafd707b1f.tar.bz2
volse-hubzilla-3d69e2a50c432421fb417e748a28d2cafd707b1f.zip
Merge branch 'master' into themetests
Diffstat (limited to 'view/it')
-rw-r--r--view/it/mail_received_eml.tpl49
-rw-r--r--view/it/mail_received_html_body_eml.tpl25
-rw-r--r--view/it/mail_received_text_body_eml.tpl10
-rw-r--r--view/it/wallwall_item.tpl1
4 files changed, 44 insertions, 41 deletions
diff --git a/view/it/mail_received_eml.tpl b/view/it/mail_received_eml.tpl
index 829c0fee5..538d28e1e 100644
--- a/view/it/mail_received_eml.tpl
+++ b/view/it/mail_received_eml.tpl
@@ -1,46 +1,13 @@
--$mimeboundary
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: base64
-Hai ricevuto un nuovo messsaggio privato su $siteName da '$from'.
-
-$title
-
-$textversion
-
-Accedi a $siteurl per leggere e rispondere ai tuoi messaggi privati.
-
-Grazie,
-L'amministratore di $siteName
+$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 Messsaggio</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>
+Content-Type: text/html; charset=UTF-8
+Content-Transfer-Encoding: base64
- <tr><td style="padding-top:22px;" colspan="2">Hai ricevuto un nuovo messsaggio privato su $siteName da '$from'.</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">Accedi a $siteurl per leggere e rispondere ai tuoi messaggi privati.</td></tr>
- <tr><td></td><td>Grazie,</td></tr>
- <tr><td></td><td>L'amministratore di $siteName</td></tr>
- </tbody>
-</table>
-</body>
-</html>
-
---$mimeboundary-- \ No newline at end of file
+$htmlbody
+
+--$mimeboundary--
diff --git a/view/it/mail_received_html_body_eml.tpl b/view/it/mail_received_html_body_eml.tpl
new file mode 100644
index 000000000..7510f2b30
--- /dev/null
+++ b/view/it/mail_received_html_body_eml.tpl
@@ -0,0 +1,25 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
+<html>
+<head>
+ <title>Friendika Messsaggio</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">Hai ricevuto un nuovo messsaggio privato su $siteName da '$from'.</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">Accedi a <a href="$siteurl">$siteurl</a> per leggere e rispondere ai tuoi messaggi privati.</td></tr>
+ <tr><td></td><td>Grazie,</td></tr>
+ <tr><td></td><td>L'amministratore di $siteName</td></tr>
+ </tbody>
+</table>
+</body>
+</html>
diff --git a/view/it/mail_received_text_body_eml.tpl b/view/it/mail_received_text_body_eml.tpl
new file mode 100644
index 000000000..c7da9533f
--- /dev/null
+++ b/view/it/mail_received_text_body_eml.tpl
@@ -0,0 +1,10 @@
+Hai ricevuto un nuovo messsaggio privato su $siteName da '$from'.
+
+$title
+
+$textversion
+
+Accedi a $siteurl per leggere e rispondere ai tuoi messaggi privati.
+
+Grazie,
+L'amministratore di $siteName
diff --git a/view/it/wallwall_item.tpl b/view/it/wallwall_item.tpl
index bc2d3f2ec..3c7883fc8 100644
--- a/view/it/wallwall_item.tpl
+++ b/view/it/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>