Merge branch 'chriscase-master'

[friendica.git] / view / en / msg-header.tpl

diff --git a/view/en/msg-header.tpl b/view/en/msg-header.tpl
index 494d5e93e227b2b67720fe7b2f3ec9d8ce9477be..174e6c985f15aaee715dd9e005eaeb151afe35a7 100644 (file)
--- a/view/en/msg-header.tpl
+++ b/view/en/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>
@@ -54,7 +58,7 @@ tinyMCE.init({
        $(document).ready(function() {
                var uploader = new window.AjaxUpload(
                        'prvmail-upload',
-                       { action: 'wall_upload',
+                       { action: 'wall_upload/$nickname',
                                name: 'userfile',
                                onSubmit: function(file,ext) { $('#profile-rotator').show(); },
                                onComplete: function(file,response) {