diff --git a/docs/upgrades/upgrade_6.2.11-6.3.0.sql b/docs/upgrades/upgrade_6.2.11-6.3.0.sql index 88002e313..63f1238b2 100644 --- a/docs/upgrades/upgrade_6.2.11-6.3.0.sql +++ b/docs/upgrades/upgrade_6.2.11-6.3.0.sql @@ -4,7 +4,8 @@ UPDATE template set template = '\n/tinymce/jscripts/tiny_mce/tiny_mce.js\");\r\n\r\n\r\n','richEditor',1,1); -UPDATE template set template = '\r\n \r\n \r\n <tmpl_var session.page.title> - <tmpl_var session.setting.companyName>\r\n \r\n \r\n\r\n \r\n \r\n\r\n\r\n\r\n\r\n\r\n\r\n \r\n \r\n\r\n \r\n ' where templateId = '10' and namespace='style'; +delete from template where namespace='style' and templateId='10'; +update template set template='^JavaScript(\"/tinymce/jscripts/tiny_mce/tiny_mce.js\");\r\n\r\n\r\n' where templateId='tinymce' and namespace='richEditor'; delete from userProfileField where fieldName='richEditor'; INSERT INTO userProfileField VALUES ('richEditor','WebGUI::International::get(496)',1,0,'selectList','{\'PBtmpl0000000000000126\'=>WebGUI::International::get(880),\r\nnone=>WebGUI::International::get(881),\r\n\'PBtmpl0000000000000138\'=>WebGUI::International::get(\"tinymce\")\n}','[\'PBtmpl0000000000000138\']',11,'4',0,1); update userProfileData set fieldData='PBtmpl0000000000000138' where fieldName='richEditor'; @@ -324,4 +325,7 @@ create table Post_read ( ); delete from template where namespace='Forum/PostPreview'; +insert into settings values ("richEditCss","^/;site.css"); +delete from settings where name in ('sharedTrash','sharedClipboard'); + diff --git a/lib/WebGUI/Form.pm b/lib/WebGUI/Form.pm index 1807ff674..1b7ca3df4 100644 --- a/lib/WebGUI/Form.pm +++ b/lib/WebGUI/Form.pm @@ -1151,8 +1151,8 @@ sub HTMLArea { $var{"form.".$_} = $params->{$_} unless (ref $params->{$_}); } # Textarea field - $rows = $params->{rows} || ($session{setting}{textAreaRows}+15); - $columns = $params->{columns} || ($session{setting}{textAreaCols}+5); + $rows = $params->{rows} || ($session{setting}{textAreaRows}+20); + $columns = $params->{columns} || ($session{setting}{textAreaCols}+10); $var{textarea} = textarea({ name=>$params->{name}, value=>$params->{value}, diff --git a/lib/WebGUI/Operation/Settings.pm b/lib/WebGUI/Operation/Settings.pm index 2595926b1..9534cc2a8 100644 --- a/lib/WebGUI/Operation/Settings.pm +++ b/lib/WebGUI/Operation/Settings.pm @@ -102,15 +102,10 @@ sub www_editSettings { -value=>$session{setting}{metaDataEnabled} ); # user interface settings - $tabform->getTab("ui")->yesNo( - -name=>"sharedClipboard", - -label=>$i18n->get(947), - -value=>$session{setting}{sharedClipboard} - ); - $tabform->getTab("ui")->yesNo( - -name=>"sharedTrash", - -label=>$i18n->get(946), - -value=>$session{setting}{sharedTrash} + $tabform->getTab("ui")->text( + -name=>"richEditCss", + -label=>"Rich Edit CSS URL", + -value=>$session{setting}{richEditCss} ); $tabform->getTab("ui")->integer( -name=>"textAreaRows", diff --git a/lib/WebGUI/i18n/English/WebGUI.pm b/lib/WebGUI/i18n/English/WebGUI.pm index 6663555cd..fd9a51348 100644 --- a/lib/WebGUI/i18n/English/WebGUI.pm +++ b/lib/WebGUI/i18n/English/WebGUI.pm @@ -2171,11 +2171,6 @@ will be modified to make it unique.|, lastUpdated => 1031514049 }, - '947' => { - message => q|Use shared clipboard?|, - lastUpdated => 1052850265 - }, - '810' => { message => q|send|, lastUpdated => 1037579743 @@ -2651,11 +2646,6 @@ One package that many people create is a Page/Article package. It is often the c lastUpdated => 1066073289 }, - '946' => { - message => q|Use shared trash?|, - lastUpdated => 1052850265 - }, - '1005' => { message => q|SQL Query|, lastUpdated => 1057208065