aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-03-20 15:51:09 -0700
committerFriendika <info@friendika.com>2011-03-20 15:51:09 -0700
commit2b0af1456ceebb6be24768d14702742e73125588 (patch)
treeaee20af0735c00cb613363b1066e3b4803beb0b4
parent0609037b9e342a01c429800cabcd88cecbe61bdb (diff)
downloadvolse-hubzilla-2b0af1456ceebb6be24768d14702742e73125588.tar.gz
volse-hubzilla-2b0af1456ceebb6be24768d14702742e73125588.tar.bz2
volse-hubzilla-2b0af1456ceebb6be24768d14702742e73125588.zip
editor consistency on profile edit page
-rw-r--r--boot.php2
-rw-r--r--view/profed_head.tpl17
2 files changed, 12 insertions, 7 deletions
diff --git a/boot.php b/boot.php
index c10b1ea6f..e28d00946 100644
--- a/boot.php
+++ b/boot.php
@@ -2,7 +2,7 @@
set_time_limit(0);
-define ( 'FRIENDIKA_VERSION', '2.1.923' );
+define ( 'FRIENDIKA_VERSION', '2.1.924' );
define ( 'DFRN_PROTOCOL_VERSION', '2.1' );
define ( 'DB_UPDATE_VERSION', 1043 );
diff --git a/view/profed_head.tpl b/view/profed_head.tpl
index 7958c7ace..1c1efdbe5 100644
--- a/view/profed_head.tpl
+++ b/view/profed_head.tpl
@@ -6,22 +6,27 @@
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,
force_p_newlines : false,
force_br_newlines : true,
forced_root_block : '',
- content_css: "$baseurl/view/custom_tinymce.css"
-
+ content_css: "$baseurl/view/custom_tinymce.css",
+ theme_advanced_path : false,
+ setup : function(ed) {
+ ed.onInit.add(function(ed) {
+ ed.pasteAsPlainText = true;
+ });
+ }
});