diff options
| author | Fabio Comuni <fabrix.xm@gmail.com> | 2011-02-15 14:19:54 +0100 |
|---|---|---|
| committer | Fabio Comuni <fabrix.xm@gmail.com> | 2011-02-15 14:19:54 +0100 |
| commit | 70cf5ae3c79ad1b94e9d5fab82325d55a12761c0 (patch) | |
| tree | 5aeffd36453e9b890442a682623c84aee276836e /view/it | |
| parent | dd8bbe820294ce6e0ca2e17f8783cb125b9871db (diff) | |
| parent | 473786d3a09a2210b2fe55a00d2bac5d8d207d52 (diff) | |
| download | volse-hubzilla-70cf5ae3c79ad1b94e9d5fab82325d55a12761c0.tar.gz volse-hubzilla-70cf5ae3c79ad1b94e9d5fab82325d55a12761c0.tar.bz2 volse-hubzilla-70cf5ae3c79ad1b94e9d5fab82325d55a12761c0.zip | |
Merge remote-tracking branch 'friendika-master/master'
Diffstat (limited to 'view/it')
| -rw-r--r-- | view/it/mail_received_eml.tpl | 48 | ||||
| -rw-r--r-- | view/it/msg-header.tpl | 14 |
2 files changed, 48 insertions, 14 deletions
diff --git a/view/it/mail_received_eml.tpl b/view/it/mail_received_eml.tpl index 137614ca4..829c0fee5 100644 --- a/view/it/mail_received_eml.tpl +++ b/view/it/mail_received_eml.tpl @@ -1,16 +1,46 @@ +--$mimeboundary +Content-Type: text/plain; charset=utf-8 +Content-Transfer-Encoding: 8bit -Caro/a $username, - - Hai ricevuto un nuovo messsaggio privato su $sitename da '$from'. ------ +Hai ricevuto un nuovo messsaggio privato su $siteName da '$from'. + $title ------ -$body ------ + +$textversion + Accedi a $siteurl per leggere e rispondere ai tuoi messaggi privati. Grazie, - L'amministratore di $sitename +L'amministratore di $siteName + +--$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> + + <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 diff --git a/view/it/msg-header.tpl b/view/it/msg-header.tpl index f6f437864..69e813ae2 100644 --- a/view/it/msg-header.tpl +++ b/view/it/msg-header.tpl @@ -6,14 +6,14 @@ tinyMCE.init({ theme : "advanced", mode : "specific_textareas", editor_selector: /(profile-jot-text|prvmail-text)/, - plugins : "bbcode", + plugins : "bbcode,paste", theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor", theme_advanced_buttons2 : "", theme_advanced_buttons3 : "", theme_advanced_toolbar_location : "top", theme_advanced_toolbar_align : "center", - theme_advanced_styles : "Code=codeStyle;Quote=quoteStyle", - content_css : "bbcode.css", + theme_advanced_blockformats : "blockquote,code", + paste_text_sticky : true, entity_encoding : "raw", add_unload_trigger : false, remove_linebreaks : false, @@ -44,8 +44,12 @@ tinyMCE.init({ $('#character-counter').addClass('red'); } $('#character-counter').text(text); - }); - } + }); + + ed.onInit.add(function(ed) { + ed.pasteAsPlainText = true; + }); + } }); </script> |