diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2013-09-03 22:52:26 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2013-09-03 22:52:26 -0700 |
| commit | 36ad5e538cb56de33c779e34baf9abdf63c4312e (patch) | |
| tree | de42d922496c881b69643656f055b68e64e96d72 /httemplate/edit | |
| parent | 04c1a98c9bcf2b6f0da8f18b627eec703dbafd49 (diff) | |
| parent | aae697565c071b2880d0106b00a4a01d0ddab7bf (diff) | |
Merge branch 'master' of git.freeside.biz:/home/git/freeside
Diffstat (limited to 'httemplate/edit')
| -rw-r--r-- | httemplate/edit/elements/edit.html | 2 | ||||
| -rw-r--r-- | httemplate/edit/msg_template.html | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/httemplate/edit/elements/edit.html b/httemplate/edit/elements/edit.html index 08408297b..ed677d7ab 100644 --- a/httemplate/edit/elements/edit.html +++ b/httemplate/edit/elements/edit.html @@ -328,7 +328,7 @@ Example: % qw( hashref agent_virt agent_null agent_null_right ),#*-table % qw( formatted_value ), #fixed % qw( country ), #select-country -% qw( width height ), #htmlarea +% qw( width height config ), #htmlarea % qw( alt_format ), #select-cust_location % qw( classnum ), # select-inventory_item % ; diff --git a/httemplate/edit/msg_template.html b/httemplate/edit/msg_template.html index 7205ba844..06cac440e 100644 --- a/httemplate/edit/msg_template.html +++ b/httemplate/edit/msg_template.html @@ -67,7 +67,8 @@ if ( $curuser->access_right('Edit global templates') { field => 'subject', size=>60, }, { field => 'body', type => 'htmlarea', - width => 763 + width => 763, + config=> { extraPlugins => 'blockprotect' }, }, ; } else { #readonly @@ -328,8 +329,8 @@ my $widget = new HTML::Widgets::SelectLayers( my $sidebar = ' <SCRIPT TYPE="text/javascript"> function insertHtml(what) { - var oEditor = FCKeditorAPI.GetInstance("body"); - oEditor.InsertHtml(what); + var oEditor = CKEDITOR.instances["body"]; + oEditor.insertHtml(what); }; function areyousure(url, message) { |