From yuppie at codespeak.net  Mon Dec  4 21:13:36 2006
From: yuppie at codespeak.net (yuppie at codespeak.net)
Date: Mon,  4 Dec 2006 21:13:36 +0100 (CET)
Subject: [kupu-checkins] r35268 - in kupu/trunk/kupu: common doc tests
Message-ID: <20061204201336.EF8571007E@code0.codespeak.net>

Author: yuppie
Date: Mon Dec  4 21:13:33 2006
New Revision: 35268

Modified:
   kupu/trunk/kupu/common/kupubasetools.js
   kupu/trunk/kupu/doc/CHANGES.txt
   kupu/trunk/kupu/tests/run_tests.html
   kupu/trunk/kupu/tests/test_kupubasetools.js
   kupu/trunk/kupu/tests/test_kupuhelpers.js
Log:
- fixed bug in createLink

Modified: kupu/trunk/kupu/common/kupubasetools.js
==============================================================================
--- kupu/trunk/kupu/common/kupubasetools.js	(original)
+++ kupu/trunk/kupu/common/kupubasetools.js	Mon Dec  4 21:13:33 2006
@@ -1111,6 +1111,11 @@
     // the order of the arguments is a bit odd here because of backward
     // compatibility
     this.createLink = function(url, type, name, target, title) {
+        url = url.strip();
+        if (!url) {
+            this.deleteLink();
+            return;
+        };
         if (!this.formatSelectedLink(url, type, name, target, title)) {
             // No links inside or outside.
             this.editor.execCommand("CreateLink", url);

Modified: kupu/trunk/kupu/doc/CHANGES.txt
==============================================================================
--- kupu/trunk/kupu/doc/CHANGES.txt	(original)
+++ kupu/trunk/kupu/doc/CHANGES.txt	Mon Dec  4 21:13:33 2006
@@ -2,6 +2,10 @@
 Kupu changes
 ============
 
+- 1.4 unreleased
+
+  - Fixed a bug where createLink deleted the selected text.
+
 - 1.4 Beta 2
 
   - Paragraph styling now permitted inside a table again (contributed

Modified: kupu/trunk/kupu/tests/run_tests.html
==============================================================================
--- kupu/trunk/kupu/tests/run_tests.html	(original)
+++ kupu/trunk/kupu/tests/run_tests.html	Mon Dec  4 21:13:33 2006
@@ -67,6 +67,7 @@
         testsuite.registerTest(InitKupuCheckersTestCase);
         testsuite.registerTest(KupuUITestCase);
         testsuite.registerTest(ImageToolTestCase);
+        testsuite.registerTest(LinkToolTestCase);
         testsuite.runSuite();
 
         // global tear down

Modified: kupu/trunk/kupu/tests/test_kupubasetools.js
==============================================================================
--- kupu/trunk/kupu/tests/test_kupubasetools.js	(original)
+++ kupu/trunk/kupu/tests/test_kupubasetools.js	Mon Dec  4 21:13:33 2006
@@ -291,7 +291,7 @@
 KupuUITestCase.prototype = new SelectionTestCase;
 
 function ImageToolTestCase() {
-    this.name = 'KupuUITestCase';
+    this.name = 'ImageToolTestCase';
     SelectionTestCase.apply(this);
     this.base_setUp = this.setUp;
 
@@ -325,3 +325,37 @@
 };
 
 ImageToolTestCase.prototype = new SelectionTestCase;
+
+function LinkToolTestCase() {
+    this.name = 'LinkToolTestCase';
+    SelectionTestCase.apply(this);
+    this.base_setUp = this.setUp;
+
+    this.setUp = function() {
+        this.base_setUp();
+        this.editor = new KupuEditor(this.kupudoc, {}, new DummyLogger());
+        this.editor._initialized = true;
+        this.linktool = new LinkTool();
+        this.linktool.editor = this.editor;
+    };
+
+    this.test_createLink = function() {
+        this.body.innerHTML = '<p>foo bar baz</p>';
+        // select                    |bar|
+        this._setSelection(4, null, 7, null, 'bar');
+        this.linktool.createLink('http://www.example.org');
+        this.assertEquals(this._cleanHtml(this.body.innerHTML),
+                          '<p>foo <a href="http://www.example.org">bar</a> baz</p>');
+    };
+
+    this.test_createLinkEmpty = function() {
+        this.body.innerHTML = '<p>foo bar baz</p>';
+        // select                    |bar|
+        this._setSelection(4, null, 7, null, 'bar');
+        this.linktool.createLink('');
+        this.assertEquals(this._cleanHtml(this.body.innerHTML),
+                          '<p>foo bar baz</p>');
+    };
+};
+
+LinkToolTestCase.prototype = new SelectionTestCase;

Modified: kupu/trunk/kupu/tests/test_kupuhelpers.js
==============================================================================
--- kupu/trunk/kupu/tests/test_kupuhelpers.js	(original)
+++ kupu/trunk/kupu/tests/test_kupuhelpers.js	Mon Dec  4 21:13:33 2006
@@ -101,6 +101,8 @@
         s = s.toLowerCase().replace(/[\r\n]/g, "");
         s = s.replace(/\>[ ]+\</g, "><");
         s = s.replace(/\/>/g, ">");
+        s = s.replace(' style=""', "");
+        s = s.replace(" style=''", "");
         return s;
     };
 

From duncan at codespeak.net  Wed Dec  6 10:06:23 2006
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Wed,  6 Dec 2006 10:06:23 +0100 (CET)
Subject: [kupu-checkins] r35367 - in kupu/trunk/kupu: doc plone
	plone/kupu_plone_layer
Message-ID: <20061206090623.EB1C410070@code0.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"

From duncan at codespeak.net  Thu Dec  7 15:39:42 2006
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Thu,  7 Dec 2006 15:39:42 +0100 (CET)
Subject: [kupu-checkins] r35436 - kupu/trunk/kupu/plone
Message-ID: <20061207143942.0168F10053@code0.codespeak.net>

Author: duncan
Date: Thu Dec  7 15:39:41 2006
New Revision: 35436

Modified:
   kupu/trunk/kupu/plone/html2captioned.py
Log:
Link fixing messed up the page if you had href attributes containing non-ascii characters AND someone had set the python default encoding to something stupid like latin1. Fixed by forcing all replacements to work in unicode.

Modified: kupu/trunk/kupu/plone/html2captioned.py
==============================================================================
--- kupu/trunk/kupu/plone/html2captioned.py	(original)
+++ kupu/trunk/kupu/plone/html2captioned.py	Thu Dec  7 15:39:41 2006
@@ -14,7 +14,7 @@
 import re
 from cgi import escape
 from urlparse import urlsplit, urljoin, urlunsplit
-from urllib import unquote_plus
+from urllib import unquote_plus, quote_plus
 from Acquisition import aq_base
 from htmlentitydefs import name2codepoint
 
@@ -386,8 +386,9 @@
 
             if newlink != link:
                 prefix = match.group('prefix')
+                newlink = html_quote(newlink).encode('ascii', 'xmlcharrefreplace')
                 changes.append((match.start()+len(prefix), match.end(), newlink))
-                return prefix + html_quote(newlink)
+                return prefix + newlink
             return matched
 
         info = []
@@ -413,13 +414,13 @@
             # Don't attempt to modify non-html
             return None
             
-        data = field.getEditAccessor(object)()
+        data = field.getEditAccessor(object)().decode('utf8')
         __traceback_info__ = (object, data)
         newdata = LINK_PATTERN.sub(checklink, data)
         if data != newdata and self.commit_changes:
             mutator = field.getMutator(object)
             if mutator:
-                mutator(newdata, mimetype='text/html')
+                mutator(newdata.encode('utf8'), mimetype='text/html')
                 object.reindexObject() # Need to flag update
 
         if info or changes:

From duncan at codespeak.net  Fri Dec  8 14:20:43 2006
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Fri,  8 Dec 2006 14:20:43 +0100 (CET)
Subject: [kupu-checkins] r35477 - in kupu/trunk/kupu/plone: .
	kupu_plone_layer kupu_plone_layer/plonekupuimages
Message-ID: <20061208132043.BD5461006E@code0.codespeak.net>

Author: duncan
Date: Fri Dec  8 14:20:38 2006
New Revision: 35477

Added:
   kupu/trunk/kupu/plone/helpers.py   (contents, props changed)
   kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/link_icon.gif   (contents, props changed)
   kupu/trunk/kupu/plone/spellchecker.kupu   (contents, props changed)
   kupu/trunk/kupu/plone/zmi_toolbar.pt   (contents, props changed)
Modified:
   kupu/trunk/kupu/plone/drawers.kupu
   kupu/trunk/kupu/plone/kupu_config.pt
   kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
   kupu/trunk/kupu/plone/kupu_plone_layer/kupuplone.css.dtml
   kupu/trunk/kupu/plone/librarytool.py
   kupu/trunk/kupu/plone/plonelibrarytool.py
   kupu/trunk/kupu/plone/sourceedit.kupu
   kupu/trunk/kupu/plone/toolbar.kupu
Log:
Paragraph styles may now be replaced as well as added to in widget definitions.
All toolbar buttons may be controlled from the configlet or from widget definition whitelists and blacklists.
In javascript all the tools (I think) are now robust against their toolbar elements being omitted.
Internal link icon now comes from kupu's images (as for all the other toolbar buttons) instead of using the icon for the link content type.


Modified: kupu/trunk/kupu/plone/drawers.kupu
==============================================================================
--- kupu/trunk/kupu/plone/drawers.kupu	(original)
+++ kupu/trunk/kupu/plone/drawers.kupu	Fri Dec  8 14:20:38 2006
@@ -14,6 +14,35 @@
   <kupu:part name="jsincludes">
   </kupu:part>
 
+  <kupu:part name="buttons">
+    <span class="kupu-tb-buttongroup" tal:condition="filter/bg-drawers">
+      <button type="button" class="kupu-image"
+              tal:condition="filter/imagelibdrawer-button"
+              id="kupu-imagelibdrawer-button"
+              title="Insert image" i18n:attributes="title"
+        >&#160;</button>
+      <button type="button" class="kupu-inthyperlink"
+              tal:condition="filter/linklibdrawer-button"
+              id="kupu-linklibdrawer-button"
+              title="Insert internal link"
+        i18n:attributes="title">&#160;</button>
+      <button type="button" class="kupu-exthyperlink"
+              tal:condition="filter/linkdrawer-button"
+              id="kupu-linkdrawer-button"
+              title="Insert external link"
+        i18n:attributes="title">&#160;</button>
+      <button type="button" class="kupu-anchors"
+              tal:condition="filter/anchors-button"
+              id="kupu-anchors"
+              title="Insert anchors" i18n:attributes="title">&#160;</button>
+      <button type="button" class="kupu-table"
+              tal:condition="filter/tabledrawer-button"
+              id="kupu-tabledrawer-button"
+              title="Insert table" i18n:attributes="title"
+        >&#160;</button>
+    </span>
+  </kupu:part>
+
   <kupu:part name="xmlconfig">
     <tal:var define="field field|nothing;
             tool here/kupu_library_tool;

Added: kupu/trunk/kupu/plone/helpers.py
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/plone/helpers.py	Fri Dec  8 14:20:38 2006
@@ -0,0 +1,80 @@
+##############################################################################
+#
+# Copyright (c) 2003-2005 Kupu Contributors. All rights reserved.
+#
+# This software is distributed under the terms of the Kupu
+# License. See LICENSE.txt for license text. For a list of Kupu
+# Contributors see CREDITS.txt.
+#
+##############################################################################
+# Helper classes
+FILTERS = [
+    ('bg-basicmarkup', 'Bold/Italic group', True),
+    ('bold-button', 'Bold button', True),
+    ('italic-button', 'Italic button', True),
+    ('bg-subsuper', 'Subscript/Superscript group', True),
+    ('subscript-button', 'Subscript button', True),
+    ('superscript-button', 'Superscript button', True),
+    ('bg-justify', 'Justify group', True),
+    ('justifyleft-button', 'Justify left button', True),
+    ('justifycenter-button', 'Justify center button', True),
+    ('justifyright-button', 'Justify right button', True),
+    ('bg-list', 'List group', True),
+    ('list-ol-addbutton', 'Add ordered list button', True),
+    ('list-ul-addbutton', 'Add unordered list button', True),
+    ('definitionlist', 'Definition list', True),
+    ('bg-indent', 'Indent group', True),
+    ('outdent-button', 'Outdent button', True),
+    ('indent-button', 'Indent button', True),
+    ('bg-drawers', 'Drawers group', True),
+    ('imagelibdrawer-button', 'Image drawer button', True),
+    ('linklibdrawer-button', 'Link drawer button', True),
+    ('linkdrawer-button', 'External link drawer button', True),
+    ('anchors-button', 'Anchor drawer button', True),
+    ('tabledrawer-button', 'Table drawer button', True),
+    ('bg-remove', 'Remove group', True),
+    ('removeimage-button', 'Remove image button', True),
+    ('removelink-button', 'Remove link button', True),
+    ('bg-undo', 'Undo group', True),
+    ('undo-button', 'Undo button', True),
+    ('redo-button', 'Redo button', True),
+    ('spellchecker', 'Spellchecker', False),
+    ('source', 'Source', True),
+    ('styles', 'Styles pulldown', True),
+    ('ulstyles', 'Unordered list style pulldown', True),
+    ('olstyles', 'Ordered list style pulldown', True),
+    ('zoom', 'Zoom button', True),
+]
+FILTERDICT = dict([(k,v) for (k,title,v) in FILTERS])
+
+class ButtonFilter:
+    """Helper class to control visibility of buttons.
+    Works from both a whitelist and a blacklist in the widget.
+    XXX Add expressions to the configlet so that a button may be hidden conditionally.
+    """
+    __allow_access_to_unprotected_subobjects__ = 1
+
+    def __init__(self, tool, context, field=None):
+        self.tool = tool
+        self.field = field
+        widget = getattr(field, 'widget', None)
+        self.filter_buttons = getattr(widget, 'filter_buttons', None)
+        self.allow_buttons = getattr(widget, 'allow_buttons', None)
+        self.visible_buttons = tool.getToolbarFilters(context, field)
+        print "visible=", self.visible_buttons
+
+    def isButtonAllowed(self, name):
+        visible = self.visible_buttons.get(name, True)
+        if self.allow_buttons is not None:
+            return visible and name in self.allow_buttons
+        if self.filter_buttons is not None:
+           return visible and name not in self.filter_buttons
+        return visible
+
+    def __getattr__(self, name):
+        """name should be an id of a button or a button group in the kupu toolbar."""
+        if name[0]=='_':
+            raise AttributeError("'%s' object has no attribute '%s'" % (self.__class__.__name__, name))
+        allowed = self.isButtonAllowed(name)
+        print "ButtonFilter",name,"->",allowed
+        return allowed

Modified: kupu/trunk/kupu/plone/kupu_config.pt
==============================================================================
--- kupu/trunk/kupu/plone/kupu_config.pt	(original)
+++ kupu/trunk/kupu/plone/kupu_config.pt	Fri Dec  8 14:20:38 2006
@@ -33,7 +33,7 @@
     <!-- simulating views -->
     <ul class="contentViews"
        tal:define="tabs python:('Config','kupu_config'),('Libraries','zmi_libraries'),('Resource Types','zmi_resource_types'),
-        ('Documentation', 'zmi_docs'),('Links', 'zmi_links'),;
+        ('Documentation', 'zmi_docs'),('Links', 'zmi_links'),('Toolbar', 'zmi_toolbar'),;
                    tabs python:[ {'label':label, 'name':name} for (label,name) in tabs ];"
     >
         <li tal:repeat="tab tabs"

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	Fri Dec  8 14:20:38 2006
@@ -20,7 +20,7 @@
     <!--$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 34332 2006-11-07 14:50:40Z duncan $-->
-    <!--$Id: xmlconfig.kupu 30512 2006-07-25 10:17:05Z duncan $-->
+    <!--$Id: xmlconfig.kupu 35367 2006-12-06 09:06:21Z duncan $-->
     <!--$Id: body.kupu 34311 2006-11-07 11:18:23Z duncan $-->
     <!--$Id: toolbar.kupu 25717 2006-04-12 10:33:01Z fschulze $-->
     <!--$Id: drawers.kupu 21175 2005-12-15 14:25:08Z duncan $-->
@@ -117,89 +117,89 @@
   
     <script tal:condition="not:exists:portal/portal_javascripts" type="text/javascript" src="kupuploneinit.js" tal:attributes="src string:${portal_url}/kupuploneinit.js"> </script>
   
-    <div class="kupu-tb" id="toolbar">
+    <div class="kupu-tb" id="toolbar" tal:define="tool context/kupu_library_tool;field field|nothing;filter python:tool.filterToolbar(context,field);">
       
     <span id="kupu-tb-buttons" class="kupu-tb-buttons">
       
   
-    <span class="kupu-tb-buttongroup" style="float: right" id="kupu-zoom">
+    <span class="kupu-tb-buttongroup" style="float: right" id="kupu-zoom" tal:condition="filter/zoom">
       <button type="button" class="kupu-zoom" id="kupu-zoom-button" i18n:attributes="title" title="Zoom: Access key (Alt or Ctrl) + X" accesskey="x">&#160;</button>
     </span>
   
-    <span class="kupu-tb-buttongroup" id="kupu-bg-basicmarkup">
-      <button type="button" class="kupu-bold" id="kupu-bold-button" title="Bold: Access key (Alt or Ctrl) + B" i18n:attributes="title" accesskey="b">&#160;</button>
-      <button type="button" class="kupu-italic" id="kupu-italic-button" title="Italic: Access key (Alt or Ctrl) + I" i18n:attributes="title" accesskey="i">&#160;</button>
+    <span class="kupu-tb-buttongroup" id="kupu-bg-basicmarkup" tal:condition="filter/bg-basicmarkup">
+      <button type="button" class="kupu-bold" id="kupu-bold-button" title="Bold: Access key (Alt or Ctrl) + B" tal:condition="filter/bold-button" i18n:attributes="title" accesskey="b">&#160;</button>
+      <button type="button" class="kupu-italic" id="kupu-italic-button" title="Italic: Access key (Alt or Ctrl) + I" tal:condition="filter/italic-button" i18n:attributes="title" accesskey="i">&#160;</button>
     </span>
   
-    <span class="kupu-tb-buttongroup" id="kupu-bg-subsuper">
-      <button type="button" class="kupu-subscript" id="kupu-subscript-button" title="Subscript: Access key (Alt or Ctrl) + -" i18n:attributes="title" accesskey="-">&#160;</button>
-      <button type="button" class="kupu-superscript" id="kupu-superscript-button" title="Superscript: Access key (Alt or Ctrl) + +" i18n:attributes="title" accesskey="+">&#160;</button>
+    <span class="kupu-tb-buttongroup" id="kupu-bg-subsuper" tal:condition="filter/bg-subsuper">
+      <button type="button" class="kupu-subscript" id="kupu-subscript-button" title="Subscript: Access key (Alt or Ctrl) + -" tal:condition="filter/subscript-button" i18n:attributes="title" accesskey="-">&#160;</button>
+      <button type="button" class="kupu-superscript" id="kupu-superscript-button" title="Superscript: Access key (Alt or Ctrl) + +" tal:condition="filter/superscript-button" i18n:attributes="title" accesskey="+">&#160;</button>
     </span>
   
-    <span class="kupu-tb-buttongroup" id="kupu-bg-justify">
-      <button type="button" class="kupu-justifyleft" id="kupu-justifyleft-button" title="Left justify: Access key (Alt or Ctrl) + L" i18n:attributes="title" accesskey="l">&#160;</button>
-      <button type="button" class="kupu-justifycenter" id="kupu-justifycenter-button" title="Center justify: Access key (Alt or Ctrl) + C" i18n:attributes="title" accesskey="c">&#160;</button>
-      <button type="button" class="kupu-justifyright" id="kupu-justifyright-button" title="Right justify: Access key (Alt or Ctrl) + R" i18n:attributes="title" accesskey="r">&#160;</button>
+    <span class="kupu-tb-buttongroup" id="kupu-bg-justify" tal:condition="filter/bg-justify">
+      <button type="button" class="kupu-justifyleft" id="kupu-justifyleft-button" tal:condition="filter/justifyleft-button" title="Left justify: Access key (Alt or Ctrl) + L" i18n:attributes="title" accesskey="l">&#160;</button>
+      <button type="button" class="kupu-justifycenter" tal:condition="filter/justifycenter-button" id="kupu-justifycenter-button" title="Center justify: Access key (Alt or Ctrl) + C" i18n:attributes="title" accesskey="c">&#160;</button>
+      <button type="button" class="kupu-justifyright" tal:condition="filter/justifyright-button" id="kupu-justifyright-button" title="Right justify: Access key (Alt or Ctrl) + R" i18n:attributes="title" accesskey="r">&#160;</button>
     </span>
   
-              <span class="kupu-tb-buttongroup" id="kupu-bg-list">
+    <span class="kupu-tb-buttongroup" id="kupu-bg-list" tal:condition="filter/bg-list">
       
-      <button type="button" class="kupu-insertorderedlist" title="Numbered list: Access key (Alt or Ctrl) + #" id="kupu-list-ol-addbutton" i18n:attributes="title" accesskey="#">&#160;</button>
-      <button type="button" class="kupu-insertunorderedlist" title="Unordered list: Access key (Alt or Ctrl) + *" id="kupu-list-ul-addbutton" i18n:attributes="title" accesskey="*">&#160;</button>
+      <button type="button" class="kupu-insertorderedlist" tal:condition="filter/list-ol-addbutton" title="Numbered list: Access key (Alt or Ctrl) + #" id="kupu-list-ol-addbutton" i18n:attributes="title" accesskey="#">&#160;</button>
+      <button type="button" class="kupu-insertunorderedlist" tal:condition="filter/list-ul-addbutton" title="Unordered list: Access key (Alt or Ctrl) + *" id="kupu-list-ul-addbutton" i18n:attributes="title" accesskey="*">&#160;</button>
               </span>
   
-    <span class="kupu-tb-buttongroup" id="kupu-bg-definitionlist">
+    <span class="kupu-tb-buttongroup" id="kupu-bg-definitionlist" tal:condition="filter/definitionlist">
       
       <button type="button" class="kupu-insertdefinitionlist" title="Definition list: Access key (Alt or Ctrl) + =" id="kupu-list-dl-addbutton" i18n:attributes="title" accesskey="=">&#160;</button>
     </span>
   
-    <span class="kupu-tb-buttongroup" id="kupu-bg-indent">
-      <button type="button" class="kupu-outdent" id="kupu-outdent-button" title="Decrease quote level: Access key (Alt or Ctrl) + &lt;" i18n:attributes="title" accesskey="&lt;">&#160;</button>
-      <button type="button" class="kupu-indent" id="kupu-indent-button" title="Increase quote level: Access key (Alt or Ctrl) + &gt;" i18n:attributes="title" accesskey="&gt;">&#160;</button>
+    <span class="kupu-tb-buttongroup" id="kupu-bg-indent" tal:condition="filter/bg-indent">
+      <button type="button" class="kupu-outdent" tal:condition="filter/outdent-button" id="kupu-outdent-button" title="Decrease quote level: Access key (Alt or Ctrl) + &lt;" i18n:attributes="title" accesskey="&lt;">&#160;</button>
+      <button type="button" class="kupu-indent" tal:condition="filter/indent-button" id="kupu-indent-button" title="Increase quote level: Access key (Alt or Ctrl) + &gt;" i18n:attributes="title" accesskey="&gt;">&#160;</button>
     </span>
   
-    <span class="kupu-tb-buttongroup">
-      <button type="button" class="kupu-image" id="kupu-imagelibdrawer-button" title="Insert image" i18n:attributes="title">&#160;</button>
-      <button type="button" class="kupu-inthyperlink" id="kupu-linklibdrawer-button" title="Insert internal link" i18n:attributes="title">&#160;</button>
-      <button type="button" class="kupu-exthyperlink" id="kupu-linkdrawer-button" title="Insert external link" i18n:attributes="title">&#160;</button>
-      <button type="button" class="kupu-anchors" id="kupu-anchors" title="Insert anchors" i18n:attributes="title">&#160;</button>
-      <button type="button" class="kupu-table" id="kupu-tabledrawer-button" title="Insert table" i18n:attributes="title">&#160;</button>
+    <span class="kupu-tb-buttongroup" tal:condition="filter/bg-drawers">
+      <button type="button" class="kupu-image" tal:condition="filter/imagelibdrawer-button" id="kupu-imagelibdrawer-button" title="Insert image" i18n:attributes="title">&#160;</button>
+      <button type="button" class="kupu-inthyperlink" tal:condition="filter/linklibdrawer-button" id="kupu-linklibdrawer-button" title="Insert internal link" i18n:attributes="title">&#160;</button>
+      <button type="button" class="kupu-exthyperlink" tal:condition="filter/linkdrawer-button" id="kupu-linkdrawer-button" title="Insert external link" i18n:attributes="title">&#160;</button>
+      <button type="button" class="kupu-anchors" tal:condition="filter/anchors-button" id="kupu-anchors" title="Insert anchors" i18n:attributes="title">&#160;</button>
+      <button type="button" class="kupu-table" tal:condition="filter/tabledrawer-button" id="kupu-tabledrawer-button" title="Insert table" i18n:attributes="title">&#160;</button>
     </span>
   
-    <span class="kupu-tb-buttongroup" id="kupu-bg-remove">
-      <button type="button" class="kupu-removeimage invisible" id="kupu-removeimage-button" title="Remove image" i18n:attributes="title">&#160;</button>
-      <button type="button" class="kupu-removelink invisible" id="kupu-removelink-button" title="Remove link" i18n:attributes="title">&#160;</button>
+    <span class="kupu-tb-buttongroup" id="kupu-bg-remove" tal:condition="filter/bg-remove">
+      <button type="button" class="kupu-removeimage invisible" tal:condition="filter/removeimage-button" id="kupu-removeimage-button" title="Remove image" i18n:attributes="title">&#160;</button>
+      <button type="button" class="kupu-removelink invisible" tal:condition="filter/removelink-button" id="kupu-removelink-button" title="Remove link" i18n:attributes="title">&#160;</button>
     </span>
   
-    <span class="kupu-tb-buttongroup" id="kupu-bg-undo">
-      <button type="button" class="kupu-undo" id="kupu-undo-button" title="Undo: Access key (Alt or Ctrl) + Z" i18n:attributes="title" accesskey="z">&#160;</button>
-      <button type="button" class="kupu-redo" id="kupu-redo-button" title="Redo: Access key (Alt or Ctrl) + Y" i18n:attributes="title" accesskey="y">&#160;</button>
+    <span class="kupu-tb-buttongroup" id="kupu-bg-undo" tal:condition="filter/bg-undo">
+      <button type="button" class="kupu-undo" tal:condition="filter/undo-button" id="kupu-undo-button" title="Undo: Access key (Alt or Ctrl) + Z" i18n:attributes="title" accesskey="z">&#160;</button>
+      <button type="button" class="kupu-redo" tal:condition="filter/redo-button" id="kupu-redo-button" title="Redo: Access key (Alt or Ctrl) + Y" i18n:attributes="title" accesskey="y">&#160;</button>
     </span>
   
     <span class="kupu-tb-buttongroup kupu-spellchecker-span" id="kupu-spellchecker">
       <button type="button" class="kupu-spellchecker" id="kupu-spellchecker-button" title="Check spelling" i18n:attributes="title">&#160;</button>
     </span>
   
-    <span class="kupu-tb-buttongroup kupu-source-span" id="kupu-source">
+    <span class="kupu-tb-buttongroup kupu-source-span" id="kupu-source" tal:condition="filter/source">
       <button type="button" class="kupu-source" id="kupu-source-button" title="Switch between visual editor and HTML view" i18n:attributes="title toggle_source_view;" accesskey="h">&#160;</button>
     </span>
   
-    <select class="kupu-tb-styles" tal:define="gstyles here/kupu_library_tool/getParagraphStyles|python:[];                 lstyles field/widget/parastyles|python:[];                 allstyles python:list(gstyles)+list(lstyles);">
+    <select class="kupu-tb-styles" tal:condition="filter/styles" tal:define="styles python:tool.getStyleList(field);">
       <option value="p" i18n:translate="">Normal</option>
-      <tal:block condition="allstyles|nothing" repeat="style allstyles">
-        <option i18n:translate="" tal:define="parts python:style.split('|',1)+['','']" tal:attributes="value python:parts[1]" tal:content="python:parts[0]"/>
+      <tal:block condition="styles" repeat="style styles">
+        <option i18n:translate="" tal:attributes="value style/value" tal:content="style/content"/>
       </tal:block>
     </select>
   
     </span>
   
-    <select id="kupu-ulstyles" class="kupu-ulstyles">
+    <select id="kupu-ulstyles" class="kupu-ulstyles" tal:condition="filter/ulstyles">
       <option value="disc" i18n:translate="list-disc">&#9679;</option>
       <option value="square" i18n:translate="list-square">&#9632;</option>
       <option value="circle" i18n:translate="list-circle">&#9675;</option>
       <option value="none" i18n:translate="list-nobullet">no bullet</option>
     </select>
-    <select id="kupu-olstyles" class="kupu-olstyles">
+    <select id="kupu-olstyles" class="kupu-olstyles" tal:condition="filter/olstyles">
       <option value="decimal" i18n:translate="list-decimal">1</option>
       <option value="upper-roman" i18n:translate="list-upperroman">I</option>
       <option value="lower-roman" i18n:translate="list-lowerroman">i</option>

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupuplone.css.dtml
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupuplone.css.dtml	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupuplone.css.dtml	Fri Dec  8 14:20:38 2006
@@ -147,7 +147,7 @@
 .kupu-inthyperlink-pressed {
   border-color: &dtml-buttonshadow; &dtml-buttonhighlight; &dtml-buttonhighlight; &dtml-buttonshadow;;
 }
-.kupu-exthyperlink {background-image: url("&dtml-portal_url;/link_icon.gif");}
+.kupu-exthyperlink {background-image: url("&dtml-portal_url;/plonekupuimages/link_icon.gif");}
 .kupu-exthyperlink-pressed {
   border-color: &dtml-buttonshadow; &dtml-buttonhighlight; &dtml-buttonhighlight; &dtml-buttonshadow;;
 }

Added: kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/link_icon.gif
==============================================================================
Binary file. No diff available.

Modified: kupu/trunk/kupu/plone/librarytool.py
==============================================================================
--- kupu/trunk/kupu/plone/librarytool.py	(original)
+++ kupu/trunk/kupu/plone/librarytool.py	Fri Dec  8 14:20:38 2006
@@ -227,3 +227,39 @@
                 return expr(context)
         return url
 
+    def _setToolbarFilters(self, filters):
+        """Set the toolbar filtering
+        filter is a list of records with: id, visible, override"""
+        clean = {}
+        for f in filters:
+            id = f.id
+            visible = bool(getattr(f, 'visible', False))
+            expr = getattr(f, 'override', None)
+
+            if not id:
+                continue
+
+            if expr:
+                expr = Expression(expr)
+            else:
+                expr = None
+            clean[id] = dict(id=id, visible=visible, override=expr)
+
+        self._toolbar_filters = clean
+
+    def getToolbarFilters(self, context, field=None):
+        expr_context = self._getExpressionContext(context)
+        expr_context.setGlobal('field', field)
+        filters = getattr(self, '_toolbar_filters', {})
+        visible = {}
+        for k in filters:
+            f = filters[k]
+            override = f.get('override', None)
+            if override:
+                visible[k] = override(expr_context)
+            else:
+                visible[k] = f['visible']
+        return visible
+
+    def _getToolbarFilterOptions(self):
+        return getattr(self, '_toolbar_filters', {})

Modified: kupu/trunk/kupu/plone/plonelibrarytool.py
==============================================================================
--- kupu/trunk/kupu/plone/plonelibrarytool.py	(original)
+++ kupu/trunk/kupu/plone/plonelibrarytool.py	Fri Dec  8 14:20:38 2006
@@ -28,7 +28,7 @@
 from Products.PythonScripts.standard import Object
 
 from Products.kupu.plone.librarytool import KupuLibraryTool
-from Products.kupu.plone import permissions, scanner, plonedrawers, util
+from Products.kupu.plone import permissions, scanner, plonedrawers, util, helpers
 from Products.kupu import kupu_globals
 from Products.kupu.config import TOOLNAME, TOOLTITLE
 from StringIO import StringIO
@@ -157,6 +157,66 @@
         except AttributeError:
             return _default_paragraph_styles
 
+    security.declareProtected('View', "getStyleList")
+    def getStyleList(self, field=None):
+        """Return the paragraph styles for a field."""
+        gstyles = self.getParagraphStyles()
+        if field:
+            widget = field.widget
+            redefine = getattr(widget, 'redefine_parastyles', False)
+            lstyles = getattr(widget, 'parastyles', ())
+        else:
+            redefine = False
+            lstyles = False
+
+        result = []
+        if redefine:
+            styles = lstyles
+        else:
+            styles = list(gstyles) + list(lstyles)
+            
+        for style in styles:
+            parts = style.split('|',1)+['','']
+            value = parts[1]
+            content = parts[0]
+            result.append({'value':value, 'content':content})
+
+        return result
+
+    security.declareProtected('View', "filterToolbar")
+    def filterToolbar(self, context, field=None):
+        return helpers.ButtonFilter(self, context, field)
+
+    security.declareProtected('View', "getFilterOptions")
+    def getFilterOptions(self, field=None):
+        filters = helpers.FILTERS
+        config = self._getToolbarFilterOptions()
+        res = []
+        for (id, title, default) in filters:
+            cfg = config.get(id, {})
+            visible = cfg.get('visible', default)
+            expr = cfg.get('override', None)
+            if expr is not None:
+                expr = expr.text
+            res.append(dict(id=id, title=title, visible=visible, override=expr))
+        return res
+
+    security.declareProtected(permissions.ManageLibraries, "set_toolbar_filters")
+    def set_toolbar_filters(self, filters, REQUEST=None):
+        """Set the toolbar filtering
+        filter is a list of records with: id, checked, expression"""
+        DEFAULTS = helpers.FILTERDICT
+        def nonstandard(f):
+            expr = f['override']
+            id = f['id']
+            visible = bool(f.get('visible', False))
+            return expr != '' or visible != DEFAULTS.get(id, False)
+            
+        cleaned = [ f for f in filters if nonstandard(f) ]
+        self._setToolbarFilters(filters)
+        if REQUEST:
+            REQUEST.RESPONSE.redirect(self.absolute_url() + '/zmi_toolbar')
+
     security.declareProtected('View', "getHtmlExclusions")
     def getHtmlExclusions(self):
         try:
@@ -418,6 +478,10 @@
     zmi_links = PageTemplateFile("zmi_links.pt", globals())
     zmi_links.title = 'kupu link maintenance'
 
+    security.declareProtected(permissions.ManageLibraries, "zmi_toolbar")
+    zmi_toolbar = PageTemplateFile("zmi_toolbar.pt", globals())
+    zmi_toolbar.title = 'kupu toolbar customisation'
+
     security.declareProtected(permissions.ManageLibraries, "zmi_docs")
     zmi_docs = PageTemplateFile("zmi_docs.pt", globals())
     zmi_docs.title = 'kupu configuration documentation'

Modified: kupu/trunk/kupu/plone/sourceedit.kupu
==============================================================================
--- kupu/trunk/kupu/plone/sourceedit.kupu	(original)
+++ kupu/trunk/kupu/plone/sourceedit.kupu	Fri Dec  8 14:20:38 2006
@@ -4,11 +4,24 @@
     implementation="plone"
     xmlns="http://www.w3.org/1999/xhtml"
     xmlns:kupu="http://kupu.oscom.org/namespaces/dist"
+    xmlns:i18n="http://xml.zope.org/namespaces/i18n"
     xmlns:tal="http://xml.zope.org/namespaces/tal"
     >
     <kupu:id>$Id$</kupu:id>
 
   <kupu:part name="jsincludes">
   </kupu:part>
+  <kupu:part name="buttons">
+    <span class="kupu-tb-buttongroup kupu-source-span" id="kupu-source"
+          tal:condition="filter/source">
+      <button type="button"
+              class="kupu-source"
+              id="kupu-source-button"
+              title="Switch between visual editor and HTML view"
+              i18n:attributes="title toggle_source_view;"
+              accesskey="h"
+              >&#160;</button>
+    </span>
+  </kupu:part>
 
 </kupu:feature>

Added: kupu/trunk/kupu/plone/spellchecker.kupu
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/plone/spellchecker.kupu	Fri Dec  8 14:20:38 2006
@@ -0,0 +1,24 @@
+<?xml version="1.0" ?>
+<kupu:feature
+    name="spellchecker"
+    implementation="default"
+    xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:kupu="http://kupu.oscom.org/namespaces/dist"
+    xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+    i18n:domain="kupu"
+    >
+  <kupu:id>$Id: sourceedit.kupu 9779 2005-03-15 11:34:47Z duncan $</kupu:id>
+
+  <kupu:part name="buttons">
+    <span class="kupu-tb-buttongroup kupu-spellchecker-span"
+        id="kupu-spellchecker" tal:condition="filter/spellchecker">
+      <button type="button"
+              class="kupu-spellchecker"
+              id="kupu-spellchecker-button"
+              title="Check spelling"
+              i18n:attributes="title"
+              >&#160;</button>
+    </span>
+  </kupu:part>
+
+</kupu:feature>

Modified: kupu/trunk/kupu/plone/toolbar.kupu
==============================================================================
--- kupu/trunk/kupu/plone/toolbar.kupu	(original)
+++ kupu/trunk/kupu/plone/toolbar.kupu	Fri Dec  8 14:20:38 2006
@@ -8,30 +8,158 @@
     >
 <kupu:id>$Id$</kupu:id>
 
+  <kupu:part name="toolbar">
+    <div class="kupu-tb" id="toolbar"
+         tal:define="tool context/kupu_library_tool;field field|nothing;filter python:tool.filterToolbar(context,field);">
+      <kupu:define-slot name="toolbar" />
+    </div>
+  </kupu:part>
+
   <kupu:part name="logo">
   </kupu:part>
 
+  <kupu:part name="zoom">
+    <span class="kupu-tb-buttongroup" style="float: right" id="kupu-zoom"
+          tal:condition="filter/zoom">
+      <button type="button" class="kupu-zoom" id="kupu-zoom-button"
+              i18n:attributes="title"
+              title="Zoom: Access key (Alt or Ctrl) + X" accesskey="x">&#160;</button>
+    </span>
+  </kupu:part>
+
+
+  <kupu:part name="buttongroup-basicmarkup">
+    <span class="kupu-tb-buttongroup" id="kupu-bg-basicmarkup" tal:condition="filter/bg-basicmarkup">
+      <button type="button" class="kupu-bold" id="kupu-bold-button"
+              title="Bold: Access key (Alt or Ctrl) + B"
+              tal:condition="filter/bold-button"
+              i18n:attributes="title" accesskey="b">&#160;</button>
+      <button type="button" class="kupu-italic" id="kupu-italic-button"
+              title="Italic: Access key (Alt or Ctrl) + I"
+              tal:condition="filter/italic-button"
+              i18n:attributes="title" accesskey="i">&#160;</button>
+    </span>
+  </kupu:part>
+  <kupu:part name="buttongroup-subsuper">
+    <span class="kupu-tb-buttongroup" id="kupu-bg-subsuper" tal:condition="filter/bg-subsuper">
+      <button type="button" class="kupu-subscript" id="kupu-subscript-button" title="Subscript: Access key (Alt or Ctrl) + -"
+              tal:condition="filter/subscript-button"
+              i18n:attributes="title" accesskey="-">&#160;</button>
+      <button type="button" class="kupu-superscript" id="kupu-superscript-button" title="Superscript: Access key (Alt or Ctrl) + +"
+              tal:condition="filter/superscript-button"
+              i18n:attributes="title" accesskey="+">&#160;</button>
+    </span>
+  </kupu:part>
+
+  <kupu:part name="buttongroup-justify">
+    <span class="kupu-tb-buttongroup" id="kupu-bg-justify" tal:condition="filter/bg-justify">
+      <button type="button" class="kupu-justifyleft" id="kupu-justifyleft-button" 
+              tal:condition="filter/justifyleft-button"
+              title="Left justify: Access key (Alt or Ctrl) + L" i18n:attributes="title"
+              accesskey="l">&#160;</button>
+      <button type="button" class="kupu-justifycenter" 
+              tal:condition="filter/justifycenter-button"
+              id="kupu-justifycenter-button" title="Center justify: Access key (Alt or Ctrl) + C" 
+              i18n:attributes="title" accesskey="c">&#160;</button>
+      <button type="button" class="kupu-justifyright" 
+              tal:condition="filter/justifyright-button"
+              id="kupu-justifyright-button" title="Right justify: Access key (Alt or Ctrl) + R"
+              i18n:attributes="title" accesskey="r">&#160;</button>
+    </span>
+  </kupu:part>
+
+  <kupu:part name="buttongroup-list">
+    <span class="kupu-tb-buttongroup" id="kupu-bg-list" tal:condition="filter/bg-list">
+      <!-- list button events are set on the list tool -->
+      <button type="button" class="kupu-insertorderedlist"
+              tal:condition="filter/list-ol-addbutton"
+              title="Numbered list: Access key (Alt or Ctrl) + #" id="kupu-list-ol-addbutton" 
+              i18n:attributes="title" accesskey="#">&#160;</button>
+      <button type="button" class="kupu-insertunorderedlist" 
+              tal:condition="filter/list-ul-addbutton"
+              title="Unordered list: Access key (Alt or Ctrl) + *" id="kupu-list-ul-addbutton" 
+              i18n:attributes="title" accesskey="*">&#160;</button>
+              </span>
+  </kupu:part>
+
+  <kupu:part name="buttongroup-definitionlist">
+    <span class="kupu-tb-buttongroup" id="kupu-bg-definitionlist" tal:condition="filter/definitionlist">
+      <!-- list button events are set on the list tool -->
+      <button type="button" class="kupu-insertdefinitionlist" 
+              title="Definition list: Access key (Alt or Ctrl) + =" id="kupu-list-dl-addbutton" 
+              i18n:attributes="title" accesskey="=">&#160;</button>
+    </span>
+  </kupu:part>
+
+  <kupu:part name="buttongroup-indent">
+    <span class="kupu-tb-buttongroup" id="kupu-bg-indent" tal:condition="filter/bg-indent">
+      <button type="button" class="kupu-outdent" 
+              tal:condition="filter/outdent-button"
+              id="kupu-outdent-button" title="Decrease quote level: Access key (Alt or Ctrl) + &lt;"
+              i18n:attributes="title" accesskey="&lt;">&#160;</button>
+      <button type="button" class="kupu-indent" 
+              tal:condition="filter/indent-button"
+              id="kupu-indent-button" title="Increase quote level: Access key (Alt or Ctrl) + &gt;"
+              i18n:attributes="title" accesskey="&gt;">&#160;</button>
+    </span>
+  </kupu:part>
+
+  <kupu:part name="buttongroup-remove">
+    <span class="kupu-tb-buttongroup" id="kupu-bg-remove" tal:condition="filter/bg-remove">
+      <button type="button" class="kupu-removeimage invisible"
+              tal:condition="filter/removeimage-button"
+              id="kupu-removeimage-button" title="Remove image"
+              i18n:attributes="title">&#160;</button>
+      <button type="button" class="kupu-removelink invisible"
+              tal:condition="filter/removelink-button"
+              id="kupu-removelink-button" title="Remove link"
+              i18n:attributes="title">&#160;</button>
+    </span>
+  </kupu:part>
+
+  <kupu:part name="buttongroup-undo">
+    <span class="kupu-tb-buttongroup" id="kupu-bg-undo" tal:condition="filter/bg-undo">
+      <button type="button" class="kupu-undo" 
+              tal:condition="filter/undo-button"
+              id="kupu-undo-button" title="Undo: Access key (Alt or Ctrl) + Z"
+              i18n:attributes="title" accesskey="z">&#160;</button>
+      <button type="button" class="kupu-redo" 
+              tal:condition="filter/redo-button"
+              id="kupu-redo-button" title="Redo: Access key (Alt or Ctrl) + Y"
+              i18n:attributes="title" accesskey="y">&#160;</button>
+    </span>
+  </kupu:part>
+
   <kupu:part name="select-styles">
     <select class="kupu-tb-styles"
-        tal:define="gstyles here/kupu_library_tool/getParagraphStyles|python:[];
-                lstyles field/widget/parastyles|python:[];
-                allstyles python:list(gstyles)+list(lstyles);">
+            tal:condition="filter/styles"
+            tal:define="styles python:tool.getStyleList(field);">
       <option value="p" i18n:translate="">Normal</option>
-      <tal:block condition="allstyles|nothing" repeat="style allstyles">
+      <tal:block condition="styles" repeat="style styles">
         <option i18n:translate=""
-                tal:define="parts python:style.split('|',1)+['','']"
-                tal:attributes="value python:parts[1]" tal:content="python:parts[0]"/>
+                tal:attributes="value style/value" tal:content="style/content"/>
       </tal:block>
     </select>
   </kupu:part>
 
-  <kupu:part name="buttongroup-basicmarkup">
-    <span class="kupu-tb-buttongroup" id="kupu-bg-basicmarkup">
-      <button type="button" class="kupu-bold" id="kupu-bold-button" title="Bold: Access key (Alt or Ctrl) + B"
-              i18n:attributes="title" accesskey="b">&#160;</button>
-      <button type="button" class="kupu-italic" id="kupu-italic-button" title="Italic: Access key (Alt or Ctrl) + I"
-              i18n:attributes="title" accesskey="i">&#160;</button>
-    </span>
+  <kupu:part name="liststyles">
+    <select id="kupu-ulstyles" class="kupu-ulstyles" tal:condition="filter/ulstyles">
+      <option value="disc" i18n:translate="list-disc">&#9679;</option>
+      <option value="square" i18n:translate="list-square">&#9632;</option>
+      <option value="circle" i18n:translate="list-circle">&#9675;</option>
+      <option value="none" i18n:translate="list-nobullet">no bullet</option>
+    </select>
+    <select id="kupu-olstyles" class="kupu-olstyles" tal:condition="filter/olstyles">
+      <option value="decimal" 
+              i18n:translate="list-decimal">1</option>
+      <option value="upper-roman" 
+              i18n:translate="list-upperroman">I</option>
+      <option value="lower-roman" 
+              i18n:translate="list-lowerroman">i</option>
+      <option value="upper-alpha" 
+              i18n:translate="list-upperalpha">A</option>
+      <option value="lower-alpha" 
+              i18n:translate="list-loweralpha">a</option>
+    </select>
   </kupu:part>
-
 </kupu:feature>

Added: kupu/trunk/kupu/plone/zmi_toolbar.pt
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/plone/zmi_toolbar.pt	Fri Dec  8 14:20:38 2006
@@ -0,0 +1,77 @@
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
+lang="en"
+metal:use-macro="here/kupu_config/macros/master"
+i18n:domain="plone">
+
+  <metal:cssslot fill-slot="css_slot">
+    <link href="kupustyles.css" rel="stylesheet" type="text/css" tal:attributes="href string:${portal_url}/kupustyles.css"/>
+    <link href="kupuplone.css" rel="stylesheet" type="text/css" tal:attributes="href string:${portal_url}/kupuplone.css"/>
+    <link href="kupudrawerstyles.css" rel="stylesheet" type="text/css" tal:attributes="href string:${portal_url}/kupudrawerstyles.css"/>
+    <tal:if condition="not:exists:portal/portal_javascripts"
+            metal:use-macro="context/kupu_wysiwyg_support/macros/kupu_js_include">
+    </tal:if>
+    <script type="text/javascript"
+            tal:attributes="src portal/kupu_kjax.js/absolute_url_path"
+            ></script>
+  </metal:cssslot>
+  <body>
+
+    <div class="documentContent" metal:fill-slot="kupu_content">
+      <h3 i18n:translate="heading_configuration">Kupu Toolbar Configuration</h3>
+      <form action=""
+            name="configure_kupu_toolbar"
+            method="post"
+            tal:attributes="action here/absolute_url">
+
+        <fieldset>
+          <legend i18n:translate="legend_link_options">Button visibility</legend>
+          <div class="formHelp" i18n:translate="help_link_uid">Control the global visibility of toolbar buttons from this screen.
+            If no expression is entered, only checked buttons are visible. Enter an expression for finer control of visibility.
+            Individual fields may also whitelist or blacklist buttons: see the field schema.
+            <div>Values available in expressions includes 'field' as well as the usual names</div>
+            <!-- object_url folder_url portal_url object folder portal nothing request modules member -->
+          </div>
+
+          <table class="listing nosort">
+            <thead>
+              <th>Id</th>
+              <th>Title</th>
+              <th>Visible<br/>
+                <input title="Select all items"
+                 onclick="toggleSelect(this, 'filters.visible:records:int', true);"
+                 type="checkbox" checked="checked" />
+              </th>
+              <th>Expression</th>
+            </thead>
+            <tbody>
+              <tr tal:repeat="opt context/getFilterOptions">
+                <td><span tal:content="opt/id" />
+                  <input type="hidden" name="filters.id:records" tal:attributes="value opt/id" />
+                </td>
+                <td tal:content="opt/title">
+                </td>
+                <td>
+                  <input type="checkbox" name="filters.visible:records:int" value="1" tal:attributes="checked opt/visible" />
+                </td>
+                <td>
+                  <input type="text" style="width:30em" tal:attributes="value opt/override|nothing" name="filters.override:records" />
+                </td>
+              </tr>
+            </tbody>
+          </table>
+
+        </fieldset>
+
+        <input class="context"
+               tabindex=""
+               type="submit"
+               name="set_toolbar_filters:method"
+               value="Save"
+               i18n:attributes="value"
+               tal:attributes="tabindex tabindex|nothing;"
+               />
+      </form>
+    </div>
+  </body>
+</html>
+

From duncan at codespeak.net  Fri Dec  8 14:24:16 2006
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Fri,  8 Dec 2006 14:24:16 +0100 (CET)
Subject: [kupu-checkins] r35478 - in kupu/trunk/kupu: common doc
Message-ID: <20061208132416.298F51006E@code0.codespeak.net>

Author: duncan
Date: Fri Dec  8 14:24:14 2006
New Revision: 35478

Modified:
   kupu/trunk/kupu/common/kupubasetools.js
   kupu/trunk/kupu/common/kupusourceedit.js
   kupu/trunk/kupu/doc/CHANGES.txt
   kupu/trunk/kupu/doc/PLONE2.txt
Log:
Missed a few files on last checkin

Modified: kupu/trunk/kupu/common/kupubasetools.js
==============================================================================
--- kupu/trunk/kupu/common/kupubasetools.js	(original)
+++ kupu/trunk/kupu/common/kupubasetools.js	Fri Dec  8 14:24:14 2006
@@ -115,13 +115,17 @@
 // Helper function for enabling/disabling tools
 function KupuButtonDisable(button) {
     button = button || this.button;
-    button.disabled = "disabled";
-    button.className += ' disabled';
+    if (button) {
+        button.disabled = "disabled";
+        button.className += ' disabled';
+    }
 }
 function KupuButtonEnable(button) {
     button = button || this.button;
-    button.disabled = "";
-    button.className = button.className.replace(/ *\bdisabled\b/g, '');
+    if (button) {
+        button.disabled = "";
+        button.className = button.className.replace(/ *\bdisabled\b/g, '');
+    }
 }
 
 
@@ -143,6 +147,7 @@
 
 KupuButton.prototype.initialize = function(editor) {
     this.editor = editor;
+    if (!this.button) return;
     this._fixTabIndex(this.button);
     addEventHandler(this.button, 'click', this.execCommand, this);
 };
@@ -182,6 +187,7 @@
         
             if the state of the button should be changed, we set the class
         */
+        if (!this.button) return;
         var currclass = this.button.className;
         var newclass = null;
         if (this.checkfunc(selNode, this, this.editor, event)) {
@@ -265,8 +271,10 @@
         this.editor = editor;
         this.cleanStyles();
         this.enableOptions(false);
-        this._fixTabIndex(this.tsselect);
-        this._selectevent = addEventHandler(this.tsselect, 'change', this.setTextStyleHandler, this);
+        if (this.tsselect) {
+            this._fixTabIndex(this.tsselect);
+            this._selectevent = addEventHandler(this.tsselect, 'change', this.setTextStyleHandler, this);
+        }
     };
 
     this.getStyles = function() {
@@ -337,6 +345,7 @@
     };
 
     this.cleanStyles = function() {
+        if (!this.tsselect) return;
         var options = this.tsselect.options;
         var parastyles = this.styles;
         var tablestyles = this.tablestyles;
@@ -395,6 +404,7 @@
 
     // Remove otherstyle and switch to appropriate style set.
     this.enableOptions = function(inTable) {
+        if (!this.tsselect) return;
         var select = this.tsselect;
         var options = select.options;
         if (this.otherstyle) {
@@ -509,6 +519,7 @@
         // this method does some more than the original one since it can handle commands in
         // the form of '<style>|<classname>' next to the plain
         // '<style>' commands
+        if (!this.tsselect) return;
         var index = undefined;
         var mixed = false;
         var styletag, classname;
@@ -808,10 +819,10 @@
         return ret;
     };
     this.disable = function() {
-        this.tsselect.disabled = "disabled";
+        if (this.tsselect) this.tsselect.disabled = "disabled";
     }
     this.enable = function() {
-        this.tsselect.disabled = "";
+        if (this.tsselect) this.tsselect.disabled = "";
     }
 }
 
@@ -1179,6 +1190,7 @@
         /* attach the event handlers */
         this.tool = tool;
         this.editor = editor;
+        if (!this.button) return;
         addEventHandler(this.input, "blur", this.updateLink, this);
         addEventHandler(this.button, "click", this.addLink, this);
     };
@@ -2157,17 +2169,24 @@
     this.initialize = function(editor) {
         /* attach event handlers */
         this.editor = editor;
-        this._fixTabIndex(this.addulbutton);
-        this._fixTabIndex(this.addolbutton);
-        this._fixTabIndex(this.ulselect);
-        this._fixTabIndex(this.olselect);
-
-        addEventHandler(this.addulbutton, "click", this.addUnorderedList, this);
-        addEventHandler(this.addolbutton, "click", this.addOrderedList, this);
-        addEventHandler(this.ulselect, "change", this.setUnorderedListStyle, this);
-        addEventHandler(this.olselect, "change", this.setOrderedListStyle, this);
-        this.ulselect.style.display = "none";
-        this.olselect.style.display = "none";
+        if (this.addulbutton) {
+            this._fixTabIndex(this.addulbutton);
+            addEventHandler(this.addulbutton, "click", this.addUnorderedList, this);
+        }
+        if (this.addolbutton) {
+            this._fixTabIndex(this.addolbutton);
+            addEventHandler(this.addolbutton, "click", this.addOrderedList, this);
+        }
+        if (this.ulselect) {
+            this._fixTabIndex(this.ulselect);
+            addEventHandler(this.ulselect, "change", this.setUnorderedListStyle, this);
+            this.ulselect.style.display = "none";
+        }
+        if (this.olselect) {
+            this._fixTabIndex(this.olselect);
+            addEventHandler(this.olselect, "change", this.setOrderedListStyle, this);
+            this.olselect.style.display = "none";
+        }
 
         this.editor.logMessage(_('List style tool initialized'));
     };
@@ -2178,10 +2197,14 @@
         } else {
             var currstyle = this.type_to_style[currnode.getAttribute('type')];
         }
-        selectSelectItem(onselect, currstyle);
-        offselect.style.display = "none";
-        onselect.style.display = "inline";
-        offselect.selectedIndex = 0;
+        if (onselect) {
+            selectSelectItem(onselect, currstyle);
+            onselect.style.display = "inline";
+        }
+        if (offselect) {
+            offselect.style.display = "none";
+            offselect.selectedIndex = 0;
+        }
     };
 
     this.updateState = function(selNode) {
@@ -2198,19 +2221,19 @@
                 return;
             }
         }
