[kupu-checkins] r45621 - in kupu/trunk/kupu: doc plone plone/kupu_plone_layer

[duncan at codespeak.net]

Author: duncan
Date: Mon Aug 13 14:26:50 2007
New Revision: 45621

Modified:
   kupu/trunk/kupu/doc/CHANGES.txt
   kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
   kupu/trunk/kupu/plone/toolbar.kupu
Log:
Put the 'Normal paragraph text change into the .kupu file rather than the generated one.
Updated CHANGES.txt to contain changes from rc2.

Modified: kupu/trunk/kupu/doc/CHANGES.txt
==============================================================================
--- kupu/trunk/kupu/doc/CHANGES.txt	(original)
+++ kupu/trunk/kupu/doc/CHANGES.txt	Mon Aug 13 14:26:50 2007
@@ -2,6 +2,8 @@
 Kupu changes
 ============
 
+- 1.4
+
   - The icons in the toolbar for Plone now use CSS sprites. This means that
     instead of having 30 files each being 16x16, we put all the icons  
     in one file, and reference the file once. Then we use CSS positioning to  
@@ -10,6 +12,16 @@
     Before, Kupu did 17 HTTP requests for its initial image loading, now it
     only does one.
 
+  - Fixed a KeyError exception when importing a GenericSetup profile.
+
+  - Minor styling changes to the image upload form.
+
+  - Plone tickets
+
+    * 6486: formUnload protection invoked for inline kupu editor even after Save
+
+    * 6833: Error 500 loading kupu_migration.xml
+
 - 1.4rc2
 
   - Fixed broken code for determining the width of captioned images.

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html	Mon Aug 13 14:26:50 2007
@@ -22,7 +22,7 @@
     <!--$Id: head.kupu 44831 2007-07-07 19:01:27Z duncan $-->
     <!--$Id: xmlconfig.kupu 35367 2006-12-06 09:06:21Z duncan $-->
     <!--$Id: body.kupu 45298 2007-07-24 10:38:54Z duncan $-->
-    <!--$Id: toolbar.kupu 44538 2007-06-26 10:46:28Z duncan $-->
+    <!--$Id: toolbar.kupu 45493 2007-08-05 06:38:47Z limi $-->
     <!--$Id save.kupu (not yet in svn) $-->
     <!--$Id: drawers.kupu 44538 2007-06-26 10:46:28Z duncan $-->
     <!--$Id: beforeunload.kupu 14546 2005-07-12 14:35:55Z duncan $-->

Modified: kupu/trunk/kupu/plone/toolbar.kupu
==============================================================================
--- kupu/trunk/kupu/plone/toolbar.kupu	(original)
+++ kupu/trunk/kupu/plone/toolbar.kupu	Mon Aug 13 14:26:50 2007
@@ -123,7 +123,7 @@
             tal:condition="filter/styles"
             
             tal:define="field field|nothing;styles python:tool.getStyleList(field);">
-      <option value="p" i18n:translate="Normal">Normal</option>
+      <option value="p" i18n:translate="Normal">Normal paragraph</option>
       <tal:block condition="styles" repeat="style styles">
         <option i18n:translate=""
                 tal:attributes="value style/value" tal:content="style/content"/>