diff options
-rw-r--r-- | view/de/jot-header.tpl | 16 | ||||
-rw-r--r-- | view/de/jot.tpl | 10 | ||||
-rw-r--r-- | view/en/jot.tpl | 8 | ||||
-rw-r--r-- | view/fr/jot-header.tpl | 16 | ||||
-rw-r--r-- | view/fr/jot.tpl | 9 | ||||
-rw-r--r-- | view/it/jot-header.tpl | 16 | ||||
-rw-r--r-- | view/it/jot.tpl | 9 | ||||
-rw-r--r-- | view/it/strings.php | 19 | ||||
-rw-r--r-- | view/theme/default/style.css | 2 | ||||
-rw-r--r-- | view/theme/duepuntozero/style.css | 3 |
10 files changed, 78 insertions, 30 deletions
diff --git a/view/de/jot-header.tpl b/view/de/jot-header.tpl index 508715dca..41abdf0f3 100644 --- a/view/de/jot-header.tpl +++ b/view/de/jot-header.tpl @@ -2,17 +2,20 @@ <script language="javascript" type="text/javascript" src="$baseurl/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script> <script language="javascript" type="text/javascript"> +var editor; + tinyMCE.init({ theme : "advanced", mode : "specific_textareas", editor_selector: /(profile-jot-text|prvmail-text)/, - plugins : "bbcode", - theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect", + plugins : "bbcode,paste", + theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code", theme_advanced_buttons2 : "", theme_advanced_buttons3 : "", theme_advanced_toolbar_location : "top", theme_advanced_toolbar_align : "center", theme_advanced_blockformats : "blockquote,code", + paste_text_sticky : true, entity_encoding : "raw", add_unload_trigger : false, remove_linebreaks : false, @@ -43,8 +46,13 @@ tinyMCE.init({ $('#character-counter').addClass('red'); } $('#character-counter').text(text); - }); - } + }); + + ed.onInit.add(function(ed) { + ed.pasteAsPlainText = true; + }); + + } }); </script> diff --git a/view/de/jot.tpl b/view/de/jot.tpl index d86d8f847..545bbdadd 100644 --- a/view/de/jot.tpl +++ b/view/de/jot.tpl @@ -13,10 +13,6 @@ <input type="hidden" name="location" id="jot-location" value="$defloc" /> <input type="hidden" name="coord" id="jot-coord" value="" /> -<div id="profile-jot-plugin-wrapper" > - $jotplugins -</div> -<div id="profile-jot-plugin-end"></div> <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" ></textarea> @@ -37,6 +33,12 @@ <div id="profile-nolocation-wrapper" style="display: none;" > <img id="profile-nolocation" src="images/noglobe.gif" alt="Browser Standort leeren" title="Browser Standort leeren" onclick="jotClearLocation();" /> </div> + + <div id="profile-jot-plugin-wrapper" > + $jotplugins + </div> + + <div id="profile-rotator-wrapper" style="display: $visitor;" > <img id="profile-rotator" src="images/rotator.gif" alt="Bitte warten" title="Bitte warten" style="display: none;" /> </div> diff --git a/view/en/jot.tpl b/view/en/jot.tpl index d2a1014e7..5f9935778 100644 --- a/view/en/jot.tpl +++ b/view/en/jot.tpl @@ -15,10 +15,6 @@ <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" ></textarea> -<div id="profile-jot-plugin-wrapper" > - $jotplugins -</div> -<div id="profile-jot-plugin-end"></div> <div id="profile-jot-submit-wrapper" > <input type="submit" id="profile-jot-submit" name="submit" value="Share" /> @@ -37,6 +33,10 @@ <div id="profile-nolocation-wrapper" style="display: none;" > <img id="profile-nolocation" src="images/noglobe.gif" alt="Clear Browser Location" title="Clear Browser Location" onclick="jotClearLocation();" /> </div> + <div id="profile-jot-plugin-wrapper"> + $jotplugins + </div> + <div id="profile-rotator-wrapper" style="display: $visitor;" > <img id="profile-rotator" src="images/rotator.gif" alt="Please wait" title="Please wait" style="display: none;" /> </div> diff --git a/view/fr/jot-header.tpl b/view/fr/jot-header.tpl index b687f65a6..d0c956a02 100644 --- a/view/fr/jot-header.tpl +++ b/view/fr/jot-header.tpl @@ -2,17 +2,20 @@ <script language="javascript" type="text/javascript" src="$baseurl/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script> <script language="javascript" type="text/javascript"> +var editor; + tinyMCE.init({ theme : "advanced", mode : "specific_textareas", editor_selector: /(profile-jot-text|prvmail-text)/, - plugins : "bbcode", - theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect", + plugins : "bbcode,paste", + theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code", theme_advanced_buttons2 : "", theme_advanced_buttons3 : "", theme_advanced_toolbar_location : "top", theme_advanced_toolbar_align : "center", theme_advanced_blockformats : "blockquote,code", + paste_text_sticky : true, entity_encoding : "raw", add_unload_trigger : false, remove_linebreaks : false, @@ -43,8 +46,13 @@ tinyMCE.init({ $('#character-counter').addClass('red'); } $('#character-counter').text(text); - }); - } + }); + + ed.onInit.add(function(ed) { + ed.pasteAsPlainText = true; + }); + + } }); </script> diff --git a/view/fr/jot.tpl b/view/fr/jot.tpl index 7c49d771d..720cb0d1b 100644 --- a/view/fr/jot.tpl +++ b/view/fr/jot.tpl @@ -15,10 +15,6 @@ <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" ></textarea> -<div id="profile-jot-plugin-wrapper" > - $jotplugins -</div> -<div id="profile-jot-plugin-end"></div> <div id="profile-jot-submit-wrapper" > @@ -38,6 +34,11 @@ <div id="profile-nolocation-wrapper" style="display: none;" > <img id="profile-nolocation" src="images/noglobe.gif" alt="Clear Browser Location" title="Clear Browser Location" onclick="jotClearLocation();" /> </div> + + <div id="profile-jot-plugin-wrapper" > + $jotplugins + </div> + <div id="profile-rotator-wrapper" style="display: $visitor;" > <img id="profile-rotator" src="images/rotator.gif" alt="Please wait" title="Please wait" style="display: none;" /> </div> diff --git a/view/it/jot-header.tpl b/view/it/jot-header.tpl index bf655ab37..e55a357e8 100644 --- a/view/it/jot-header.tpl +++ b/view/it/jot-header.tpl @@ -2,17 +2,20 @@ <script language="javascript" type="text/javascript" src="$baseurl/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script> <script language="javascript" type="text/javascript"> +var editor; + tinyMCE.init({ theme : "advanced", mode : "specific_textareas", editor_selector: /(profile-jot-text|prvmail-text)/, - plugins : "bbcode", - theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect", + plugins : "bbcode,paste", + theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code", theme_advanced_buttons2 : "", theme_advanced_buttons3 : "", theme_advanced_toolbar_location : "top", theme_advanced_toolbar_align : "center", theme_advanced_blockformats : "blockquote,code", + paste_text_sticky : true, entity_encoding : "raw", add_unload_trigger : false, remove_linebreaks : false, @@ -43,8 +46,13 @@ tinyMCE.init({ $('#character-counter').addClass('red'); } $('#character-counter').text(text); - }); - } + }); + + ed.onInit.add(function(ed) { + ed.pasteAsPlainText = true; + }); + + } }); </script> diff --git a/view/it/jot.tpl b/view/it/jot.tpl index 7153c341c..eae3ecba8 100644 --- a/view/it/jot.tpl +++ b/view/it/jot.tpl @@ -15,10 +15,6 @@ <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" ></textarea> -<div id="profile-jot-plugin-wrapper" > - $jotplugins -</div> -<div id="profile-jot-plugin-end"></div> <div id="profile-jot-submit-wrapper" > <input type="submit" id="profile-jot-submit" name="submit" value="Condividi" /> @@ -37,6 +33,11 @@ <div id="profile-nolocation-wrapper" style="display: none;" > <img id="profile-nolocation" src="images/noglobe.gif" alt="Cancella la tua posizione data dal browser" title="Cancella la tua posizione data dal browser" onclick="jotClearLocation();" /> </div> + + <div id="profile-jot-plugin-wrapper" > + $jotplugins + </div> + <div id="profile-rotator-wrapper" style="display: $visitor;" > <img id="profile-rotator" src="images/rotator.gif" alt="Attendi" title="Attendi" style="display: none;" /> </div> diff --git a/view/it/strings.php b/view/it/strings.php index d0f62543f..aa5359dbf 100644 --- a/view/it/strings.php +++ b/view/it/strings.php @@ -1032,4 +1032,23 @@ $a->strings['Normal View'] = 'Vista normale'; $a->strings['New Item View'] = 'Vista Nuovi Elementi'; $a->strings[' Cannot change to that email.'] = 'Non puoi cambiare a quella email.'; $a->strings['Birthday:'] = 'Compleanno:'; +$a->strings['Update now'] = 'Aggiorna adesso'; +$a->strings['This message was sent to you by '] = 'Questo messaggio è ti è stato inviato da '; +$a->strings[', a member of the Friendika social network.'] = ', un membro del social network Friendika'; +$a->strings['You may visit them online at'] = 'Puoi visitarli online a '; +$a->strings['Please contact the sender by replying to this post if you do not wish to receive these messages.'] = 'Contatta il mittente rispondendo a questo post se non vuoi ricevere questi messaggi.'; +$a->strings['posted an update.'] = 'ha inviato un aggiornamento.'; +$a->strings['CC: email addresses'] = 'CC: indirizzi email'; +$a->strings['Example: bob@example.com, mary@example.com'] = 'Esempio: bob@example.com, mary@example.com'; +$a->strings['Embedding disabled'] = 'Inclusione disabilitata'; +$a->strings['Upload a file'] = 'Carica un file'; +$a->strings['Drop files here to upload'] = 'Trascina un file qui per caricarlo'; +$a->strings['Failed'] = 'Fallito'; +$a->strings['No files were uploaded.'] = 'Nessun file è stato caricato.'; +$a->strings['Uploaded file is empty'] = 'Il file caricato è vuoto'; +$a->strings['Uploaded file is too large'] = 'Il file caricato è troppo grande'; +$a->strings['File has an invalid extension, it should be one of '] = 'Il file ha una estensione non valida, dovrebbe essere una di '; +$a->strings['Upload was cancelled, or server error encountered'] = 'Il caricamento è stato cancellato, o si è verificato un errore sul server'; +$a->strings['Randplace Settings'] = 'Impostazioni Randplace'; +$a->strings['Enable Randplace Plugin'] = 'Abilita il plugin Randplace'; ?> diff --git a/view/theme/default/style.css b/view/theme/default/style.css index ae45a4244..a60ea9db6 100644 --- a/view/theme/default/style.css +++ b/view/theme/default/style.css @@ -2010,7 +2010,7 @@ a.mail-list-link { .tool-wrapper { float: left; - margin-left: 5px; + margin-left: 20px; } .tool-link { cursor: pointer; diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index d6a1744a6..d27a894b7 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -1900,8 +1900,9 @@ a.mail-list-link { .tool-wrapper { float: left; - margin-left: 5px; + margin-left: 20px; } + .tool-link { cursor: pointer; } |