diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt index d5997e50e..c972b513d 100644 --- a/docs/changelog/6.x.x.txt +++ b/docs/changelog/6.x.x.txt @@ -1,3 +1,7 @@ +6.8.1 + - Upgraded TinyMCE to 2.0.1, which allows the rich editor to work with + Firefox 1.5. + 6.8.0 - Switched Date::Manip to DateTime for better performance and more functionality. See gotchas for details. In our benchmarks DateTime runs diff --git a/docs/upgrades/upgrade_6.8.0-6.8.1.pl b/docs/upgrades/upgrade_6.8.0-6.8.1.pl new file mode 100644 index 000000000..e1c020175 --- /dev/null +++ b/docs/upgrades/upgrade_6.8.0-6.8.1.pl @@ -0,0 +1,55 @@ +#------------------------------------------------------------------- +# WebGUI is Copyright 2001-2005 Plain Black Corporation. +#------------------------------------------------------------------- +# Please read the legal notices (docs/legal.txt) and the license +# (docs/license.txt) that came with this distribution before using +# this software. +#------------------------------------------------------------------- +# http://www.plainblack.com info@plainblack.com +#------------------------------------------------------------------- + +use lib "../../lib"; +use strict; +use Getopt::Long; +use WebGUI::Session; +use File::Path; + +my $toVersion = "6.8.1"; # make this match what version you're going to +my $quiet; # this line required + + +start(); # this line required + +upgradeRichEditor(); + +finish(); # this line required + + +#------------------------------------------------- +sub upgradeRichEditor { + print "\tUpgrade rich editor\n" unless ($quiet); + rmtree("../../www/extras/tinymce"); +} + + + +# ---- DO NOT EDIT BELOW THIS LINE ---- + +#------------------------------------------------- +sub start { + my $configFile; + $|=1; #disable output buffering + GetOptions( + 'configFile=s'=>\$configFile, + 'quiet'=>\$quiet + ); + WebGUI::Session::open("../..",$configFile); + WebGUI::Session::refreshUserInfo(3); + WebGUI::SQL->write("insert into webguiVersion values (".quote($toVersion).",'upgrade',".time().")"); +} + +#------------------------------------------------- +sub finish { + WebGUI::Session::close(); +} + diff --git a/lib/WebGUI.pm b/lib/WebGUI.pm index d71e243f4..a4733d3ae 100644 --- a/lib/WebGUI.pm +++ b/lib/WebGUI.pm @@ -1,5 +1,5 @@ package WebGUI; -our $VERSION = "6.8.0"; +our $VERSION = "6.8.1"; our $STATUS = "beta"; #------------------------------------------------------------------- diff --git a/lib/WebGUI/Asset/RichEdit.pm b/lib/WebGUI/Asset/RichEdit.pm index b2e011617..4e969705c 100644 --- a/lib/WebGUI/Asset/RichEdit.pm +++ b/lib/WebGUI/Asset/RichEdit.pm @@ -464,7 +464,7 @@ sub getRichEditor { $language = WebGUI::International::getLanguage("English","languageAbbreviation"); } $config{language} = $language; - $config{content_css} = $self->getValue("cssFile") || $session{config}{extrasURL}.'/tinymce/defaultcontent.css'; + $config{content_css} = $self->getValue("cssFile") || $session{config}{extrasURL}.'/tinymce2/defaultcontent.css'; $config{width} = $self->getValue("editorWidth") if ($self->getValue("editorWidth") > 0); $config{height} = $self->getValue("editorHeight") if ($self->getValue("editorHeight") > 0); $config{plugins} = join(",",@plugins); @@ -476,8 +476,8 @@ sub getRichEditor { push(@directives,$key." : '".$config{$key}."'"); } } - WebGUI::Style::setScript($session{config}{extrasURL}."/tinymce/jscripts/tiny_mce/tiny_mce.js",{type=>"text/javascript"}); - WebGUI::Style::setScript($session{config}{extrasURL}."/tinymce/jscripts/webgui.js",{type=>"text/javascript"}); + WebGUI::Style::setScript($session{config}{extrasURL}."/tinymce2/jscripts/tiny_mce/tiny_mce.js",{type=>"text/javascript"}); + WebGUI::Style::setScript($session{config}{extrasURL}."/tinymce2/jscripts/webgui.js",{type=>"text/javascript"}); return ' - - - -
- - -