X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Fmsg-header.tpl;h=67775a45b221117a07e6c7b0ea3d3fef421d1668;hb=20d4fda22f26a99e7da930be639874f80ae7060d;hp=bef2a03bbc5644a20c52a7235b9c8b68e7dbe0a2;hpb=04e65823d70d448400d3be7f0b3244ea8658834d;p=friendica.git

diff --git a/view/msg-header.tpl b/view/msg-header.tpl
index bef2a03bbc..67775a45b2 100644
--- a/view/msg-header.tpl
+++ b/view/msg-header.tpl
@@ -1,22 +1,25 @@
 
-<script language="javascript" type="text/javascript" src="$baseurl/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
+<script language="javascript" type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
 <script language="javascript" type="text/javascript">
 
 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,
+	force_p_newlines : false,
+	force_br_newlines : true,
+	forced_root_block : '',
 	convert_urls: false,
 	content_css: "$baseurl/view/custom_tinymce.css",
 	     //Character count
@@ -41,8 +44,12 @@ tinyMCE.init({
 				$('#character-counter').addClass('red');
 			}
 			$('#character-counter').text(text);
-    		});
-     	}
+    	});
+
+		ed.onInit.add(function(ed) {
+			ed.pasteAsPlainText = true;
+		});
+	}
 });
 
 </script>
@@ -51,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) {
@@ -64,7 +71,7 @@ tinyMCE.init({
 	});
 
 	function jotGetLink() {
-		reply = prompt("Please enter a link URL:");
+		reply = prompt("$linkurl");
 		if(reply && reply.length) {
 			$('#profile-rotator').show();
 			$.get('parse_url?url=' + reply, function(data) {