[Checkins] SVN: zope.html/trunk/ - upgrade to use CKeditor 3.2.5

[Alex Chapman]

Log message for revision 120520:
   - upgrade to use CKeditor 3.2.5
  

Changed:
  U   zope.html/trunk/CHANGES.txt
  U   zope.html/trunk/bootstrap.py
  U   zope.html/trunk/setup.py
  D   zope.html/trunk/src/zope/html/ckeditor/3.2.1/
  U   zope.html/trunk/src/zope/html/configure.zcml
  U   zope.html/trunk/src/zope/html/widget.py
  U   zope.html/trunk/src/zope/html/widget.txt

-=-
Modified: zope.html/trunk/CHANGES.txt
===================================================================
--- zope.html/trunk/CHANGES.txt	2011-02-22 20:06:15 UTC (rev 120519)
+++ zope.html/trunk/CHANGES.txt	2011-02-22 22:40:14 UTC (rev 120520)
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+2.5.0 (2011-02-22)
+------------------
+
+- Use CKEditor 3.2.5
+
+
 2.2.0 (2010-11-19)
 ------------------
 

Modified: zope.html/trunk/bootstrap.py
===================================================================
--- zope.html/trunk/bootstrap.py	2011-02-22 20:06:15 UTC (rev 120519)
+++ zope.html/trunk/bootstrap.py	2011-02-22 22:40:14 UTC (rev 120520)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2006 Zope Foundation and Contributors.
+# Copyright (c) 2006 Zope Corporation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
@@ -16,6 +16,8 @@
 Simply run this script in a directory containing a buildout.cfg.
 The script accepts buildout command-line options, so you can
 use the -c option to specify an alternate configuration file.
+
+$Id$
 """
 
 import os, shutil, sys, tempfile, urllib2

Modified: zope.html/trunk/setup.py
===================================================================
--- zope.html/trunk/setup.py	2011-02-22 20:06:15 UTC (rev 120519)
+++ zope.html/trunk/setup.py	2011-02-22 22:40:14 UTC (rev 120520)
@@ -20,7 +20,7 @@
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
 setup(name='zope.html',
-      version = '2.2.1dev',
+      version = '2.2.5dev',
       author='Zope Foundation and Contributors',
       author_email='zope-dev at zope.org',
       description='HTML and XHTML Editing Support',

Modified: zope.html/trunk/src/zope/html/configure.zcml
===================================================================
--- zope.html/trunk/src/zope/html/configure.zcml	2011-02-22 20:06:15 UTC (rev 120519)
+++ zope.html/trunk/src/zope/html/configure.zcml	2011-02-22 22:40:14 UTC (rev 120520)
@@ -75,14 +75,14 @@
   <resourceLibrary name="ckeditor">
     <directory
         source="ckeditor"
-        include="3.2.1/ckeditor/ckeditor.js"
+        include="3.2.5/ckeditor/ckeditor.js"
         />
   </resourceLibrary>
 
   <resourceLibrary name="ckeditor_dev">
     <directory
         source="ckeditor"
-        include="3.2.1/ckeditor/ckeditor_source.js"
+        include="3.2.5/ckeditor/ckeditor_source.js"
         />
   </resourceLibrary>
 

Modified: zope.html/trunk/src/zope/html/widget.py
===================================================================
--- zope.html/trunk/src/zope/html/widget.py	2011-02-22 20:06:15 UTC (rev 120519)
+++ zope.html/trunk/src/zope/html/widget.py	2011-02-22 22:40:14 UTC (rev 120520)
@@ -63,7 +63,7 @@
 class CkeditorWidget(zope.app.form.browser.TextAreaWidget):
 
     editorHeight = 400
-    fckVersion = '3.2.1'
+    fckVersion = '3.2.5'
 
     configurationPath = "/@@/zope_ckconfig.js"
 

Modified: zope.html/trunk/src/zope/html/widget.txt
===================================================================
--- zope.html/trunk/src/zope/html/widget.txt	2011-02-22 20:06:15 UTC (rev 120519)
+++ zope.html/trunk/src/zope/html/widget.txt	2011-02-22 22:40:14 UTC (rev 120520)
@@ -45,7 +45,7 @@
 The "fckVersion" attribute holds the version of CKEditor library.
 
   >>> ckwidget.fckVersion
-  '3.2.1'
+  '3.2.5'
 
   >>> print ckwidget()
   <textarea...></textarea>