From b0742689129e78dadad50fa3c25dcca55a3f80f1 Mon Sep 17 00:00:00 2001 From: Sam Minnee Date: Wed, 23 Jan 2008 23:58:53 +0000 Subject: [PATCH] Merged revisions 47157 via svnmerge from http://svn.silverstripe.com/open/modules/cms/branches/2.2.1asfonz ........ r47157 | sminnee | 2007-12-17 11:21:34 +1300 (Mon, 17 Dec 2007) | 1 line Added paste plain text and paste from word buttons to the HtmlEditorField in the CMS ........ git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@48519 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- javascript/tinymce.template.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/javascript/tinymce.template.js b/javascript/tinymce.template.js index 8aaa3bb1..02d68fa7 100755 --- a/javascript/tinymce.template.js +++ b/javascript/tinymce.template.js @@ -27,7 +27,7 @@ if((typeof tinyMCE != 'undefined')) { theme_advanced_toolbar_location : "manually_placed", theme_advanced_toolbar_align : "left", theme_advanced_toolbar_parent : "right", - plugins : "contextmenu,table,emotions,flash", + plugins : "contextmenu,table,emotions,flash,paste", table_inline_editing : true, theme_advanced_buttons1 : "italic,underline,strikethrough,separator,justifyleft,justifycenter,justifyright,justifyfull,styleselect,formatselect,separator,bullist,numlist,outdent,indent,hr,charmap", theme_advanced_buttons2 : "undo,redo,separator,cut,copy,paste,separator,search,replace,separator,flash", @@ -43,4 +43,4 @@ if((typeof tinyMCE != 'undefined')) { valid_elements : "+a[id|rel|rev|dir|tabindex|accesskey|type|name|href|target|title|class],-strong/-b[class],-em/-i[class],-strike[class],-u[class],#p[id|dir|class|align],-ol[class],-ul[class],-li[class],br,img[id|dir|longdesc|usemap|class|src|border|alt=|title|width|height|align],-sub[class],-sup[class],-blockquote[dir|class],-table[border=0|cellspacing|cellpadding|width|height|class|align|summary|dir|id|style],-tr[id|dir|class|rowspan|width|height|align|valign|bgcolor|background|bordercolor|style],tbody[id|class|style],thead[id|class|style],tfoot[id|class|style],-td[id|dir|class|colspan|rowspan|width|height|align|valign|scope|style],-th[id|dir|class|colspan|rowspan|width|height|align|valign|scope|style],caption[id|dir|class],-div[id|dir|class|align],-span[class|align],-pre[class|align],address[class|align],-h1[id|dir|class|align],-h2[id|dir|class|align],-h3[id|dir|class|align],-h4[id|dir|class|align],-h5[id|dir|class|align],-h6[id|dir|class|align],hr[class],dd[id|class|title|dir],dl[id|class|title|dir],dt[id|class|title|dir]", extended_valid_elements : "img[class|src|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name]" }); -} \ No newline at end of file +}