oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

migrating tinymce to 1.41

Browse source
This commit is contained in:
JT Smith 2005-02-12 15:45:17 +00:00
parent 2c5d17cb67
commit cf74e3386a
4 changed files with 11 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
docs/upgrades/upgrade_6.2.11-6.3.0.sql
View file

@ -4,7 +4,8 @@ UPDATE template set template = '<tmpl_if session.var.adminOn>\n<tmpl_var config.
delete from template where templateId='tinymce' and namespace='richEditor';
INSERT INTO template VALUES ('tinymce','TinyMCE','^JavaScript(\"<tmpl_var session.config.extrasURL>/tinymce/jscripts/tiny_mce/tiny_mce.js\");\r\n<script language=\"javascript\" type=\"text/javascript\">\r\n tinyMCE.init({\r\n theme : \"advanced\",\r\n mode : \"specific_textareas\",\r\n plugins : \"collateral,emotions,insertImage,iespell,pagetree\",\r\n theme_advanced_buttons2_add : \"insertImage,pagetree,collateral\", \r\n theme_advanced_buttons3_add : \"emotions,iespell\" \r\n });\r\n</script>\r\n\r\n<tmpl_var textarea>','richEditor',1,1);
UPDATE template set template = '<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\r\n <html>\r\n <head>\r\n <title><tmpl_var session.page.title> - <tmpl_var session.setting.companyName></title>\r\n <tmpl_var head.tags>\r\n <style type=\"text/css\">\r\nTD { font: 8pt \'MS Shell Dlg\', Helvetica, sans-serif; }\r\nTD.delete { font: italic 7pt \'MS Shell Dlg\', Helvetica, sans-serif; }\r\nTD.label { font: 8pt \'MS Shell Dlg\', Helvetica, sans-serif; background-color: #c0c0c0; }\r\nTD.none { font: italic 12pt \'MS Shell Dlg\', Helvetica, sans-serif; }\r\n\r\n</style>\r\n\r\n </head>\r\n <script language=\"javascript\">\r\n</script>\r\n<script language=\"javascript\">\r\n\r\nfunction actionComplete(action, path, error, info) {\r\n\r\n if (window.parent && window.parent.resetForm) {\r\n window.parent.resetForm();\r\n }\r\n\r\n}\r\n</script>\r\n\r\n<script language=\"javascript\">\r\nfunction deleteCollateral(options) {\r\n var lister = window.parent.document.getElementById(\"lister\");\r\n\r\n if(lister && confirm(\"Are you sure you want to delete this item ?\"))\r\n lister.src=\'^/;?op=htmlAreaDelete&\' + options;\r\n}\r\n</script>\r\n</head>\r\n<body leftmargin=\"0\" topmargin=\"0\" marginwidth=\"0\" marginheight=\"0\">\r\n\r\n <tmpl_var body.content>\r\n \r\n</body>\r\n </html>\r\n ' where templateId = '10' and namespace='style';
delete from template where namespace='style' and templateId='10';
update template set template='^JavaScript(\"<tmpl_var session.config.extrasURL>/tinymce/jscripts/tiny_mce/tiny_mce.js\");\r\n<script language=\"javascript\" type=\"text/javascript\">\r\n tinyMCE.init({\r\n theme : \"advanced\",\r\n mode : \"specific_textareas\",\r\n elements : \"elm1,elm2\",\r\n content_css : \"<tmpl_var session.setting.richEditCss>\",\r\n extended_valid_elements : \"a[href|target|name]\",\r\n plugins : \"collateral,emotions,insertImage,iespell,pagetree,table\",\r\n theme_advanced_buttons2_add : \"insertImage,pagetree,collateral\", \r\n theme_advanced_buttons3_add : \"emotions,iespell\" ,\r\n theme_advanced_buttons3_add_before : \"tablecontrols,separator\",\r\n debug : false\r\n });\r\n</script>\r\n\r\n<tmpl_var textarea>' 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');

4
lib/WebGUI/Form.pm
View file

@ -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},

13
lib/WebGUI/Operation/Settings.pm
View file

@ -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",

10
lib/WebGUI/i18n/English/WebGUI.pm
View file

@ -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