-        with(this.ulselect) {
+        if (this.ulselect) with(this.ulselect) {
             selectedIndex = 0;
             style.display = "none";
         };
-        with(this.olselect) {
+        if (this.olselect) with(this.olselect) {
             selectedIndex = 0;
             style.display = "none";
         };
     };
 
     this.addList = function(command) {
-        this.ulselect.style.display = "inline";
-        this.olselect.style.display = "none";
+        if (this.ulselect) this.ulselect.style.display = "inline";
+        if (this.olselect) this.olselect.style.display = "none";
         this.editor.execCommand(command);
         this.editor.focusDocument();
     };
@@ -2226,6 +2249,7 @@
 
     this.setListStyle = function(tag, select) {
         /* set the type of an ul */
+        if (!select) return;
         var currnode = this.editor.getSelectedNode();
         var l = this.editor.getNearestParentOfType(currnode, tag);
         var style = select.options[select.selectedIndex].value;
@@ -2251,14 +2275,14 @@
     this.enable = function() {
         KupuButtonEnable(this.addulbutton);
         KupuButtonEnable(this.addolbutton);
-        this.ulselect.disabled = "";
-        this.olselect.disabled = "";
+        if (this.ulselect) this.ulselect.disabled = "";
+        if (this.olselect) this.olselect.disabled = "";
     }
     this.disable = function() {
         KupuButtonDisable(this.addulbutton);
         KupuButtonDisable(this.addolbutton);
-        this.ulselect.disabled = "disabled";
-        this.olselect.disabled = "disabled";
+        if (this.ulselect) this.ulselect.disabled = "disabled";
+        if (this.olselect) this.olselect.disabled = "disabled";
     }
 };
 
@@ -2343,6 +2367,7 @@
     this.initialize = function(editor) {
         /* initialize the tool */
         this.editor = editor;
+        if (!this.dlbutton) return;
         this._fixTabIndex(this.dlbutton);
         addEventHandler(this.dlbutton, 'click', this.createDefinitionList, this);
         addEventHandler(editor.getInnerDocument(), 'keyup', this._keyDownHandler, this);
@@ -2650,7 +2675,7 @@
         this.offclass = 'kupu-zoom';
         this.onclass = 'kupu-zoom-pressed';
         this.pressed = false;
-
+        if (!this.button) return;
         this.baseinitialize(editor);
         this.button.tabIndex = this.editor.document.editable.tabIndex;
         addEventHandler(window, "resize", this.onresize, this);

Modified: kupu/trunk/kupu/common/kupusourceedit.js
==============================================================================
--- kupu/trunk/kupu/common/kupusourceedit.js	(original)
+++ kupu/trunk/kupu/common/kupusourceedit.js	Fri Dec  8 14:24:14 2006
@@ -39,6 +39,7 @@
 SourceEditTool.prototype.initialize = function(editor) {
     /* attach the event handlers */
     this.editor = editor;
+    if (!this.sourceButton) return;
     this._fixTabIndex(this.sourceButton);
     addEventHandler(this.sourceButton, "click", this.switchSourceEdit, this);
     this.editor.logMessage(_('Source edit tool initialized'));

Modified: kupu/trunk/kupu/doc/CHANGES.txt
==============================================================================
--- kupu/trunk/kupu/doc/CHANGES.txt	(original)
+++ kupu/trunk/kupu/doc/CHANGES.txt	Fri Dec  8 14:24:14 2006
@@ -2,10 +2,16 @@
 Kupu changes
 ============
 
-- 1.4 unreleased
+- 1.4 Beta 3
 
   - Fixed a bug where createLink deleted the selected text.
 
+  - Paragraph styles may now be replaced as well as added to in a
+    widget definition.
+
+  - Toolbar buttons may be hidden globally, according to an 
+    expression, or from a widget definition.
+
 - 1.4 Beta 2
 
   - Paragraph styling now permitted inside a table again (contributed

Modified: kupu/trunk/kupu/doc/PLONE2.txt
==============================================================================
--- kupu/trunk/kupu/doc/PLONE2.txt	(original)
+++ kupu/trunk/kupu/doc/PLONE2.txt	Fri Dec  8 14:24:14 2006
@@ -399,6 +399,72 @@
         screen showing the proposed changes and may exclude any of them
         before confirming the search.
 
+toolbar tab
+===========
+
+This tab allows you to control which buttons and groups of buttons are
+displayed on the kupu toolbar. N.B. Be carefule, some combinations of
+buttons may render kupu hard to use.
+
+You may hide a button or group completely simply by unchecking the
+appropriate ``visible`` checkbox in this page. A button can only be
+visible if the group which contains it is also visible.
+
+You may enter an expression to control whether a button should be
+visible, e.g. to restrict buttons based on the user's roles.
+If there is an expression for a button the setting of the checkbox is
+ignored. The following values are available within the expression
+context:
+
+    field object_url folder_url portal_url object folder portal 
+    nothing request modules member
+
+The visibility of buttons may be further controlled within the widget
+definition for a field, but the this can only hide buttons, it cannot
+force a button to display if the settings on this tab have made it
+invisible. The widget allows for either a whitelist ``allow_buttons``
+attribute or a blacklist ``filter_buttons``. Either attribute should
+contain a list or tuple of button or group ids. The available ids are
+listed on the toolbar tab.
+
+If the widget has an attribute ``allow_buttons`` then only buttons and
+groups listed in this attribute will be visible; all other buttons are
+hidden. If there is no ``allow_buttons`` attribute (or its value is
+``None`` then all buttons are allowed unless excluded by
+``filter_buttons``.
+
+This example would hide all buttons except for bold, italic, left and
+right justify::
+
+        TextField('text',
+            allowable_content_types=('text/html',),
+            default_output_type='text/x-html-safe',
+            required=1,
+            widget=RichWidget
+            (label='Content',
+                allow_buttons=(
+                'bg-basicmarkup',
+                'bold-button', 'italic-button',
+                'bg-justify',
+                'justifyleft-button',
+                'justifyright-button',
+                ),
+            ),
+        ),
+
+This example would hide only the zoom button::
+
+        TextField('text',
+            allowable_content_types=('text/html',),
+            default_output_type='text/x-html-safe',
+            required=1,
+            widget=RichWidget
+            (label='Content',
+                filter_buttons=('zoom',
+                ),
+            ),
+        ),
+
 Custom styles
 -------------
 Kupu allows you to specify styles for paragraphs (P or DIV tags),
@@ -439,20 +505,27 @@
             widget=RichWidget
             (description='Please paste or type your article here',
                 label='Body Copy',
+                redefine_parastyles=False,
                 parastyles=(
-                 'div|pullQuote|Pull Quote',
-                 'div|Caption|Caption',
-                 'div|contactInformation|Contact Information',
-                 'div|notesToEditors|Notes to editors',
+                 'Pull Quote|div|pullQuote',
+                 'Caption|div|caption',
+                 'Contact Information|div|contactInformation',
+                 'Notes to editors|div|notesToEditors',
                 ),
             ),
         ),
 
 ``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.
+containing the description that appears in the style pulldown, vertical
+bar, the tag to be added, vertical bar, class to be assigned to
+the tag.
+The class may be omitted, so description, vertical bar, tag is also valid.
+
+If the widget has an attribute ``redefine_parastyles`` which is true,
+then the styles defined for the field will replace the globally
+configured styles. If false or not set the field styles are added to
+the global styles.
 
 Images
 ------
@@ -471,6 +544,10 @@
 and the field you are editing must invoke the html-to-captioned output 
 transform.
 
+The field must have a default output type of text/x-html-safe or
+text/x-html-captioned otherwise image drawer will not include the
+caption option.
+
 If both of these conditions are filled, then the image drawer will
 include a checkbox for captioning an image. By default this is
 checked, turn it off to disable the caption on that image.
@@ -565,11 +642,6 @@
             widget=RichWidget
             (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'),
                 ),
             ),
         ),

From duncan at codespeak.net  Fri Dec  8 14:46:23 2006
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Fri,  8 Dec 2006 14:46:23 +0100 (CET)
Subject: [kupu-checkins] r35480 - kupu/trunk/kupu/plone
Message-ID: <20061208134623.71B4B10079@code0.codespeak.net>

Author: duncan
Date: Fri Dec  8 14:46:22 2006
New Revision: 35480

Modified:
   kupu/trunk/kupu/plone/helpers.py
   kupu/trunk/kupu/plone/plonelibrarytool.py
   kupu/trunk/kupu/plone/zmi_toolbar.pt
Log:
Added buttons to the toolbar tab.

Modified: kupu/trunk/kupu/plone/helpers.py
==============================================================================
--- kupu/trunk/kupu/plone/helpers.py	(original)
+++ kupu/trunk/kupu/plone/helpers.py	Fri Dec  8 14:46:22 2006
@@ -9,43 +9,43 @@
 ##############################################################################
 # Helper classes
 FILTERS = [
-    ('bg-basicmarkup', 'Bold/Italic group', True),
-    ('bold-button', 'Bold button', True),
-    ('italic-button', 'Italic button', True),
-    ('bg-subsuper', 'Subscript/Superscript group', True),
-    ('subscript-button', 'Subscript button', True),
-    ('superscript-button', 'Superscript button', True),
-    ('bg-justify', 'Justify group', True),
-    ('justifyleft-button', 'Justify left button', True),
-    ('justifycenter-button', 'Justify center button', True),
-    ('justifyright-button', 'Justify right button', True),
-    ('bg-list', 'List group', True),
-    ('list-ol-addbutton', 'Add ordered list button', True),
-    ('list-ul-addbutton', 'Add unordered list button', True),
-    ('definitionlist', 'Definition list', True),
-    ('bg-indent', 'Indent group', True),
-    ('outdent-button', 'Outdent button', True),
-    ('indent-button', 'Indent button', True),
-    ('bg-drawers', 'Drawers group', True),
-    ('imagelibdrawer-button', 'Image drawer button', True),
-    ('linklibdrawer-button', 'Link drawer button', True),
-    ('linkdrawer-button', 'External link drawer button', True),
-    ('anchors-button', 'Anchor drawer button', True),
-    ('tabledrawer-button', 'Table drawer button', True),
-    ('bg-remove', 'Remove group', True),
-    ('removeimage-button', 'Remove image button', True),
-    ('removelink-button', 'Remove link button', True),
-    ('bg-undo', 'Undo group', True),
-    ('undo-button', 'Undo button', True),
-    ('redo-button', 'Redo button', True),
-    ('spellchecker', 'Spellchecker', False),
-    ('source', 'Source', True),
-    ('styles', 'Styles pulldown', True),
-    ('ulstyles', 'Unordered list style pulldown', True),
-    ('olstyles', 'Ordered list style pulldown', True),
-    ('zoom', 'Zoom button', True),
+    ('bg-basicmarkup', 'Bold/Italic group', True, None),
+    ('bold-button', 'Bold button', True, 'kupu-bold'),
+    ('italic-button', 'Italic button', True, 'kupu-italic'),
+    ('bg-subsuper', 'Subscript/Superscript group', True, None),
+    ('subscript-button', 'Subscript button', True, 'kupu-subscript'),
+    ('superscript-button', 'Superscript button', True, 'kupu-superscript'),
+    ('bg-justify', 'Justify group', True, None),
+    ('justifyleft-button', 'Justify left button', True, 'kupu-justifyleft'),
+    ('justifycenter-button', 'Justify center button', True, 'kupu-justifycenter'),
+    ('justifyright-button', 'Justify right button', True, 'kupu-justifyright'),
+    ('bg-list', 'List group', True, None),
+    ('list-ol-addbutton', 'Add ordered list button', True, 'kupu-insertorderedlist'),
+    ('list-ul-addbutton', 'Add unordered list button', True, 'kupu-insertunorderedlist'),
+    ('definitionlist', 'Definition list', True, 'kupu-insertdefinitionlist'),
+    ('bg-indent', 'Indent group', True, None),
+    ('outdent-button', 'Outdent button', True, 'kupu-outdent'),
+    ('indent-button', 'Indent button', True, 'kupu-indent'),
+    ('bg-drawers', 'Drawers group', True, None),
+    ('imagelibdrawer-button', 'Image drawer button', True, 'kupu-image'),
+    ('linklibdrawer-button', 'Link drawer button', True, 'kupu-inthyperlink'),
+    ('linkdrawer-button', 'External link drawer button', True, 'kupu-exthyperlink'),
+    ('anchors-button', 'Anchor drawer button', True, 'kupu-anchors'),
+    ('tabledrawer-button', 'Table drawer button', True, 'kupu-table'),
+    ('bg-remove', 'Remove group', True, None),
+    ('removeimage-button', 'Remove image button', True, 'kupu-removeimage'),
+    ('removelink-button', 'Remove link button', True, 'kupu-removelink'),
+    ('bg-undo', 'Undo group', True, None),
+    ('undo-button', 'Undo button', True, 'kupu-undo'),
+    ('redo-button', 'Redo button', True, 'kupu-redo'),
+    ('spellchecker', 'Spellchecker', False, ''),
+    ('source', 'Source', True, 'kupu-source'),
+    ('styles', 'Styles pulldown', True, None),
+    ('ulstyles', 'Unordered list style pulldown', True, None),
+    ('olstyles', 'Ordered list style pulldown', True, None),
+    ('zoom', 'Zoom button', True, 'kupu-zoom'),
 ]
-FILTERDICT = dict([(k,v) for (k,title,v) in FILTERS])
+FILTERDICT = dict([(k,v) for (k,title,v,cl) in FILTERS])
 
 class ButtonFilter:
     """Helper class to control visibility of buttons.

Modified: kupu/trunk/kupu/plone/plonelibrarytool.py
==============================================================================
--- kupu/trunk/kupu/plone/plonelibrarytool.py	(original)
+++ kupu/trunk/kupu/plone/plonelibrarytool.py	Fri Dec  8 14:46:22 2006
@@ -192,13 +192,13 @@
         filters = helpers.FILTERS
         config = self._getToolbarFilterOptions()
         res = []
-        for (id, title, default) in filters:
+        for (id, title, default, klass) in filters:
             cfg = config.get(id, {})
             visible = cfg.get('visible', default)
             expr = cfg.get('override', None)
             if expr is not None:
                 expr = expr.text
-            res.append(dict(id=id, title=title, visible=visible, override=expr))
+            res.append(dict(id=id, title=title, visible=visible, override=expr, classname=klass))
         return res
 
     security.declareProtected(permissions.ManageLibraries, "set_toolbar_filters")

Modified: kupu/trunk/kupu/plone/zmi_toolbar.pt
==============================================================================
--- kupu/trunk/kupu/plone/zmi_toolbar.pt	(original)
+++ kupu/trunk/kupu/plone/zmi_toolbar.pt	Fri Dec  8 14:46:22 2006
@@ -34,6 +34,7 @@
 
           <table class="listing nosort">
             <thead>
+              <th></th>
               <th>Id</th>
               <th>Title</th>
               <th>Visible<br/>
@@ -43,9 +44,13 @@
               </th>
               <th>Expression</th>
             </thead>
-            <tbody>
+            <tbody class="kupu-tb-buttons">
               <tr tal:repeat="opt context/getFilterOptions">
-                <td><span tal:content="opt/id" />
+                <td><button tal:condition="opt/classname"
+                  tal:attributes="class opt/classname">&#160;</button>
+                </td>
+                <td>
+                  <span tal:content="opt/id" />
                   <input type="hidden" name="filters.id:records" tal:attributes="value opt/id" />
                 </td>
                 <td tal:content="opt/title">

From duncan at codespeak.net  Fri Dec  8 14:47:47 2006
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Fri,  8 Dec 2006 14:47:47 +0100 (CET)
Subject: [kupu-checkins] r35481 - kupu/trunk/kupu/plone
Message-ID: <20061208134747.2174410079@code0.codespeak.net>

Author: duncan
Date: Fri Dec  8 14:47:46 2006
New Revision: 35481

Modified:
   kupu/trunk/kupu/plone/helpers.py
Log:
Nixed the debug prints

Modified: kupu/trunk/kupu/plone/helpers.py
==============================================================================
--- kupu/trunk/kupu/plone/helpers.py	(original)
+++ kupu/trunk/kupu/plone/helpers.py	Fri Dec  8 14:47:46 2006
@@ -61,7 +61,6 @@
         self.filter_buttons = getattr(widget, 'filter_buttons', None)
         self.allow_buttons = getattr(widget, 'allow_buttons', None)
         self.visible_buttons = tool.getToolbarFilters(context, field)
-        print "visible=", self.visible_buttons
 
     def isButtonAllowed(self, name):
         visible = self.visible_buttons.get(name, True)
@@ -76,5 +75,4 @@
         if name[0]=='_':
             raise AttributeError("'%s' object has no attribute '%s'" % (self.__class__.__name__, name))
         allowed = self.isButtonAllowed(name)
-        print "ButtonFilter",name,"->",allowed
         return allowed

From duncan at codespeak.net  Fri Dec  8 14:52:09 2006
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Fri,  8 Dec 2006 14:52:09 +0100 (CET)
Subject: [kupu-checkins] r35483 - kupu/trunk/kupu/plone/kupu_plone_layer
Message-ID: <20061208135209.A56C910079@code0.codespeak.net>

Author: duncan
Date: Fri Dec  8 14:52:08 2006
New Revision: 35483

Modified:
   kupu/trunk/kupu/plone/kupu_plone_layer/kupuplone.css.dtml
Log:
Fix button backgrounds in configlet.

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupuplone.css.dtml
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupuplone.css.dtml	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupuplone.css.dtml	Fri Dec  8 14:52:08 2006
@@ -79,7 +79,7 @@
   border:1px solid &dtml-contentViewBorderColor;;
 }
 
-span.kupu-tb-buttons button {
+.kupu-tb-buttons button {
   width: 24px;
   height: 24px;
   border-color:&dtml-contentViewBackgroundColor;;

From duncan at codespeak.net  Fri Dec  8 14:54:25 2006
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Fri,  8 Dec 2006 14:54:25 +0100 (CET)
Subject: [kupu-checkins] r35484 - kupu/trunk/kupu/plone
Message-ID: <20061208135425.A0CB21007C@code0.codespeak.net>

Author: duncan
Date: Fri Dec  8 14:54:24 2006
New Revision: 35484

Modified:
   kupu/trunk/kupu/plone/zmi_toolbar.pt
Log:
Disabled the buttons!

Modified: kupu/trunk/kupu/plone/zmi_toolbar.pt
==============================================================================
--- kupu/trunk/kupu/plone/zmi_toolbar.pt	(original)
+++ kupu/trunk/kupu/plone/zmi_toolbar.pt	Fri Dec  8 14:54:24 2006
@@ -46,7 +46,7 @@
             </thead>
             <tbody class="kupu-tb-buttons">
               <tr tal:repeat="opt context/getFilterOptions">
-                <td><button tal:condition="opt/classname"
+                <td><button tal:condition="opt/classname" disabled
                   tal:attributes="class opt/classname">&#160;</button>
                 </td>
                 <td>

From duncan at codespeak.net  Fri Dec  8 15:15:29 2006
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Fri,  8 Dec 2006 15:15:29 +0100 (CET)
Subject: [kupu-checkins] r35486 - kupu/trunk/kupu/plone
Message-ID: <20061208141529.C76A710088@code0.codespeak.net>

Author: duncan
Date: Fri Dec  8 15:15:28 2006
New Revision: 35486

Modified:
   kupu/trunk/kupu/plone/plonelibrarytool.py
Log:
Avoid bombing if wysiwyg_editor property is None. (Thanks to Vitalie Cherpec)

Modified: kupu/trunk/kupu/plone/plonelibrarytool.py
==============================================================================
--- kupu/trunk/kupu/plone/plonelibrarytool.py	(original)
+++ kupu/trunk/kupu/plone/plonelibrarytool.py	Fri Dec  8 15:15:28 2006
@@ -270,8 +270,10 @@
             return False
 
         user = pm.getAuthenticatedMember()
-        if user.getProperty('wysiwyg_editor').lower() != 'kupu':
-            return False
+        if not pm.isAnonymousUser():
+            editor = user.getProperty('wysiwyg_editor')
+            if editor and editor.lower() != 'kupu':
+                return False
 
         # Then check whether the current content allows html
         if context is not None and fieldName and hasattr(context, 'getWrappedField'):
@@ -325,7 +327,8 @@
         """Find the appropriate template to use for the kupu widget"""
         pm = getToolByName(self, 'portal_membership')
         user = pm.getAuthenticatedMember()
-        editor = user.getProperty('wysiwyg_editor', '').lower()
+        editor = user.getProperty('wysiwyg_editor', '')
+        if editor: editor = editor.lower()
         if editor=='fck editor':
             editor = 'editor_fck'
 

From duncan at codespeak.net  Fri Dec  8 16:41:53 2006
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Fri,  8 Dec 2006 16:41:53 +0100 (CET)
Subject: [kupu-checkins] r35491 - in kupu/trunk/kupu: . common default plone
	plone/kupu_plone_layer
Message-ID: <20061208154153.0A1C81008E@code0.codespeak.net>

Author: duncan
Date: Fri Dec  8 16:41:49 2006
New Revision: 35491

Modified:
   kupu/trunk/kupu/common/kupubasetools.js
   kupu/trunk/kupu/default/colorchooser.kupu
   kupu/trunk/kupu/dist-plone.kupu
   kupu/trunk/kupu/plone/helpers.py
   kupu/trunk/kupu/plone/include.kupu
   kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
   kupu/trunk/kupu/plone/kupu_plone_layer/kupuplone.css.dtml
   kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneinit.js
   kupu/trunk/kupu/plone/plonelibrarytool.py
   kupu/trunk/kupu/plone/spellchecker.kupu
   kupu/trunk/kupu/plone/toolbar.kupu
   kupu/trunk/kupu/plone/zmi_toolbar.pt
Log:
Enabled the color chooser tool in Plone kupu. Ick, but at least it is disabled by default still.
Fixed the icon for the spellchecker.kupu

Modified: kupu/trunk/kupu/common/kupubasetools.js
==============================================================================
--- kupu/trunk/kupu/common/kupubasetools.js	(original)
+++ kupu/trunk/kupu/common/kupubasetools.js	Fri Dec  8 16:41:49 2006
@@ -839,15 +839,13 @@
     this.initialize = function(editor) {
         /* attach the event handlers */
         this.editor = editor;
-        
+        if (!(this.fgcolorbutton && this.hlcolorbutton && this.ccwindow)) return;
         this.createColorchooser(this.ccwindow);
 
         addEventHandler(this.fgcolorbutton, "click", this.openFgColorChooser, this);
         addEventHandler(this.hlcolorbutton, "click", this.openHlColorChooser, this);
         addEventHandler(this.ccwindow, "click", this.chooseColor, this);
-
         this.hide();
-
         this.editor.logMessage(_('Colorchooser tool initialized'));
     };
 
@@ -876,7 +874,12 @@
         /* event handler for choosing the color */
         var target = _SARISSA_IS_MOZ ? event.target : event.srcElement;
         var cell = this.editor.getNearestParentOfType(target, 'td');
-        this.editor.execCommand(this.command, cell.getAttribute('bgColor'));
+        var ed = this.editor;
+        var doc = ed.getDocument();
+        ed.execCommand('styleWithCSS', true);
+        doc.execCommand(this.command, cell.bgColor);
+        ed.execCommand('styleWithCSS', false);
+        // this.editor.execCommand(this.command, cell.bgColor);
         this.hide();
     
         this.editor.logMessage(_('Color chosen'));
@@ -889,7 +892,6 @@
 
     this.hide = function() {
         /* hide the colorchooser */
-        this.command = null;
         this.ccwindow.style.display = "none";
     };
 

Modified: kupu/trunk/kupu/default/colorchooser.kupu
==============================================================================
--- kupu/trunk/kupu/default/colorchooser.kupu	(original)
+++ kupu/trunk/kupu/default/colorchooser.kupu	Fri Dec  8 16:41:49 2006
@@ -10,7 +10,7 @@
   <kupu:id>$Id$</kupu:id>
 
   <kupu:part name="colorchooser">
-    <table id="kupu-colorchooser" cellpadding="0" cellspacing="0"
+    <table id="kupu-colorchooser" class="kupu-colorchooser" cellpadding="0" cellspacing="0"
            style="position: fixed; border-style: solid; border-color: black; border-width: 1px;">
     </table>
   </kupu:part>

Modified: kupu/trunk/kupu/dist-plone.kupu
==============================================================================
--- kupu/trunk/kupu/dist-plone.kupu	(original)
+++ kupu/trunk/kupu/dist-plone.kupu	Fri Dec  8 16:41:49 2006
@@ -22,6 +22,5 @@
   <!-- Plone does not want to use certain features -->
   <kupu:disable-feature name="toolboxes" />
   <kupu:disable-feature name="save" />
-  <kupu:disable-feature name="colorchooser" />
 
 </kupu:dist>

Modified: kupu/trunk/kupu/plone/helpers.py
==============================================================================
--- kupu/trunk/kupu/plone/helpers.py	(original)
+++ kupu/trunk/kupu/plone/helpers.py	Fri Dec  8 16:41:49 2006
@@ -15,6 +15,9 @@
     ('bg-subsuper', 'Subscript/Superscript group', True, None),
     ('subscript-button', 'Subscript button', True, 'kupu-subscript'),
     ('superscript-button', 'Superscript button', True, 'kupu-superscript'),
+    ('bg-colorchooser', 'Colour chooser group', False, None),
+    ('forecolor-button', 'Psychedelic foreground', False, 'kupu-forecolor'),
+    ('hilitecolor-button', 'Psychedelic background', False, 'kupu-hilitecolor'),
     ('bg-justify', 'Justify group', True, None),
     ('justifyleft-button', 'Justify left button', True, 'kupu-justifyleft'),
     ('justifycenter-button', 'Justify center button', True, 'kupu-justifycenter'),
@@ -38,7 +41,7 @@
     ('bg-undo', 'Undo group', True, None),
     ('undo-button', 'Undo button', True, 'kupu-undo'),
     ('redo-button', 'Redo button', True, 'kupu-redo'),
-    ('spellchecker', 'Spellchecker', False, ''),
+    ('spellchecker', 'Spellchecker', False, 'kupu-spellchecker'),
     ('source', 'Source', True, 'kupu-source'),
     ('styles', 'Styles pulldown', True, None),
     ('ulstyles', 'Unordered list style pulldown', True, None),
@@ -50,7 +53,7 @@
 class ButtonFilter:
     """Helper class to control visibility of buttons.
     Works from both a whitelist and a blacklist in the widget.
-    XXX Add expressions to the configlet so that a button may be hidden conditionally.
+    The configlet also provides a master list of visibilities
     """
     __allow_access_to_unprotected_subobjects__ = 1
 
@@ -63,7 +66,9 @@
         self.visible_buttons = tool.getToolbarFilters(context, field)
 
     def isButtonAllowed(self, name):
-        visible = self.visible_buttons.get(name, True)
+        visible = self.visible_buttons.get(name, None)
+        if visible is None:
+            visible = FILTERDICT.get(name, True)
         if self.allow_buttons is not None:
             return visible and name in self.allow_buttons
         if self.filter_buttons is not None:
@@ -75,4 +80,5 @@
         if name[0]=='_':
             raise AttributeError("'%s' object has no attribute '%s'" % (self.__class__.__name__, name))
         allowed = self.isButtonAllowed(name)
+        #print name, "->", allowed
         return allowed

Modified: kupu/trunk/kupu/plone/include.kupu
==============================================================================
--- kupu/trunk/kupu/plone/include.kupu	(original)
+++ kupu/trunk/kupu/plone/include.kupu	Fri Dec  8 16:41:49 2006
@@ -14,6 +14,8 @@
   <xi:include href="drawers.kupu" />
   <xi:include href="beforeunload.kupu" />
   <xi:include href="sourceedit.kupu" />
+  <xi:include href="colorchooser.kupu" />
+  <xi:include href="spellchecker.kupu" />
   <xi:include href="wysiwyg_support.kupu" />
 
 </kupu:include>

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	Fri Dec  8 16:41:49 2006
@@ -22,10 +22,10 @@
     <!--$Id: head.kupu 34332 2006-11-07 14:50:40Z duncan $-->
     <!--$Id: xmlconfig.kupu 35367 2006-12-06 09:06:21Z duncan $-->
     <!--$Id: body.kupu 34311 2006-11-07 11:18:23Z duncan $-->
-    <!--$Id: toolbar.kupu 25717 2006-04-12 10:33:01Z fschulze $-->
-    <!--$Id: drawers.kupu 21175 2005-12-15 14:25:08Z duncan $-->
+    <!--$Id: toolbar.kupu 35477 2006-12-08 13:20:38Z duncan $-->
+    <!--$Id: drawers.kupu 35477 2006-12-08 13:20:38Z duncan $-->
     <!--$Id: beforeunload.kupu 14546 2005-07-12 14:35:55Z duncan $-->
-    <!--$Id: sourceedit.kupu 14546 2005-07-12 14:35:55Z duncan $-->
+    <!--$Id: sourceedit.kupu 35477 2006-12-08 13:20:38Z duncan $-->
     <!--$Id: wysiwyg_support.kupu 27722 2006-05-26 11:10:05Z duncan $-->
     
 
@@ -136,6 +136,11 @@
       <button type="button" class="kupu-superscript" id="kupu-superscript-button" title="Superscript: Access key (Alt or Ctrl) + +" tal:condition="filter/superscript-button" i18n:attributes="title" accesskey="+">&#160;</button>
     </span>
   
+    <span class="kupu-tb-buttongroup" tal:condition="filter/bg-colorchooser">
+      <button type="button" class="kupu-forecolor" id="kupu-forecolor-button" tal:condition="filter/forecolor-button" title="text color: alt-f" i18n:attributes="title" accesskey="f">&#160;</button>
+      <button type="button" class="kupu-hilitecolor" id="kupu-hilitecolor-button" tal:condition="filter/hilitecolor-button" title="background color: alt-h" i18n:attributes="title" accesskey="h">&#160;</button>
+    </span>
+  
     <span class="kupu-tb-buttongroup" id="kupu-bg-justify" tal:condition="filter/bg-justify">
       <button type="button" class="kupu-justifyleft" id="kupu-justifyleft-button" tal:condition="filter/justifyleft-button" title="Left justify: Access key (Alt or Ctrl) + L" i18n:attributes="title" accesskey="l">&#160;</button>
       <button type="button" class="kupu-justifycenter" tal:condition="filter/justifycenter-button" id="kupu-justifycenter-button" title="Center justify: Access key (Alt or Ctrl) + C" i18n:attributes="title" accesskey="c">&#160;</button>
@@ -176,7 +181,7 @@
       <button type="button" class="kupu-redo" tal:condition="filter/redo-button" id="kupu-redo-button" title="Redo: Access key (Alt or Ctrl) + Y" i18n:attributes="title" accesskey="y">&#160;</button>
     </span>
   
-    <span class="kupu-tb-buttongroup kupu-spellchecker-span" id="kupu-spellchecker">
+    <span class="kupu-tb-buttongroup kupu-spellchecker-span" id="kupu-spellchecker" tal:condition="filter/spellchecker">
       <button type="button" class="kupu-spellchecker" id="kupu-spellchecker-button" title="Check spelling" i18n:attributes="title">&#160;</button>
     </span>
   
@@ -184,7 +189,7 @@
       <button type="button" class="kupu-source" id="kupu-source-button" title="Switch between visual editor and HTML view" i18n:attributes="title toggle_source_view;" accesskey="h">&#160;</button>
     </span>
   
-    <select class="kupu-tb-styles" tal:condition="filter/styles" tal:define="styles python:tool.getStyleList(field);">
+    <select class="kupu-tb-styles" tal:condition="filter/styles" tal:define="field field|nothing;styles python:tool.getStyleList(field);">
       <option value="p" i18n:translate="">Normal</option>
       <tal:block condition="styles" repeat="style styles">
         <option i18n:translate="" tal:attributes="value style/value" tal:content="style/content"/>
@@ -414,6 +419,9 @@
   
   
     </div>
+  
+    <table id="kupu-colorchooser" class="kupu-colorchooser" cellpadding="0" cellspacing="0" style="position: fixed; border-style: solid; border-color: black; border-width: 1px;">
+    </table>
   <script type="text/javascript">var focuscount = 0;</script>
     <div>
     <iframe class="kupu-editor-iframe" frameborder="0" src="emptypage" onfocus="this.contentWindow.focus();" tal:define="base python:here.kupu_library_tool.getBaseUrl(here, True);                     base kupu_base_override|base;" tal:attributes="src string:${base}/emptypage;                         tabindex tabindex/next|nothing;">

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupuplone.css.dtml
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupuplone.css.dtml	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupuplone.css.dtml	Fri Dec  8 16:41:49 2006
@@ -142,7 +142,8 @@
 .kupu-bold,
 .kupu-bold-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/bold.gif");}
 
-.kupu-forecolor {background-image: url("&dtml-portal_url;/plonekupuimages/text-color.gif");}
+.kupu-forecolor {background-image: url("&dtml-portal_url;/kupuimages/text-color.png");}
+.kupu-hilitecolor {background-image: url("&dtml-portal_url;/kupuimages/background-color.png");}
 .kupu-inthyperlink {background-image: url("&dtml-portal_url;/plonekupuimages/hyperlink.gif");}
 .kupu-inthyperlink-pressed {
   border-color: &dtml-buttonshadow; &dtml-buttonhighlight; &dtml-buttonhighlight; &dtml-buttonshadow;;
@@ -196,7 +197,7 @@
 .kupu-undo {background-image: url("&dtml-portal_url;/plonekupuimages/undo.gif");}
 .kupu-removelink {background-image: url("&dtml-portal_url;/plonekupuimages/delete_icon.gif");}
 .kupu-removeimage {background-image: url("&dtml-portal_url;/plonekupuimages/delete_icon.gif");}
-.kupu-spellchecker { display:none; }
+.kupu-spellchecker {background-image: url("&dtml-portal_url;/kupuimages/text-check.png");}
 
 .kupu-zoom {background-image: url("&dtml-portal_url;/plonekupuimages/fullscreenexpand_icon.gif");}
 .kupu-zoom-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/fullscreencollapse_icon.gif");}

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneinit.js
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneinit.js	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneinit.js	Fri Dec  8 16:41:49 2006
@@ -89,6 +89,11 @@
                                                 'kupu-superscript-pressed');
     kupu.registerTool('superscriptbutton', superscriptbutton);
 
+    var colorchoosertool = new ColorchooserTool(prefix+'button.kupu-forecolor',
+        prefix+'button.kupu-hilitecolor',
+        prefix+'table.kupu-colorchooser');
+    kupu.registerTool('colorchooser', colorchoosertool);
+
     var justifyleftbutton = new KupuButton(prefix+'button.kupu-justifyleft',
                                            execCommand('justifyleft'));
     kupu.registerTool('justifyleftbutton', justifyleftbutton);
@@ -163,8 +168,8 @@
         kupu.registerTool('spellchecker', spellchecker);
     } else {
         // hide the button when not available
-        var spellchecker_tool = document.getElementById('kupu-spellchecker');
-        spellchecker_tool.style.display = 'none';
+        var sc = getFromSelector(prefix+'span.kupu-spellchecker-span');
+        if (sc) sc.style.display = 'none';
     }
 
     // Use the generic beforeUnload handler if we have it:

Modified: kupu/trunk/kupu/plone/plonelibrarytool.py
==============================================================================
--- kupu/trunk/kupu/plone/plonelibrarytool.py	(original)
+++ kupu/trunk/kupu/plone/plonelibrarytool.py	Fri Dec  8 16:41:49 2006
@@ -213,7 +213,8 @@
             return expr != '' or visible != DEFAULTS.get(id, False)
             
         cleaned = [ f for f in filters if nonstandard(f) ]
-        self._setToolbarFilters(filters)
+        print cleaned
+        self._setToolbarFilters(cleaned)
         if REQUEST:
             REQUEST.RESPONSE.redirect(self.absolute_url() + '/zmi_toolbar')
 

Modified: kupu/trunk/kupu/plone/spellchecker.kupu
==============================================================================
--- kupu/trunk/kupu/plone/spellchecker.kupu	(original)
+++ kupu/trunk/kupu/plone/spellchecker.kupu	Fri Dec  8 16:41:49 2006
@@ -1,14 +1,12 @@
 <?xml version="1.0" ?>
 <kupu:feature
     name="spellchecker"
-    implementation="default"
+    implementation="plone"
     xmlns="http://www.w3.org/1999/xhtml"
     xmlns:kupu="http://kupu.oscom.org/namespaces/dist"
     xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-    i18n:domain="kupu"
+    xmlns:tal="http://xml.zope.org/namespaces/tal"
     >
-  <kupu:id>$Id: sourceedit.kupu 9779 2005-03-15 11:34:47Z duncan $</kupu:id>
-
   <kupu:part name="buttons">
     <span class="kupu-tb-buttongroup kupu-spellchecker-span"
         id="kupu-spellchecker" tal:condition="filter/spellchecker">

Modified: kupu/trunk/kupu/plone/toolbar.kupu
==============================================================================
--- kupu/trunk/kupu/plone/toolbar.kupu	(original)
+++ kupu/trunk/kupu/plone/toolbar.kupu	Fri Dec  8 16:41:49 2006
@@ -133,7 +133,8 @@
   <kupu:part name="select-styles">
     <select class="kupu-tb-styles"
             tal:condition="filter/styles"
-            tal:define="styles python:tool.getStyleList(field);">
+            
+            tal:define="field field|nothing;styles python:tool.getStyleList(field);">
       <option value="p" i18n:translate="">Normal</option>
       <tal:block condition="styles" repeat="style styles">
         <option i18n:translate=""

Modified: kupu/trunk/kupu/plone/zmi_toolbar.pt
==============================================================================
--- kupu/trunk/kupu/plone/zmi_toolbar.pt	(original)
+++ kupu/trunk/kupu/plone/zmi_toolbar.pt	Fri Dec  8 16:41:49 2006
@@ -45,7 +45,7 @@
               <th>Expression</th>
             </thead>
             <tbody class="kupu-tb-buttons">
-              <tr tal:repeat="opt context/getFilterOptions">
+              <tr tal:repeat="opt context/getFilterOptions" style="height:28px">
                 <td><button tal:condition="opt/classname" disabled
                   tal:attributes="class opt/classname">&#160;</button>
                 </td>

From guido at codespeak.net  Fri Dec  8 17:46:42 2006
From: guido at codespeak.net (guido at codespeak.net)
Date: Fri,  8 Dec 2006 17:46:42 +0100 (CET)
Subject: [kupu-checkins] r35493 - kupu/trunk/kupu/doc
Message-ID: <20061208164642.49A4E1007C@code0.codespeak.net>

Author: guido
Date: Fri Dec  8 17:46:41 2006
New Revision: 35493

Modified:
   kupu/trunk/kupu/doc/README.txt
Log:
Test checkin to see if SVN works.


Modified: kupu/trunk/kupu/doc/README.txt
==============================================================================
--- kupu/trunk/kupu/doc/README.txt	(original)
+++ kupu/trunk/kupu/doc/README.txt	Fri Dec  8 17:46:41 2006
@@ -97,3 +97,4 @@
 (common/sarissa.js) is the work of Manos Batsis and distributed under
 the Kupu License with his kind permission. See the Sarissa homepage at
 http://sarissa.sourceforge.net for more information.
+

From eric at codespeak.net  Fri Dec  8 17:51:00 2006
From: eric at codespeak.net (eric at codespeak.net)
Date: Fri,  8 Dec 2006 17:51:00 +0100 (CET)
Subject: [kupu-checkins] r35496 - kupu/branch/kupu-1.3.5-silva-1.5
Message-ID: <20061208165100.7B4F410089@code0.codespeak.net>

Author: eric
Date: Fri Dec  8 17:50:59 2006
New Revision: 35496

Added:
   kupu/branch/kupu-1.3.5-silva-1.5/
      - copied from r35495, kupu/tag/kupu-1.3.5-pre-infrae/
Log:
branch for silva 1.5 branch


From eric at codespeak.net  Fri Dec  8 17:56:39 2006
From: eric at codespeak.net (eric at codespeak.net)
Date: Fri,  8 Dec 2006 17:56:39 +0100 (CET)
Subject: [kupu-checkins] r35497 - kupu/branch/kupu-1.3.5-silva-1.5/silva
Message-ID: <20061208165639.6E26C1008E@code0.codespeak.net>

Author: eric
Date: Fri Dec  8 17:56:38 2006
New Revision: 35497

Modified:
   kupu/branch/kupu-1.3.5-silva-1.5/silva/kupusilvainit.js
Log:
fix for cached images (wuw issue 34 77, silva issue 1557)


Modified: kupu/branch/kupu-1.3.5-silva-1.5/silva/kupusilvainit.js
==============================================================================
--- kupu/branch/kupu-1.3.5-silva-1.5/silva/kupusilvainit.js	(original)
+++ kupu/branch/kupu-1.3.5-silva-1.5/silva/kupusilvainit.js	Fri Dec  8 17:56:38 2006
@@ -79,8 +79,9 @@
         };
     };
 
-    var cm = new ContextMenu();
-    kupu.setContextMenu(cm);
+    // commented out to fix caching issues with images
+    //var cm = new ContextMenu();
+    //kupu.setContextMenu(cm);
 
     // now we can create a UI object which we can use from the UI
     var ui = new SilvaKupuUI('kupu-tb-styles');

From eric at codespeak.net  Fri Dec  8 18:25:41 2006
From: eric at codespeak.net (eric at codespeak.net)
Date: Fri,  8 Dec 2006 18:25:41 +0100 (CET)
Subject: [kupu-checkins] r35498 - kupu/branch/kupu-1.3.5-silva-1.5
Message-ID: <20061208172541.9D25710086@code0.codespeak.net>

Author: eric
Date: Fri Dec  8 18:25:40 2006
New Revision: 35498

Removed:
   kupu/branch/kupu-1.3.5-silva-1.5/
Log:
copied the wrong tag...


From eric at codespeak.net  Fri Dec  8 18:26:43 2006
From: eric at codespeak.net (eric at codespeak.net)
Date: Fri,  8 Dec 2006 18:26:43 +0100 (CET)
Subject: [kupu-checkins] r35499 - kupu/branch/kupu-1.3.6-silva-1.5
Message-ID: <20061208172643.2730610086@code0.codespeak.net>

Author: eric
Date: Fri Dec  8 18:26:42 2006
New Revision: 35499

Added:
   kupu/branch/kupu-1.3.6-silva-1.5/
      - copied from r35498, kupu/tag/kupu-1.3.6/
Log:
a kupu branch for the silva 1.5 branch


From eric at codespeak.net  Fri Dec  8 18:29:58 2006
From: eric at codespeak.net (eric at codespeak.net)
Date: Fri,  8 Dec 2006 18:29:58 +0100 (CET)
Subject: [kupu-checkins] r35500 - in kupu/branch/kupu-1.3.6-silva-1.5: .
	silva
Message-ID: <20061208172958.67A8C10086@code0.codespeak.net>

Author: eric
Date: Fri Dec  8 18:29:57 2006
New Revision: 35500

Modified:
   kupu/branch/kupu-1.3.6-silva-1.5/silva/kupusilvainit.js
   kupu/branch/kupu-1.3.6-silva-1.5/version.txt
Log:
- fixed issue with caching of images
- version corrected


Modified: kupu/branch/kupu-1.3.6-silva-1.5/silva/kupusilvainit.js
==============================================================================
--- kupu/branch/kupu-1.3.6-silva-1.5/silva/kupusilvainit.js	(original)
+++ kupu/branch/kupu-1.3.6-silva-1.5/silva/kupusilvainit.js	Fri Dec  8 18:29:57 2006
@@ -79,8 +79,9 @@
         };
     };
 
-    var cm = new ContextMenu();
-    kupu.setContextMenu(cm);
+    //change to fix wrongful caching of images
+    //var cm = new ContextMenu();
+    //kupu.setContextMenu(cm);
 
     // now we can create a UI object which we can use from the UI
     var ui = new SilvaKupuUI('kupu-tb-styles');

Modified: kupu/branch/kupu-1.3.6-silva-1.5/version.txt
==============================================================================
--- kupu/branch/kupu-1.3.6-silva-1.5/version.txt	(original)
+++ kupu/branch/kupu-1.3.6-silva-1.5/version.txt	Fri Dec  8 18:29:57 2006
@@ -1 +1 @@
-kupu 1.3.5 pre
+kupu 1.3.6

From duncan at codespeak.net  Mon Dec 11 10:23:03 2006
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Mon, 11 Dec 2006 10:23:03 +0100 (CET)
Subject: [kupu-checkins] r35558 - kupu/trunk/kupu/plone
Message-ID: <20061211092303.DE5F610061@code0.codespeak.net>

Author: duncan
Date: Mon Dec 11 10:23:01 2006
New Revision: 35558

Added:
   kupu/trunk/kupu/plone/colorchooser.kupu   (contents, props changed)
Modified:
   kupu/trunk/kupu/plone/plonelibrarytool.py
Log:
Added missing .kupu file. Fixed type on plonelibrarytool.py which broke non-field use of kupu.

Added: kupu/trunk/kupu/plone/colorchooser.kupu
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/plone/colorchooser.kupu	Mon Dec 11 10:23:01 2006
@@ -0,0 +1,26 @@
+<?xml version="1.0" ?>
+<kupu:feature
+    name="colorchooser"
+    implementation="plone"
+    xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:kupu="http://kupu.oscom.org/namespaces/dist"
+    xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+    xmlns:tal="http://xml.zope.org/namespaces/tal"
+    >
+  <kupu:part name="buttons">
+    <span class="kupu-tb-buttongroup" tal:condition="filter/bg-colorchooser">
+      <button type="button" class="kupu-forecolor" id="kupu-forecolor-button"
+              tal:condition="filter/forecolor-button"
+              title="text color: alt-f" i18n:attributes="title" 
+              accesskey="f">&#160;</button>
+      <button type="button" class="kupu-hilitecolor" id="kupu-hilitecolor-button"
+              tal:condition="filter/hilitecolor-button"
+              title="background color: alt-h" i18n:attributes="title"
+              accesskey="h">&#160;</button>
+    </span>
+  </kupu:part>
+
+  <!-- We will have the button tool configuration here, too, once we
+       do tool definitions in XML config. -->
+
+</kupu:feature>

Modified: kupu/trunk/kupu/plone/plonelibrarytool.py
==============================================================================
--- kupu/trunk/kupu/plone/plonelibrarytool.py	(original)
+++ kupu/trunk/kupu/plone/plonelibrarytool.py	Mon Dec 11 10:23:01 2006
@@ -167,7 +167,7 @@
             lstyles = getattr(widget, 'parastyles', ())
         else:
             redefine = False
-            lstyles = False
+            lstyles = []
 
         result = []
         if redefine:
@@ -213,7 +213,6 @@
             return expr != '' or visible != DEFAULTS.get(id, False)
             
         cleaned = [ f for f in filters if nonstandard(f) ]
-        print cleaned
         self._setToolbarFilters(cleaned)
         if REQUEST:
             REQUEST.RESPONSE.redirect(self.absolute_url() + '/zmi_toolbar')

From duncan at codespeak.net  Mon Dec 11 15:48:32 2006
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Mon, 11 Dec 2006 15:48:32 +0100 (CET)
Subject: [kupu-checkins] r35578 - in kupu/trunk/kupu: Extensions plone
	plone/profiles plone/profiles/default plone/xml
Message-ID: <20061211144832.D948B10090@code0.codespeak.net>

Author: duncan
Date: Mon Dec 11 15:48:13 2006
New Revision: 35578

Added:
   kupu/trunk/kupu/plone/configure.zcml
   kupu/trunk/kupu/plone/exportimport.py
   kupu/trunk/kupu/plone/profiles/
   kupu/trunk/kupu/plone/profiles/default/
   kupu/trunk/kupu/plone/profiles/default/actionicons.xml
   kupu/trunk/kupu/plone/profiles/default/controlpanel.xml
   kupu/trunk/kupu/plone/profiles/default/cssregistry.xml
   kupu/trunk/kupu/plone/profiles/default/export_steps.xml
   kupu/trunk/kupu/plone/profiles/default/import_steps.xml
   kupu/trunk/kupu/plone/profiles/default/jsregistry.xml
   kupu/trunk/kupu/plone/profiles/default/kupu.xml
   kupu/trunk/kupu/plone/profiles/default/skins.xml
   kupu/trunk/kupu/plone/profiles/default/toolset.xml
   kupu/trunk/kupu/plone/xml/
   kupu/trunk/kupu/plone/xml/kupuExport.xml
   kupu/trunk/kupu/plone/z3interfaces.py
Modified:
   kupu/trunk/kupu/Extensions/Install.py
   kupu/trunk/kupu/plone/__init__.py
   kupu/trunk/kupu/plone/plonelibrarytool.py
   kupu/trunk/kupu/plone/util.py
Log:
Added support for genericsetup

Modified: kupu/trunk/kupu/Extensions/Install.py
==============================================================================
--- kupu/trunk/kupu/Extensions/Install.py	(original)
+++ kupu/trunk/kupu/Extensions/Install.py	Mon Dec 11 15:48:13 2006
@@ -40,8 +40,8 @@
     """
     # register the plone skin layers
     register_layer(self, 'plone/kupu_plone_layer', 'kupu_plone', out)
-    # Leave the reference browser turned off by default :(
-    #register_layer(self, 'plone/kupu_references', 'kupu_references', out)
+    # By default, add the directory view but not the skin layer for the reference browser
+    register_layer(self, 'plone/kupu_references', 'kupu_references', out, add=False)
     register_layer(self, 'tests', 'kupu_tests', out)
 
     # register as editor

Modified: kupu/trunk/kupu/plone/__init__.py
==============================================================================
--- kupu/trunk/kupu/plone/__init__.py	(original)
+++ kupu/trunk/kupu/plone/__init__.py	Mon Dec 11 15:48:13 2006
@@ -21,6 +21,13 @@
 from Products.kupu.plone.plonelibrarytool import PloneKupuLibraryTool
 from Products.kupu import kupu_globals
 
+try:
+    from Products.GenericSetup import profile_registry
+    from Products.GenericSetup import BASE, EXTENSION
+    from Products.CMFPlone.interfaces import IPloneSiteRoot
+except ImportError:
+    profile_registry = None
+
 kupu_package_dir = package_home(kupu_globals)
 registerDirectory('plone/kupu_plone_layer', kupu_package_dir)
 registerDirectory('plone/kupu_references', kupu_package_dir)
@@ -40,3 +47,13 @@
                        icon="kupu_icon.gif",
                        )
     init.initialize(context)
+
+    if profile_registry is not None:
+        profile_registry.registerProfile('default',
+                                     'Kupu',
+                                     'Extension profile for Kupu',
+                                     'plone/profiles/default',
+                                     'kupu',
+                                     EXTENSION,
+                                     for_=IPloneSiteRoot)
+

Added: kupu/trunk/kupu/plone/configure.zcml
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/plone/configure.zcml	Mon Dec 11 15:48:13 2006
@@ -0,0 +1,11 @@
+<configure xmlns="http://namespaces.zope.org/zope"
+           xmlns:five="http://namespaces.zope.org/five"
+           xmlns:zcml="http://namespaces.zope.org/zcml">
+<adapter
+    zcml:condition="installed Products.GenericSetup"
+    factory=".exportimport"
+    provides="Products.GenericSetup.interfaces.IBody"
+    for=".interfaces.IPloneKupuLibraryTool
+         Products.GenericSetup.interfaces.ISetupEnviron"
+    />
+</configure>

Added: kupu/trunk/kupu/plone/exportimport.py
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/plone/exportimport.py	Mon Dec 11 15:48:13 2006
@@ -0,0 +1,260 @@
+##############################################################################
+#
+# Copyright (c) 2005 Zope Corporation and Contributors. All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+""" Kupu library tool setup handlers.
+"""
+import os
+
+from AccessControl import ClassSecurityInfo
+from AccessControl.Permission import Permission
+from Globals import InitializeClass
+from Globals import package_home
+from Products.PageTemplates.PageTemplateFile import PageTemplateFile
+
+from Products.CMFCore.utils import getToolByName
+
+from Products.GenericSetup.utils import CONVERTER
+from Products.GenericSetup.utils import DEFAULT
+from Products.GenericSetup.utils import ExportConfiguratorBase
+from Products.GenericSetup.utils import ImportConfiguratorBase
+from Products.GenericSetup.utils import KEY
+
+try:
+    from Products.CMFCore.permissions import ManagePortal
+except ImportError:
+    from Products.CMFCore.CMFCorePermissions import ManagePortal
+
+from Products.PythonScripts.standard import Object
+
+_pkgdir = package_home( globals() )
+_xmldir = os.path.join( _pkgdir, 'xml' )
+
+#
+#   Configurator entry points
+#
+_FILENAME = 'kupu.xml'
+
+def importKupuSettings(context):
+    """ Import kupu settings from an XML file.
+    """
+    site = context.getSite()
+    kupu = getToolByName(site, 'kupu_library_tool', None)
+    if kupu is None:
+        return 'Kupu: No tool!'
+
+    body = context.readDataFile(_FILENAME)
+    if body is None:
+        return 'Kupu: Nothing to import.'
+
+    # now act on the settings we've retrieved
+    configurator = KupuToolImportConfigurator(site, 'utf-8')
+    info = configurator.parseXML(body)
+
+    config = info['config'][0]
+    parastyles = config['parastyles']
+    tableclasses = config['tableclasses']
+    stylewhitelist = config['filterstyles']
+    classblacklist = config['filterclasses']
+    excludedhtml = [ (f['tags'].split(' '), f['attributes'].split(' ')) for f in config['filters']]
+    
+    captioning = config['captioning']
+    userefbrowser = config['userefbrowser']
+    linkbyuid = config['linkbyuid']
+    filtersourceedit = config['filtersourceedit']
+    installbeforeunload = config['installbeforeunload']
+
+    kupu.configure_kupu(
+        table_classnames = tableclasses,
+        parastyles=parastyles,
+        style_whitelist = stylewhitelist,
+        class_blacklist = classblacklist,
+        installBeforeUnload=installbeforeunload,
+        linkbyuid=linkbyuid,
+        captioning=captioning,
+        )
+    kupu.set_html_exclusions(excludedhtml)
+
+    # Set up resources
+    # XXX whitelist/blacklist handling
+    resources = info['resources']
+    types = kupu.zmi_get_resourcetypes()
+    kupu.deleteResourceTypes([ t.name for t in types])
+    for k in resources:
+        kupu.addResourceType(k['id'], k['types'])
+
+    if info.has_key('generatepreviews'):
+        # This code generates preview URLs automatically from the most
+        # appropriately sized image (if you have PIL installed) or just an
+        # image field (if you don't).
+        #
+        # If you have content types which don't always have an image, or if
+        # this picks the wrong preview URL, you might want to change these
+        # expressions.
+        PREVIEW_EXPR = 'string:${object_url}/%s'
+        PREVIEW = [ { 'portal_type': type,
+            'expression': PREVIEW_EXPR % image,
+            'normal': None,
+            'scalefield': image.split('_',1)[0],
+            } for (type, image) in kupu.getPreviewable() ]
+        kupu.updatePreviewActions(PREVIEW)
+    else:
+        PREVIEW = []
+
+    preview = PREVIEW + list(info['previews'])
+    print preview
+    kupu.updatePreviewActions(preview)
+
+    # Set up libraries
+    libraries = info['libraries']
+    deflib = info['default'][0]
+    libs = kupu.zmi_get_libraries()
+    kupu.deleteLibraries(range(len(libs)))
+    for lib in libraries:
+        kupu.addLibrary(**lib)
+    kupu.zmi_set_default_library(deflib)
+
+    
+    toolbar = info['toolbar'][0]['elements']
+    kupu.set_toolbar_filters(toolbar)
+    
+    return 'Kupu settings imported.'
+
+def exportKupuSettings(context):
+    """ Export kupu settings as an XML file.
+    """
+    site = context.getSite()
+
+    mhc = KupuToolExportConfigurator( site ).__of__( site )
+    if mhc.getTool() is None:
+        return 'Kupu not installed: no settings to export'
+
+    text = mhc.generateXML()
+
+    context.writeDataFile( _FILENAME, text, 'text/xml' )
+
+    return 'Kupu settings exported.'
+
+
+class KupuToolExportConfigurator(ExportConfiguratorBase):
+    """ Synthesize XML description of cc properties.
+    """
+    security = ClassSecurityInfo()
+
+    security.declareProtected(ManagePortal, 'getTool')
+    def getTool(self):
+        """Get Kupu's tool"""
+        kupu = getToolByName(self._site, 'kupu_library_tool', None)
+        return kupu
+
+    def getPreviews(self):
+        typetool = getToolByName(self._site, 'portal_types')
+        kupu = self.getTool()
+        typeinfos = typetool.listTypeInfo()
+        previewable = [t for t in typeinfos if kupu.getPreviewForType(t.getId())]
+
+        res = []
+        for t in typeinfos:
+            previewable = kupu.getPreviewForType(t.getId())
+            if not previewable:
+                continue
+            portal_type =  t.getId()
+            previewaction = kupu.getPreviewForType(portal_type)
+            normalaction = kupu.getNormalViewForType(portal_type)
+            scalefield = kupu.getScaleFieldForType(portal_type)
+            res.append(dict(portal_type=portal_type,
+                previewaction=previewaction,
+                normalaction=normalaction,
+                scalefield=scalefield))
+        return res
+
+    security.declarePrivate('_getExportTemplate')
+    def _getExportTemplate(self):
+        return PageTemplateFile('kupuExport.xml', _xmldir)
+
+InitializeClass(KupuToolExportConfigurator)
+
+
+class KupuToolImportConfigurator(ImportConfiguratorBase):
+
+    def _getImportMapping(self):
+        return {
+            'kupu-settings':
+                {
+                    'config': {},
+                    'library': { KEY: 'libraries' },
+                    'default': {},
+                    'resource': { KEY: 'resources' },
+                    'preview': { KEY: 'previews', DEFAULT: () },
+                    'generatepreviews': {},
+                    'toolbar': {}
+                },
+            'config':
+                {
+                    'captioning': {CONVERTER: self._convertToBoolean, DEFAULT: False},
+                    'userefbrowser': {CONVERTER: self._convertToBoolean, DEFAULT: False},
+                    'linkbyuid': {CONVERTER: self._convertToBoolean, DEFAULT: False},
+                    'filtersourceedit': {CONVERTER: self._convertToBoolean, DEFAULT: True},
+                    'installbeforeunload': {CONVERTER: self._convertToBoolean, DEFAULT: False},
+                    'table': {KEY: 'tableclasses', DEFAULT:() },
+                    'style': {KEY: 'parastyles', DEFAULT:() },
+                    'filter': {KEY: 'filters', DEFAULT:() },
+                    'filterstyle': {KEY: 'filterstyles', DEFAULT:() },
+                    'filterclass': {KEY: 'filterclasses', DEFAULT:() },
+                },
+            'table': { '#text': {KEY:None}, },
+            'style': { '#text': {KEY:None}, },
+            'filter':
+                {
+                    'attributes': {},
+                    'tags': {},
+                },
+            'filterstyle': { '#text': {KEY:None}, },
+            'filterclass': { '#text': {KEY:None}, },
+            'library':
+                {
+                    'src': {},
+                    'uri': {},
+                    'id': {},
+                    'icon': {},
+                    'title': {},
+                },
+            'default': { '#text': { KEY:None }, },
+            'resource':
+                {
+                    'mode': {},
+                    'id': {},
+                    'type': { KEY:'types' },
+                },
+            'type':
+                { '#text': { KEY: None },
+                },
+            'preview':
+                {
+                    'portaltype': { KEY: 'portal_type' },
+                    'preview': { KEY:'expression', DEFAULT: ''},
+                    'normal': { DEFAULT: ''},
+                    'scalefield': { DEFAULT: 'image' },
+                },
+            'generatepreviews': {},
+            'toolbar':
+                {
+                    'element': { KEY: 'elements' },
+                },
+            'element':
+                {
+                    'visible': {CONVERTER: self._convertToBoolean, DEFAULT: True},
+                    'id': { '#text': None },
+                    'expression':  { KEY: 'override', DEFAULT: '' },
+                },
+            }
+
+InitializeClass(KupuToolImportConfigurator)

Modified: kupu/trunk/kupu/plone/plonelibrarytool.py
==============================================================================
--- kupu/trunk/kupu/plone/plonelibrarytool.py	(original)
+++ kupu/trunk/kupu/plone/plonelibrarytool.py	Mon Dec 11 15:48:13 2006
@@ -35,6 +35,14 @@
 from urllib import quote_plus, unquote_plus
 import html2captioned
 
+# Zope 3 interfaces, but on older zopes we'll just skip this bit.
+try:
+    from zope.interface import implements
+except ImportError:
+    def implements(*args): pass
+
+from z3interfaces import IPloneKupuLibraryTool
+
 _default_libraries = (
     dict(id="root",
          title="string:Home",
@@ -96,6 +104,7 @@
     meta_type = "Kupu Library Tool"
     title = TOOLTITLE
     security = ClassSecurityInfo()
+    implements(IPloneKupuLibraryTool)
 
     # protect methods provided by super class KupuLibraryTool
     security.declareProtected(permissions.QueryLibraries, "getLibraries",
@@ -124,9 +133,9 @@
     def getLinkbyuid(self):
         """Returns 'is linking by UID enabled'?"""
         try:
-            return self.linkbyuid
+            return bool(self.linkbyuid)
         except AttributeError:
-            return 1
+            return False
 
     security.declareProtected('View', "getRefBrowser")
     def getRefBrowser(self):
@@ -137,7 +146,7 @@
     def getCaptioning(self):
         """Returns True if captioning is enabled"""
         try:
-            return self.captioning
+            return bool(self.captioning)
         except AttributeError:
             return False
 
@@ -170,6 +179,7 @@
             lstyles = []
 
         result = []
+        __traceback_info__ = (gstyles, lstyles)
         if redefine:
             styles = lstyles
         else:
@@ -563,9 +573,9 @@
            Old version of code. Returns name,types pairs plus a dummy"""
         return [(t.name, t.types) for t in self.zmi_get_resourcetypes()] + [('',())]
 
-    security.declareProtected(permissions.ManageLibraries, "zmi_get_resourcetypes")
-    def zmi_get_resourcetypes(self):
-        """Return the type mapping for the ZMI view"""
+    security.declareProtected(permissions.ManageLibraries, "get_resourcetypes")
+    def get_resourcetypes(self):
+        """Return the type mapping, but without the ZMI dummy entry"""
         keys = self._res_types.keys()
         keys.sort()
         real = []
@@ -573,7 +583,12 @@
             value = self._res_types[name]
             wrapped = Object(name=name, types=tuple(value))
             real.append(wrapped)
-            
+        return real
+
+    security.declareProtected(permissions.ManageLibraries, "zmi_get_resourcetypes")
+    def zmi_get_resourcetypes(self):
+        """Return the type mapping for the ZMI view"""
+        real = self.get_resourcetypes()
         real.append(Object(name='', types=()))
         return real
 
@@ -623,39 +638,57 @@
         value = action_map.get(portal_type, {}).get('scalefield', 'image')
         return value
 
+    security.declareProtected(permissions.ManageLibraries, "set_html_exclusions")
+    def set_html_exclusions(self, exclusions):
+        """Set the html_exclusions.
+        Expects a list/tuple of 2-tuples [(tags,attrs),...]
+        """
+        for (tag,attr) in exclusions:
+            pass
+        self.html_exclusions = exclusions
+
     security.declareProtected(permissions.ManageLibraries,
                               "configure_kupu")
     def configure_kupu(self,
-        linkbyuid, table_classnames, html_exclusions, style_whitelist, class_blacklist,
+        linkbyuid=None,
+        table_classnames=None,
+        html_exclusions=None,
+        style_whitelist=None,
+        class_blacklist=None,
         installBeforeUnload=None, parastyles=None, refbrowser=None,
         captioning=None,
         filterSourceEdit=None,
         REQUEST=None):
         """Delete resource types through the ZMI"""
-        self.linkbyuid = int(linkbyuid)
-        self.table_classnames = table_classnames
+        if linkbyuid is not None:
+            self.linkbyuid = bool(linkbyuid)
+        if table_classnames is not None:
+            self.table_classnames = [t for t in table_classnames if t]
         if installBeforeUnload is not None:
             self.install_beforeunload = bool(installBeforeUnload)
         if filterSourceEdit is not None:
             self.filtersourceedit = bool(filterSourceEdit)
 
-        if parastyles:
+        if parastyles is not None:
             self.paragraph_styles = [ line.strip() for line in parastyles if line.strip() ]
 
-        newex = html_exclusions.pop(-1)
+        if html_exclusions is not None:
+            newex = html_exclusions[-1]
+            html_exclusions = html_exclusions[:-1]
             
-        html_exclusions = [ (tuple(h.get('tags', ())), tuple(h.get('attributes', ())))
-            for h in html_exclusions if h.get('keep')]
-
-        tags = newex.get('tags', '').replace(',',' ').split()
-        attr = newex.get('attributes', '').replace(',',' ').split()
-        if tags or attr:
-            html_exclusions.append((tuple(tags), tuple(attr)))
-
-        self.html_exclusions = html_exclusions
+            html_exclusions = [ (tuple(h.get('tags', ())), tuple(h.get('attributes', ())))
+                for h in html_exclusions if h.get('keep')]
 
-        self.style_whitelist = list(style_whitelist)
-        self.class_blacklist = list(class_blacklist)
+            tags = newex.get('tags', '').replace(',',' ').split()
+            attr = newex.get('attributes', '').replace(',',' ').split()
+            if tags or attr:
+                html_exclusions.append((tuple(tags), tuple(attr)))
+            self.set_html_exclusions(html_exclusions)
+
+        if style_whitelist is not None:
+            self.style_whitelist = list(style_whitelist)
+        if class_blacklist is not None:
+            self.class_blacklist = list(class_blacklist)
 
         if refbrowser is not None:
             out = StringIO()
@@ -670,7 +703,7 @@
                 pass
 
         if captioning is not None:
-            self.captioning = captioning
+            self.captioning = bool(captioning)
         if REQUEST:
             REQUEST.RESPONSE.redirect(self.absolute_url() + '/kupu_config')
 

Added: kupu/trunk/kupu/plone/profiles/default/actionicons.xml
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/plone/profiles/default/actionicons.xml	Mon Dec 11 15:48:13 2006
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<action-icons>
+ <action-icon category="controlpanel" action_id="kupu"
+              title="Kupu visual editor" priority="0"
+              icon_expr="kupuimages/kupu_icon.gif"/>
+</action-icons>

Added: kupu/trunk/kupu/plone/profiles/default/controlpanel.xml
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/plone/profiles/default/controlpanel.xml	Mon Dec 11 15:48:13 2006
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<object name="portal_controlpanel" meta_type="Plone Control Panel Tool">
+ <configlet title="Kupu visual editor" action_id="kupu" appId="Kupu"
+    category="Products" condition_expr=""
+    url_expr="string:${portal_url}/kupu_library_tool/kupu_config"
+    visible="True">
+  <permission>Manage portal</permission>
+ </configlet>
+</object>

Added: kupu/trunk/kupu/plone/profiles/default/cssregistry.xml
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/plone/profiles/default/cssregistry.xml	Mon Dec 11 15:48:13 2006
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<object name="portal_css" meta_type="Stylesheets Registry">
+ <stylesheet title="" cacheable="True" compression="safe" cookable="True"
+    enabled="True"
+    expression="python:portal.kupu_library_tool.isKupuEnabled(REQUEST=request)"
+    id="kupustyles.css" media="" rel="stylesheet" rendering="import"/>
+ <stylesheet title="" cacheable="True" compression="safe" cookable="True"
+    enabled="True"
+    expression="python:portal.kupu_library_tool.isKupuEnabled(REQUEST=request)"
+    id="kupuplone.css" media="" rel="stylesheet" rendering="import"/>
+ <stylesheet title="" cacheable="True" compression="safe" cookable="True"
+    enabled="True"
+    expression="python:portal.kupu_library_tool.isKupuEnabled(REQUEST=request)"
+    id="kupudrawerstyles.css" media="" rel="stylesheet" rendering="import"/>
+</object>

Added: kupu/trunk/kupu/plone/profiles/default/export_steps.xml
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/plone/profiles/default/export_steps.xml	Mon Dec 11 15:48:13 2006
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<export-steps>
+ <export-step id="kupu-setup" version="20061211-01"
+              handler="Products.kupu.plone.exportimport.exportKupuSettings"
+              title="Kupu Settings">
+  Export Kupu settings
+ </export-step>
+</export-steps>

Added: kupu/trunk/kupu/plone/profiles/default/import_steps.xml
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/plone/profiles/default/import_steps.xml	Mon Dec 11 15:48:13 2006
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<import-steps>
+ <import-step id="kupu-setup" version="20061211-01"
+              handler="Products.kupu.plone.exportimport.importKupuSettings"
+              title="Kupu Settings">
+  <dependency step="toolset"/>
+  Import Kupu settings
+ </import-step>
+</import-steps>

Added: kupu/trunk/kupu/plone/profiles/default/jsregistry.xml
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/plone/profiles/default/jsregistry.xml	Mon Dec 11 15:48:13 2006
@@ -0,0 +1,55 @@
+<?xml version="1.0"?>
+<object name="portal_javascripts" meta_type="JavaScripts Registry">
+ <javascript cacheable="True" compression="safe" cookable="True"
+    enabled="True"
+    expression="python:portal.kupu_library_tool.isKupuEnabled(REQUEST=request)"
+    id="kupunoi18n.js" inline="False"/>
+ <javascript cacheable="True" compression="safe" cookable="True"
+    enabled="True"
+    expression="python:portal.kupu_library_tool.isKupuEnabled(REQUEST=request)"
+    id="sarissa_ieemu_xpath.js" inline="False"/>
+ <javascript cacheable="True" compression="safe" cookable="True"
+    enabled="True"
+    expression="python:portal.kupu_library_tool.isKupuEnabled(REQUEST=request)"
+    id="kupuhelpers.js" inline="False"/>
+ <javascript cacheable="True" compression="safe" cookable="True"
+    enabled="True"
+    expression="python:portal.kupu_library_tool.isKupuEnabled(REQUEST=request)"
+    id="kupueditor.js" inline="False"/>
+ <javascript cacheable="True" compression="safe" cookable="True"
+    enabled="True"
+    expression="python:portal.kupu_library_tool.isKupuEnabled(REQUEST=request)"
+    id="kupubasetools.js" inline="False"/>
+ <javascript cacheable="True" compression="safe" cookable="True"
+    enabled=