Merge branch 'pull'

[friendica.git] / view / profed_head.tpl

diff --git a/view/profed_head.tpl b/view/profed_head.tpl
old mode 100644 (file)
new mode 100755 (executable)
index 0ff789a..e1df2c4
--- a/view/profed_head.tpl
+++ b/view/profed_head.tpl
@@ -1,24 +1,32 @@
 <script language="javascript" type="text/javascript"
-          src="$baseurl/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
+          src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
           <script language="javascript" type="text/javascript">
 
 
 tinyMCE.init({
        theme : "advanced",
        mode : "textareas",
-       plugins : "bbcode",
-       theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
+       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_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,
-       content_css: "$baseurl/view/custom_tinymce.css"
-
+       force_p_newlines : false,
+       force_br_newlines : true,
+       forced_root_block : '',
+       content_css: "$baseurl/view/custom_tinymce.css",
+       theme_advanced_path : false,
+       setup : function(ed) {
+               ed.onInit.add(function(ed) {
+            ed.pasteAsPlainText = true;
+        });
+    }
 
 });