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

[duncan at codespeak.net]

Author: duncan
Date: Wed Dec  6 10:06:21 2006
New Revision: 35367

Modified:
   kupu/trunk/kupu/doc/PLONE2.txt
   kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
   kupu/trunk/kupu/plone/xmlconfig.kupu
Log:
Htmlfilter should not disappear just because we have no tag/attribute filters.
Fixed docs for widget styles.

Modified: kupu/trunk/kupu/doc/PLONE2.txt
==============================================================================
--- kupu/trunk/kupu/doc/PLONE2.txt	(original)
+++ kupu/trunk/kupu/doc/PLONE2.txt	Wed Dec  6 10:06:21 2006
@@ -440,18 +440,19 @@
             (description='Please paste or type your article here',
                 label='Body Copy',
                 parastyles=(
-                 ('div|pullQuote','Pull Quote'),
-                 ('div|Caption','Caption'),
-                 ('div|contactInformation','Contact Information'),
-                 ('div|notesToEditors','Notes to editors'),
+                 'div|pullQuote|Pull Quote',
+                 'div|Caption|Caption',
+                 'div|contactInformation|Contact Information',
+                 'div|notesToEditors|Notes to editors',
                 ),
             ),
         ),
 
-``parastyles`` is a sequence of style definitions. Each definition should
-be a 2-tuple of strings. The first string if either the tag to be
-added, or tag, vertical bar, class to be assigned to the tag. The
-second string is the caption that appears in the style pulldown.
+``parastyles`` is a sequence of style definitions. Each definition
+should be a string as for the style definitions in the control panel
+containing the tag to be added, vertical bar, class to be assigned to
+the tag, vertical bar, description that appears in the style pulldown.
+The class may be omitted, so tag, vertical bar, description is also valid.
 
 Images
 ------
@@ -499,7 +500,7 @@
      text/x-html-captioned and output type text/html.
 
    * On the portal_transforms policy tab add a policy with output
-     type=text/x-html-captioned, uses transforms='html-to-captioned'.
+     type=text/x-html-safe, uses transforms='html-to-captioned'.
 
 This will force the captioning transform to be applied before the
 safe_html transform.

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	Wed Dec  6 10:06:21 2006
@@ -19,7 +19,7 @@
     <!--$Id: drawers.kupu 32938 2006-10-06 06:56:24Z guido $-->
     <!--$Id: include.kupu 9520 2005-02-26 16:30:23Z duncan $-->
     <!--$Id: wire.kupu 25247 2006-04-03 11:23:02Z fschulze $-->
-    <!--$Id: head.kupu 20919 2005-12-09 10:14:44Z duncan $-->
+    <!--$Id: head.kupu 34332 2006-11-07 14:50:40Z duncan $-->
     <!--$Id: xmlconfig.kupu 30512 2006-07-25 10:17:05Z duncan $-->
     <!--$Id: body.kupu 34311 2006-11-07 11:18:23Z duncan $-->
     <!--$Id: toolbar.kupu 25717 2006-04-12 10:33:01Z fschulze $-->
@@ -57,7 +57,7 @@
     </tal:block>
 
 <tal:block define="excludes here/kupu_library_tool/getHtmlExclusions">
-<htmlfilter tal:condition="excludes">
+<htmlfilter>
 <tal:block repeat="exclude excludes"><tal:block define="tags python:exclude[0]; attributes python:exclude[1];"><c tal:omit-tag="not:python:tags and attributes"><a tal:repeat="attr attributes" tal:content="attr">
   </a><t tal:repeat="tag tags" tal:content="tag"/></c></tal:block></tal:block>
 <xstyle tal:repeat="st here/kupu_library_tool/getStyleWhitelist" tal:content="st"/>

Modified: kupu/trunk/kupu/plone/xmlconfig.kupu
==============================================================================
--- kupu/trunk/kupu/plone/xmlconfig.kupu	(original)
+++ kupu/trunk/kupu/plone/xmlconfig.kupu	Wed Dec  6 10:06:21 2006
@@ -32,7 +32,7 @@
     </tal:block>
 
 <tal:block define="excludes here/kupu_library_tool/getHtmlExclusions">
-<htmlfilter tal:condition="excludes">
+<htmlfilter>
 <tal:block repeat="exclude excludes"><tal:block
      define="tags python:exclude[0]; attributes python:exclude[1];"
   ><c tal:omit-tag="not:python:tags and attributes"