From duncan at codespeak.net  Thu Feb  1 16:59:57 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Thu,  1 Feb 2007 16:59:57 +0100 (CET)
Subject: [kupu-checkins] r37753 - in kupu/trunk/kupu: doc plone
Message-ID: <20070201155957.44F4210079@code0.codespeak.net>

Author: duncan
Date: Thu Feb  1 16:59:55 2007
New Revision: 37753

Modified:
   kupu/trunk/kupu/doc/CHANGES.txt
   kupu/trunk/kupu/plone/html2captioned.py
Log:
Added a hook so that the transform removing resolveuid urls can do something useful when the link is broken.

Modified: kupu/trunk/kupu/doc/CHANGES.txt
==============================================================================
--- kupu/trunk/kupu/doc/CHANGES.txt	(original)
+++ kupu/trunk/kupu/doc/CHANGES.txt	Thu Feb  1 16:59:55 2007
@@ -2,6 +2,11 @@
 Kupu changes
 ============
 
+  - the uid/captioning transform now has a hook which gets called if
+    kupu fails to resolve the uid.  Use this for any fallback processing
+    (e.g. lookup the uid catalog in a different plone site, or just return
+    a default error page.
+
 - 1.4 Beta 3
 
   - Fixed NonXHTMLTagFilter default filterdata: 'big', 'small' and 'tt' are

Modified: kupu/trunk/kupu/plone/html2captioned.py
==============================================================================
--- kupu/trunk/kupu/plone/html2captioned.py	(original)
+++ kupu/trunk/kupu/plone/html2captioned.py	Thu Feb  1 16:59:55 2007
@@ -88,6 +88,19 @@
             return self.config['output']
         raise AttributeError(attr)
 
+    def resolveuid(self, context, reference_catalog, uid):
+        """Convert a uid to an object by looking it up in the reference catalog.
+        If not found then tries to fallback to a possible hook (e.g. so you could
+        resolve uids on another system).
+        """
+        target = reference_catalog.lookupObject(uid)
+        if target is not None:
+            return target
+        hook = getattr(context, 'kupu_resolveuid_hook', None)
+        if hook:
+            target = hook(uid)
+        return target
+
     def convert(self, data, idata, filename=None, **kwargs):
         """convert the data, store the result in idata and return that
         optional argument filename may give the original file name of received data
@@ -100,6 +113,7 @@
         context = kwargs.get('context', None)
         if context:
             at_tool = context.archetype_tool
+            rc = at_tool.reference_catalog
 
         if context and at_tool:        
             def replaceImage(match):
@@ -115,7 +129,7 @@
                 width = attrs.group('width')
                 if src:
                     d = attrs.groupdict()
-                    target = at_tool.reference_catalog.lookupObject(src)
+                    target = self.resolveuid(context, rc, src)
                     if target:
                         d['caption'] = newline_to_br(html_quote(target.Description()))
                         tag = CLASS_PATTERN.sub('', d['tag'])
@@ -145,7 +159,7 @@
             def replaceUids(match):
                 tag = match.group('tag')
                 uid = match.group('uid')
-                target = at_tool.reference_catalog.lookupObject(uid)
+                target = self.resolveuid(context, rc, uid)
                 if target:
                     try:
                         url = target.getRemoteUrl()

From yuppie at codespeak.net  Thu Feb  1 18:24:38 2007
From: yuppie at codespeak.net (yuppie at codespeak.net)
Date: Thu,  1 Feb 2007 18:24:38 +0100 (CET)
Subject: [kupu-checkins] r37754 - in kupu/trunk/kupu: common default doc
	mmbase
Message-ID: <20070201172438.F1C2B10080@code0.codespeak.net>

Author: yuppie
Date: Thu Feb  1 18:24:29 2007
New Revision: 37754

Modified:
   kupu/trunk/kupu/common/kupubasetools.js
   kupu/trunk/kupu/common/kupudrawers.js
   kupu/trunk/kupu/common/kupuinit.js
   kupu/trunk/kupu/common/kupuinit_form.js
   kupu/trunk/kupu/common/kupuinit_multi.js
   kupu/trunk/kupu/default/drawers.kupu
   kupu/trunk/kupu/default/toolboxes.kupu
   kupu/trunk/kupu/doc/CHANGES.txt
   kupu/trunk/kupu/mmbase/kupuinit.js
Log:
- added 'remove table' buttons

Modified: kupu/trunk/kupu/common/kupubasetools.js
==============================================================================
--- kupu/trunk/kupu/common/kupubasetools.js	(original)
+++ kupu/trunk/kupu/common/kupubasetools.js	Thu Feb  1 18:24:29 2007
@@ -1543,8 +1543,6 @@
         
         // get the current index
         var tdindex = this._getColIndex(currtd);
-        // XXX this looks like a debug message, remove
-        this.editor.logMessage(_('tdindex: ${tdindex}'));
 
         // now add a column to all rows
         // first the thead
@@ -2011,12 +2009,9 @@
 function TableToolBox(addtabledivid, edittabledivid, newrowsinputid, 
                     newcolsinputid, makeheaderinputid, classselectid, alignselectid, addtablebuttonid,
                     addrowbuttonid, delrowbuttonid, addcolbuttonid, delcolbuttonid, fixbuttonid,
-                    fixallbuttonid, toolboxid, plainclass, activeclass) {
+                    delbuttonid, fixallbuttonid, toolboxid, plainclass, activeclass) {
     /* The table tool */
 
-    // XXX There are some awfully long methods in here!!
-    
-
     // a lot of dependencies on html elements here, but most implementations
     // will use them all I guess
     this.addtablediv = getFromSelector(addtabledivid);
@@ -2032,6 +2027,7 @@
     this.addcolbutton = getFromSelector(addcolbuttonid);
     this.delcolbutton = getFromSelector(delcolbuttonid);
     this.fixbutton = getFromSelector(fixbuttonid);
+    this.delbutton = getFromSelector(delbuttonid);
     this.fixallbutton = getFromSelector(fixallbuttonid);
     this.toolboxel = getFromSelector(toolboxid);
     this.plainclass = plainclass;
@@ -2066,6 +2062,7 @@
         addEventHandler(this.alignselect, "change", this.setColumnAlign, this);
         addEventHandler(this.classselect, "change", this.setTableClass, this);
         addEventHandler(this.fixbutton, "click", this.fixTable, this);
+        addEventHandler(this.delbutton, "click", this.delTable, this);
         addEventHandler(this.fixallbutton, "click", this.fixAllTables, this);
         this.addtablediv.style.display = "block";
         this.edittablediv.style.display = "none";
@@ -2161,6 +2158,12 @@
         this.tool.fixAllTables();
         this.editor.updateState();
     };
+
+    this.delTable = function() {
+        this.editor.focusDocument();
+        this.tool.delTable();
+        this.editor.updateState();
+    };
 };
 
 TableToolBox.prototype = new KupuToolBox;

Modified: kupu/trunk/kupu/common/kupudrawers.js
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers.js	(original)
+++ kupu/trunk/kupu/common/kupudrawers.js	Thu Feb  1 18:24:29 2007
@@ -387,41 +387,55 @@
         this.tool.createTable(parseInt(rows), parseInt(cols), add_header, style);
         this.drawertool.closeDrawer();
     };
+
     this.delTableRow = function() {
         this.editor.resumeEditing();
         this.tool.delTableRow();
         this.editor.suspendEditing();
     };
+
     this.addTableRow = function() {
         this.editor.resumeEditing();
         this.tool.addTableRow();
         this.editor.suspendEditing();
     };
+
     this.delTableColumn = function() {
         this.editor.resumeEditing();
         this.tool.delTableColumn();
         this.editor.suspendEditing();
     };
+
     this.addTableColumn = function() {
         this.editor.resumeEditing();
         this.tool.addTableColumn();
         this.editor.suspendEditing();
     };
+
     this.fixTable = function() {
         this.editor.resumeEditing();
         this.tool.fixTable();
         this.editor.suspendEditing();
     };
+
     this.fixAllTables = function() {
         this.editor.resumeEditing();
         this.tool.fixAllTables();
         this.editor.suspendEditing();
     };
+
+    this.delTable = function() {
+        this.editor.resumeEditing();
+        this.tool.delTable();
+        this.drawertool.closeDrawer();
+    };
+
     this.setTableClass = function(className) {
         this.editor.resumeEditing();
         this.tool.setTableClass(className);
         this.editor.suspendEditing();
     };
+
     this.setColumnAlign = function(align) {
         this.editor.resumeEditing();
         this.tool.setColumnAlign(align);

Modified: kupu/trunk/kupu/common/kupuinit.js
==============================================================================
--- kupu/trunk/kupu/common/kupuinit.js	(original)
+++ kupu/trunk/kupu/common/kupuinit.js	Thu Feb  1 18:24:29 2007
@@ -168,12 +168,14 @@
 
     var tabletool = new TableTool();
     kupu.registerTool('tabletool', tabletool);
-    var tabletoolbox = new TableToolBox('kupu-toolbox-addtable', 
+    var tabletoolbox = new TableToolBox('kupu-toolbox-addtable',
         'kupu-toolbox-edittable', 'kupu-table-newrows', 'kupu-table-newcols',
-        'kupu-table-makeheader', 'kupu-table-classchooser', 'kupu-table-alignchooser',
-        'kupu-table-addtable-button', 'kupu-table-addrow-button', 'kupu-table-delrow-button', 
-        'kupu-table-addcolumn-button', 'kupu-table-delcolumn-button', 
-        'kupu-table-fix-button', 'kupu-table-fixall-button', 'kupu-toolbox-tables',
+        'kupu-table-makeheader', 'kupu-table-classchooser',
+        'kupu-table-alignchooser', 'kupu-table-addtable-button',
+        'kupu-table-addrow-button', 'kupu-table-delrow-button',
+        'kupu-table-addcolumn-button', 'kupu-table-delcolumn-button',
+        'kupu-table-fix-button', 'kupu-table-del-button',
+        'kupu-table-fixall-button', 'kupu-toolbox-tables',
         'kupu-toolbox', 'kupu-toolbox-active');
     tabletool.registerToolBox('tabletoolbox', tabletoolbox);
 

Modified: kupu/trunk/kupu/common/kupuinit_form.js
==============================================================================
--- kupu/trunk/kupu/common/kupuinit_form.js	(original)
+++ kupu/trunk/kupu/common/kupuinit_form.js	Thu Feb  1 18:24:29 2007
@@ -169,12 +169,14 @@
 
     var tabletool = new TableTool();
     kupu.registerTool('tabletool', tabletool);
-    var tabletoolbox = new TableToolBox('kupu-toolbox-addtable', 
+    var tabletoolbox = new TableToolBox('kupu-toolbox-addtable',
         'kupu-toolbox-edittable', 'kupu-table-newrows', 'kupu-table-newcols',
-        'kupu-table-makeheader', 'kupu-table-classchooser', 'kupu-table-alignchooser',
-        'kupu-table-addtable-button', 'kupu-table-addrow-button', 'kupu-table-delrow-button', 
-        'kupu-table-addcolumn-button', 'kupu-table-delcolumn-button', 
-        'kupu-table-fix-button', 'kupu-table-fixall-button', 'kupu-toolbox-tables',
+        'kupu-table-makeheader', 'kupu-table-classchooser',
+        'kupu-table-alignchooser', 'kupu-table-addtable-button',
+        'kupu-table-addrow-button', 'kupu-table-delrow-button',
+        'kupu-table-addcolumn-button', 'kupu-table-delcolumn-button',
+        'kupu-table-fix-button', 'kupu-table-del-button',
+        'kupu-table-fixall-button', 'kupu-toolbox-tables',
         'kupu-toolbox', 'kupu-toolbox-active');
     tabletool.registerToolBox('tabletoolbox', tabletoolbox);
 

Modified: kupu/trunk/kupu/common/kupuinit_multi.js
==============================================================================
--- kupu/trunk/kupu/common/kupuinit_multi.js	(original)
+++ kupu/trunk/kupu/common/kupuinit_multi.js	Thu Feb  1 18:24:29 2007
@@ -171,12 +171,14 @@
 
     var tabletool = new TableTool();
     kupu.registerTool('tabletool', tabletool);
-    var tabletoolbox = new TableToolBox('kupu-toolbox-addtable', 
+    var tabletoolbox = new TableToolBox('kupu-toolbox-addtable',
         'kupu-toolbox-edittable', 'kupu-table-newrows', 'kupu-table-newcols',
-        'kupu-table-makeheader', 'kupu-table-classchooser', 'kupu-table-alignchooser',
-        'kupu-table-addtable-button', 'kupu-table-addrow-button', 'kupu-table-delrow-button', 
-        'kupu-table-addcolumn-button', 'kupu-table-delcolumn-button', 
-        'kupu-table-fix-button', 'kupu-table-fixall-button', 'kupu-toolbox-tables',
+        'kupu-table-makeheader', 'kupu-table-classchooser',
+        'kupu-table-alignchooser', 'kupu-table-addtable-button',
+        'kupu-table-addrow-button', 'kupu-table-delrow-button',
+        'kupu-table-addcolumn-button', 'kupu-table-delcolumn-button',
+        'kupu-table-fix-button', 'kupu-table-del-button',
+        'kupu-table-fixall-button', 'kupu-toolbox-tables',
         'kupu-toolbox', 'kupu-toolbox-active');
     tabletool.registerToolBox('tabletoolbox', tabletoolbox);
 

Modified: kupu/trunk/kupu/default/drawers.kupu
==============================================================================
--- kupu/trunk/kupu/default/drawers.kupu	(original)
+++ kupu/trunk/kupu/default/drawers.kupu	Thu Feb  1 18:24:29 2007
@@ -209,12 +209,16 @@
                 </tr>
                 <tr>
                   <th class="kupu-toolbox-label"
-                      i18n:translate="tabledrawer_fix_table_label">Fix Table</th>
+                      i18n:translate="tabledrawer_table_label">Table</th>
                   <td>
                     <button class="kupu-dialog-button"
                             type="button"
                             i18n:translate="tabledrawer_fix_button"
                             onclick="drawertool.current_drawer.fixTable()">Fix</button> 
+                    <button class="kupu-dialog-button"
+                            type="button"
+                            i18n:translate="tabledrawer_remove_button"
+                            onclick="drawertool.current_drawer.delTable()">Remove</button> 
                   </td>
                 </tr>
               </table>

Modified: kupu/trunk/kupu/default/toolboxes.kupu
==============================================================================
--- kupu/trunk/kupu/default/toolboxes.kupu	(original)
+++ kupu/trunk/kupu/default/toolboxes.kupu	Thu Feb  1 18:24:29 2007
@@ -144,7 +144,9 @@
                     i18n:translate="">Remove Row</button>
           
             <button type="button" id="kupu-table-fix-button" 
-                    i18n:translate="">Fix</button>
+                    i18n:translate="">Fix Table</button>
+            <button type="button" id="kupu-table-del-button" 
+                    i18n:translate="">Remove Table</button>
           </div>
           
       </div>

Modified: kupu/trunk/kupu/doc/CHANGES.txt
==============================================================================
--- kupu/trunk/kupu/doc/CHANGES.txt	(original)
+++ kupu/trunk/kupu/doc/CHANGES.txt	Thu Feb  1 18:24:29 2007
@@ -2,18 +2,22 @@
 Kupu changes
 ============
 
+- 1.4 (unreleased)
+
+  - Added 'remove table' button to table drawer and tool box.
+
   - the uid/captioning transform now has a hook which gets called if
     kupu fails to resolve the uid.  Use this for any fallback processing
     (e.g. lookup the uid catalog in a different plone site, or just return
     a default error page.
 
-- 1.4 Beta 3
-
   - Fixed NonXHTMLTagFilter default filterdata: 'big', 'small' and 'tt' are
     valid XHTML tags, 'h7' not.
 
   - Fixed some small issues in XhtmlValidation elements.
 
+- 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

Modified: kupu/trunk/kupu/mmbase/kupuinit.js
==============================================================================
--- kupu/trunk/kupu/mmbase/kupuinit.js	(original)
+++ kupu/trunk/kupu/mmbase/kupuinit.js	Thu Feb  1 18:24:29 2007
@@ -72,13 +72,18 @@
 
     var undobutton = new KupuButton('kupu-undo-button', execCommand('undo'));
     kupu.registerTool('undobutton', undobutton);
+
     var redobutton = new KupuButton('kupu-redo-button', execCommand('redo'));
     kupu.registerTool('redobutton', redobutton);
 
-    var removeimagebutton = new KupuRemoveElementButton('kupu-removeimage-button', 'img', 'kupu-removeimage');
+    var removeimagebutton = new KupuRemoveElementButton('kupu-removeimage-button',
+                                                        'img',
+                                                        'kupu-removeimage');
     kupu.registerTool('removeimagebutton', removeimagebutton);
 
-    var removelinkbutton = new KupuRemoveElementButton('kupu-removelink-button', 'a', 'kupu-removelink');
+    var removelinkbutton = new KupuRemoveElementButton('kupu-removelink-button',
+                                                       'a',
+                                                       'kupu-removelink');
     kupu.registerTool('removelinkbutton', removelinkbutton);
 
     var removedivbutton = new KupuRemoveElementButton('kupu-removediv-button', 'div', 'kupu-removediv');
@@ -102,7 +107,6 @@
     var linktoolbox = new LinkToolBox("kupu-link-input", "kupu-link-button", 'kupu-toolbox-links', 'kupu-toolbox', 'kupu-toolbox-active');
     linktool.registerToolBox('linktoolbox', linktoolbox);
 
-
     var imagetool = new ImageTool();
     // remove 'create image' from context menu, it doesn't work, and there are 2 wokring methods.
     imagetool.createContextMenuElements = function(selNode, event) {
@@ -113,17 +117,17 @@
                                         'kupu-image-float-select', 'kupu-toolbox-images',  'kupu-toolbox', 'kupu-toolbox-active');
     imagetool.registerToolBox('imagetoolbox', imagetoolbox);
 
-
     var tabletool = new TableTool();
     kupu.registerTool('tabletool', tabletool);
     var tabletoolbox = new TableToolBox('kupu-toolbox-addtable',
         'kupu-toolbox-edittable', 'kupu-table-newrows', 'kupu-table-newcols',
-        'kupu-table-makeheader', 'kupu-table-classchooser', 'kupu-table-alignchooser',
-        'kupu-table-addtable-button', 'kupu-table-addrow-button', 'kupu-table-delrow-button',
+        'kupu-table-makeheader', 'kupu-table-classchooser',
+        'kupu-table-alignchooser', 'kupu-table-addtable-button',
+        'kupu-table-addrow-button', 'kupu-table-delrow-button',
         'kupu-table-addcolumn-button', 'kupu-table-delcolumn-button',
-        'kupu-table-fix-button', 'kupu-table-fixall-button', 'kupu-toolbox-tables',
-        'kupu-toolbox', 'kupu-toolbox-active'
-        );
+        'kupu-table-fix-button', 'kupu-table-del-button',
+        'kupu-table-fixall-button', 'kupu-toolbox-tables',
+        'kupu-toolbox', 'kupu-toolbox-active');
     tabletool.registerToolBox('tabletoolbox', tabletoolbox);
 
     var divstool = new DivsTool();

From nouri at codespeak.net  Fri Feb  2 19:42:59 2007
From: nouri at codespeak.net (nouri at codespeak.net)
Date: Fri,  2 Feb 2007 19:42:59 +0100 (CET)
Subject: [kupu-checkins] r37817 - kupu/trunk/kupu/plone
Message-ID: <20070202184259.4C5F510061@code0.codespeak.net>

Author: nouri
Date: Fri Feb  2 19:42:44 2007
New Revision: 37817

Modified:
   kupu/trunk/kupu/plone/plonedrawers.py
Log:
Removed imports of PIL, which is not there when PIL is installed as an
egg. We import Image instead. This closes
http://dev.plone.org/plone/ticket/5883



Modified: kupu/trunk/kupu/plone/plonedrawers.py
==============================================================================
--- kupu/trunk/kupu/plone/plonedrawers.py	(original)
+++ kupu/trunk/kupu/plone/plonedrawers.py	Fri Feb  2 19:42:44 2007
@@ -26,7 +26,7 @@
 import html2captioned
 
 try:
-    from PIL import Image
+    import Image
 except ImportError:
     HAS_PIL = False
 else:

From nouri at codespeak.net  Sun Feb  4 20:17:56 2007
From: nouri at codespeak.net (nouri at codespeak.net)
Date: Sun,  4 Feb 2007 20:17:56 +0100 (CET)
Subject: [kupu-checkins] r37924 - kupu/trunk/kupu/plone
Message-ID: <20070204191756.C87401006E@code0.codespeak.net>

Author: nouri
Date: Sun Feb  4 20:17:53 2007
New Revision: 37924

Modified:
   kupu/trunk/kupu/plone/plonedrawers.py
Log:
Undo r37817 as this introduces another bug, see
http://dev.plone.org/plone/ticket/5883



Modified: kupu/trunk/kupu/plone/plonedrawers.py
==============================================================================
--- kupu/trunk/kupu/plone/plonedrawers.py	(original)
+++ kupu/trunk/kupu/plone/plonedrawers.py	Sun Feb  4 20:17:53 2007
@@ -26,7 +26,7 @@
 import html2captioned
 
 try:
-    import Image
+    from PIL import Image
 except ImportError:
     HAS_PIL = False
 else:

From mihxil at codespeak.net  Tue Feb  6 14:06:56 2007
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Tue,  6 Feb 2007 14:06:56 +0100 (CET)
Subject: [kupu-checkins] r38004 - in kupu/trunk/kupu/mmbase: . drawers
Message-ID: <20070206130656.7608C1006E@code0.codespeak.net>

Author: mihxil
Date: Tue Feb  6 14:06:53 2007
New Revision: 38004

Modified:
   kupu/trunk/kupu/mmbase/drawers.kupu
   kupu/trunk/kupu/mmbase/drawers/collection.jspx
   kupu/trunk/kupu/mmbase/drawers/images.items.jspx
   kupu/trunk/kupu/mmbase/drawers/kupudrawerstyles.css
   kupu/trunk/kupu/mmbase/drawers/libraries.jspx
   kupu/trunk/kupu/mmbase/drawers/library.jspx
   kupu/trunk/kupu/mmbase/drawers/search.constraints.jspx
   kupu/trunk/kupu/mmbase/drawers/search.library.jspx
   kupu/trunk/kupu/mmbase/drawers/segments.items.jspx
   kupu/trunk/kupu/mmbase/mmbase.css
   kupu/trunk/kupu/mmbase/node.body.jspx
Log:
made drawers a bit bigger, made 'librarysize' configurable, some start on 'version' filtering in drawers (a bit rudimentary still)

Modified: kupu/trunk/kupu/mmbase/drawers.kupu
==============================================================================
--- kupu/trunk/kupu/mmbase/drawers.kupu	(original)
+++ kupu/trunk/kupu/mmbase/drawers.kupu	Tue Feb  6 14:06:53 2007
@@ -34,14 +34,15 @@
 
   <kupu:part name="xmlconfig">
     <mm:import externid="link_nodetypes">urls,segments,attachments</mm:import>
+    <mm:import externid="librarysize">50</mm:import>
     <image_xsl_uri>drawers/drawer.xsl.jspx</image_xsl_uri>
     <link_xsl_uri>drawers/drawer.xsl.jspx</link_xsl_uri>
     
-    <image_libraries_uri>drawers/libraries.jspx?nodetypes=images&amp;amp;source=${objectnumber}</image_libraries_uri>
-    <link_libraries_uri>drawers/libraries.jspx?nodetypes=${link_nodetypes}&amp;amp;source=${objectnumber}</link_libraries_uri>
+    <image_libraries_uri>drawers/libraries.jspx?nodetypes=images&amp;amp;source=${objectnumber}&amp;amp;librarysize=${librarysize}</image_libraries_uri>
+    <link_libraries_uri>drawers/libraries.jspx?nodetypes=${link_nodetypes}&amp;amp;source=${objectnumber}&amp;amp;librarysize=${librarysize}</link_libraries_uri>
 
-    <search_images_uri>drawers/search.library.jspx?kupubasedir=${kupubasedir}&amp;amp;link_nodetypes=images&amp;amp;source=${objectnumber}</search_images_uri>
-    <search_links_uri> drawers/search.library.jspx?kupubasedir=${kupubasedir}&amp;amp;link_nodetypes=${link_nodetypes}&amp;amp;source=${objectnumber}</search_links_uri>
+    <search_images_uri>drawers/search.library.jspx?kupubasedir=${kupubasedir}&amp;amp;link_nodetypes=images&amp;amp;source=${objectnumber}&amp;amp;librarysize=${librarysize}</search_images_uri>
+    <search_links_uri> drawers/search.library.jspx?kupubasedir=${kupubasedir}&amp;amp;link_nodetypes=${link_nodetypes}&amp;amp;source=${objectnumber}&amp;amp;librarysize=${librarysize}</search_links_uri>
   </kupu:part>
 
 

Modified: kupu/trunk/kupu/mmbase/drawers/collection.jspx
==============================================================================
--- kupu/trunk/kupu/mmbase/drawers/collection.jspx	(original)
+++ kupu/trunk/kupu/mmbase/drawers/collection.jspx	Tue Feb  6 14:06:53 2007
@@ -7,10 +7,10 @@
   <jsp:directive.page session="true" errorPage="../error.jspx" />
   <mm:import externid="search" />
   <mm:import externid="page" vartype="integer" >0</mm:import>
-  <mm:import id="max" vartype="integer">50</mm:import>
+  <mm:import externid="max" vartype="integer">50</mm:import>
   <mm:import externid="kupubasedir" />
   <collection>
-    <uri>drawers/collection.jspx?search=${search}</uri>
+    <uri>drawers/collection.jspx?search=${search}&amp;max=${max}</uri>
     <icon>${kupubasedir}/mmbase/icons/map.gif</icon>
     <title>MMBase</title>
     <mm:cloud method="asis">
@@ -19,18 +19,18 @@
 
       <mm:context scope="request" id="drawer">
         <mm:listnodescontainer id="query" type="$nodetype">          
-          <jsp:directive.include file="search.constraints.jspx" />
           <mm:present referid="source">
             <mm:constraint field="number" inverse="true" value="${source}" />
           </mm:present>
+          <jsp:directive.include file="search.constraints.jspx" />
           <mm:sortorder field="number" direction="down" />
           <mm:maxnumber value="$max" />
           <mm:offset    value="${page * max}" />
           <mm:haspage page="${nodetype}.items.jspx">
-            <mm:include referids="kupubasedir" page="${nodetype}.items.jspx" />
+            <mm:include referids="kupubasedir,max" page="${nodetype}.items.jspx" />
           </mm:haspage>
           <mm:haspage page="${nodetype}.items.jspx" inverse="true">
-            <mm:include referids="kupubasedir" page="texts.items.jspx" />
+            <mm:include referids="kupubasedir,max" page="texts.items.jspx" />
           </mm:haspage>         
         </mm:listnodescontainer>
       </mm:context>

Modified: kupu/trunk/kupu/mmbase/drawers/images.items.jspx
==============================================================================
--- kupu/trunk/kupu/mmbase/drawers/images.items.jspx	(original)
+++ kupu/trunk/kupu/mmbase/drawers/images.items.jspx	Tue Feb  6 14:06:53 2007
@@ -14,8 +14,9 @@
         <mm:listnodescontainer id="query" type="images" />
       </mm:cloud>
     </mm:notpresent>
+    <mm:import externid="max">100</mm:import>
     <mm:listnodescontainer referid="query">
-      <mm:maxnumber value="100" />
+      <mm:maxnumber value="${100}" />
       <mm:sortorder field="number" direction="down" />
       <items>
         <mm:context>

Modified: kupu/trunk/kupu/mmbase/drawers/kupudrawerstyles.css
==============================================================================
--- kupu/trunk/kupu/mmbase/drawers/kupudrawerstyles.css	(original)
+++ kupu/trunk/kupu/mmbase/drawers/kupudrawerstyles.css	Tue Feb  6 14:06:53 2007
@@ -83,7 +83,7 @@
 }
 
 td.panel {
-  height: 260px;
+  height: 400px;
 }
 
 td#kupu-librariespanel {

Modified: kupu/trunk/kupu/mmbase/drawers/libraries.jspx
==============================================================================
--- kupu/trunk/kupu/mmbase/drawers/libraries.jspx	(original)
+++ kupu/trunk/kupu/mmbase/drawers/libraries.jspx	Tue Feb  6 14:06:53 2007
@@ -14,12 +14,13 @@
       <param name="showupload">yes</param>
       <param name="drawertype">image</param>
       <mm:import id="kupubasedir"><mm:url absolute="server" page="../.." /></mm:import>
+      <mm:import externid="librarysize">50</mm:import>
       <mm:stringlist referid="nodetypes" id="nodetype">
         <mm:hasnodemanager name="$_">
           <mm:hasrelationmanager sourcemanager="$s" destinationmanager="$_" role="idrel">
             <mm:context scope="request" id="drawer">
               <mm:import from="parent" externid="nodetype" reset="true" />
-              <mm:include referids="kupubasedir" page="library.jspx" />
+              <mm:include referids="kupubasedir,librarysize" page="library.jspx" />
             </mm:context>
           </mm:hasrelationmanager>
           <mm:hasrelationmanager sourcemanager="$s" destinationmanager="$_" role="idrel" inverse="true">

Modified: kupu/trunk/kupu/mmbase/drawers/library.jspx
==============================================================================
--- kupu/trunk/kupu/mmbase/drawers/library.jspx	(original)
+++ kupu/trunk/kupu/mmbase/drawers/library.jspx	Tue Feb  6 14:06:53 2007
@@ -12,6 +12,7 @@
     <mm:import externid="nodetype">images</mm:import>
     <mm:import externid="source" />
     <mm:import externid="kupubasedir" />
+    <mm:import externid="librarysize">50</mm:import>
     <mm:context scope="request" id="drawer">
       <library id="${nodetype}">
         <title>
@@ -20,11 +21,15 @@
         <icon height="12" width="16">${kupubasedir}mmbase/icons/map.gif</icon>
         <mm:remove referid="query" />
         <mm:listnodescontainer id="query" type="$nodetype">
+          <!-- a bit of a hack, we probably need a bit more sophisticated filter on version -->
+          <mm:hasfield nodetype="$nodetype" name="version">
+            <mm:constraint field="version" value="10000" />
+          </mm:hasfield>
           <mm:present referid="source">
             <mm:constraint field="number" inverse="true" value="${source}" />
           </mm:present>
           <mm:sortorder field="number" direction="down" />
-          <src><mm:url referids="nodetype,kupubasedir,source?" page="drawers/collection.jspx" /></src>
+          <src><mm:url referids="nodetype,kupubasedir,source?,librarysize at max" page="drawers/collection.jspx" /></src>
         </mm:listnodescontainer>
         <mm:compare referid="nodetype" valueset="images,attachments">
           <uploadbutton type="${nodetype}">

Modified: kupu/trunk/kupu/mmbase/drawers/search.constraints.jspx
==============================================================================
--- kupu/trunk/kupu/mmbase/drawers/search.constraints.jspx	(original)
+++ kupu/trunk/kupu/mmbase/drawers/search.constraints.jspx	Tue Feb  6 14:06:53 2007
@@ -5,17 +5,26 @@
      nodetype:  fields of which node-type must be considered
      $Id: search.constraints.jspx,v 1.2 2005/06/28 12:33:20 michiel Exp $
 -->
-<mm:isnotempty  xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0"
-    referid="search">
-  <mm:composite operator="OR">
-    <mm:fieldlist type="search" nodetype="$nodetype">
-      <mm:fieldinfo type="typedescription">
-        <mm:compare valueset="STRING,XML">
-          <mm:fieldinfo type="name">
-            <mm:constraint field="$_" operator="LIKE" value="%$search%" />
-          </mm:fieldinfo>
-        </mm:compare>
+<jsp:root
+    xmlns:jsp="http://java.sun.com/JSP/Page" 
+    version="1.2"
+    xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0"
+    >
+  <mm:isnotempty  xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0" referid="search">
+    <mm:composite operator="OR">
+      <mm:fieldlist type="search" nodetype="$nodetype">
+        <mm:fieldinfo type="typedescription">
+          <mm:compare valueset="STRING,XML">
+            <mm:fieldinfo type="name">
+              <mm:constraint field="$_" operator="LIKE" value="%$search%" />
+            </mm:fieldinfo>
+          </mm:compare>
       </mm:fieldinfo>
-    </mm:fieldlist>
-  </mm:composite>
-</mm:isnotempty>
+      </mm:fieldlist>
+    </mm:composite>
+  </mm:isnotempty>
+  <!-- see remark in library.jspx -->
+  <mm:hasfield nodetype="$nodetype" name="version">
+    <mm:constraint field="version" value="10000" />
+  </mm:hasfield>
+</jsp:root>
\ No newline at end of file

Modified: kupu/trunk/kupu/mmbase/drawers/search.library.jspx
==============================================================================
--- kupu/trunk/kupu/mmbase/drawers/search.library.jspx	(original)
+++ kupu/trunk/kupu/mmbase/drawers/search.library.jspx	Tue Feb  6 14:06:53 2007
@@ -36,6 +36,7 @@
                 <mm:constraint field="number" inverse="true" value="${source}" />
               </mm:present>
               <mm:sortorder field="number" direction="down" />
+              <mm:size id="size" write="false" />
               <mm:maxnumber value="$librarysize" />
               <mm:offset    value="${librarysize * page}" />
               <mm:haspage page="${nodetype}.items.jspx">

Modified: kupu/trunk/kupu/mmbase/drawers/segments.items.jspx
==============================================================================
--- kupu/trunk/kupu/mmbase/drawers/segments.items.jspx	(original)
+++ kupu/trunk/kupu/mmbase/drawers/segments.items.jspx	Tue Feb  6 14:06:53 2007
@@ -18,12 +18,11 @@
               <title>
                 <mm:hasfunction name="index">
                   <mm:function name="index">
-                    <mm:isempty>
-                      <mm:field name="title" />
-                    </mm:isempty>
                     <mm:write />
                   </mm:function>
                 </mm:hasfunction>
+                <jsp:text> </jsp:text>
+                <mm:field name="title" />
               </title>
               <description><h2><mm:field name="title" /></h2><mm:field name="subtitle" /><mm:field name="intro" ><mm:isnotempty> / <mm:write /></mm:isnotempty></mm:field></description>
               <icon>${kupubasedir}/common/kupuimages/document.png</icon>

Modified: kupu/trunk/kupu/mmbase/mmbase.css
==============================================================================
--- kupu/trunk/kupu/mmbase/mmbase.css	(original)
+++ kupu/trunk/kupu/mmbase/mmbase.css	Tue Feb  6 14:06:53 2007
@@ -103,6 +103,12 @@
   display: none;
   background-color: white;
 }
+#kupu div.kupu-drawer { 
+  width: 800px;
+} 
+#kupu div.kupu-resourceitems { 
+  width: 400px;
+}
 #kupu div.kupu-drawer textarea, #kupu div.kupu-drawer input { 
   border: 1px solid;
   background-color: #eee;
@@ -110,6 +116,10 @@
 #kupu div.kupu-drawer textarea { 
   width: 95%;
 }
+div.kupu-panels td.panel { 
+  height: 300px;
+} 
+
 #kupu div#image_alt_div { 
   display: none;
 }

Modified: kupu/trunk/kupu/mmbase/node.body.jspx
==============================================================================
--- kupu/trunk/kupu/mmbase/node.body.jspx	(original)
+++ kupu/trunk/kupu/mmbase/node.body.jspx	Tue Feb  6 14:06:53 2007
@@ -8,7 +8,7 @@
   <jsp:directive.page session="false" errorPage="error.jspx" />
   <jsp:output omit-xml-declaration="true" />
   <mm:import id="kupu_node" from="session" externid="node" />
-  <mm:import id="node" externid="kupu_node" from="this,session" />
+  <mm:import id="node" externid="kupu_node" from="parameters,this,session" />
   <mm:cloud method="asis">
     <mm:notpresent referid="node">      
       <mm:remove referid="node" />

From mihxil at codespeak.net  Tue Feb  6 14:47:10 2007
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Tue,  6 Feb 2007 14:47:10 +0100 (CET)
Subject: [kupu-checkins] r38007 - in kupu/trunk/kupu/mmbase: . drawers i18n
Message-ID: <20070206134710.5FDF81006E@code0.codespeak.net>

Author: mihxil
Date: Tue Feb  6 14:47:08 2007
New Revision: 38007

Modified:
   kupu/trunk/kupu/mmbase/drawers/collection.jspx
   kupu/trunk/kupu/mmbase/drawers/images.items.jspx
   kupu/trunk/kupu/mmbase/drawers/search.constraints.jspx
   kupu/trunk/kupu/mmbase/i18n/de.po
   kupu/trunk/kupu/mmbase/i18n/en.po
   kupu/trunk/kupu/mmbase/i18n/eo.po
   kupu/trunk/kupu/mmbase/i18n/fr.po
   kupu/trunk/kupu/mmbase/i18n/it.po
   kupu/trunk/kupu/mmbase/i18n/nl.po
   kupu/trunk/kupu/mmbase/kupustyle.css
   kupu/trunk/kupu/mmbase/toolboxes.kupu
Log:
translations, bugfixes

Modified: kupu/trunk/kupu/mmbase/drawers/collection.jspx
==============================================================================
--- kupu/trunk/kupu/mmbase/drawers/collection.jspx	(original)
+++ kupu/trunk/kupu/mmbase/drawers/collection.jspx	Tue Feb  6 14:47:08 2007
@@ -10,7 +10,7 @@
   <mm:import externid="max" vartype="integer">50</mm:import>
   <mm:import externid="kupubasedir" />
   <collection>
-    <uri>drawers/collection.jspx?search=${search}&amp;max=${max}</uri>
+    <uri>drawers/collection.jspx?search=${search}&amp;amp;max=${max}</uri>
     <icon>${kupubasedir}/mmbase/icons/map.gif</icon>
     <title>MMBase</title>
     <mm:cloud method="asis">
@@ -24,7 +24,7 @@
           </mm:present>
           <jsp:directive.include file="search.constraints.jspx" />
           <mm:sortorder field="number" direction="down" />
-          <mm:maxnumber value="$max" />
+          <mm:maxnumber value="${max}" />
           <mm:offset    value="${page * max}" />
           <mm:haspage page="${nodetype}.items.jspx">
             <mm:include referids="kupubasedir,max" page="${nodetype}.items.jspx" />

Modified: kupu/trunk/kupu/mmbase/drawers/images.items.jspx
==============================================================================
--- kupu/trunk/kupu/mmbase/drawers/images.items.jspx	(original)
+++ kupu/trunk/kupu/mmbase/drawers/images.items.jspx	Tue Feb  6 14:47:08 2007
@@ -16,7 +16,6 @@
     </mm:notpresent>
     <mm:import externid="max">100</mm:import>
     <mm:listnodescontainer referid="query">
-      <mm:maxnumber value="${100}" />
       <mm:sortorder field="number" direction="down" />
       <items>
         <mm:context>

Modified: kupu/trunk/kupu/mmbase/drawers/search.constraints.jspx
==============================================================================
--- kupu/trunk/kupu/mmbase/drawers/search.constraints.jspx	(original)
+++ kupu/trunk/kupu/mmbase/drawers/search.constraints.jspx	Tue Feb  6 14:47:08 2007
@@ -11,6 +11,7 @@
     xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0"
     >
   <mm:isnotempty  xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0" referid="search">
+    <mm:log>bla</mm:log>
     <mm:composite operator="OR">
       <mm:fieldlist type="search" nodetype="$nodetype">
         <mm:fieldinfo type="typedescription">
@@ -19,12 +20,12 @@
               <mm:constraint field="$_" operator="LIKE" value="%$search%" />
             </mm:fieldinfo>
           </mm:compare>
-      </mm:fieldinfo>
+        </mm:fieldinfo>
       </mm:fieldlist>
     </mm:composite>
   </mm:isnotempty>
   <!-- see remark in library.jspx -->
-  <mm:hasfield nodetype="$nodetype" name="version">
+  <mm:hasfield nodetype="${nodetype}" name="version">
     <mm:constraint field="version" value="10000" />
   </mm:hasfield>
 </jsp:root>
\ No newline at end of file

Modified: kupu/trunk/kupu/mmbase/i18n/de.po
==============================================================================
--- kupu/trunk/kupu/mmbase/i18n/de.po	(original)
+++ kupu/trunk/kupu/mmbase/i18n/de.po	Tue Feb  6 14:47:08 2007
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: mmbase 18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-19 17:56+0200\n"
+"POT-Creation-Date: 2007-02-06 14:05+0100\n"
 "PO-Revision-Date: 2005-06-09 00:42+0200\n"
 "Last-Translator: Michiel Meeuwissen <EMAIL at ADDRESS>\n"
 "Language-Team: German <de at li.org>\n"
@@ -16,19 +16,19 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: mmbase.js:141 mmbase.js:158
+#: mmbase.js:141 mmbase.js:158 mmbase.js:159
 msgid "Saving body (kupu)"
 msgstr ""
 
-#: mmbase.js:144 mmbase.js:161
+#: mmbase.js:144 mmbase.js:161 mmbase.js:162
 msgid "Saving fields (form)"
 msgstr ""
 
-#: mmbase.js:173 mmbase.js:191
+#: mmbase.js:173 mmbase.js:191 mmbase.js:192
 msgid "saved"
 msgstr ""
 
-#: mmbase.js:202 mmbase.js:242
+#: mmbase.js:202 mmbase.js:242 mmbase.js:243
 msgid "RELOAD"
 msgstr ""
 
@@ -44,7 +44,7 @@
 msgid "Getting node body "
 msgstr ""
 
-#: mmbase.js:250 mmbase.js:300
+#: mmbase.js:250 mmbase.js:300 mmbase.js:299
 msgid "Loading node body "
 msgstr ""
 
@@ -52,55 +52,55 @@
 msgid "Div tool initialized"
 msgstr ""
 
-#: mmbasetools.js:39 mmbasetools.js:40
+#: mmbasetools.js:39 mmbasetools.js:40 mmbasetools.js:48
 msgid "Found paragraph"
 msgstr ""
 
-#: mmbasetools.js:43 mmbasetools.js:44
+#: mmbasetools.js:43 mmbasetools.js:44 mmbasetools.js:52
 msgid "Didn't find paragraph"
 msgstr ""
 
-#: mmbasetools.js:48 mmbasetools.js:50
+#: mmbasetools.js:48 mmbasetools.js:50 mmbasetools.js:57
 msgid "Div inserted"
 msgstr ""
 
-#: phony.js:1
+#: phony.js:1 phony.js:117
 msgid "No node"
 msgstr ""
 
-#: phony.js:2
+#: phony.js:2 phony.js:4 phony.js:75
 msgid "Normal"
 msgstr ""
 
-#: phony.js:3 phony.js:5 phony.js:2
+#: phony.js:3 phony.js:5 phony.js:2 phony.js:1 phony.js:116 phony.js:118
 msgid "Richtext editor"
 msgstr ""
 
-#: phony.js:4
+#: phony.js:4 phony.js:5
 msgid "Heading 1"
 msgstr ""
 
-#: phony.js:6 phony.js:3
+#: phony.js:6 phony.js:3 phony.js:2 phony.js:119
 msgid "default"
 msgstr ""
 
-#: phony.js:7 phony.js:4 phony.js:6
+#: phony.js:7 phony.js:4 phony.js:6 phony.js:110 phony.js:123
 msgid "Block"
 msgstr ""
 
-#: phony.js:8 phony.js:5 phony.js:7
+#: phony.js:8 phony.js:5 phony.js:7 phony.js:111 phony.js:124
 msgid "Block class"
 msgstr ""
 
-#: phony.js:9 phony.js:6 phony.js:8
+#: phony.js:9 phony.js:6 phony.js:8 phony.js:112 phony.js:125
 msgid "Note left"
 msgstr ""
 
-#: phony.js:10 phony.js:7 phony.js:9
+#: phony.js:10 phony.js:7 phony.js:9 phony.js:113 phony.js:126
 msgid "Note right"
 msgstr ""
 
-#: phony.js:11 phony.js:8 phony.js:10
+#: phony.js:11 phony.js:8 phony.js:10 phony.js:114 phony.js:127
 msgid "Insert block"
 msgstr ""
 
@@ -112,18 +112,470 @@
 msgid "emphasis: alt-i"
 msgstr ""
 
-#: mmbase.js:197
+#: mmbase.js:197 mmbase.js:198
 msgid "Not saved"
 msgstr ""
 
-#: mmbase.js:215
+#: mmbase.js:215 mmbase.js:216
 msgid "Reinited "
 msgstr ""
 
-#: phony.js:4
+#: phony.js:4 phony.js:88 phony.js:120
 msgid "Left (Big)"
 msgstr ""
 
-#: phony.js:5
+#: phony.js:5 phony.js:89 phony.js:121
 msgid "Right (Big)"
 msgstr ""
+
+#: phony.js:3
+msgid "Kupu SVN/unreleased"
+msgstr ""
+
+#: phony.js:3 phony.js:18 phony.js:19 phony.js:20 phony.js:21 phony.js:22
+#: phony.js:23 phony.js:26
+msgid "http://xml.zope.org/namespaces/i18n"
+msgstr ""
+
+#: phony.js:3 phony.js:18 phony.js:19 phony.js:20 phony.js:21 phony.js:22
+#: phony.js:23 phony.js:26
+msgid "button"
+msgstr ""
+
+#: phony.js:3
+msgid "kupu-logo"
+msgstr ""
+
+#: phony.js:3 phony.js:18 phony.js:19 phony.js:20 phony.js:21 phony.js:22
+#: phony.js:23 phony.js:26
+msgid "${_}"
+msgstr ""
+
+#: phony.js:3
+msgid "kupu-logo-button"
+msgstr ""
+
+#: phony.js:3 phony.js:18 phony.js:19 phony.js:20 phony.js:21 phony.js:22
+#: phony.js:23 phony.js:26
+msgid "title"
+msgstr ""
+
+#: phony.js:3
+msgid "window.open('http://kupu.oscom.org');"
+msgstr ""
+
+#: phony.js:6
+msgid "Heading 2"
+msgstr ""
+
+#: phony.js:7
+msgid "Heading 3"
+msgstr ""
+
+#: phony.js:8
+msgid "Heading 4"
+msgstr ""
+
+#: phony.js:9
+msgid "Heading 5"
+msgstr ""
+
+#: phony.js:10
+msgid "Heading 6"
+msgstr ""
+
+#: phony.js:11
+msgid "s"
+msgstr ""
+
+#: phony.js:12
+msgid "b"
+msgstr ""
+
+#: phony.js:13
+msgid "i"
+msgstr ""
+
+#: phony.js:14
+msgid "-"
+msgstr ""
+
+#: phony.js:15
+msgid "+"
+msgstr ""
+
+#: phony.js:16
+msgid "#"
+msgstr ""
+
+#: phony.js:17
+msgid "*"
+msgstr ""
+
+#: phony.js:18
+msgid "image"
+msgstr ""
+
+#: phony.js:18
+msgid "kupu-image"
+msgstr ""
+
+#: phony.js:18
+msgid "kupu-imagelibdrawer-button"
+msgstr ""
+
+#: phony.js:19
+msgid "link"
+msgstr ""
+
+#: phony.js:19
+msgid "kupu-inthyperlink"
+msgstr ""
+
+#: phony.js:19
+msgid "kupu-linklibdrawer-button"
+msgstr ""
+
+#: phony.js:20
+msgid "external link"
+msgstr ""
+
+#: phony.js:20
+msgid "kupu-exthyperlink"
+msgstr ""
+
+#: phony.js:20
+msgid "kupu-linkdrawer-button"
+msgstr ""
+
+#: phony.js:21
+msgid "Remove image"
+msgstr ""
+
+#: phony.js:21
+msgid "kupu-removeimage invisible"
+msgstr ""
+
+#: phony.js:21
+msgid "kupu-removeimage-button"
+msgstr ""
+
+#: phony.js:22
+msgid "Remove link"
+msgstr ""
+
+#: phony.js:22
+msgid "kupu-removelink invisible"
+msgstr ""
+
+#: phony.js:22
+msgid "kupu-removelink-button"
+msgstr ""
+
+#: phony.js:23
+msgid "Remove block"
+msgstr ""
+
+#: phony.js:23
+msgid "kupu-removediv invisible"
+msgstr ""
+
+#: phony.js:23
+msgid "kupu-removediv-button"
+msgstr ""
+
+#: phony.js:24
+msgid "z"
+msgstr ""
+
+#: phony.js:25
+msgid "y"
+msgstr ""
+
+#: phony.js:26
+msgid "Check spelling"
+msgstr ""
+
+#: phony.js:26
+msgid "kupu-spellchecker"
+msgstr ""
+
+#: phony.js:26
+msgid "kupu-spellchecker-button"
+msgstr ""
+
+#: phony.js:27
+msgid "list-disc"
+msgstr ""
+
+#: phony.js:28
+msgid "list-square"
+msgstr ""
+
+#: phony.js:29
+msgid "list-circle"
+msgstr ""
+
+#: phony.js:30
+msgid "list-nobullet"
+msgstr ""
+
+#: phony.js:31
+msgid "list-decimal"
+msgstr ""
+
+#: phony.js:32
+msgid "list-upperroman"
+msgstr ""
+
+#: phony.js:33
+msgid "list-lowerroman"
+msgstr ""
+
+#: phony.js:34
+msgid "list-upperalpha"
+msgstr ""
+
+#: phony.js:35
+msgid "list-loweralpha"
+msgstr ""
+
+#: phony.js:36
+msgid "External Link"
+msgstr ""
+
+#: phony.js:37 phony.js:81
+msgid "Link the highlighted text to this URL:"
+msgstr ""
+
+#: phony.js:38
+msgid "Preview"
+msgstr ""
+
+#: phony.js:39
+msgid "(none)"
+msgstr ""
+
+#: phony.js:40 phony.js:78
+msgid "Ok"
+msgstr ""
+
+#: phony.js:41 phony.js:79
+msgid "Cancel"
+msgstr ""
+
+#: phony.js:42
+msgid "tabledrawer_title"
+msgstr ""
+
+#: phony.js:43 phony.js:53
+msgid "tabledrawer_class_label"
+msgstr ""
+
+#: phony.js:44 phony.js:54
+msgid "Plain"
+msgstr ""
+
+#: phony.js:45 phony.js:55
+msgid "Listing"
+msgstr ""
+
+#: phony.js:46 phony.js:56
+msgid "Grid"
+msgstr ""
+
+#: phony.js:47 phony.js:57
+msgid "Data"
+msgstr ""
+
+#: phony.js:48
+msgid "tabledrawer_rows_label"
+msgstr ""
+
+#: phony.js:49
+msgid "tabledrawer_columns_label"
+msgstr ""
+
+#: phony.js:50
+msgid "tabledrawer_headings_label"
+msgstr ""
+
+#: phony.js:51
+msgid "tabledrawer_add_table_button"
+msgstr ""
+
+#: phony.js:52
+msgid "tabledrawer_fix_tables_button"
+msgstr ""
+
+#: phony.js:58
+msgid "tabledrawer_alignment_label"
+msgstr ""
+
+#: phony.js:59
+msgid "tabledrawer_left_option"
+msgstr ""
+
+#: phony.js:60
+msgid "tabledrawer_center_option"
+msgstr ""
+
+#: phony.js:61
+msgid "tabledrawer_right_option"
+msgstr ""
+
+#: phony.js:62
+msgid "tabledrawer_column_label"
+msgstr ""
+
+#: phony.js:63 phony.js:66
+msgid "tabledrawer_add_button"
+msgstr ""
+
+#: phony.js:64 phony.js:67
+msgid "tabledrawer_remove_button"
+msgstr ""
+
+#: phony.js:65
+msgid "tabledrawer_row_label"
+msgstr ""
+
+#: phony.js:68
+msgid "tabledrawer_fix_table_label"
+msgstr ""
+
+#: phony.js:69
+msgid "tabledrawer_fix_button"
+msgstr ""
+
+#: phony.js:70
+msgid "tabledrawer_close_button"
+msgstr ""
+
+#: phony.js:71
+msgid "anchordrawer_title"
+msgstr ""
+
+#: phony.js:72
+msgid "Link to anchor"
+msgstr ""
+
+#: phony.js:73
+msgid "Table of contents"
+msgstr ""
+
+#: phony.js:74
+msgid "Table style"
+msgstr ""
+
+#: phony.js:76
+msgid "toggle all"
+msgstr ""
+
+#: phony.js:77
+msgid "(optional 2nd style)"
+msgstr ""
+
+#: phony.js:80
+msgid "Links"
+msgstr ""
+
+#: phony.js:82
+msgid "Make Link"
+msgstr ""
+
+#: phony.js:83
+msgid "Images"
+msgstr ""
+
+#: phony.js:84
+msgid "Image class:"
+msgstr ""
+
+#: phony.js:85
+msgid "Inline"
+msgstr ""
+
+#: phony.js:86 phony.js:102
+msgid "Left"
+msgstr ""
+
+#: phony.js:87 phony.js:104
+msgid "Right"
+msgstr ""
+
+#: phony.js:90 phony.js:122
+msgid "Big"
+msgstr ""
+
+#: phony.js:91
+msgid "Insert image at the following URL:"
+msgstr ""
+
+#: phony.js:92
+msgid "Insert Image"
+msgstr ""
+
+#: phony.js:93
+msgid "Tables"
+msgstr ""
+
+#: phony.js:94
+msgid "Table Class:"
+msgstr ""
+
+#: phony.js:95
+msgid "Rows:"
+msgstr ""
+
+#: phony.js:96
+msgid "Columns:"
+msgstr ""
+
+#: phony.js:97
+msgid "Headings:"
+msgstr ""
+
+#: phony.js:98
+msgid "Create"
+msgstr ""
+
+#: phony.js:99
+msgid "Fix Table"
+msgstr ""
+
+#: phony.js:100
+msgid "Add Table"
+msgstr ""
+
+#: phony.js:101
+msgid "Col Align:"
+msgstr ""
+
+#: phony.js:103
+msgid "Center"
+msgstr ""
+
+#: phony.js:105
+msgid "Add Column"
+msgstr ""
+
+#: phony.js:106
+msgid "Remove Column"
+msgstr ""
+
+#: phony.js:107
+msgid "Add Row"
+msgstr ""
+
+#: phony.js:108
+msgid "Remove Row"
+msgstr ""
+
+#: phony.js:109
+msgid "Fix"
+msgstr ""
+
+#: phony.js:115
+msgid "Debug Log"
+msgstr ""

Modified: kupu/trunk/kupu/mmbase/i18n/en.po
==============================================================================
--- kupu/trunk/kupu/mmbase/i18n/en.po	(original)
+++ kupu/trunk/kupu/mmbase/i18n/en.po	Tue Feb  6 14:47:08 2007
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-19 17:56+0200\n"
+"POT-Creation-Date: 2007-02-06 14:05+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,19 +16,19 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: mmbase.js:141 mmbase.js:158
+#: mmbase.js:141 mmbase.js:158 mmbase.js:159
 msgid "Saving body (kupu)"
 msgstr "Saving body (kupu)"
 
-#: mmbase.js:144 mmbase.js:161
+#: mmbase.js:144 mmbase.js:161 mmbase.js:162
 msgid "Saving fields (form)"
 msgstr "Saving fields (form)"
 
-#: mmbase.js:173 mmbase.js:191
+#: mmbase.js:173 mmbase.js:191 mmbase.js:192
 msgid "saved"
 msgstr "saved"
 
-#: mmbase.js:202 mmbase.js:242
+#: mmbase.js:202 mmbase.js:242 mmbase.js:243
 msgid "RELOAD"
 msgstr "RELOAD"
 
@@ -44,7 +44,7 @@
 msgid "Getting node body "
 msgstr "Getting node body "
 
-#: mmbase.js:250 mmbase.js:300
+#: mmbase.js:250 mmbase.js:300 mmbase.js:299
 msgid "Loading node body "
 msgstr "Loading node body "
 
@@ -52,55 +52,55 @@
 msgid "Div tool initialized"
 msgstr "Div tool initialized"
 
-#: mmbasetools.js:39 mmbasetools.js:40
+#: mmbasetools.js:39 mmbasetools.js:40 mmbasetools.js:48
 msgid "Found paragraph"
 msgstr "Found paragraph"
 
-#: mmbasetools.js:43 mmbasetools.js:44
+#: mmbasetools.js:43 mmbasetools.js:44 mmbasetools.js:52
 msgid "Didn't find paragraph"
 msgstr "Didn't find paragraph"
 
-#: mmbasetools.js:48 mmbasetools.js:50
+#: mmbasetools.js:48 mmbasetools.js:50 mmbasetools.js:57
 msgid "Div inserted"
 msgstr "Div inserted"
 
-#: phony.js:1
+#: phony.js:1 phony.js:117
 msgid "No node"
 msgstr "No node"
 
-#: phony.js:2
+#: phony.js:2 phony.js:4 phony.js:75
 msgid "Normal"
 msgstr "Normal"
 
-#: phony.js:3 phony.js:5 phony.js:2
+#: phony.js:3 phony.js:5 phony.js:2 phony.js:1 phony.js:116 phony.js:118
 msgid "Richtext editor"
 msgstr "Richtext editor"
 
-#: phony.js:4
+#: phony.js:4 phony.js:5
 msgid "Heading 1"
 msgstr "Heading 1"
 
-#: phony.js:6 phony.js:3
+#: phony.js:6 phony.js:3 phony.js:2 phony.js:119
 msgid "default"
 msgstr "default"
 
-#: phony.js:7 phony.js:4 phony.js:6
+#: phony.js:7 phony.js:4 phony.js:6 phony.js:110 phony.js:123
 msgid "Block"
 msgstr "Block"
 
-#: phony.js:8 phony.js:5 phony.js:7
+#: phony.js:8 phony.js:5 phony.js:7 phony.js:111 phony.js:124
 msgid "Block class"
 msgstr "Block class"
 
-#: phony.js:9 phony.js:6 phony.js:8
+#: phony.js:9 phony.js:6 phony.js:8 phony.js:112 phony.js:125
 msgid "Note left"
 msgstr "Note left"
 
-#: phony.js:10 phony.js:7 phony.js:9
+#: phony.js:10 phony.js:7 phony.js:9 phony.js:113 phony.js:126
 msgid "Note right"
 msgstr "Note right"
 
-#: phony.js:11 phony.js:8 phony.js:10
+#: phony.js:11 phony.js:8 phony.js:10 phony.js:114 phony.js:127
 msgid "Insert block"
 msgstr "Insert block"
 
@@ -112,18 +112,470 @@
 msgid "emphasis: alt-i"
 msgstr "emphasis: alt-i"
 
-#: mmbase.js:197
+#: mmbase.js:197 mmbase.js:198
 msgid "Not saved"
 msgstr ""
 
-#: mmbase.js:215
+#: mmbase.js:215 mmbase.js:216
 msgid "Reinited "
 msgstr ""
 
-#: phony.js:4
+#: phony.js:4 phony.js:88 phony.js:120
 msgid "Left (Big)"
 msgstr ""
 
-#: phony.js:5
+#: phony.js:5 phony.js:89 phony.js:121
 msgid "Right (Big)"
 msgstr ""
+
+#: phony.js:3
+msgid "Kupu SVN/unreleased"
+msgstr ""
+
+#: phony.js:3 phony.js:18 phony.js:19 phony.js:20 phony.js:21 phony.js:22
+#: phony.js:23 phony.js:26
+msgid "http://xml.zope.org/namespaces/i18n"
+msgstr ""
+
+#: phony.js:3 phony.js:18 phony.js:19 phony.js:20 phony.js:21 phony.js:22
+#: phony.js:23 phony.js:26
+msgid "button"
+msgstr ""
+
+#: phony.js:3
+msgid "kupu-logo"
+msgstr ""
+
+#: phony.js:3 phony.js:18 phony.js:19 phony.js:20 phony.js:21 phony.js:22
+#: phony.js:23 phony.js:26
+msgid "${_}"
+msgstr ""
+
+#: phony.js:3
+msgid "kupu-logo-button"
+msgstr ""
+
+#: phony.js:3 phony.js:18 phony.js:19 phony.js:20 phony.js:21 phony.js:22
+#: phony.js:23 phony.js:26
+msgid "title"
+msgstr ""
+
+#: phony.js:3
+msgid "window.open('http://kupu.oscom.org');"
+msgstr ""
+
+#: phony.js:6
+msgid "Heading 2"
+msgstr ""
+
+#: phony.js:7
+msgid "Heading 3"
+msgstr ""
+
+#: phony.js:8
+msgid "Heading 4"
+msgstr ""
+
+#: phony.js:9
+msgid "Heading 5"
+msgstr ""
+
+#: phony.js:10
+msgid "Heading 6"
+msgstr ""
+
+#: phony.js:11
+msgid "s"
+msgstr ""
+
+#: phony.js:12
+msgid "b"
+msgstr ""
+
+#: phony.js:13
+msgid "i"
+msgstr ""
+
+#: phony.js:14
+msgid "-"
+msgstr ""
+
+#: phony.js:15
+msgid "+"
+msgstr ""
+
+#: phony.js:16
+msgid "#"
+msgstr ""
+
+#: phony.js:17
+msgid "*"
+msgstr ""
+
+#: phony.js:18
+msgid "image"
+msgstr ""
+
+#: phony.js:18
+msgid "kupu-image"
+msgstr ""
+
+#: phony.js:18
+msgid "kupu-imagelibdrawer-button"
+msgstr ""
+
+#: phony.js:19
+msgid "link"
+msgstr ""
+
+#: phony.js:19
+msgid "kupu-inthyperlink"
+msgstr ""
+
+#: phony.js:19
+msgid "kupu-linklibdrawer-button"
+msgstr ""
+
+#: phony.js:20
+msgid "external link"
+msgstr ""
+
+#: phony.js:20
+msgid "kupu-exthyperlink"
+msgstr ""
+
+#: phony.js:20
+msgid "kupu-linkdrawer-button"
+msgstr ""
+
+#: phony.js:21
+msgid "Remove image"
+msgstr ""
+
+#: phony.js:21
+msgid "kupu-removeimage invisible"
+msgstr ""
+
+#: phony.js:21
+msgid "kupu-removeimage-button"
+msgstr ""
+
+#: phony.js:22
+msgid "Remove link"
+msgstr ""
+
+#: phony.js:22
+msgid "kupu-removelink invisible"
+msgstr ""
+
+#: phony.js:22
+msgid "kupu-removelink-button"
+msgstr ""
+
+#: phony.js:23
+msgid "Remove block"
+msgstr ""
+
+#: phony.js:23
+msgid "kupu-removediv invisible"
+msgstr ""
+
+#: phony.js:23
+msgid "kupu-removediv-button"
+msgstr ""
+
+#: phony.js:24
+msgid "z"
+msgstr ""
+
+#: phony.js:25
+msgid "y"
+msgstr ""
+
+#: phony.js:26
+msgid "Check spelling"
+msgstr ""
+
+#: phony.js:26
+msgid "kupu-spellchecker"
+msgstr ""
+
+#: phony.js:26
+msgid "kupu-spellchecker-button"
+msgstr ""
+
+#: phony.js:27
+msgid "list-disc"
+msgstr ""
+
+#: phony.js:28
+msgid "list-square"
+msgstr ""
+
+#: phony.js:29
+msgid "list-circle"
+msgstr ""
+
+#: phony.js:30
+msgid "list-nobullet"
+msgstr ""
+
+#: phony.js:31
+msgid "list-decimal"
+msgstr ""
+
+#: phony.js:32
+msgid "list-upperroman"
+msgstr ""
+
+#: phony.js:33
+msgid "list-lowerroman"
+msgstr ""
+
+#: phony.js:34
+msgid "list-upperalpha"
+msgstr ""
+
+#: phony.js:35
+msgid "list-loweralpha"
+msgstr ""
+
+#: phony.js:36
+msgid "External Link"
+msgstr ""
+
+#: phony.js:37 phony.js:81
+msgid "Link the highlighted text to this URL:"
+msgstr ""
+
+#: phony.js:38
+msgid "Preview"
+msgstr ""
+
+#: phony.js:39
+msgid "(none)"
+msgstr ""
+
+#: phony.js:40 phony.js:78
+msgid "Ok"
+msgstr ""
+
+#: phony.js:41 phony.js:79
+msgid "Cancel"
+msgstr ""
+
+#: phony.js:42
+msgid "tabledrawer_title"
+msgstr ""
+
+#: phony.js:43 phony.js:53
+msgid "tabledrawer_class_label"
+msgstr ""
+
+#: phony.js:44 phony.js:54
+msgid "Plain"
+msgstr ""
+
+#: phony.js:45 phony.js:55
+msgid "Listing"
+msgstr ""
+
+#: phony.js:46 phony.js:56
+msgid "Grid"
+msgstr ""
+
+#: phony.js:47 phony.js:57
+msgid "Data"
+msgstr ""
+
+#: phony.js:48
+msgid "tabledrawer_rows_label"
+msgstr ""
+
+#: phony.js:49
+msgid "tabledrawer_columns_label"
+msgstr ""
+
+#: phony.js:50
+msgid "tabledrawer_headings_label"
+msgstr ""
+
+#: phony.js:51
+msgid "tabledrawer_add_table_button"
+msgstr ""
+
+#: phony.js:52
+msgid "tabledrawer_fix_tables_button"
+msgstr ""
+
+#: phony.js:58
+msgid "tabledrawer_alignment_label"
+msgstr ""
+
+#: phony.js:59
+msgid "tabledrawer_left_option"
+msgstr ""
+
+#: phony.js:60
+msgid "tabledrawer_center_option"
+msgstr ""
+
+#: phony.js:61
+msgid "tabledrawer_right_option"
+msgstr ""
+
+#: phony.js:62
+msgid "tabledrawer_column_label"
+msgstr ""
+
+#: phony.js:63 phony.js:66
+msgid "tabledrawer_add_button"
+msgstr ""
+
+#: phony.js:64 phony.js:67
+msgid "tabledrawer_remove_button"
+msgstr ""
+
+#: phony.js:65
+msgid "tabledrawer_row_label"
+msgstr ""
+
+#: phony.js:68
+msgid "tabledrawer_fix_table_label"
+msgstr ""
+
+#: phony.js:69
+msgid "tabledrawer_fix_button"
+msgstr ""
+
+#: phony.js:70
+msgid "tabledrawer_close_button"
+msgstr ""
+
+#: phony.js:71
+msgid "anchordrawer_title"
+msgstr ""
+
+#: phony.js:72
+msgid "Link to anchor"
+msgstr ""
+
+#: phony.js:73
+msgid "Table of contents"
+msgstr ""
+
+#: phony.js:74
+msgid "Table style"
+msgstr ""
+
+#: phony.js:76
+msgid "toggle all"
+msgstr ""
+
+#: phony.js:77
+msgid "(optional 2nd style)"
+msgstr ""
+
+#: phony.js:80
+msgid "Links"
+msgstr ""
+
+#: phony.js:82
+msgid "Make Link"
+msgstr ""
+
+#: phony.js:83
+msgid "Images"
+msgstr ""
+
+#: phony.js:84
+msgid "Image class:"
+msgstr ""
+
+#: phony.js:85
+msgid "Inline"
+msgstr ""
+
+#: phony.js:86 phony.js:102
+msgid "Left"
+msgstr ""
+
+#: phony.js:87 phony.js:104
+msgid "Right"
+msgstr ""
+
+#: phony.js:90 phony.js:122
+msgid "Big"
+msgstr ""
+
+#: phony.js:91
+msgid "Insert image at the following URL:"
+msgstr ""
+
+#: phony.js:92
+msgid "Insert Image"
+msgstr ""
+
+#: phony.js:93
+msgid "Tables"
+msgstr ""
+
+#: phony.js:94
+msgid "Table Class:"
+msgstr ""
+
+#: phony.js:95
+msgid "Rows:"
+msgstr ""
+
+#: phony.js:96
+msgid "Columns:"
+msgstr ""
+
+#: phony.js:97
+msgid "Headings:"
+msgstr ""
+
+#: phony.js:98
+msgid "Create"
+msgstr ""
+
+#: phony.js:99
+msgid "Fix Table"
+msgstr ""
+
+#: phony.js:100
+msgid "Add Table"
+msgstr ""
+
+#: phony.js:101
+msgid "Col Align:"
+msgstr ""
+
+#: phony.js:103
+msgid "Center"
+msgstr ""
+
+#: phony.js:105
+msgid "Add Column"
+msgstr ""
+
+#: phony.js:106
+msgid "Remove Column"
+msgstr ""
+
+#: phony.js:107
+msgid "Add Row"
+msgstr ""
+
+#: phony.js:108
+msgid "Remove Row"
+msgstr ""
+
+#: phony.js:109
+msgid "Fix"
+msgstr ""
+
+#: phony.js:115
+msgid "Debug Log"
+msgstr ""

Modified: kupu/trunk/kupu/mmbase/i18n/eo.po
==============================================================================
--- kupu/trunk/kupu/mmbase/i18n/eo.po	(original)
+++ kupu/trunk/kupu/mmbase/i18n/eo.po	Tue Feb  6 14:47:08 2007
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: mmbase 18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-19 17:56+0200\n"
-"PO-Revision-Date: 2005-11-28 18:06+0100\n"
+"POT-Creation-Date: 2007-02-06 14:05+0100\n"
+"PO-Revision-Date: 2007-02-06 14:06+0100\n"
 "Last-Translator: Michiel Meeuwissen <mihxil at xs4all.nl>\n"
 "Language-Team: Esperanto <translation-team-eo at lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -16,19 +16,19 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: mmbase.js:141 mmbase.js:158
+#: mmbase.js:141 mmbase.js:158 mmbase.js:159
 msgid "Saving body (kupu)"
 msgstr "Savante tekston (kupan)"
 
-#: mmbase.js:144 mmbase.js:161
+#: mmbase.js:144 mmbase.js:161 mmbase.js:162
 msgid "Saving fields (form)"
 msgstr "Savante kampojn (formularajn)"
 
-#: mmbase.js:173 mmbase.js:191
+#: mmbase.js:173 mmbase.js:191 mmbase.js:192
 msgid "saved"
 msgstr "Savita"
 
-#: mmbase.js:202 mmbase.js:242
+#: mmbase.js:202 mmbase.js:242 mmbase.js:243
 msgid "RELOAD"
 msgstr "RETIRAS"
 
@@ -44,7 +44,7 @@
 msgid "Getting node body "
 msgstr "Tirante nodan korpon "
 
-#: mmbase.js:250 mmbase.js:300
+#: mmbase.js:250 mmbase.js:300 mmbase.js:299
 msgid "Loading node body "
 msgstr "En?utante objekton"
 
@@ -52,55 +52,55 @@
 msgid "Div tool initialized"
 msgstr ""
 
-#: mmbasetools.js:39 mmbasetools.js:40
+#: mmbasetools.js:39 mmbasetools.js:40 mmbasetools.js:48
 msgid "Found paragraph"
 msgstr ""
 
-#: mmbasetools.js:43 mmbasetools.js:44
+#: mmbasetools.js:43 mmbasetools.js:44 mmbasetools.js:52
 msgid "Didn't find paragraph"
 msgstr ""
 
-#: mmbasetools.js:48 mmbasetools.js:50
+#: mmbasetools.js:48 mmbasetools.js:50 mmbasetools.js:57
 msgid "Div inserted"
 msgstr ""
 
-#: phony.js:1
+#: phony.js:1 phony.js:117
 msgid "No node"
 msgstr "Nenio nodo"
 
-#: phony.js:2
+#: phony.js:2 phony.js:4 phony.js:75
 msgid "Normal"
 msgstr ""
 
-#: phony.js:3 phony.js:5 phony.js:2
+#: phony.js:3 phony.js:5 phony.js:2 phony.js:1 phony.js:116 phony.js:118
 msgid "Richtext editor"
 msgstr "Ri?a redaktilo"
 
-#: phony.js:4
+#: phony.js:4 phony.js:5
 msgid "Heading 1"
 msgstr ""
 
-#: phony.js:6 phony.js:3
+#: phony.js:6 phony.js:3 phony.js:2 phony.js:119
 msgid "default"
 msgstr "defa?lto"
 
-#: phony.js:7 phony.js:4 phony.js:6
+#: phony.js:7 phony.js:4 phony.js:6 phony.js:110 phony.js:123
 msgid "Block"
 msgstr ""
 
-#: phony.js:8 phony.js:5 phony.js:7
+#: phony.js:8 phony.js:5 phony.js:7 phony.js:111 phony.js:124
 msgid "Block class"
 msgstr ""
 
-#: phony.js:9 phony.js:6 phony.js:8
+#: phony.js:9 phony.js:6 phony.js:8 phony.js:112 phony.js:125
 msgid "Note left"
 msgstr ""
 
-#: phony.js:10 phony.js:7 phony.js:9
+#: phony.js:10 phony.js:7 phony.js:9 phony.js:113 phony.js:126
 msgid "Note right"
 msgstr ""
 
-#: phony.js:11 phony.js:8 phony.js:10
+#: phony.js:11 phony.js:8 phony.js:10 phony.js:114 phony.js:127
 msgid "Insert block"
 msgstr ""
 
@@ -112,19 +112,471 @@
 msgid "emphasis: alt-i"
 msgstr "emfaze: alt-e"
 
-#: mmbase.js:197
+#: mmbase.js:197 mmbase.js:198
 #, fuzzy
 msgid "Not saved"
 msgstr "Savita"
 
-#: mmbase.js:215
+#: mmbase.js:215 mmbase.js:216
 msgid "Reinited "
 msgstr ""
 
-#: phony.js:4
+#: phony.js:4 phony.js:88 phony.js:120
 msgid "Left (Big)"
-msgstr ""
+msgstr "Maldekstra (kaj granda)"
 
-#: phony.js:5
+#: phony.js:5 phony.js:89 phony.js:121
 msgid "Right (Big)"
+msgstr "Dekstra (kaj granda)"
+
+#: phony.js:3
+msgid "Kupu SVN/unreleased"
+msgstr ""
+
+#: phony.js:3 phony.js:18 phony.js:19 phony.js:20 phony.js:21 phony.js:22
+#: phony.js:23 phony.js:26
+msgid "http://xml.zope.org/namespaces/i18n"
+msgstr ""
+
+#: phony.js:3 phony.js:18 phony.js:19 phony.js:20 phony.js:21 phony.js:22
+#: phony.js:23 phony.js:26
+msgid "button"
+msgstr ""
+
+#: phony.js:3
+msgid "kupu-logo"
+msgstr ""
+
+#: phony.js:3 phony.js:18 phony.js:19 phony.js:20 phony.js:21 phony.js:22
+#: phony.js:23 phony.js:26
+msgid "${_}"
+msgstr ""
+
+#: phony.js:3
+msgid "kupu-logo-button"
+msgstr ""
+
+#: phony.js:3 phony.js:18 phony.js:19 phony.js:20 phony.js:21 phony.js:22
+#: phony.js:23 phony.js:26
+msgid "title"
+msgstr ""
+
+#: phony.js:3
+msgid "window.open('http://kupu.oscom.org');"
+msgstr ""
+
+#: phony.js:6
+msgid "Heading 2"
+msgstr ""
+
+#: phony.js:7
+msgid "Heading 3"
+msgstr ""
+
+#: phony.js:8
+msgid "Heading 4"
+msgstr ""
+
+#: phony.js:9
+msgid "Heading 5"
+msgstr ""
+
+#: phony.js:10
+msgid "Heading 6"
+msgstr ""
+
+#: phony.js:11
+msgid "s"
+msgstr ""
+
+#: phony.js:12
+msgid "b"
+msgstr ""
+
+#: phony.js:13
+msgid "i"
+msgstr ""
+
+#: phony.js:14
+msgid "-"
+msgstr ""
+
+#: phony.js:15
+msgid "+"
+msgstr ""
+
+#: phony.js:16
+msgid "#"
+msgstr ""
+
+#: phony.js:17
+msgid "*"
+msgstr ""
+
+#: phony.js:18
+msgid "image"
+msgstr ""
+
+#: phony.js:18
+msgid "kupu-image"
+msgstr ""
+
+#: phony.js:18
+msgid "kupu-imagelibdrawer-button"
+msgstr ""
+
+#: phony.js:19
+msgid "link"
+msgstr ""
+
+#: phony.js:19
+msgid "kupu-inthyperlink"
+msgstr ""
+
+#: phony.js:19
+msgid "kupu-linklibdrawer-button"
+msgstr ""
+
+#: phony.js:20
+msgid "external link"
+msgstr ""
+
+#: phony.js:20
+msgid "kupu-exthyperlink"
+msgstr ""
+
+#: phony.js:20
+msgid "kupu-linkdrawer-button"
+msgstr ""
+
+#: phony.js:21
+msgid "Remove image"
+msgstr ""
+
+#: phony.js:21
+msgid "kupu-removeimage invisible"
+msgstr ""
+
+#: phony.js:21
+msgid "kupu-removeimage-button"
+msgstr ""
+
+#: phony.js:22
+msgid "Remove link"
+msgstr ""
+
+#: phony.js:22
+msgid "kupu-removelink invisible"
+msgstr ""
+
+#: phony.js:22
+msgid "kupu-removelink-button"
+msgstr ""
+
+#: phony.js:23
+msgid "Remove block"
+msgstr ""
+
+#: phony.js:23
+msgid "kupu-removediv invisible"
+msgstr ""
+
+#: phony.js:23
+msgid "kupu-removediv-button"
+msgstr ""
+
+#: phony.js:24
+msgid "z"
+msgstr ""
+
+#: phony.js:25
+msgid "y"
+msgstr ""
+
+#: phony.js:26
+msgid "Check spelling"
+msgstr ""
+
+#: phony.js:26
+msgid "kupu-spellchecker"
+msgstr ""
+
+#: phony.js:26
+msgid "kupu-spellchecker-button"
+msgstr ""
+
+#: phony.js:27
+msgid "list-disc"
+msgstr ""
+
+#: phony.js:28
+msgid "list-square"
+msgstr ""
+
+#: phony.js:29
+msgid "list-circle"
+msgstr ""
+
+#: phony.js:30
+msgid "list-nobullet"
+msgstr ""
+
+#: phony.js:31
+msgid "list-decimal"
+msgstr ""
+
+#: phony.js:32
+msgid "list-upperroman"
+msgstr ""
+
+#: phony.js:33
+msgid "list-lowerroman"
+msgstr ""
+
+#: phony.js:34
+msgid "list-upperalpha"
+msgstr ""
+
+#: phony.js:35
+msgid "list-loweralpha"
+msgstr ""
+
+#: phony.js:36
+msgid "External Link"
+msgstr ""
+
+#: phony.js:37 phony.js:81
+msgid "Link the highlighted text to this URL:"
+msgstr ""
+
+#: phony.js:38
+msgid "Preview"
+msgstr ""
+
+#: phony.js:39
+msgid "(none)"
+msgstr ""
+
+#: phony.js:40 phony.js:78
+msgid "Ok"
+msgstr ""
+
+#: phony.js:41 phony.js:79
+msgid "Cancel"
+msgstr ""
+
+#: phony.js:42
+msgid "tabledrawer_title"
+msgstr ""
+
+#: phony.js:43 phony.js:53
+msgid "tabledrawer_class_label"
+msgstr ""
+
+#: phony.js:44 phony.js:54
+msgid "Plain"
+msgstr ""
+
+#: phony.js:45 phony.js:55
+msgid "Listing"
+msgstr ""
+
+#: phony.js:46 phony.js:56
+msgid "Grid"
+msgstr ""
+
+#: phony.js:47 phony.js:57
+msgid "Data"
+msgstr ""
+
+#: phony.js:48
+msgid "tabledrawer_rows_label"
+msgstr ""
+
+#: phony.js:49
+msgid "tabledrawer_columns_label"
+msgstr ""
+
+#: phony.js:50
+msgid "tabledrawer_headings_label"
+msgstr ""
+
+#: phony.js:51
+msgid "tabledrawer_add_table_button"
+msgstr ""
+
+#: phony.js:52
+msgid "tabledrawer_fix_tables_button"
+msgstr ""
+
+#: phony.js:58
+msgid "tabledrawer_alignment_label"
+msgstr ""
+
+#: phony.js:59
+msgid "tabledrawer_left_option"
+msgstr ""
+
+#: phony.js:60
+msgid "tabledrawer_center_option"
+msgstr ""
+
+#: phony.js:61
+msgid "tabledrawer_right_option"
+msgstr ""
+
+#: phony.js:62
+msgid "tabledrawer_column_label"
+msgstr ""
+
+#: phony.js:63 phony.js:66
+msgid "tabledrawer_add_button"
+msgstr ""
+
+#: phony.js:64 phony.js:67
+msgid "tabledrawer_remove_button"
+msgstr ""
+
+#: phony.js:65
+msgid "tabledrawer_row_label"
+msgstr ""
+
+#: phony.js:68
+msgid "tabledrawer_fix_table_label"
+msgstr ""
+
+#: phony.js:69
+msgid "tabledrawer_fix_button"
+msgstr ""
+
+#: phony.js:70
+msgid "tabledrawer_close_button"
+msgstr ""
+
+#: phony.js:71
+msgid "anchordrawer_title"
+msgstr ""
+
+#: phony.js:72
+msgid "Link to anchor"
+msgstr ""
+
+#: phony.js:73
+msgid "Table of contents"
+msgstr ""
+
+#: phony.js:74
+msgid "Table style"
+msgstr ""
+
+#: phony.js:76
+msgid "toggle all"
+msgstr ""
+
+#: phony.js:77
+msgid "(optional 2nd style)"
+msgstr ""
+
+#: phony.js:80
+msgid "Links"
+msgstr ""
+
+#: phony.js:82
+msgid "Make Link"
+msgstr ""
+
+#: phony.js:83
+msgid "Images"
+msgstr ""
+
+#: phony.js:84
+msgid "Image class:"
+msgstr ""
+
+#: phony.js:85
+msgid "Inline"
+msgstr ""
+
+#: phony.js:86 phony.js:102
+msgid "Left"
+msgstr "Maldekstra"
+
+#: phony.js:87 phony.js:104
+msgid "Right"
+msgstr "Dekstra"
+
+#: phony.js:90 phony.js:122
+msgid "Big"
+msgstr "Granda"
+
+#: phony.js:91
+msgid "Insert image at the following URL:"
+msgstr ""
+
+#: phony.js:92
+msgid "Insert Image"
+msgstr ""
+
+#: phony.js:93
+msgid "Tables"
+msgstr ""
+
+#: phony.js:94
+msgid "Table Class:"
+msgstr ""
+
+#: phony.js:95
+msgid "Rows:"
+msgstr ""
+
+#: phony.js:96
+msgid "Columns:"
+msgstr ""
+
+#: phony.js:97
+msgid "Headings:"
+msgstr ""
+
+#: phony.js:98
+msgid "Create"
+msgstr ""
+
+#: phony.js:99
+msgid "Fix Table"
+msgstr ""
+
+#: phony.js:100
+msgid "Add Table"
+msgstr ""
+
+#: phony.js:101
+msgid "Col Align:"
+msgstr ""
+
+#: phony.js:103
+msgid "Center"
+msgstr ""
+
+#: phony.js:105
+msgid "Add Column"
+msgstr ""
+
+#: phony.js:106
+msgid "Remove Column"
+msgstr ""
+
+#: phony.js:107
+msgid "Add Row"
+msgstr ""
+
+#: phony.js:108
+msgid "Remove Row"
+msgstr ""
+
+#: phony.js:109
+msgid "Fix"
+msgstr ""
+
+#: phony.js:115
+msgid "Debug Log"
 msgstr ""

Modified: kupu/trunk/kupu/mmbase/i18n/fr.po
==============================================================================
--- kupu/trunk/kupu/mmbase/i18n/fr.po	(original)
+++ kupu/trunk/kupu/mmbase/i18n/fr.po	Tue Feb  6 14:47:08 2007
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: mmbase 18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-19 17:56+0200\n"
+"POT-Creation-Date: 2007-02-06 14:05+0100\n"
 "PO-Revision-Date: 2006-12-13 14:37+0100\n"
 "Last-Translator: Michiel Meeuwissen <EMAIL at ADDRESS>\n"
 "Language-Team: French <traduc at traduc.org>\n"
@@ -16,19 +16,19 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: mmbase.js:141 mmbase.js:158
+#: mmbase.js:141 mmbase.js:158 mmbase.js:159
 msgid "Saving body (kupu)"
 msgstr ""
 
-#: mmbase.js:144 mmbase.js:161
+#: mmbase.js:144 mmbase.js:161 mmbase.js:162
 msgid "Saving fields (form)"
 msgstr ""
 
-#: mmbase.js:173 mmbase.js:191
+#: mmbase.js:173 mmbase.js:191 mmbase.js:192
 msgid "saved"
 msgstr ""
 
-#: mmbase.js:202 mmbase.js:242
+#: mmbase.js:202 mmbase.js:242 mmbase.js:243
 msgid "RELOAD"
 msgstr ""
 
@@ -44,7 +44,7 @@
 msgid "Getting node body "
 msgstr ""
 
-#: mmbase.js:250 mmbase.js:300
+#: mmbase.js:250 mmbase.js:300 mmbase.js:299
 msgid "Loading node body "
 msgstr ""
 
@@ -52,55 +52,55 @@
 msgid "Div tool initialized"
 msgstr ""
 
-#: mmbasetools.js:39 mmbasetools.js:40
+#: mmbasetools.js:39 mmbasetools.js:40 mmbasetools.js:48
 msgid "Found paragraph"
 msgstr ""
 
-#: mmbasetools.js:43 mmbasetools.js:44
+#: mmbasetools.js:43 mmbasetools.js:44 mmbasetools.js:52
 msgid "Didn't find paragraph"
 msgstr ""
 
-#: mmbasetools.js:48 mmbasetools.js:50
+#: mmbasetools.js:48 mmbasetools.js:50 mmbasetools.js:57
 msgid "Div inserted"
 msgstr ""
 
-#: phony.js:1
+#: phony.js:1 phony.js:117
 msgid "No node"
 msgstr ""
 
-#: phony.js:2
+#: phony.js:2 phony.js:4 phony.js:75
 msgid "Normal"
 msgstr ""
 
-#: phony.js:3 phony.js:5 phony.js:2
+#: phony.js:3 phony.js:5 phony.js:2 phony.js:1 phony.js:116 phony.js:118
 msgid "Richtext editor"
 msgstr "Richtext editor"
 
-#: phony.js:4
+#: phony.js:4 phony.js:5
 msgid "Heading 1"
 msgstr ""
 
-#: phony.js:6 phony.js:3
+#: phony.js:6 phony.js:3 phony.js:2 phony.js:119
 msgid "default"
 msgstr ""
 
-#: phony.js:7 phony.js:4 phony.js:6
+#: phony.js:7 phony.js:4 phony.js:6 phony.js:110 phony.js:123
 msgid "Block"
 msgstr ""
 
-#: phony.js:8 phony.js:5 phony.js:7
+#: phony.js:8 phony.js:5 phony.js:7 phony.js:111 phony.js:124
 msgid "Block class"
 msgstr ""
 
-#: phony.js:9 phony.js:6 phony.js:8
+#: phony.js:9 phony.js:6 phony.js:8 phony.js:112 phony.js:125
 msgid "Note left"
 msgstr ""
 
-#: phony.js:10 phony.js:7 phony.js:9
+#: phony.js:10 phony.js:7 phony.js:9 phony.js:113 phony.js:126
 msgid "Note right"
 msgstr ""
 
-#: phony.js:11 phony.js:8 phony.js:10
+#: phony.js:11 phony.js:8 phony.js:10 phony.js:114 phony.js:127
 msgid "Insert block"
 msgstr ""
 
@@ -112,18 +112,471 @@
 msgid "emphasis: alt-i"
 msgstr ""
 
-#: mmbase.js:197
+#: mmbase.js:197 mmbase.js:198
 msgid "Not saved"
 msgstr ""
 
-#: mmbase.js:215
+#: mmbase.js:215 mmbase.js:216
 msgid "Reinited "
 msgstr ""
 
-#: phony.js:4
+#: phony.js:4 phony.js:88 phony.js:120
 msgid "Left (Big)"
 msgstr "Gauche (Grand)"
 
-#: phony.js:5
+#: phony.js:5 phony.js:89 phony.js:121
 msgid "Right (Big)"
 msgstr "Droite (Grand)"
+
+#: phony.js:3
+msgid "Kupu SVN/unreleased"
+msgstr ""
+
+#: phony.js:3 phony.js:18 phony.js:19 phony.js:20 phony.js:21 phony.js:22
+#: phony.js:23 phony.js:26
+msgid "http://xml.zope.org/namespaces/i18n"
+msgstr ""
+
+#: phony.js:3 phony.js:18 phony.js:19 phony.js:20 phony.js:21 phony.js:22
+#: phony.js:23 phony.js:26
+msgid "button"
+msgstr ""
+
+#: phony.js:3
+msgid "kupu-logo"
+msgstr ""
+
+#: phony.js:3 phony.js:18 phony.js:19 phony.js:20 phony.js:21 phony.js:22
+#: phony.js:23 phony.js:26
+msgid "${_}"
+msgstr ""
+
+#: phony.js:3
+msgid "kupu-logo-button"
+msgstr ""
+
+#: phony.js:3 phony.js:18 phony.js:19 phony.js:20 phony.js:21 phony.js:22
+#: phony.js:23 phony.js:26
+msgid "title"
+msgstr ""
+
+#: phony.js:3
+msgid "window.open('http://kupu.oscom.org');"
+msgstr ""
+
+#: phony.js:6
+msgid "Heading 2"
+msgstr ""
+
+#: phony.js:7
+msgid "Heading 3"
+msgstr ""
+
+#: phony.js:8
+msgid "Heading 4"
+msgstr ""
+
+#: phony.js:9
+msgid "Heading 5"
+msgstr ""
+
+#: phony.js:10
+msgid "Heading 6"
+msgstr ""
+
+#: phony.js:11
+msgid "s"
+msgstr ""
+
+#: phony.js:12
+msgid "b"
+msgstr ""
+
+#: phony.js:13
+msgid "i"
+msgstr ""
+
+#: phony.js:14
+msgid "-"
+msgstr ""
+
+#: phony.js:15
+msgid "+"
+msgstr ""
+
+#: phony.js:16
+msgid "#"
+msgstr ""
+
+#: phony.js:17
+msgid "*"
+msgstr ""
+
+#: phony.js:18
+msgid "image"
+msgstr ""
+
+#: phony.js:18
+msgid "kupu-image"
+msgstr ""
+
+#: phony.js:18
+msgid "kupu-imagelibdrawer-button"
+msgstr ""
+
+#: phony.js:19
+msgid "link"
+msgstr ""
+
+#: phony.js:19
+msgid "kupu-inthyperlink"
+msgstr ""
+
+#: phony.js:19
+msgid "kupu-linklibdrawer-button"
+msgstr ""
+
+#: phony.js:20
+msgid "external link"
+msgstr ""
+
+#: phony.js:20
+msgid "kupu-exthyperlink"
+msgstr ""
+
+#: phony.js:20
+msgid "kupu-linkdrawer-button"
+msgstr ""
+
+#: phony.js:21
+msgid "Remove image"
+msgstr ""
+
+#: phony.js:21
+msgid "kupu-removeimage invisible"
+msgstr ""
+
+#: phony.js:21
+msgid "kupu-removeimage-button"
+msgstr ""
+
+#: phony.js:22
+msgid "Remove link"
+msgstr ""
+
+#: phony.js:22
+msgid "kupu-removelink invisible"
+msgstr ""
+
+#: phony.js:22
+msgid "kupu-removelink-button"
+msgstr ""
+
+#: phony.js:23
+msgid "Remove block"
+msgstr ""
+
+#: phony.js:23
+msgid "kupu-removediv invisible"
+msgstr ""
+
+#: phony.js:23
+msgid "kupu-removediv-button"
+msgstr ""
+
+#: phony.js:24
+msgid "z"
+msgstr ""
+
+#: phony.js:25
+msgid "y"
+msgstr ""
+
+#: phony.js:26
+msgid "Check spelling"
+msgstr ""
+
+#: phony.js:26
+msgid "kupu-spellchecker"
+msgstr ""
+
+#: phony.js:26
+msgid "kupu-spellchecker-button"
+msgstr ""
+
+#: phony.js:27
+msgid "list-disc"
+msgstr ""
+
+#: phony.js:28
+msgid "list-square"
+msgstr ""
+
+#: phony.js:29
+msgid "list-circle"
+msgstr ""
+
+#: phony.js:30
+msgid "list-nobullet"
+msgstr ""
+
+#: phony.js:31
+msgid "list-decimal"
+msgstr ""
+
+#: phony.js:32
+msgid "list-upperroman"
+msgstr ""
+
+#: phony.js:33
+msgid "list-lowerroman"
+msgstr ""
+
+#: phony.js:34
+msgid "list-upperalpha"
+msgstr ""
+
+#: phony.js:35
+msgid "list-loweralpha"
+msgstr ""
+
+#: phony.js:36
+msgid "External Link"
+msgstr ""
+
+#: phony.js:37 phony.js:81
+msgid "Link the highlighted text to this URL:"
+msgstr ""
+
+#: phony.js:38
+msgid "Preview"
+msgstr ""
+
+#: phony.js:39
+msgid "(none)"
+msgstr ""
+
+#: phony.js:40 phony.js:78
+msgid "Ok"
+msgstr ""
+
+#: phony.js:41 phony.js:79
+msgid "Cancel"
+msgstr ""
+
+#: phony.js:42
+msgid "tabledrawer_title"
+msgstr ""
+
+#: phony.js:43 phony.js:53
+msgid "tabledrawer_class_label"
+msgstr ""
+
+#: phony.js:44 phony.js:54
+msgid "Plain"
+msgstr ""
+
+#: phony.js:45 phony.js:55
+msgid "Listing"
+msgstr ""
+
+#: phony.js:46 phony.js:56
+msgid "Grid"
+msgstr ""
+
+#: phony.js:47 phony.js:57
+msgid "Data"
+msgstr ""
+
+#: phony.js:48
+msgid "tabledrawer_rows_label"
+msgstr ""
+
+#: phony.js:49
+msgid "tabledrawer_columns_label"
+msgstr ""
+
+#: phony.js:50
+msgid "tabledrawer_headings_label"
+msgstr ""
+
+#: phony.js:51
+msgid "tabledrawer_add_table_button"
+msgstr ""
+
+#: phony.js:52
+msgid "tabledrawer_fix_tables_button"
+msgstr ""
+
+#: phony.js:58
+msgid "tabledrawer_alignment_label"
+msgstr ""
+
+#: phony.js:59
+msgid "tabledrawer_left_option"
+msgstr ""
+
+#: phony.js:60
+msgid "tabledrawer_center_option"
+msgstr ""
+
+#: phony.js:61
+msgid "tabledrawer_right_option"
+msgstr ""
+
+#: phony.js:62
+msgid "tabledrawer_column_label"
+msgstr ""
+
+#: phony.js:63 phony.js:66
+msgid "tabledrawer_add_button"
+msgstr ""
+
+#: phony.js:64 phony.js:67
+msgid "tabledrawer_remove_button"
+msgstr ""
+
+#: phony.js:65
+msgid "tabledrawer_row_label"
+msgstr ""
+
+#: phony.js:68
+msgid "tabledrawer_fix_table_label"
+msgstr ""
+
+#: phony.js:69
+msgid "tabledrawer_fix_button"
+msgstr ""
+
+#: phony.js:70
+msgid "tabledrawer_close_button"
+msgstr ""
+
+#: phony.js:71
+msgid "anchordrawer_title"
+msgstr ""
+
+#: phony.js:72
+msgid "Link to anchor"
+msgstr ""
+
+#: phony.js:73
+msgid "Table of contents"
+msgstr ""
+
+#: phony.js:74
+msgid "Table style"
+msgstr ""
+
+#: phony.js:76
+msgid "toggle all"
+msgstr ""
+
+#: phony.js:77
+msgid "(optional 2nd style)"
+msgstr ""
+
+#: phony.js:80
+msgid "Links"
+msgstr ""
+
+#: phony.js:82
+msgid "Make Link"
+msgstr ""
+
+#: phony.js:83
+msgid "Images"
+msgstr ""
+
+#: phony.js:84
+msgid "Image class:"
+msgstr ""
+
+#: phony.js:85
+msgid "Inline"
+msgstr ""
+
+#: phony.js:86 phony.js:102
+msgid "Left"
+msgstr ""
+
+#: phony.js:87 phony.js:104
+#, fuzzy
+msgid "Right"
+msgstr "Droite (Grand)"
+
+#: phony.js:90 phony.js:122
+msgid "Big"
+msgstr ""
+
+#: phony.js:91
+msgid "Insert image at the following URL:"
+msgstr ""
+
+#: phony.js:92
+msgid "Insert Image"
+msgstr ""
+
+#: phony.js:93
+msgid "Tables"
+msgstr ""
+
+#: phony.js:94
+msgid "Table Class:"
+msgstr ""
+
+#: phony.js:95
+msgid "Rows:"
+msgstr ""
+
+#: phony.js:96
+msgid "Columns:"
+msgstr ""
+
+#: phony.js:97
+msgid "Headings:"
+msgstr ""
+
+#: phony.js:98
+msgid "Create"
+msgstr ""
+
+#: phony.js:99
+msgid "Fix Table"
+msgstr ""
+
+#: phony.js:100
+msgid "Add Table"
+msgstr ""
+
+#: phony.js:101
+msgid "Col Align:"
+msgstr ""
+
+#: phony.js:103
+msgid "Center"
+msgstr ""
+
+#: phony.js:105
+msgid "Add Column"
+msgstr ""
+
+#: phony.js:106
+msgid "Remove Column"
+msgstr ""
+
+#: phony.js:107
+msgid "Add Row"
+msgstr ""
+
+#: phony.js:108
+msgid "Remove Row"
+msgstr ""
+
+#: phony.js:109
+msgid "Fix"
+msgstr ""
+
+#: phony.js:115
+msgid "Debug Log"
+msgstr ""

Modified: kupu/trunk/kupu/mmbase/i18n/it.po
==============================================================================
--- kupu/trunk/kupu/mmbase/i18n/it.po	(original)
+++ kupu/trunk/kupu/mmbase/i18n/it.po	Tue Feb  6 14:47:08 2007
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: mmbase 18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-19 17:56+0200\n"
+"POT-Creation-Date: 2007-02-06 14:05+0100\n"
 "PO-Revision-Date: 2005-06-09 00:45+0200\n"
 "Last-Translator: Michiel Meeuwissen <EMAIL at ADDRESS>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -16,19 +16,19 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: mmbase.js:141 mmbase.js:158
+#: mmbase.js:141 mmbase.js:158 mmbase.js:159
 msgid "Saving body (kupu)"
 msgstr ""
 
-#: mmbase.js:144 mmbase.js:161
+#: mmbase.js:144 mmbase.js:161 mmbase.js:162
 msgid "Saving fields (form)"
 msgstr ""
 
-#: mmbase.js:173 mmbase.js:191
+#: mmbase.js:173 mmbase.js:191 mmbase.js:192
 msgid "saved"
 msgstr ""
 
-#: mmbase.js:202 mmbase.js:242
+#: mmbase.js:202 mmbase.js:242 mmbase.js:243
 msgid "RELOAD"
 msgstr ""
 
@@ -44,7 +44,7 @@
 msgid "Getting node body "
 msgstr ""
 
-#: mmbase.js:250 mmbase.js:300
+#: mmbase.js:250 mmbase.js:300 mmbase.js:299
 msgid "Loading node body "
 msgstr ""
 
@@ -52,55 +52,55 @@
 msgid "Div tool initialized"
 msgstr ""
 
-#: mmbasetools.js:39 mmbasetools.js:40
+#: mmbasetools.js:39 mmbasetools.js:40 mmbasetools.js:48
 msgid "Found paragraph"
 msgstr ""
 
-#: mmbasetools.js:43 mmbasetools.js:44
+#: mmbasetools.js:43 mmbasetools.js:44 mmbasetools.js:52
 msgid "Didn't find paragraph"
 msgstr ""
 
-#: mmbasetools.js:48 mmbasetools.js:50
+#: mmbasetools.js:48 mmbasetools.js:50 mmbasetools.js:57
 msgid "Div inserted"
 msgstr ""
 
-#: phony.js:1
+#: phony.js:1 phony.js:117
 msgid "No node"
 msgstr ""
 
-#: phony.js:2
+#: phony.js:2 phony.js:4 phony.js:75
 msgid "Normal"
 msgstr ""
 
-#: phony.js:3 phony.js:5 phony.js:2
+#: phony.js:3 phony.js:5 phony.js:2 phony.js:1 phony.js:116 phony.js:118
 msgid "Richtext editor"
 msgstr ""
 
-#: phony.js:4
+#: phony.js:4 phony.js:5
 msgid "Heading 1"
 msgstr ""
 
-#: phony.js:6 phony.js:3
+#: phony.js:6 phony.js:3 phony.js:2 phony.js:119
 msgid "default"
 msgstr ""
 
-#: phony.js:7 phony.js:4 phony.js:6
+#: phony.js:7 phony.js:4 phony.js:6 phony.js:110 phony.js:123
 msgid "Block"
 msgstr ""
 
-#: phony.js:8 phony.js:5 phony.js:7
+#: phony.js:8 phony.js:5 phony.js:7 phony.js:111 phony.js:124
 msgid "Block class"
 msgstr ""
 
-#: phony.js:9 phony.js:6 phony.js:8
+#: phony.js:9 phony.js:6 phony.js:8 phony.js:112 phony.js:125
 msgid "Note left"
 msgstr ""
 
-#: phony.js:10 phony.js:7 phony.js:9
+#: phony.js:10 phony.js:7 phony.js:9 phony.js:113 phony.js:126
 msgid "Note right"
 msgstr ""
 
-#: phony.js:11 phony.js:8 phony.js:10
+#: phony.js:11 phony.js:8 phony.js:10 phony.js:114 phony.js:127
 msgid "Insert block"
 msgstr ""
 
@@ -112,18 +112,470 @@
 msgid "emphasis: alt-i"
 msgstr ""
 
-#: mmbase.js:197
+#: mmbase.js:197 mmbase.js:198
 msgid "Not saved"
 msgstr ""
 
-#: mmbase.js:215
+#: mmbase.js:215 mmbase.js:216
 msgid "Reinited "
 msgstr ""
 
-#: phony.js:4
+#: phony.js:4 phony.js:88 phony.js:120
 msgid "Left (Big)"
 msgstr ""
 
-#: phony.js:5
+#: phony.js:5 phony.js:89 phony.js:121
 msgid "Right (Big)"
 msgstr ""
+
+#: phony.js:3
+msgid "Kupu SVN/unreleased"
+msgstr ""
+
+#: phony.js:3 phony.js:18 phony.js:19 phony.js:20 phony.js:21 phony.js:22
+#: phony.js:23 phony.js:26
+msgid "http://xml.zope.org/namespaces/i18n"
+msgstr ""
+
+#: phony.js:3 phony.js:18 phony.js:19 phony.js:20 phony.js:21 phony.js:22
+#: phony.js:23 phony.js:26
+msgid "button"
+msgstr ""
+
+#: phony.js:3
+msgid "kupu-logo"
+msgstr ""
+
+#: phony.js:3 phony.js:18 phony.js:19 phony.js:20 phony.js:21 phony.js:22
+#: phony.js:23 phony.js:26
+msgid "${_}"
+msgstr ""
+
+#: phony.js:3
+msgid "kupu-logo-button"
+msgstr ""
+
+#: phony.js:3 phony.js:18 phony.js:19 phony.js:20 phony.js:21 phony.js:22
+#: phony.js:23 phony.js:26
+msgid "title"
+msgstr ""
+
+#: phony.js:3
+msgid "window.open('http://kupu.oscom.org');"
+msgstr ""
+
+#: phony.js:6
+msgid "Heading 2"
+msgstr ""
+
+#: phony.js:7
+msgid "Heading 3"
+msgstr ""
+
+#: phony.js:8
+msgid "Heading 4"
+msgstr ""
+
+#: phony.js:9
+msgid "Heading 5"
+msgstr ""
+
+#: phony.js:10
+msgid "Heading 6"
+msgstr ""
+
+#: phony.js:11
+msgid "s"
+msgstr ""
+
+#: phony.js:12
+msgid "b"
+msgstr ""
+
+#: phony.js:13
+msgid "i"
+msgstr ""
+
+#: phony.js:14
+msgid "-"
+msgstr ""
+
+#: phony.js:15
+msgid "+"
+msgstr ""
+
+#: phony.js:16
+msgid "#"
+msgstr ""
+
+#: phony.js:17
+msgid "*"
+msgstr ""
+
+#: phony.js:18
+msgid "image"
+msgstr ""
+
+#: phony.js:18
+msgid "kupu-image"
+msgstr ""
+
+#: phony.js:18
+msgid "kupu-imagelibdrawer-button"
+msgstr ""
+
+#: phony.js:19
+msgid "link"
+msgstr ""
+
+#: phony.js:19
+msgid "kupu-inthyperlink"
+msgstr ""
+
+#: phony.js:19
+msgid "kupu-linklibdrawer-button"
+msgstr ""
+
+#: phony.js:20
+msgid "external link"
+msgstr ""
+
+#: phony.js:20
+msgid "kupu-exthyperlink"
+msgstr ""
+
+#: phony.js:20
+msgid "kupu-linkdrawer-button"
+msgstr ""
+
+#: phony.js:21
+msgid "Remove image"
+msgstr ""
+
+#: phony.js:21
+msgid "kupu-removeimage invisible"
+msgstr ""
+
+#: phony.js:21
+msgid "kupu-removeimage-button"
+msgstr ""
+
+#: phony.js:22
+msgid "Remove link"
+msgstr ""
+
+#: phony.js:22
+msgid "kupu-removelink invisible"
+msgstr ""
+
+#: phony.js:22
+msgid "kupu-removelink-button"
+msgstr ""
+
+#: phony.js:23
+msgid "Remove block"
+msgstr ""
+
+#: phony.js:23
+msgid "kupu-removediv invisible"
+msgstr ""
+
+#: phony.js:23
+msgid "kupu-removediv-button"
+msgstr ""
+
+#: phony.js:24
+msgid "z"
+msgstr ""
+
+#: phony.js:25
+msgid "y"
+msgstr ""
+
+#: phony.js:26
+msgid "Check spelling"
+msgstr ""
+
+#: phony.js:26
+msgid "kupu-spellchecker"
+msgstr ""
+
+#: phony.js:26
+msgid "kupu-spellchecker-button"
+msgstr ""
+
+#: phony.js:27
+msgid "list-disc"
+msgstr ""
+
+#: phony.js:28
+msgid "list-square"
+msgstr ""
+
+#: phony.js:29
+msgid "list-circle"
+msgstr ""
+
+#: phony.js:30
+msgid "list-nobullet"
+msgstr ""
+
+#: phony.js:31
+msgid "list-decimal"
+msgstr ""
+
+#: phony.js:32
+msgid "list-upperroman"
+msgstr ""
+
+#: phony.js:33
+msgid "list-lowerroman"
+msgstr ""
+
+#: phony.js:34
+msgid "list-upperalpha"
+msgstr ""
+
+#: phony.js:35
+msgid "list-loweralpha"
+msgstr ""
+
+#: phony.js:36
+msgid "External Link"
+msgstr ""
+
+#: phony.js:37 phony.js:81
+msgid "Link the highlighted text to this URL:"
+msgstr ""
+
+#: phony.js:38
+msgid "Preview"
+msgstr ""
+
+#: phony.js:39
+msgid "(none)"
+msgstr ""
+
+#: phony.js:40 phony.js:78
+msgid "Ok"
+msgstr ""
+
+#: phony.js:41 phony.js:79
+msgid "Cancel"
+msgstr ""
+
+#: phony.js:42
+msgid "tabledrawer_title"
+msgstr ""
+
+#: phony.js:43 phony.js:53
+msgid "tabledrawer_class_label"
+msgstr ""
+
+#: phony.js:44 phony.js:54
+msgid "Plain"
+msgstr ""
+
+#: phony.js:45 phony.js:55
+msgid "Listing"
+msgstr ""
+
+#: phony.js:46 phony.js:56
+msgid "Grid"
+msgstr ""
+
+#: phony.js:47 phony.js:57
+msgid "Data"
+msgstr ""
+
+#: phony.js:48
+msgid "tabledrawer_rows_label"
+msgstr ""
+
+#: phony.js:49
+msgid "tabledrawer_columns_label"
+msgstr ""
+
+#: phony.js:50
+msgid "tabledrawer_headings_label"
+msgstr ""
+
+#: phony.js:51
+msgid "tabledrawer_add_table_button"
+msgstr ""
+
+#: phony.js:52
+msgid "tabledrawer_fix_tables_button"
+msgstr ""
+
+#: phony.js:58
+msgid "tabledrawer_alignment_label"
+msgstr ""
+
+#: phony.js:59
+msgid "tabledrawer_left_option"
+msgstr ""
+
+#: phony.js:60
+msgid "tabledrawer_center_option"
+msgstr ""
+
+#: phony.js:61
+msgid "tabledrawer_right_option"
+msgstr ""
+
+#: phony.js:62
+msgid "tabledrawer_column_label"
+msgstr ""
+
+#: phony.js:63 phony.js:66
+msgid "tabledrawer_add_button"
+msgstr ""
+
+#: phony.js:64 phony.js:67
+msgid "tabledrawer_remove_button"
+msgstr ""
+
+#: phony.js:65
+msgid "tabledrawer_row_label"
+msgstr ""
+
+#: phony.js:68
+msgid "tabledrawer_fix_table_label"
+msgstr ""
+
+#: phony.js:69
+msgid "tabledrawer_fix_button"
+msgstr ""
+
+#: phony.js:70
+msgid "tabledrawer_close_button"
+msgstr ""
+
+#: phony.js:71
+msgid "anchordrawer_title"
+msgstr ""
+
+#: phony.js:72
+msgid "Link to anchor"
+msgstr ""
+
+#: phony.js:73
+msgid "Table of contents"
+msgstr ""
+
+#: phony.js:74
+msgid "Table style"
+msgstr ""
+
+#: phony.js:76
+msgid "toggle all"
+msgstr ""
+
+#: phony.js:77
+msgid "(optional 2nd style)"
+msgstr ""
+
+#: phony.js:80
+msgid "Links"
+msgstr ""
+
+#: phony.js:82
+msgid "Make Link"
+msgstr ""
+
+#: phony.js:83
+msgid "Images"
+msgstr ""
+
+#: phony.js:84
+msgid "Image class:"
+msgstr ""
+
+#: phony.js:85
+msgid "Inline"
+msgstr ""
+
+#: phony.js:86 phony.js:102
+msgid "Left"
+msgstr ""
+
+#: phony.js:87 phony.js:104
+msgid "Right"
+msgstr ""
+
+#: phony.js:90 phony.js:122
+msgid "Big"
+msgstr ""
+
+#: phony.js:91
+msgid "Insert image at the following URL:"
+msgstr ""
+
+#: phony.js:92
+msgid "Insert Image"
+msgstr ""
+
+#: phony.js:93
+msgid "Tables"
+msgstr ""
+
+#: phony.js:94
+msgid "Table Class:"
+msgstr ""
+
+#: phony.js:95
+msgid "Rows:"
+msgstr ""
+
+#: phony.js:96
+msgid "Columns:"
+msgstr ""
+
+#: phony.js:97
+msgid "Headings:"
+msgstr ""
+
+#: phony.js:98
+msgid "Create"
+msgstr ""
+
+#: phony.js:99
+msgid "Fix Table"
+msgstr ""
+
+#: phony.js:100
+msgid "Add Table"
+msgstr ""
+
+#: phony.js:101
+msgid "Col Align:"
+msgstr ""
+
+#: phony.js:103
+msgid "Center"
+msgstr ""
+
+#: phony.js:105
+msgid "Add Column"
+msgstr ""
+
+#: phony.js:106
+msgid "Remove Column"
+msgstr ""
+
+#: phony.js:107
+msgid "Add Row"
+msgstr ""
+
+#: phony.js:108
+msgid "Remove Row"
+msgstr ""
+
+#: phony.js:109
+msgid "Fix"
+msgstr ""
+
+#: phony.js:115
+msgid "Debug Log"
+msgstr ""

Modified: kupu/trunk/kupu/mmbase/i18n/nl.po
==============================================================================
--- kupu/trunk/kupu/mmbase/i18n/nl.po	(original)
+++ kupu/trunk/kupu/mmbase/i18n/nl.po	Tue Feb  6 14:47:08 2007
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: mmbase 19\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-19 17:56+0200\n"
-"PO-Revision-Date: 2006-09-19 18:00+0200\n"
+"POT-Creation-Date: 2007-02-06 14:05+0100\n"
+"PO-Revision-Date: 2007-02-06 14:06+0100\n"
 "Last-Translator: Michiel Meeuwissen <mihxil at xs4all.nl>\n"
 "Language-Team: Dutch <vertaling at vrijschrift.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,19 +16,19 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: mmbase.js:141 mmbase.js:158
+#: mmbase.js:141 mmbase.js:158 mmbase.js:159
 msgid "Saving body (kupu)"
 msgstr "Schrijft tekst weg (kupu)"
 
-#: mmbase.js:144 mmbase.js:161
+#: mmbase.js:144 mmbase.js:161 mmbase.js:162
 msgid "Saving fields (form)"
 msgstr "Schrijft velden weg (formulier)"
 
-#: mmbase.js:173 mmbase.js:191
+#: mmbase.js:173 mmbase.js:191 mmbase.js:192
 msgid "saved"
 msgstr "opgeslagen"
 
-#: mmbase.js:202 mmbase.js:242
+#: mmbase.js:202 mmbase.js:242 mmbase.js:243
 msgid "RELOAD"
 msgstr "Herladen"
 
@@ -44,7 +44,7 @@
 msgid "Getting node body "
 msgstr "Haalt node text"
 
-#: mmbase.js:250 mmbase.js:300
+#: mmbase.js:250 mmbase.js:300 mmbase.js:299
 msgid "Loading node body "
 msgstr "Haalt node op"
 
@@ -52,55 +52,55 @@
 msgid "Div tool initialized"
 msgstr "Blok-tool geinitialiseerd"
 
-#: mmbasetools.js:39 mmbasetools.js:40
+#: mmbasetools.js:39 mmbasetools.js:40 mmbasetools.js:48
 msgid "Found paragraph"
 msgstr "Alinea gevonden"
 
-#: mmbasetools.js:43 mmbasetools.js:44
+#: mmbasetools.js:43 mmbasetools.js:44 mmbasetools.js:52
 msgid "Didn't find paragraph"
 msgstr "Geen alinea gevonden"
 
-#: mmbasetools.js:48 mmbasetools.js:50
+#: mmbasetools.js:48 mmbasetools.js:50 mmbasetools.js:57
 msgid "Div inserted"
 msgstr "Blok ingevoegd"
 
-#: phony.js:1
+#: phony.js:1 phony.js:117
 msgid "No node"
 msgstr "Geen node"
 
-#: phony.js:2
+#: phony.js:2 phony.js:4 phony.js:75
 msgid "Normal"
 msgstr "Normaal"
 
-#: phony.js:3 phony.js:5 phony.js:2
+#: phony.js:3 phony.js:5 phony.js:2 phony.js:1 phony.js:116 phony.js:118
 msgid "Richtext editor"
 msgstr "Richtext editor"
 
-#: phony.js:4
+#: phony.js:4 phony.js:5
 msgid "Heading 1"
 msgstr ""
 
-#: phony.js:6 phony.js:3
+#: phony.js:6 phony.js:3 phony.js:2 phony.js:119
 msgid "default"
 msgstr "default"
 
-#: phony.js:7 phony.js:4 phony.js:6
+#: phony.js:7 phony.js:4 phony.js:6 phony.js:110 phony.js:123
 msgid "Block"
 msgstr "Blok"
 
-#: phony.js:8 phony.js:5 phony.js:7
+#: phony.js:8 phony.js:5 phony.js:7 phony.js:111 phony.js:124
 msgid "Block class"
 msgstr "Blok-soort"
 
-#: phony.js:9 phony.js:6 phony.js:8
+#: phony.js:9 phony.js:6 phony.js:8 phony.js:112 phony.js:125
 msgid "Note left"
 msgstr "Noot (links)"
 
-#: phony.js:10 phony.js:7 phony.js:9
+#: phony.js:10 phony.js:7 phony.js:9 phony.js:113 phony.js:126
 msgid "Note right"
 msgstr "Noot (rechts)"
 
-#: phony.js:11 phony.js:8 phony.js:10
+#: phony.js:11 phony.js:8 phony.js:10 phony.js:114 phony.js:127
 msgid "Insert block"
 msgstr "Voeg blok in"
 
@@ -112,18 +112,471 @@
 msgid "emphasis: alt-i"
 msgstr "benadrukt: alt-i"
 
-#: mmbase.js:197
+#: mmbase.js:197 mmbase.js:198
 msgid "Not saved"
 msgstr "Niet opgeslagen"
 
-#: mmbase.js:215
+#: mmbase.js:215 mmbase.js:216
 msgid "Reinited "
 msgstr "Herladen "
 
-#: phony.js:4
+#: phony.js:4 phony.js:88 phony.js:120
 msgid "Left (Big)"
 msgstr "Links (Groot)"
 
-#: phony.js:5
+#: phony.js:5 phony.js:89 phony.js:121
 msgid "Right (Big)"
 msgstr "Rechts (Groot)"
+
+#: phony.js:3
+msgid "Kupu SVN/unreleased"
+msgstr ""
+
+#: phony.js:3 phony.js:18 phony.js:19 phony.js:20 phony.js:21 phony.js:22
+#: phony.js:23 phony.js:26
+msgid "http://xml.zope.org/namespaces/i18n"
+msgstr ""
+
+#: phony.js:3 phony.js:18 phony.js:19 phony.js:20 phony.js:21 phony.js:22
+#: phony.js:23 phony.js:26
+msgid "button"
+msgstr ""
+
+#: phony.js:3
+msgid "kupu-logo"
+msgstr ""
+
+#: phony.js:3 phony.js:18 phony.js:19 phony.js:20 phony.js:21 phony.js:22
+#: phony.js:23 phony.js:26
+msgid "${_}"
+msgstr ""
+
+#: phony.js:3
+msgid "kupu-logo-button"
+msgstr ""
+
+#: phony.js:3 phony.js:18 phony.js:19 phony.js:20 phony.js:21 phony.js:22
+#: phony.js:23 phony.js:26
+msgid "title"
+msgstr ""
+
+#: phony.js:3
+msgid "window.open('http://kupu.oscom.org');"
+msgstr ""
+
+#: phony.js:6
+msgid "Heading 2"
+msgstr ""
+
+#: phony.js:7
+msgid "Heading 3"
+msgstr ""
+
+#: phony.js:8
+msgid "Heading 4"
+msgstr ""
+
+#: phony.js:9
+msgid "Heading 5"
+msgstr ""
+
+#: phony.js:10
+msgid "Heading 6"
+msgstr ""
+
+#: phony.js:11
+msgid "s"
+msgstr ""
+
+#: phony.js:12
+msgid "b"
+msgstr ""
+
+#: phony.js:13
+msgid "i"
+msgstr ""
+
+#: phony.js:14
+msgid "-"
+msgstr ""
+
+#: phony.js:15
+msgid "+"
+msgstr ""
+
+#: phony.js:16
+msgid "#"
+msgstr ""
+
+#: phony.js:17
+msgid "*"
+msgstr ""
+
+#: phony.js:18
+msgid "image"
+msgstr ""
+
+#: phony.js:18
+msgid "kupu-image"
+msgstr ""
+
+#: phony.js:18
+msgid "kupu-imagelibdrawer-button"
+msgstr ""
+
+#: phony.js:19
+msgid "link"
+msgstr ""
+
+#: phony.js:19
+msgid "kupu-inthyperlink"
+msgstr ""
+
+#: phony.js:19
+msgid "kupu-linklibdrawer-button"
+msgstr ""
+
+#: phony.js:20
+msgid "external link"
+msgstr ""
+
+#: phony.js:20
+msgid "kupu-exthyperlink"
+msgstr ""
+
+#: phony.js:20
+msgid "kupu-linkdrawer-button"
+msgstr ""
+
+#: phony.js:21
+msgid "Remove image"
+msgstr ""
+
+#: phony.js:21
+msgid "kupu-removeimage invisible"
+msgstr ""
+
+#: phony.js:21
+msgid "kupu-removeimage-button"
+msgstr ""
+
+#: phony.js:22
+msgid "Remove link"
+msgstr ""
+
+#: phony.js:22
+msgid "kupu-removelink invisible"
+msgstr ""
+
+#: phony.js:22
+msgid "kupu-removelink-button"
+msgstr ""
+
+#: phony.js:23
+msgid "Remove block"
+msgstr ""
+
+#: phony.js:23
+msgid "kupu-removediv invisible"
+msgstr ""
+
+#: phony.js:23
+msgid "kupu-removediv-button"
+msgstr ""
+
+#: phony.js:24
+msgid "z"
+msgstr ""
+
+#: phony.js:25
+msgid "y"
+msgstr ""
+
+#: phony.js:26
+msgid "Check spelling"
+msgstr ""
+
+#: phony.js:26
+msgid "kupu-spellchecker"
+msgstr ""
+
+#: phony.js:26
+msgid "kupu-spellchecker-button"
+msgstr ""
+
+#: phony.js:27
+msgid "list-disc"
+msgstr ""
+
+#: phony.js:28
+msgid "list-square"
+msgstr ""
+
+#: phony.js:29
+msgid "list-circle"
+msgstr ""
+
+#: phony.js:30
+msgid "list-nobullet"
+msgstr ""
+
+#: phony.js:31
+msgid "list-decimal"
+msgstr ""
+
+#: phony.js:32
+msgid "list-upperroman"
+msgstr ""
+
+#: phony.js:33
+msgid "list-lowerroman"
+msgstr ""
+
+#: phony.js:34
+msgid "list-upperalpha"
+msgstr ""
+
+#: phony.js:35
+msgid "list-loweralpha"
+msgstr ""
+
+#: phony.js:36
+msgid "External Link"
+msgstr ""
+
+#: phony.js:37 phony.js:81
+msgid "Link the highlighted text to this URL:"
+msgstr ""
+
+#: phony.js:38
+msgid "Preview"
+msgstr ""
+
+#: phony.js:39
+msgid "(none)"
+msgstr ""
+
+#: phony.js:40 phony.js:78
+msgid "Ok"
+msgstr ""
+
+#: phony.js:41 phony.js:79
+msgid "Cancel"
+msgstr ""
+
+#: phony.js:42
+msgid "tabledrawer_title"
+msgstr ""
+
+#: phony.js:43 phony.js:53
+msgid "tabledrawer_class_label"
+msgstr ""
+
+#: phony.js:44 phony.js:54
+msgid "Plain"
+msgstr ""
+
+#: phony.js:45 phony.js:55
+msgid "Listing"
+msgstr ""
+
+#: phony.js:46 phony.js:56
+msgid "Grid"
+msgstr ""
+
+#: phony.js:47 phony.js:57
+msgid "Data"
+msgstr ""
+
+#: phony.js:48
+msgid "tabledrawer_rows_label"
+msgstr ""
+
+#: phony.js:49
+msgid "tabledrawer_columns_label"
+msgstr ""
+
+#: phony.js:50
+msgid "tabledrawer_headings_label"
+msgstr ""
+
+#: phony.js:51
+msgid "tabledrawer_add_table_button"
+msgstr ""
+
+#: phony.js:52
+msgid "tabledrawer_fix_tables_button"
+msgstr ""
+
+#: phony.js:58
+msgid "tabledrawer_alignment_label"
+msgstr ""
+
+#: phony.js:59
+msgid "tabledrawer_left_option"
+msgstr ""
+
+#: phony.js:60
+msgid "tabledrawer_center_option"
+msgstr ""
+
+#: phony.js:61
+msgid "tabledrawer_right_option"
+msgstr ""
+
+#: phony.js:62
+msgid "tabledrawer_column_label"
+msgstr ""
+
+#: phony.js:63 phony.js:66
+msgid "tabledrawer_add_button"
+msgstr ""
+
+#: phony.js:64 phony.js:67
+msgid "tabledrawer_remove_button"
+msgstr ""
+
+#: phony.js:65
+msgid "tabledrawer_row_label"
+msgstr ""
+
+#: phony.js:68
+msgid "tabledrawer_fix_table_label"
+msgstr ""
+
+#: phony.js:69
+msgid "tabledrawer_fix_button"
+msgstr ""
+
+#: phony.js:70
+msgid "tabledrawer_close_button"
+msgstr ""
+
+#: phony.js:71
+msgid "anchordrawer_title"
+msgstr ""
+
+#: phony.js:72
+msgid "Link to anchor"
+msgstr ""
+
+#: phony.js:73
+msgid "Table of contents"
+msgstr ""
+
+#: phony.js:74
+msgid "Table style"
+msgstr ""
+
+#: phony.js:76
+msgid "toggle all"
+msgstr ""
+
+#: phony.js:77
+msgid "(optional 2nd style)"
+msgstr ""
+
+#: phony.js:80
+msgid "Links"
+msgstr ""
+
+#: phony.js:82
+msgid "Make Link"
+msgstr ""
+
+#: phony.js:83
+msgid "Images"
+msgstr ""
+
+#: phony.js:84
+msgid "Image class:"
+msgstr ""
+
+#: phony.js:85
+msgid "Inline"
+msgstr ""
+
+#: phony.js:86 phony.js:102
+msgid "Left"
+msgstr ""
+
+#: phony.js:87 phony.js:104
+#, fuzzy
+msgid "Right"
+msgstr "Rechts (Groot)"
+
+#: phony.js:90 phony.js:122
+msgid "Big"
+msgstr "Groot"
+
+#: phony.js:91
+msgid "Insert image at the following URL:"
+msgstr ""
+
+#: phony.js:92
+msgid "Insert Image"
+msgstr ""
+
+#: phony.js:93
+msgid "Tables"
+msgstr ""
+
+#: phony.js:94
+msgid "Table Class:"
+msgstr ""
+
+#: phony.js:95
+msgid "Rows:"
+msgstr ""
+
+#: phony.js:96
+msgid "Columns:"
+msgstr ""
+
+#: phony.js:97
+msgid "Headings:"
+msgstr ""
+
+#: phony.js:98
+msgid "Create"
+msgstr ""
+
+#: phony.js:99
+msgid "Fix Table"
+msgstr ""
+
+#: phony.js:100
+msgid "Add Table"
+msgstr ""
+
+#: phony.js:101
+msgid "Col Align:"
+msgstr ""
+
+#: phony.js:103
+msgid "Center"
+msgstr ""
+
+#: phony.js:105
+msgid "Add Column"
+msgstr ""
+
+#: phony.js:106
+msgid "Remove Column"
+msgstr ""
+
+#: phony.js:107
+msgid "Add Row"
+msgstr ""
+
+#: phony.js:108
+msgid "Remove Row"
+msgstr ""
+
+#: phony.js:109
+msgid "Fix"
+msgstr ""
+
+#: phony.js:115
+msgid "Debug Log"
+msgstr ""

Modified: kupu/trunk/kupu/mmbase/kupustyle.css
==============================================================================
--- kupu/trunk/kupu/mmbase/kupustyle.css	(original)
+++ kupu/trunk/kupu/mmbase/kupustyle.css	Tue Feb  6 14:47:08 2007
@@ -84,6 +84,7 @@
   margin-left: 0px;
   margin-right: 1ex;
 }
+
 img.section-inline { 
 }
 

Modified: kupu/trunk/kupu/mmbase/toolboxes.kupu
==============================================================================
--- kupu/trunk/kupu/mmbase/toolboxes.kupu	(original)
+++ kupu/trunk/kupu/mmbase/toolboxes.kupu	Tue Feb  6 14:47:08 2007
@@ -26,6 +26,7 @@
           <fmt:bundle basename="org.mmbase.kupu.Messages">             
             <option value="image-left big" ><fmt:message key="Left (Big)" /></option>
             <option value="image-right big"><fmt:message key="Right (Big)" /></option>
+            <option value="image-center big"><fmt:message key="Big" /></option>
           </fmt:bundle>
           <!--
           <option value="paragraph" i18n:translate="">Paragraph</option>

From duncan at codespeak.net  Wed Feb  7 12:52:12 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Wed,  7 Feb 2007 12:52:12 +0100 (CET)
Subject: [kupu-checkins] r38054 - kupu/trunk/kupu/plone
Message-ID: <20070207115212.1746B1007C@code0.codespeak.net>

Author: duncan
Date: Wed Feb  7 12:51:49 2007
New Revision: 38054

Modified:
   kupu/trunk/kupu/plone/kupu_config.pt
   kupu/trunk/kupu/plone/plonedrawers.py
Log:
The code to test the UID transform was taking too long and didn't always work correctly.


Modified: kupu/trunk/kupu/plone/kupu_config.pt
==============================================================================
--- kupu/trunk/kupu/plone/kupu_config.pt	(original)
+++ kupu/trunk/kupu/plone/kupu_config.pt	Wed Feb  7 12:51:49 2007
@@ -54,7 +54,7 @@
     name="configure_kupu"
     method="post"
     tal:attributes="action here/absolute_url"
-    tal:define="isTransformEnabled here/transformIsEnabled">
+    tal:define="isTransformEnabled context/transformIsEnabled">
 
 <fieldset>
 <legend i18n:translate="legend_link_options">Link options</legend>

Modified: kupu/trunk/kupu/plone/plonedrawers.py
==============================================================================
--- kupu/trunk/kupu/plone/plonedrawers.py	(original)
+++ kupu/trunk/kupu/plone/plonedrawers.py	Wed Feb  7 12:51:49 2007
@@ -757,22 +757,24 @@
         unsupp = [t+'/'+f.widget.label for (t,f,pt) in self._getKupuFields() if not self.canCaption(f) ]
         return str.join(', ', unsupp)
 
+    security.declareProtected("View", "transformIsEnabled")
     def transformIsEnabled(self):
         """Test whether the output transform is enabled for x-html-safe"""
-        archetype_tool = getToolByName(self, 'archetype_tool', None)
+        uid_catalog = getToolByName(self, 'uid_catalog', None)
         portal_transforms = getToolByName(self, 'portal_transforms', None)
-        if not archetype_tool or not portal_transforms:
+        if not uid_catalog or not portal_transforms:
             return False
-        content = archetype_tool.Content()
+        # Find something, anything which has a UID
+        content = uid_catalog.searchResults(sort_on='', sort_limit=1)
         if not content:
             return False
-
         uid = content[0].UID # Get an arbitrary used UID.
-        test = '<a href="resolveuid/%s"></a>' % uid
+        link = 'resolveuid/%s' % uid
+        test = '<a href="%s"></a>' % link
         txfrm = portal_transforms.convertTo('text/x-html-safe', test, mimetype='text/html', context=self)
         if hasattr(txfrm, 'getData'):
             txfrm = txfrm.getData()
-        return txfrm and not uid in txfrm
+        return txfrm and not link in txfrm
 
     security.declareProtected("View", "isUploadSupported")
     def isUploadSupported(self, context):

From duncan at codespeak.net  Wed Feb  7 14:27:18 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Wed,  7 Feb 2007 14:27:18 +0100 (CET)
Subject: [kupu-checkins] r38064 - kupu/tag/kupu-1.3.9
Message-ID: <20070207132718.BB7D610080@code0.codespeak.net>

Author: duncan
Date: Wed Feb  7 14:27:15 2007
New Revision: 38064

Added:
   kupu/tag/kupu-1.3.9/
      - copied from r38063, kupu/branch/kupu-1.3/
Log:
Another belated tag

From duncan at codespeak.net  Wed Feb  7 16:25:29 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Wed,  7 Feb 2007 16:25:29 +0100 (CET)
Subject: [kupu-checkins] r38072 - in kupu/trunk/kupu: Extensions doc plone
	plone/kupu_plone_layer
Message-ID: <20070207152529.E507710087@code0.codespeak.net>

Author: duncan
Date: Wed Feb  7 16:25:13 2007
New Revision: 38072

Modified:
   kupu/trunk/kupu/Extensions/Install.py
   kupu/trunk/kupu/doc/PLONE2.txt
   kupu/trunk/kupu/plone/html2captioned.py
   kupu/trunk/kupu/plone/kupu_config.pt
   kupu/trunk/kupu/plone/kupu_plone_layer/resolveuid.py
   kupu/trunk/kupu/plone/plonelibrarytool.py
   kupu/trunk/kupu/plone/util.py
Log:
UID/Captioning transform is now fully installed and enabled when you
turn on UID linking or cpationing.  It is installed but not including
in the x-safe-html policy if you have UID linking and captioning
turned off.  It is fully removed if you uninstall kupu.


Modified: kupu/trunk/kupu/Extensions/Install.py
==============================================================================
--- kupu/trunk/kupu/Extensions/Install.py	(original)
+++ kupu/trunk/kupu/Extensions/Install.py	Wed Feb  7 16:25:13 2007
@@ -24,6 +24,7 @@
 from Products.CMFCore.DirectoryView import createDirectoryView
 from Products.kupu import kupu_globals
 from Products.kupu.plone.util import register_layer, unregister_layers
+from Products.kupu.plone import util
 from Products.kupu.config import TOOLNAME, PROJECTNAME, TOOLTITLE
 from OFS.ObjectManager import BadRequestException
 from zExceptions import BadRequest
@@ -194,28 +195,10 @@
 
 def install_transform(self, out):
     try:
-        print >>out, "Adding new mimetype"
-        mimetypes_tool = getToolByName(self, 'mimetypes_registry')
-        newtype = MimeTypeItem.MimeTypeItem('HTML with captioned images',
-            ('text/x-html-captioned',), ('html-captioned',), 0)
-        mimetypes_tool.register(newtype)
-
-        print >>out,"Add transform"
-        transform_tool = getToolByName(self, 'portal_transforms')
-        try:
-            transform_tool.manage_delObjects(['html-to-captioned'])
-        except: # XXX: get rid of bare except
-            pass
-        transform_tool.manage_addTransform('html-to-captioned', 'Products.kupu.plone.html2captioned')
-        print >>out,"Add identity transform"
-        transform_tool = getToolByName(self, 'portal_transforms')
-        try:
-            transform_tool.manage_delObjects(['captioned-to-html'])
-        except: # XXX: get rid of bare except
-            pass
-        transform_tool.manage_addTransform('captioned-to-html', 'Products.PortalTransforms.transforms.identity')
+        util.install_transform(self)
+        util.remove_transform(self) # Transform is installed but disabled by default.
     except (NameError,AttributeError):
-        print >>out, "No MimetypesRegistry, captioning not supported."
+        print >>out, "Transform not installed."
 
 def install_customisation(self, out):
     """Default settings may be stored in a customisation policy script so
@@ -260,9 +243,10 @@
 def uninstall_transform(self, out):
     transform_tool = getToolByName(self, 'portal_transforms')
     try:
-        transform_tool.manage_delObjects(['html-to-captioned'])
+        util.remove_transform(self)
+        transform_tool.manage_delObjects(['html-to-captioned', 'captioned-to-html'])
     except:
-        print >>out, "transform not removed"
+        print >>out, "Transform not removed"
         pass
     else:
         print >>out, "Transform removed"

Modified: kupu/trunk/kupu/doc/PLONE2.txt
==============================================================================
--- kupu/trunk/kupu/doc/PLONE2.txt	(original)
+++ kupu/trunk/kupu/doc/PLONE2.txt	Wed Feb  7 16:25:13 2007
@@ -18,7 +18,7 @@
 
 * CMF 1.4 or greater
 
-* Archetypes 1.3.x
+* Archetypes 1.3.9 or greater
 
 If you plan on customizing kupu by editing the '.kupu' files then
 you also need:
@@ -160,10 +160,10 @@
    means that you can move the target object to a different location, or
    even rename it, and the link will continue to work.
 
- - the URL used for the link will require an extra hit on the server,
-   and will contain the internal UID. These issues may be avoided by
-   configuring the output transform for image caption support (`see
-   below`__).
+ - the URL used for the link would require an extra hit on the server,
+   and will contain the internal UID so a transform is installed for any
+   field which has text/x-safe-html or text/x-html-captioned as its
+   output format.  (`see below`__).
 
 __ captioning_
 
@@ -173,6 +173,29 @@
 
  - Links to all objects simply link to the current URL of the object.
 
+Links which are redirected use Kupu's transform to correct the URL
+when the page is rendered in view mode, but in edit mode the links use
+the resolveuid script to resolve as they are accessed. This involves
+an additional hit through the server.
+
+If a UID link does not have a UID which is currently valid then Kupu
+will look for an additional script kupu_resolveuid_hook. This script
+may be used to lookup the UIDs in an external system, or to provide a
+customised error page for broken UID links.
+
+To point all broken links to a specific URL you could for example
+invent a dummy object::
+
+   from Products.PythonScripts.standard import Object
+   def absurl():
+        return '[insert url of broken link page here]'
+   def Title():
+        return 'This link is broken'
+   return Object(absolute_url=absurl,
+       absolute_url_path=absurl,
+       Title=Title, Description=Description,)
+
+
 Warn before losing changes
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -205,7 +228,7 @@
 Paragraph Styles
 ::::::::::::::::
 Enter a list of styles to be added to the style pulldown. See `Custom
-Paragraph Styles`_.
+Styles`_.
 
 
 HTML Filter
@@ -556,11 +579,12 @@
 should have its ``default_output_type`` set to
 ``text/x-html-captioned`` in the Archetypes schema. The problem with
 this is that the default ATContentTypes use an output type of
-'text/x-html-safe'. It should be possible to configure the
-portal_transforms tool to apply the captioning transform in addition
-to the safe html, but (at the time of writing) bugs in
-PortalTransforms prevent this working correctly unless you also patch
-Products/PortalTransforms/TransformEngine.py:
+'text/x-html-safe'. If either link by uid or captioning is enabled
+then Kupu will attempt to configure the Portal Transform engine to
+apply the transform automatically.
+
+If you have a version of Portal Transforms earlier than 1.3.9 then you
+may need to patch it to work correctly with the transform:
 
 Find the line::
 
@@ -570,7 +594,7 @@
 
         requirements = self._policies.get(str(target_mt), [])
 
-Once you have done this you can configure the portal_transforms tool as follows:
+Once you have done kupu will configure the portal_transforms tool as follows:
 
    * add a new transform id 'captioned_to_html', module
      'Products.PortalTransforms.transforms.identity' with input type

Modified: kupu/trunk/kupu/plone/html2captioned.py
==============================================================================
--- kupu/trunk/kupu/plone/html2captioned.py	(original)
+++ kupu/trunk/kupu/plone/html2captioned.py	Wed Feb  7 16:25:13 2007
@@ -143,7 +143,10 @@
                             except AttributeError:
                                 pass
                         if not width:
-                            width = target.getWidth()
+                            try:
+                                width = target.getWidth()
+                            except AttributeError:
+                                pass
                         if not width:
                             try:
                                 width = target.getImage().getWidth()

Modified: kupu/trunk/kupu/plone/kupu_config.pt
==============================================================================
--- kupu/trunk/kupu/plone/kupu_config.pt	(original)
+++ kupu/trunk/kupu/plone/kupu_config.pt	Wed Feb  7 16:25:13 2007
@@ -78,10 +78,11 @@
 <blockquote tal:content="here/supportedCaptioning"></blockquote>
 </span>
 <span tal:condition="not:isTransformEnabled">
-If you enable this option you should also
-enable the output transform as for image captioning (see <a
-href="zmi_docs#images">image captioning documentation</a>).  This
-transform will hide the UID based URLs from client browsers.
+If you enable this option a transform to hide UIDs and support image
+captioning from client browsers will also be enabled (see <a
+href="zmi_docs#images">image captioning documentation</a>).  If the
+transform does not enable itself automatically you may need to update
+your PortalTransforms product.
 </span>
 </div>
 
@@ -98,10 +99,16 @@
 Allow captioned images</label>
 
 <div class="formHelp">
+Images which are linked using UID based links may be automatically captioned.
+
 <div tal:condition="not:isTransformEnabled">
-<span i18n:translate="help_captioning">To support
-captioning you may need to apply a patch to PortalTransforms. See
-the <a href="zmi_docs#images">image captioning documentation</a> for details.</span>
+<span i18n:translate="help_captioning">
+If you enable this option a transform to hide UIDs and support image
+captioning from client browsers will also be enabled (see <a
+href="zmi_docs#images">image captioning documentation</a>).  If the
+transform does not enable itself automatically you may need to update
+your PortalTransforms product.
+</span>
 <div>Fields which could support image captioning:</div>
 </div>
 <div tal:condition="isTransformEnabled">

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/resolveuid.py
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/resolveuid.py	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/resolveuid.py	Wed Feb  7 16:25:13 2007
@@ -17,9 +17,13 @@
 reference_tool = getToolByName(context, 'reference_catalog')
 obj = reference_tool.lookupObject(uuid)
 if not obj:
-    return context.standard_error_message(error_type=404,
-     error_message='''The link you followed appears to be broken''')
-    
+    hook = getattr(context, 'kupu_resolveuid_hook', None)
+    if hook:
+        obj = hook(uid)
+    if not obj:
+        return context.standard_error_message(error_type=404,
+            error_message='''The link you followed appears to be broken''')
+
 if traverse_subpath:
     traverse_subpath.insert(0, obj.absolute_url())
     target = '/'.join(traverse_subpath)

Modified: kupu/trunk/kupu/plone/plonelibrarytool.py
==============================================================================
--- kupu/trunk/kupu/plone/plonelibrarytool.py	(original)
+++ kupu/trunk/kupu/plone/plonelibrarytool.py	Wed Feb  7 16:25:13 2007
@@ -731,7 +731,16 @@
 
         if captioning is not None:
             self.captioning = bool(captioning)
+
+        if self.linkbyuid or self.captioning:
+            util.install_transform(self)
+        else:
+            util.remove_transform(self)
+
         if REQUEST:
             REQUEST.RESPONSE.redirect(self.absolute_url() + '/kupu_config')
 
+    def _enableuidtransform(self, enable):
+        """Enable or disable the uid transform."""
+        
 InitializeClass(PloneKupuLibraryTool)

Modified: kupu/trunk/kupu/plone/util.py
==============================================================================
--- kupu/trunk/kupu/plone/util.py	(original)
+++ kupu/trunk/kupu/plone/util.py	Wed Feb  7 16:25:13 2007
@@ -3,6 +3,7 @@
 from App.Common import package_home
 from Products.CMFCore.utils import getToolByName, minimalpath
 from Products.CMFCore.DirectoryView import createDirectoryView
+from Products.MimetypesRegistry import MimeTypeItem
 from Products.kupu import kupu_globals
 
 kupu_package_dir = package_home(kupu_globals)
@@ -66,4 +67,50 @@
 
         if name not in path:
             return False
-    return True
\ No newline at end of file
+    return True
+
+UID_TRANSFORM = 'html-to-captioned'
+INVERSE_TRANSFORM = 'captioned-to-html'
+MT_SAFE = 'text/x-html-safe'
+MT_CAPTIONED = 'text/x-html-captioned'
+
+def install_transform(self):
+    """Install the uid transform and set up the policy chain to include it when going from html to safe html"""
+    mimetypes_tool = getToolByName(self, 'mimetypes_registry')
+    if not mimetypes_tool.lookup(MT_CAPTIONED):
+        newtype = MimeTypeItem.MimeTypeItem('HTML with captioned images',
+            (MT_CAPTIONED,), ('html-captioned',), 0)
+        mimetypes_tool.register(newtype)
+
+    transform_tool = getToolByName(self, 'portal_transforms')
+    if not hasattr(transform_tool, UID_TRANSFORM):
+        transform_tool.manage_addTransform(UID_TRANSFORM, 'Products.kupu.plone.html2captioned')
+
+    if not hasattr(transform_tool, INVERSE_TRANSFORM):
+        transform_tool.manage_addTransform(INVERSE_TRANSFORM, 'Products.PortalTransforms.transforms.identity')
+    
+    inverse = transform_tool[INVERSE_TRANSFORM]
+    if inverse.get_parameter_value('inputs') != [MT_CAPTIONED] or inverse.get_parameter_value('output') != 'text/html':
+        inverse.set_parameters(inputs=[MT_CAPTIONED], output='text/html')
+
+    # Set policy
+    policies = [ (mimetype, required) for (mimetype, required) in transform_tool.listPolicies()
+         if mimetype==MT_SAFE ]
+    required = [UID_TRANSFORM]
+    if policies:
+        if not UID_TRANSFORM in required:
+            required.append(UID_TRANSFORM)
+
+        transform_tool.manage_delPolicies([MT_SAFE])
+    transform_tool.manage_addPolicy(MT_SAFE, required)
+
+def remove_transform(self):
+    """Disable the UID transform: remove the policy but leave everything else intact."""
+    transform_tool = getToolByName(self, 'portal_transforms')
+    policies = [ (mimetype, required) for (mimetype, required) in transform_tool.listPolicies() if mimetype==MT_SAFE ]
+    required = list(policies[0][1])
+    if UID_TRANSFORM in required:
+        required.remove(UID_TRANSFORM)
+        transform_tool.manage_delPolicies([MT_SAFE])
+        if required:
+            transform_tool.manage_addPolicy(MT_SAFE, required)

From wiggy at codespeak.net  Thu Feb  8 18:55:48 2007
From: wiggy at codespeak.net (wiggy at codespeak.net)
Date: Thu,  8 Feb 2007 18:55:48 +0100 (CET)
Subject: [kupu-checkins] r38190 - kupu/trunk/kupu/plone
Message-ID: <20070208175548.7B4D410070@code0.codespeak.net>

Author: wiggy
Date: Thu Feb  8 18:55:37 2007
New Revision: 38190

Modified:
   kupu/trunk/kupu/plone/util.py
Log:
Deal with empty transform lists. This happens during testing when the transform is removed, and later removed again when setting up the sample customisation

Modified: kupu/trunk/kupu/plone/util.py
==============================================================================
--- kupu/trunk/kupu/plone/util.py	(original)
+++ kupu/trunk/kupu/plone/util.py	Thu Feb  8 18:55:37 2007
@@ -108,6 +108,8 @@
     """Disable the UID transform: remove the policy but leave everything else intact."""
     transform_tool = getToolByName(self, 'portal_transforms')
     policies = [ (mimetype, required) for (mimetype, required) in transform_tool.listPolicies() if mimetype==MT_SAFE ]
+    if not policies:
+        return
     required = list(policies[0][1])
     if UID_TRANSFORM in required:
         required.remove(UID_TRANSFORM)

From wiggy at codespeak.net  Fri Feb  9 12:51:00 2007
From: wiggy at codespeak.net (wiggy at codespeak.net)
Date: Fri,  9 Feb 2007 12:51:00 +0100 (CET)
Subject: [kupu-checkins] r38234 - kupu/branch/kupu-1.3/plone/kupu_plone_layer
Message-ID: <20070209115100.2134C10090@code0.codespeak.net>

Author: wiggy
Date: Fri Feb  9 12:50:53 2007
New Revision: 38234

Modified:
   kupu/branch/kupu-1.3/plone/kupu_plone_layer/kupuInfoForBrains.py
Log:
Take acquisition wrapping into account when comparing object instances

Modified: kupu/branch/kupu-1.3/plone/kupu_plone_layer/kupuInfoForBrains.py
==============================================================================
--- kupu/branch/kupu-1.3/plone/kupu_plone_layer/kupuInfoForBrains.py	(original)
+++ kupu/branch/kupu-1.3/plone/kupu_plone_layer/kupuInfoForBrains.py	Fri Feb  9 12:50:53 2007
@@ -167,14 +167,15 @@
 res = []
 
 portal = url_tool.getPortalObject()
-if linkhere and portal is not context:
+portal = portal.aq_base
+if linkhere and portal is not context.aq_base:
     data = info_object(context, False)
     if data:
         data['label'] = '. (%s)' % context.title_or_id()
         res.append(data)
 
 if linkparent:
-    if portal is not context:
+    if portal is not context.aq_base:
         data = info_object(context.aq_parent, True)
         if data:
             data['label'] = '.. (Parent folder)'

From wiggy at codespeak.net  Fri Feb  9 12:52:15 2007
From: wiggy at codespeak.net (wiggy at codespeak.net)
Date: Fri,  9 Feb 2007 12:52:15 +0100 (CET)
Subject: [kupu-checkins] r38235 - kupu/branch/kupu-1.3/doc
Message-ID: <20070209115215.772B910093@code0.codespeak.net>

Author: wiggy
Date: Fri Feb  9 12:52:08 2007
New Revision: 38235

Modified:
   kupu/branch/kupu-1.3/doc/CHANGES.txt
Log:
Document the change

Modified: kupu/branch/kupu-1.3/doc/CHANGES.txt
==============================================================================
--- kupu/branch/kupu-1.3/doc/CHANGES.txt	(original)
+++ kupu/branch/kupu-1.3/doc/CHANGES.txt	Fri Feb  9 12:52:08 2007
@@ -2,6 +2,13 @@
 Kupu changes
 ============
 
+- 1.3.x
+
+  - Fix bugs:
+
+   * Handle acquisition wrapping correctly when looking for the portal
+     root
+
 - 1.3.9
 
   - Fixes for IE7 compatability.

From yuppie at codespeak.net  Fri Feb  9 17:33:04 2007
From: yuppie at codespeak.net (yuppie at codespeak.net)
Date: Fri,  9 Feb 2007 17:33:04 +0100 (CET)
Subject: [kupu-checkins] r38268 - in kupu/trunk/kupu: common widgeteer
Message-ID: <20070209163304.0F806100A4@code0.codespeak.net>

Author: yuppie
Date: Fri Feb  9 17:32:47 2007
New Revision: 38268

Modified:
   kupu/trunk/kupu/common/kupuinit.js
   kupu/trunk/kupu/common/kupuinit_experimental.js
   kupu/trunk/kupu/common/kupuinit_form.js
   kupu/trunk/kupu/common/kupuinit_genericelements.js
   kupu/trunk/kupu/common/kupuinit_multi.js
   kupu/trunk/kupu/widgeteer/kupuinit.js
Log:
- replaced wrong config name 'link_images_uri' by 'search_links_uri'

Modified: kupu/trunk/kupu/common/kupuinit.js
==============================================================================
--- kupu/trunk/kupu/common/kupuinit.js	(original)
+++ kupu/trunk/kupu/common/kupuinit.js	Fri Feb  9 17:32:47 2007
@@ -238,7 +238,7 @@
         var linklibdrawer = new LinkLibraryDrawer(linktool, 
                                                   conf.link_xsl_uri,
                                                   conf.link_libraries_uri,
-                                                  conf.link_images_uri);
+                                                  conf.search_links_uri);
         drawertool.registerDrawer('linklibdrawer', linklibdrawer);
 
         var imagelibdrawer = new ImageLibraryDrawer(imagetool, 

Modified: kupu/trunk/kupu/common/kupuinit_experimental.js
==============================================================================
--- kupu/trunk/kupu/common/kupuinit_experimental.js	(original)
+++ kupu/trunk/kupu/common/kupuinit_experimental.js	Fri Feb  9 17:32:47 2007
@@ -200,7 +200,7 @@
 
     var linklibdrawer = new LinkLibraryDrawer(linktool, conf.link_xsl_uri,
                                               conf.link_libraries_uri,
-                                              conf.link_images_uri);
+                                              conf.search_links_uri);
     drawertool.registerDrawer('linklibdrawer', linklibdrawer);
 
     var imagelibdrawer = new ImageLibraryDrawer(imagetool, conf.image_xsl_uri,

Modified: kupu/trunk/kupu/common/kupuinit_form.js
==============================================================================
--- kupu/trunk/kupu/common/kupuinit_form.js	(original)
+++ kupu/trunk/kupu/common/kupuinit_form.js	Fri Feb  9 17:32:47 2007
@@ -239,7 +239,7 @@
         var linklibdrawer = new LinkLibraryDrawer(linktool, 
                                                   conf.link_xsl_uri,
                                                   conf.link_libraries_uri,
-                                                  conf.link_images_uri);
+                                                  conf.search_links_uri);
         drawertool.registerDrawer('linklibdrawer', linklibdrawer);
 
         var imagelibdrawer = new ImageLibraryDrawer(imagetool, 

Modified: kupu/trunk/kupu/common/kupuinit_genericelements.js
==============================================================================
--- kupu/trunk/kupu/common/kupuinit_genericelements.js	(original)
+++ kupu/trunk/kupu/common/kupuinit_genericelements.js	Fri Feb  9 17:32:47 2007
@@ -239,7 +239,7 @@
         var linklibdrawer = new LinkLibraryDrawer(linktool, 
                                                   conf.link_xsl_uri,
                                                   conf.link_libraries_uri,
-                                                  conf.link_images_uri);
+                                                  conf.search_links_uri);
         drawertool.registerDrawer('linklibdrawer', linklibdrawer);
 
         var imagelibdrawer = new ImageLibraryDrawer(imagetool, 

Modified: kupu/trunk/kupu/common/kupuinit_multi.js
==============================================================================
--- kupu/trunk/kupu/common/kupuinit_multi.js	(original)
+++ kupu/trunk/kupu/common/kupuinit_multi.js	Fri Feb  9 17:32:47 2007
@@ -234,7 +234,7 @@
         var linklibdrawer = new LinkLibraryDrawer(linktool, 
                                                   conf.link_xsl_uri,
                                                   conf.link_libraries_uri,
-                                                  conf.link_images_uri);
+                                                  conf.search_links_uri);
         drawertool.registerDrawer('linklibdrawer', linklibdrawer);
 
         var imagelibdrawer = new ImageLibraryDrawer(imagetool, 

Modified: kupu/trunk/kupu/widgeteer/kupuinit.js
==============================================================================
--- kupu/trunk/kupu/widgeteer/kupuinit.js	(original)
+++ kupu/trunk/kupu/widgeteer/kupuinit.js	Fri Feb  9 17:32:47 2007
@@ -317,7 +317,7 @@
 
     var linklibdrawer = new LinkLibraryDrawer(linktool, conf['link_xsl_uri'],
                                               conf['link_libraries_uri'],
-                                              conf['link_images_uri']);
+                                              conf['search_links_uri']);
     drawertool.registerDrawer('linklibdrawer', linklibdrawer);
 
     var imagelibdrawer = new ImageLibraryDrawer(imagetool, conf['image_xsl_uri'],

From hannosch at codespeak.net  Sun Feb 11 14:31:50 2007
From: hannosch at codespeak.net (hannosch at codespeak.net)
Date: Sun, 11 Feb 2007 14:31:50 +0100 (CET)
Subject: [kupu-checkins] r38457 - kupu/branch/kupu-1.3/i18n
Message-ID: <20070211133150.D6C551009F@code0.codespeak.net>

Author: hannosch
Date: Sun Feb 11 14:31:43 2007
New Revision: 38457

Modified:
   kupu/branch/kupu-1.3/i18n/kupu-de.po
Log:
changes made during the german translation sprint: terminology, language

Modified: kupu/branch/kupu-1.3/i18n/kupu-de.po
==============================================================================
--- kupu/branch/kupu-1.3/i18n/kupu-de.po	(original)
+++ kupu/branch/kupu-1.3/i18n/kupu-de.po	Sun Feb 11 14:31:43 2007
@@ -21,11 +21,11 @@
 
 #: /common/kupu.pox:None
 msgid "Command ${command} executed with parameter ${param}"
-msgstr "Kommando ${command} mit Parameter ${param} ausgef?hrt"
+msgstr "Kommando ${command} mit Parameter ${param} ausgef?hrt."
 
 #: /common/kupu.pox:None
 msgid "Not inside a definition list element!"
-msgstr "Sie befinden sich ausserhalb eines Definitionslisten Elementes!"
+msgstr "Sie befinden sich nicht in einer Definitionsliste."
 
 #: /common/kupu.pox:None
 msgid "Add table"
@@ -33,11 +33,11 @@
 
 #: /common/kupu.pox:None
 msgid "Table added"
-msgstr "Tabelle hinzugef?gt"
+msgstr "Tabelle hinzugef?gt."
 
 #: /common/kupu.pox:None
 msgid "Source edit tool initialized"
-msgstr "Werkzeug zum Editieren des Quellcodes geladen."
+msgstr "Quellcode-Editor geladen."
 
 #: /common/kupu.pox:None
 msgid "Delete row"
@@ -49,17 +49,16 @@
 
 #: /common/kupu.pox:None
 msgid "List style changed"
-msgstr "Listenstil ver?ndert"
+msgstr "Listenstil ver?ndert."
 
 #: /common/kupu.pox:None
 msgid "Create image"
-msgstr "Bild erstellen."
+msgstr "Bild erstellen"
 
 #: /common/kupu.pox:None
 msgid "You have unsaved changes. Do you want to save before leaving the page?"
 msgstr ""
-"Sie haben nicht gespeicherte ?nderungen. M?chten Sie die ?nderungen vor dem "
-"Verlassen des Editors speichern?"
+"Sie haben ungespeicherte ?nderungen. M?chten Sie die ?nderungen speichern, bevor Sie den Editor verlassen?"
 
 #: /common/kupu.pox:None
 msgid "Table row removed"
@@ -67,15 +66,15 @@
 
 #: /common/kupu.pox:None
 msgid "Document saved"
-msgstr "Dokument abgespeichert."
+msgstr "Dokument gespeichert."
 
 #: /common/kupu.pox:None
 msgid "Color chosen"
-msgstr "Farbe ausgew?hlt"
+msgstr "Farbe ausgew?hlt."
 
 #: /common/kupu.pox:None
 msgid "Table row added"
-msgstr "Tabellenzeile hinzugef?gt"
+msgstr "Tabellenzeile hinzugef?gt."
 
 #: /common/kupu.pox:None
 msgid "Error saving document"
@@ -83,15 +82,15 @@
 
 #: /common/kupu.pox:None
 msgid "No destination URL available!"
-msgstr "Kein Verweisziel vorhanden!"
+msgstr "Keine Zieladresse vorhanden."
 
 #: /common/kupu.pox:None
 msgid "Link removed"
-msgstr "Verweis entfernt"
+msgstr "Verweis entfernt."
 
 #: /common/kupu.pox:None
 msgid "No row to delete"
-msgstr "Keine Tabellenzeile zum l?schen ausgew?hlt."
+msgstr "Keine Tabellenzeile zum L?schen ausgew?hlt."
 
 #: /common/kupu.pox:None
 msgid "Delete Table"
@@ -99,7 +98,7 @@
 
 #: /common/kupu.pox:None
 msgid "Cleanup done, sending document to server"
-msgstr "Verbesserung ist abgeschlossen. Sende Dokument zum Server."
+msgstr "Aufger?umt. Dokument wird zum Server gesendet."
 
 #: /common/kupu.pox:None
 msgid "Image tool initialized"
@@ -119,7 +118,7 @@
 
 #: /common/kupu.pox:None
 msgid "Starting HTML cleanup"
-msgstr "Verbessere HTML Quellcode"
+msgstr "Es wird begonnen, den HTML-Quellcode aufzur?umen."
 
 #: /common/kupu.pox:None
 msgid "Link modified"
@@ -131,7 +130,7 @@
 
 #: /common/kupu.pox:None
 msgid "Table tool initialized"
-msgstr "Tabellenwerkzeug geladen"
+msgstr "Tabellenwerkzeug geladen."
 
 #: /common/kupu.pox:None
 msgid "There were no errors."
@@ -146,8 +145,7 @@
 #: /common/kupu.pox:None
 msgid "Error loading translation (status ${status} ), falling back to english"
 msgstr ""
-"Kann den ?bersetzungsstatus (status $(status)) nichtfeststellen; benutze "
-"Englisch."
+"Fehler beim Laden der ?bersetzung (Status: $(status)). Es wird Englisch benutzt."
 
 #: /common/kupu.pox:None
 msgid "Start node offset detected in a node without children!"
@@ -160,7 +158,7 @@
 #: /common/kupu.pox:None
 msgid "Couldn\\'t set design mode. Kupu will not work on this browser."
 msgstr ""
-"Kann nicht in den Design-Modus wechseln. Sie verwenden einen Browser der "
+"Kann nicht in den Design-Modus wechseln. Sie verwenden einen Browser, der "
 "diesen Modus nicht unterst?tzt."
 
 #: /common/kupu.pox:None
@@ -177,8 +175,8 @@
 "settings. For more information, read http://www.mozilla.org/editor/midasdemo/"
 "securityprefs.html"
 msgstr ""
-"Einf?gen mit Hilfe von JavaScript ist in den Sicherheits-Einstellungen Ihres Browsers deaktiviert. "
-"Informationen dazu finden Sie unter http://www.mozilla.org/editor/midasdemo/securityprefs.html"
+"Einf?gen mit Hilfe von JavaScript ist in den Sicherheitseinstellungen Ihres Browsers deaktiviert. "
+"Siehe dazu http://www.mozilla.org/editor/midasdemo/securityprefs.html"
 
 #: /common/kupu.pox:None
 msgid "Property tool initialized"
@@ -186,7 +184,7 @@
 
 #: /common/kupu.pox:None
 msgid "Colorchooser tool initialized"
-msgstr "Farbauswahlwerkzeug geladen."
+msgstr "Farbauswahl geladen."
 
 #: /common/kupu.pox:None
 msgid "No parentcolumn found!"
@@ -198,7 +196,7 @@
 
 #: /common/kupu.pox:None
 msgid "Table removed"
-msgstr "Tabelle entfernt"
+msgstr "Tabelle entfernt."
 
 #: /common/kupu.pox:None
 msgid "Cut"
@@ -206,7 +204,7 @@
 
 #: /common/kupu.pox:None
 msgid "Unsupported browser!"
-msgstr "Nicht unterst?tzter Browser!"
+msgstr "Nicht unterst?tzter Browser."
 
 #: /common/kupu.pox:None
 msgid "Add row"
@@ -218,15 +216,15 @@
 
 #: /common/kupu.pox:None
 msgid "Sending request to server"
-msgstr "Sende Anfrage an den Server"
+msgstr "Anfrage wird an den Server gesendet."
 
 #: /common/kupu.pox:None
 msgid "Invalid table size"
-msgstr "Ung?ltige Tabellengr??e"
+msgstr "Ung?ltige Tabellengr??e."
 
 #: /common/kupu.pox:None
 msgid "Error placing back selection"
-msgstr "Fehler beim einf?gen des markierten Textes."
+msgstr "Fehler beim Einf?gen des markierten Textes."
 
 #: /common/kupu.pox:None
 msgid "Delete link"
@@ -242,9 +240,8 @@
 "settings. For more information, read http://www.mozilla.org/editor/midasdemo/"
 "securityprefs.html"
 msgstr ""
-"Das Ausschneiden von JavaScript-Code ist sicherheitshalber abgeschaltet. F?r "
-"weitere Informationen lesen Sie bitte: http://www.mozilla.org/editor/"
-"midasdemo/securityprefs.html"
+"JavaScript-Anwendungen d?rfen sicherheitshalber nicht ausschneiden. "
+"Siehe dazu http://www.mozilla.org/editor/midasdemo/securityprefs.html"
 
 #: /common/kupu.pox:None
 msgid "Exception while processing updateState on ${id}: ${msg}"
@@ -252,11 +249,11 @@
 
 #: /common/kupu.pox:None
 msgid "Cleaning up HTML..."
-msgstr "Verbessere den HTML-Quellcode..."
+msgstr "HTML-Quellcode wird aufger?umt."
 
 #: /common/kupu.pox:None
 msgid "List style tool initialized"
-msgstr "Werkzeug f?r Listenstile geladen"
+msgstr "Werkzeug f?r Listenstile geladen."
 
 #: /common/kupu.pox:None
 msgid "Row repeat turned off"
@@ -271,7 +268,7 @@
 
 #: /common/kupu.pox:None
 msgid "Deprecation warning: KupuToolBox._selectSelectItem"
-msgstr "Warnung: KupuTool._selectSelectItem ist veraltet!"
+msgstr "Warnung: KupuTool._selectSelectItem ist veraltet."
 
 #: /common/kupu.pox:None
 msgid ""
@@ -279,13 +276,12 @@
 "settings. For more information, read http://www.mozilla.org/editor/midasdemo/"
 "securityprefs.html"
 msgstr ""
-"Das Kopieren von JavaScript-Code ist sicherheitshalber abgeschaltet. F?r "
-"weitere Informationen lesen Sie bitte: http://www.mozilla.org/editor/"
-"midasdemo/securityprefs.html"
+"JavaScript-Anwendungen d?rfen sicherheitshalber nicht kopieren. "
+"Siehe dazu http://www.mozilla.org/editor/midasdemo/securityprefs.html"
 
 #: /common/kupu.pox:None
 msgid "Command ${command} executed"
-msgstr "Kommando ${command} ausgef?hrt"
+msgstr "Befehl ${command} ausgef?hrt."
 
 #: /common/kupu.pox:None
 msgid "Delete column"
@@ -296,17 +292,17 @@
 "Error saving your data.\\nResponse status: ${status}.\\nCheck your server "
 "log for more information."
 msgstr ""
-"Fehler beim Speichern Ihrer Daten.\\nAntwortstatus: ${status}.\\n?berpr?fen "
-"Sie Ihr Fehlerprotokoll f?r weitereInformationen."
+"Fehler beim Speichern Ihrer Daten.\\nAntwortstatus: ${status}.\\nWeitere "
+"Informationen finden Sie im Ereignisprotokoll Ihres Servers."
 
 #: /common/kupu.pox:None
 msgid "This feature requires pop-ups to be enabled on your browser!"
-msgstr "F?r diese Funktion m?ssen \"Pop-up\" Fenster in Ihrem Browser "
-"aktiviert sein!"
+msgstr "F?r diese Funktion m?ssen Pop-up-Fenster in Ihrem Browser "
+"aktiviert sein."
 
 #: /common/kupu.pox:None
 msgid "Not inside link"
-msgstr "Sie befinden sich ausserhalb eines Links."
+msgstr "Sie befinden sich au?erhalb eines Links."
 
 #: /common/kupu.pox:None
 msgid "View source"
@@ -314,15 +310,15 @@
 
 #: /common/kupu.pox:None
 msgid "Image inserted"
-msgstr "Bild eingef?gt"
+msgstr "Bild eingef?gt."
 
 #: /common/kupu.pox:None
 msgid "Browser not supported!"
-msgstr "Ihr Browser wird nicht unterst?tzt!"
+msgstr "Ihr Browser wird nicht unterst?tzt."
 
 #: /common/kupu.pox:None
 msgid "Please wait while saving document..."
-msgstr "Bitte warten Sie w?hrend das Dokument gespeichert wird."
+msgstr "Bitte warten Sie, w?hrend das Dokument gespeichert wird."
 
 #: /common/kupu.pox:None
 msgid "Editor initialized"
@@ -338,11 +334,11 @@
 
 #: /common/kupu.pox:None
 msgid "Zoom tool initialized"
-msgstr "Vergr?sserungswerkzeug geladen"
+msgstr "Vergr??erungswerkzeug geladen."
 
 #: /common/kupu.pox:None
 msgid "Table column deleted"
-msgstr "Tabellenspalte entfernt"
+msgstr "Tabellenspalte entfernt."
 
 #: /common/kupu.pox:None
 msgid "Offset out of document range"
@@ -350,7 +346,7 @@
 
 #: /common/kupu.pox:None
 msgid "Table cleaned up"
-msgstr "Tabelle verbessern"
+msgstr "Tabelle aufger?umt."
 
 #: /common/kupu.pox:None
 msgid "Error loading data, status ${status}"
@@ -360,7 +356,7 @@
 msgid ""
 "Could not set status bar message, check your browser\\'s security settings."
 msgstr ""
-"Kann keinen Hinweistext in die Statuszeile schreiben.?berpr?fen Sie bitte "
+"Kann keinen Hinweistext in die Statuszeile schreiben. ?berpr?fen Sie bitte "
 "die Sicherheitseinstellungen des Browsers."
 
 #: /common/kupu.pox:None
@@ -370,11 +366,11 @@
 #: /common/kupu.pox:None
 msgid "Your form has not been saved. All changes you have made will be lost"
 msgstr ""
-"Ihr Formular wurde nicht gespeichert. Alle ?nderungen werden verloren gehen."
+"Ihr Formular wurde nicht gespeichert. Alle ?nderungen gehen verloren."
 
 #: /common/kupu.pox:None
 msgid "Link added"
-msgstr "Verweis hinzugef?gt"
+msgstr "Verweis hinzugef?gt."
 
 #: /common/kupu.pox:None
 msgid "No head in document!"
@@ -382,28 +378,28 @@
 
 #: /common/kupu.pox:None
 msgid "Not inside a row!"
-msgstr "Sie sind ausserhalb einer Tabellzeile!"
+msgstr "Sie befinden sich nicht in einer Tabellenzeile."
 
 #: /common/kupu.pox:None
 msgid "Not inside a table!"
-msgstr "Sie befinden sich ausserhalb der Tabelle!"
+msgstr "Sie befinden sich nicht in einer Tabelle."
 
 #: /common/kupu.pox:None
 msgid "Selection not inside the node!"
-msgstr "Die Auswahl ist ausserhalb eines Knotens!"
+msgstr "Die Auswahl ist nicht innerhalb des Knotens!"
 
 #: /common/kupu.pox:None
 msgid "Editor not initialized yet!"
-msgstr "Editor nicht vollst?ndig geladen!"
+msgstr "Editor noch nicht geladen."
 
 #: /common/kupu.pox:None
 msgid "Table column added"
-msgstr "Tabellenspalte hinzugef?gt"
+msgstr "Tabellenspalte hinzugef?gt."
 
 # Default: "Caption"
 #: /common/kupudrawers/drawer.xsl:None
 msgid "imagedrawer_caption_label"
-msgstr "Bildbeschriftung"
+msgstr "Bildunterschrift"
 
 # Default: "Insert Link"
 #: /common/kupudrawers/drawer.xsl:None
@@ -413,12 +409,12 @@
 # Default: "Left"
 #: /common/kupudrawers/drawer.xsl:None
 msgid "imagedrawer_left"
-msgstr "Verweise"
+msgstr "Links"
 
 # Default: "(${width} by ${height})"
 #: /common/kupudrawers/drawer.xsl:None
 msgid "imagedrawer_size"
-msgstr "(${width} x ${height})"
+msgstr "(${width} mal ${height})"
 
 # Default: "Insert Image"
 #: /common/kupudrawers/drawer.xsl:None
@@ -428,7 +424,7 @@
 # Default: "Upload to: ${folder}"
 #: /common/kupudrawers/drawer.xsl:None
 msgid "imagedrawer_upload_to_label"
-msgstr "Hochladen in: ${folder}"
+msgstr "Hochladen in ${folder}"
 
 # Default: "Name"
 #: /common/kupudrawers/drawer.xsl:None
@@ -446,14 +442,13 @@
 # "            editor."
 #: /common/kupudrawers/drawer.xsl:None
 msgid "imagedrawer_upload_instructions"
-msgstr "W?hlen Sie ein Bild von Ihrer Festplatte und Klicken Sie auf "
-"OK. Das Bild wird in den gew?hlten Ordner hochgeladen und in den "
-"Editor eingef?gt."
+msgstr "W?hlen Sie ein Bild von Ihrer Festplatte und best?tigen Sie mit OK."
+"Das Bild wird in den gew?hlten Ordner hochgeladen und im Editor eingef?gt."
 
 # Default: "Upload ..."
 #: /common/kupudrawers/drawer.xsl:None
 msgid "imagedrawer_upload_link"
-msgstr "Hochladen ..."
+msgstr "Hochladen"
 
 # Default: "Title:"
 #: /common/kupudrawers/drawer.xsl:None
@@ -473,7 +468,7 @@
 # Default: "ALT-text"
 #: /common/kupudrawers/drawer.xsl:None
 msgid "imagedrawer_upload_alt_text"
-msgstr "Alternativ-Text"
+msgstr "Alternativtext"
 
 # Default: "search"
 #: /common/kupudrawers/drawer.xsl:None
@@ -497,7 +492,7 @@
 
 #: /default/body.kupu:None
 msgid "Kupu Editor Test Page"
-msgstr "Kupu Editor Testseite"
+msgstr "Testseite f?r den Editor Kupu"
 
 #: /default/colorchooser.kupu:None
 msgid "text color: alt-f"
@@ -631,7 +626,7 @@
 
 #: /default/drawers.kupu:None /default/toolboxes.kupu:None
 msgid "Link the highlighted text to this URL:"
-msgstr "Verweis f?r markierten Text:"
+msgstr "Verweisziel f?r markierten Text:"
 
 #: /default/save.kupu:None
 msgid "save: alt-s"
@@ -639,7 +634,7 @@
 
 #: /default/sourceedit.kupu:None
 msgid "edit HTML code"
-msgstr "HTML Quellcode bearbeiten"
+msgstr "HTML-Quellcode bearbeiten"
 
 #: /default/spellchecker.kupu:None
 msgid "check spelling"
@@ -685,7 +680,7 @@
 # Default: "i"
 #: /default/toolbar.kupu:None
 msgid "list-lowerroman"
-msgstr "R?misch-Kleinbuchstaben"
+msgstr "R?misch mit Kleinbuchstaben"
 
 #: /default/toolbar.kupu:None
 msgid "Kupu SVN/unreleased"
@@ -730,7 +725,7 @@
 
 #: /default/toolbar.kupu:None
 msgid "outdent: alt-<"
-msgstr "nach links verschieben: Alt-<"
+msgstr "Ausr?cken: Alt-<"
 
 # Default: "&#9632;"
 #: /default/toolbar.kupu:None
@@ -755,7 +750,7 @@
 
 #: /default/toolbar.kupu:None
 msgid "unordered list: alt-*"
-msgstr "Aufz?hlungsliste: Alt-*"
+msgstr "Liste: Alt-*"
 
 #: /default/toolbar.kupu:None
 msgid "Heading 3"
@@ -783,7 +778,7 @@
 
 #: /default/toolbar.kupu:None
 msgid "numbered list: alt-#"
-msgstr "Nummerierte Liste: Alt-#"
+msgstr "Aufz?hlung: Alt-#"
 
 #: /default/toolbar.kupu:None
 msgid "italic: alt-i"
@@ -792,7 +787,7 @@
 # Default: "I"
 #: /default/toolbar.kupu:None
 msgid "list-upperroman"
-msgstr "R?misch-Gro?buchstaben"
+msgstr "R?misch mit Gro?buchstaben"
 
 #: /default/toolboxes.kupu:None
 msgid "Headings:"
@@ -808,7 +803,7 @@
 
 #: /default/toolboxes.kupu:None
 msgid "Inline"
-msgstr "Eingebettet"
+msgstr "Im Textflu?"
 
 #: /default/toolboxes.kupu:None
 msgid "Select a cleanup action:"
@@ -836,7 +831,7 @@
 
 #: /default/toolboxes.kupu:None
 msgid "Insert image at the following URL:"
-msgstr "Bild von folgender URL einf?gen:"
+msgstr "Bild von folgender Adresse einf?gen:"
 
 #: /default/toolboxes.kupu:None
 msgid "Title:"

From hannosch at codespeak.net  Sun Feb 11 15:12:05 2007
From: hannosch at codespeak.net (hannosch at codespeak.net)
Date: Sun, 11 Feb 2007 15:12:05 +0100 (CET)
Subject: [kupu-checkins] r38462 - kupu/branch/kupu-1.3/i18n
Message-ID: <20070211141205.4182510097@code0.codespeak.net>

Author: hannosch
Date: Sun Feb 11 15:12:04 2007
New Revision: 38462

Modified:
   kupu/branch/kupu-1.3/i18n/kupu-de.po
Log:
More changes made during the german translation sprint.

Modified: kupu/branch/kupu-1.3/i18n/kupu-de.po
==============================================================================
--- kupu/branch/kupu-1.3/i18n/kupu-de.po	(original)
+++ kupu/branch/kupu-1.3/i18n/kupu-de.po	Sun Feb 11 15:12:04 2007
@@ -106,7 +106,7 @@
 
 #: /common/kupu.pox:None
 msgid "End offset out of range!"
-msgstr ""
+msgstr "Auswahlende au?erhalb des Bereichs."
 
 #: /common/kupu.pox:None
 msgid "tdindex: ${tdindex}"
@@ -167,7 +167,7 @@
 
 #: /common/kupu.pox:None
 msgid "Start offset out of range!"
-msgstr ""
+msgstr "Auswahlbeginn au?erhalb des Bereichs."
 
 #: /common/kupu.pox:None
 msgid ""

From yuppie at codespeak.net  Sun Feb 11 18:38:05 2007
From: yuppie at codespeak.net (yuppie at codespeak.net)
Date: Sun, 11 Feb 2007 18:38:05 +0100 (CET)
Subject: [kupu-checkins] r38492 - in kupu/trunk/kupu/doc: . reference
Message-ID: <20070211173805.4ED481009C@code0.codespeak.net>

Author: yuppie
Date: Sun Feb 11 18:38:03 2007
New Revision: 38492

Modified:
   kupu/trunk/kupu/doc/CUSTOMIZING.txt
   kupu/trunk/kupu/doc/EXTENDING.txt
   kupu/trunk/kupu/doc/reference/kupuconfig.txt
Log:
- improved kupuconfig reference

Modified: kupu/trunk/kupu/doc/CUSTOMIZING.txt
==============================================================================
--- kupu/trunk/kupu/doc/CUSTOMIZING.txt	(original)
+++ kupu/trunk/kupu/doc/CUSTOMIZING.txt	Sun Feb 11 18:38:03 2007
@@ -51,7 +51,6 @@
 ===================== ================================================
 Directive             Possible values
 ===================== ================================================
-src                   the source URL of the document
 dst                   the URL to PUT to (not used for POST setups)
 use_css               whether Kupu should try to (it will succeed in
                       Mozilla use CSS for bold, italic etc. rather

Modified: kupu/trunk/kupu/doc/EXTENDING.txt
==============================================================================
--- kupu/trunk/kupu/doc/EXTENDING.txt	(original)
+++ kupu/trunk/kupu/doc/EXTENDING.txt	Sun Feb 11 18:38:03 2007
@@ -277,7 +277,7 @@
 `width` attribute for the `th` and `td` tags only. ::
 
         <htmlfilter>
-                <t>center></t><t>font</t>
+                <t>center</t><t>font</t>
                 <a>cellspacing</a>
                 <c><t>th</t><t>td</t><a>width</a></c>
         </htmlfilter>

Modified: kupu/trunk/kupu/doc/reference/kupuconfig.txt
==============================================================================
--- kupu/trunk/kupu/doc/reference/kupuconfig.txt	(original)
+++ kupu/trunk/kupu/doc/reference/kupuconfig.txt	Sun Feb 11 18:38:03 2007
@@ -3,62 +3,116 @@
 currently somewhat incomplete and could do with the attentions of an
 experienced Kupu developer ;)
 
-<src>http://www.example.com/mysource.html</src>
-
-  ??
-
 <dst>http://www.example.com/mysource.html</dst>
 
+  Value:    URI
+  Required: yes (for non-form mode), not used in form mode
+
   This is the URL to which the contents of the editing <iframe> will
   be sent by html POST when the save button is clicked in the editor.
 
 <use_css>1</use_css>
 
-  ??
+  Value:    boolean ('0' or '1')
+  Required: no, false by default
+
+  If true, 'style' attributes are used for text alignment and list styles.
 
 <reload_after_save>0</reload_after_save>
-  
-  ??
+
+  Value:    boolean ('0' or '1')
+  Required: no, false by default
+
+  If true, the document is reloaded after saving.
 
 <strict_output>1</strict_output>
- 
-  ??
+
+  Value:    boolean ('0' or '1')
+  Required: no, false by default, not used in form mode
+
+  If true, XHTML 1.0 Strict declarations are added before saving the document.
 
 <content_type>text/html</content_type>
 
-  ??
+  Value:    HTTP content type
+  Required: no, none by default, not used in form mode
+
+  Content type used for saving the document.
 
 <compatible_singletons>1</compatible_singletons>
-  
-  ??
+
+  Value:    boolean ('0' or '1')
+  Required: no, false by default
+
+  If true, singletons are made XHTML compatible.
 
 <image_xsl_uri>http://www.example.com/kupu/kupudrawers/drawer.xsl</image_xsl_uri>
 
+  Value:    URI
+  Required: yes (for image drawer)
+
   ??
-              
+
 <link_xsl_uri>http://www.example.com/kupu/kupudrawers/drawer.xsl</link_xsl_uri>
 
+  Value:    URI
+  Required: yes (for link drawer)
+
   ??
-              
+
 <image_libraries_uri>http://www.example.com/kupu/kupudrawers/imagelibrary.xml</image_libraries_uri>
 
+  Value:    URI
+  Required: yes (for image drawer)
+
   ??
-              
+
 <link_libraries_uri>http://www.example.com/kupu/kupudrawers/linklibrary.xml</link_libraries_uri>
 
+  Value:    URI
+  Required: yes (for link drawer)
+
   ??
-              
-<search_images_uri> </search_images_uri>
+
+<search_images_uri>...</search_images_uri>
+
+  Value:    URI
+  Required: yes (for search field of image drawer)
 
   ??
-              
-<search_links_uri> </search_links_uri>
+
+<search_links_uri>...</search_links_uri>
+
+  Value:    URI
+  Required: yes (for search field of link drawer)
 
   ??
-              
+
 <cleanup_expressions>...</cleanup_expressions>
 
+  Value:    various sub-elements
+  Required: yes (for cleanup tool)
+
   This contains the expressions used by the cleanup tool. Their format
   should be documented in kupucleanupexpressions.js.
 
-?? - there may be more ;-)
\ No newline at end of file
+<table_classes>...</table_classes>
+
+  Value:   <class> sub-elements
+  Required: yes (for table tool)
+
+  Sets list of selectable table classes.
+
+<filtersourceedit>1</filtersourceedit>
+
+  Value:    boolean ('0' or '1')
+  Required: no, false by default
+
+  If true, content filters are applied before switching to source mode.
+
+<htmlfilter>...</htmlfilter>
+
+  Value:    various sub-elements
+  Required: no, uncustomized by default
+
+  Customizes XHTML cleanup and validation.

From duncan at codespeak.net  Mon Feb 12 10:49:43 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Mon, 12 Feb 2007 10:49:43 +0100 (CET)
Subject: [kupu-checkins] r38538 - in kupu/trunk/kupu: . common
Message-ID: <20070212094943.5C36B100B0@code0.codespeak.net>

Author: duncan
Date: Mon Feb 12 10:49:42 2007
New Revision: 38538

Modified:
   kupu/trunk/kupu/common/kupudrawers.js
   kupu/trunk/kupu/jslint.js
   kupu/trunk/kupu/lint.py
Log:
Fix lint error in kupudrawers.js.
Modified jslint.js so it also works with Windows scripting host.
lint.py now chooses WSH for win32, Rhino for other platforms.

Modified: kupu/trunk/kupu/common/kupudrawers.js
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers.js	(original)
+++ kupu/trunk/kupu/common/kupudrawers.js	Mon Feb 12 10:49:42 2007
@@ -1288,7 +1288,7 @@
             alert("Please enter a title for the image you are uploading");
             return;        
         };
-        form.node_prop_desc.value = form.node_prop_desc.value.replace(/^\xa0|\xa0$/g,'')
+        form.node_prop_desc.value = form.node_prop_desc.value.replace(/^\xa0|\xa0$/g,'');
         form.submit();
     };
     

Modified: kupu/trunk/kupu/jslint.js
==============================================================================
--- kupu/trunk/kupu/jslint.js	(original)
+++ kupu/trunk/kupu/jslint.js	Mon Feb 12 10:49:42 2007
@@ -3002,6 +3002,31 @@
     return result;
 }
 
+if (WScript) {
+    var arguments = [];
+    for (var arg = 0; arg < WScript.Arguments.Count(); arg++) {
+        arguments.push(WScript.Arguments(arg));
+    }
+    var print = function() {
+        for (var i = 0; i < arguments.length; i++) {
+            try {
+                WScript.StdOut.WriteLine(arguments[i]);
+            } catch(e) {
+                WScript.Echo("Run this program using the command-line script program:\n"+
+                    "    cscript "+WScript.ScriptFullName+" [arguments]\n"+
+                    "Don't run it with wscript.\n"+
+                    "Use --help for usage text\n");
+                WScript.Quit();
+            }
+        }
+    }
+    var quit = function(n) { WScript.Quit(n); };
+    var readFile = function(fname) {
+        var filesys = WScript.CreateObject("Scripting.FileSystemObject");
+        var file = filesys.OpenTextFile(fname, 1);
+        return file.ReadAll();
+    };
+};
 (function (a) {
     function lintfile(arg, filename, options) {
         var input = readFile(filename);

Modified: kupu/trunk/kupu/lint.py
==============================================================================
--- kupu/trunk/kupu/lint.py	(original)
+++ kupu/trunk/kupu/lint.py	Mon Feb 12 10:49:42 2007
@@ -12,6 +12,8 @@
 import cPickle
 
 COMPILE_COMMAND = "java org.mozilla.javascript.tools.shell.Main %(lint)s --options %(options)s %(file)s"
+if sys.platform=='win32':
+    COMPILE_COMMAND = "cscript /NoLogo %(lint)s --options %(options)s %(file)s"
 
 def lint(name):
     cmd = COMPILE_COMMAND % dict(lint=LINT, file=name, options=OPTIONS)
@@ -54,8 +56,12 @@
         f = open(name, 'rb')
     except (IOError, WindowsError):
         return {}
-    data = cPickle.load(f)
-    f.close()
+    try:
+        data = cPickle.load(f)
+    except EOFError:
+        return {}
+    finally:
+        f.close()
     return data
 
 def savestatus(name, status):
@@ -68,3 +74,4 @@
     for n in newfiles(status, 'common/*.js', 'plone/kupu_plone_layer/*.js'):
         lint(n)
         savestatus(STATUSFILE, status)
+

From hannosch at codespeak.net  Mon Feb 12 11:31:17 2007
From: hannosch at codespeak.net (hannosch at codespeak.net)
Date: Mon, 12 Feb 2007 11:31:17 +0100 (CET)
Subject: [kupu-checkins] r38539 - in kupu/trunk/kupu: doc plone/tests
Message-ID: <20070212103117.538DD100A4@code0.codespeak.net>

Author: hannosch
Date: Mon Feb 12 11:31:14 2007
New Revision: 38539

Modified:
   kupu/trunk/kupu/doc/CHANGES.txt
   kupu/trunk/kupu/doc/CREDITS.txt
   kupu/trunk/kupu/plone/tests/test_browserSupportsKupu.py
   kupu/trunk/kupu/plone/tests/test_links.py
   kupu/trunk/kupu/plone/tests/test_plonedrawer.py
Log:
Adjusted some tests to work on Plone 3.0


Modified: kupu/trunk/kupu/doc/CHANGES.txt
==============================================================================
--- kupu/trunk/kupu/doc/CHANGES.txt	(original)
+++ kupu/trunk/kupu/doc/CHANGES.txt	Mon Feb 12 11:31:14 2007
@@ -4,6 +4,8 @@
 
 - 1.4 (unreleased)
 
+  - Adjusted some Plone tests to work on Plone 3.0.
+
   - Added 'remove table' button to table drawer and tool box.
 
   - the uid/captioning transform now has a hook which gets called if

Modified: kupu/trunk/kupu/doc/CREDITS.txt
==============================================================================
--- kupu/trunk/kupu/doc/CREDITS.txt	(original)
+++ kupu/trunk/kupu/doc/CREDITS.txt	Mon Feb 12 11:31:14 2007
@@ -92,7 +92,7 @@
 Translations
 ------------
 
-* Roman Joost and Carsten Senger - German
+* Roman Joost, Carsten Senger, Thomas Lotze and Hanno Schlichting - German
 
 * Michiel Meeuwissen - Esperanto
 
@@ -159,6 +159,8 @@
 
   - Danny Hope from Adaptive Technologies for help on icons.
 
+  - Hanno Schlichting for some bug fixing
+
 Missing your name here?
 -----------------------
 

Modified: kupu/trunk/kupu/plone/tests/test_browserSupportsKupu.py
==============================================================================
--- kupu/trunk/kupu/plone/tests/test_browserSupportsKupu.py	(original)
+++ kupu/trunk/kupu/plone/tests/test_browserSupportsKupu.py	Mon Feb 12 11:31:14 2007
@@ -18,50 +18,15 @@
     execfile(os.path.join(sys.path[0], 'framework.py'))
 
 from Testing import ZopeTestCase
-from Products.CMFPlone.tests import PloneTestCase
-from Products.CMFPlone.tests.PloneTestCase import portal_name, portal_owner
-from AccessControl.SecurityManagement import newSecurityManager, noSecurityManager
-try:
-    import transaction
-except ImportError:
-    class dummy:
-        def get(self): return get_transaction()
-        def commit(self): return self.get().commit()
-    transaction = dummy()
-
-    
-def installKupu(quiet=0):
-    _start = time.time()
-    if not quiet: ZopeTestCase._print('Adding Kupu ... ')
-
-    ZopeTestCase.installProduct('kupu')
-
-    # Install kupu into the test site. Done here because otherwise
-    # it slows the tests down a lot on Plone 2.1
-    app = ZopeTestCase.app()
-    user = app.acl_users.getUserById(portal_owner).__of__(app.acl_users)
-    newSecurityManager(None, user)
-
-    portal = app[portal_name]
-    quickinstaller = portal.portal_quickinstaller
-    quickinstaller.installProduct('kupu')
-
-    # Log out
-    noSecurityManager()
-    transaction.commit()
-    if not quiet: ZopeTestCase._print('done (%.3fs)\n' \
-                                      % (time.time()-_start,))
-    ZopeTestCase.close(app)
+from Products.PloneTestCase import PloneTestCase
 
-installKupu()
+PloneTestCase.setupPloneSite(products=['kupu'])
 
 class TestBrowserSupportsKupu(PloneTestCase.PloneTestCase):
 
     def afterSetUp(self):
         md = self.portal.portal_memberdata
         md._updateProperty('wysiwyg_editor', 'Kupu')
-        #self.qi = self.portal.portal_quickinstaller
-        #self.qi.installProduct('kupu')
         #self.script = self.portal.portal_skins.kupu_plone.browserSupportsKupu
         self.script = self.portal.kupu_library_tool.isKupuEnabled
 

Modified: kupu/trunk/kupu/plone/tests/test_links.py
==============================================================================
--- kupu/trunk/kupu/plone/tests/test_links.py	(original)
+++ kupu/trunk/kupu/plone/tests/test_links.py	Mon Feb 12 11:31:14 2007
@@ -16,7 +16,12 @@
 import Acquisition
 from Testing.ZopeTestCase import ZopeTestCase, installProduct
 from Products.CMFPlone.tests.PloneTestCase import portal_name, portal_owner
-from Products.Archetypes.tests import ArchetypesTestCase
+try:
+    from Products.Archetypes.tests.atsitetestcase import ATSiteTestCase
+except ImportError:
+    from Products.Archetypes.tests.ArchetypesTestCase import \
+        ArcheSiteTestCase as ATSiteTestCase
+
 from AccessControl.SecurityManagement import newSecurityManager
 try:
     from Products.ATContentTypes.lib import constraintypes
@@ -56,7 +61,7 @@
 def MapType(typename):
     return TypeMapping[typename]
 
-class TestLinkCode(ArchetypesTestCase.ArcheSiteTestCase):
+class TestLinkCode(ATSiteTestCase):
     """Test the link checking code"""
 
     def afterSetUp(self):

Modified: kupu/trunk/kupu/plone/tests/test_plonedrawer.py
==============================================================================
--- kupu/trunk/kupu/plone/tests/test_plonedrawer.py	(original)
+++ kupu/trunk/kupu/plone/tests/test_plonedrawer.py	Mon Feb 12 11:31:14 2007
@@ -19,11 +19,16 @@
 import Acquisition
 from Testing.ZopeTestCase import ZopeTestCase, installProduct
 from Products.CMFPlone.tests.PloneTestCase import portal_name, portal_owner
-from Products.Archetypes.tests import ArchetypesTestCase
+try:
+    from Products.Archetypes.tests.atsitetestcase import ATSiteTestCase
+except ImportError:
+    from Products.Archetypes.tests.ArchetypesTestCase import \
+        ArcheSiteTestCase as ATSiteTestCase
+
 from AccessControl.SecurityManagement import newSecurityManager
 try:
     from Products.ATContentTypes.lib import constraintypes
-except:
+except ImportError:
     constraintypes = None
 from Products.kupu.plone.tests import TestContent
 
@@ -58,7 +63,7 @@
 def MapType(typename):
     return TypeMapping[typename]
 
-class TestPloneDrawer(ArchetypesTestCase.ArcheSiteTestCase):
+class TestPloneDrawer(ATSiteTestCase):
     """Test the implementation of the PloneDrawer class"""
 
     def afterSetUp(self):

From duncan at codespeak.net  Mon Feb 12 11:41:22 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Mon, 12 Feb 2007 11:41:22 +0100 (CET)
Subject: [kupu-checkins] r38540 - in kupu/trunk/kupu: . common
Message-ID: <20070212104122.31088100A6@code0.codespeak.net>

Author: duncan
Date: Mon Feb 12 11:41:21 2007
New Revision: 38540

Modified:
   kupu/trunk/kupu/common/kupueditor.js
   kupu/trunk/kupu/lint.py
Log:
Fix escapeEntities to entitise non-break spaces. (Otherwise they get lost in source view mode).
Gratuitous rewrite of lint.py to spawn multiple sub-processes. This halves the time taken to run jslint on a dual core system.


Modified: kupu/trunk/kupu/common/kupueditor.js
==============================================================================
--- kupu/trunk/kupu/common/kupueditor.js	(original)
+++ kupu/trunk/kupu/common/kupueditor.js	Mon Feb 12 11:41:21 2007
@@ -773,6 +773,7 @@
     };
     this.escapeEntities = function(xml) {
         // XXX: temporarily disabled
+        xml = xml.replace(/\xa0/g, '&nbsp;');
         return xml;
         // Escape non-ascii characters as entities.
 //         return xml.replace(/[^\r\n -\177]/g,

Modified: kupu/trunk/kupu/lint.py
==============================================================================
--- kupu/trunk/kupu/lint.py	(original)
+++ kupu/trunk/kupu/lint.py	Mon Feb 12 11:41:21 2007
@@ -10,6 +10,8 @@
 # Run jslint over modified javascript files
 import os, sys, glob, time
 import cPickle
+from Queue import Queue
+import threading
 
 COMPILE_COMMAND = "java org.mozilla.javascript.tools.shell.Main %(lint)s --options %(options)s %(file)s"
 if sys.platform=='win32':
@@ -17,9 +19,10 @@
 
 def lint(name):
     cmd = COMPILE_COMMAND % dict(lint=LINT, file=name, options=OPTIONS)
-    ret = os.system(cmd)
-    if ret != 0:
-        sys.exit(ret)
+    stream = os.popen(cmd)
+    data = stream.read()
+    rc = stream.close()
+    return data, rc
 
 def scriptrelative(relative):
     """Find absolute path of file relative to this script"""
@@ -69,9 +72,55 @@
     cPickle.dump(status, f)
     f.close()
 
+# Thread pool code.
+class Pool:
+    def __init__(self, nThreads):
+        self.nThreads = nThreads
+        self.requestQueue = Queue()
+        self.responseQueue = Queue()
+        self.exitcode = 0
+        self.thread_pool = [
+                threading.Thread(target=self.run)
+                for i in range(nThreads)]
+        for t in self.thread_pool:
+            t.start()
+
+    def run(self):
+        for item in iter(self.requestQueue.get, None):
+            if not self.exitcode:
+                self.responseQueue.put([item, lint(item)])
+            else:
+                # Error state, just ignore this item
+                self.responseQueue.put([item, ("skipped %s" % item, 1)])
+
+    def handleResponse(self, item, data, rc):
+        if rc is not None:
+            if item in status:
+                del status[item]
+            self.exitcode = max(self.exitcode, rc)
+        print data
+
+    def process(self, items):
+        items = list(items)
+        for item in items:
+             self.requestQueue.put(item)
+        for dummy in items:
+            item, (data, rc) = self.responseQueue.get()
+            self.handleResponse(item, data, rc)
+
+    def shutdown(self):
+        # and then to shut down the threads when you've finished:
+        for t in self.thread_pool:
+            self.requestQueue.put(None)
+        for t in self.thread_pool:
+             t.join()
+
 if __name__=='__main__':
     status = loadstatus(STATUSFILE)
-    for n in newfiles(status, 'common/*.js', 'plone/kupu_plone_layer/*.js'):
-        lint(n)
-        savestatus(STATUSFILE, status)
-
+    exitcode = None
+    threads = Pool(4)
+    work = newfiles(status, 'common/*.js', 'plone/kupu_plone_layer/*.js')
+    threads.process(work)
+    threads.shutdown()
+    savestatus(STATUSFILE, status)
+    sys.exit(exitcode)

From duncan at codespeak.net  Mon Feb 12 12:15:08 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Mon, 12 Feb 2007 12:15:08 +0100 (CET)
Subject: [kupu-checkins] r38541 - kupu/trunk/kupu/plone
Message-ID: <20070212111508.6EA43100A4@code0.codespeak.net>

Author: duncan
Date: Mon Feb 12 12:15:07 2007
New Revision: 38541

Modified:
   kupu/trunk/kupu/plone/plonedrawers.py
Log:
Plone Title field can contain control characters; XML cannot. Need to sanitize the titles before using them.

Modified: kupu/trunk/kupu/plone/plonedrawers.py
==============================================================================
--- kupu/trunk/kupu/plone/plonedrawers.py	(original)
+++ kupu/trunk/kupu/plone/plonedrawers.py	Mon Feb 12 12:15:07 2007
@@ -14,7 +14,7 @@
 Python scripts, but has been moved here to make it easier to maintain.
 
 """
-import re
+import re, string
 from thread import get_ident
 from Products.CMFCore.utils import getToolByName
 from AccessControl import Unauthorized, ClassSecurityInfo, getSecurityManager
@@ -33,6 +33,7 @@
     HAS_PIL = True
 
 UIDURL = re.compile(".*\\bresolveuid/([^/?#]+)")
+NOCC = nocc = string.maketrans(''.join([chr(c) for c in range(32) if c not in (9,10,13)]), "?"*29)
 
 # mapping (thread-id, portal-physicalPath, portal_type) ->
 # imagefield-getAvailableSizes (as tuple sorted by dimension) (width, height, key)
@@ -312,7 +313,7 @@
             icon = self.icon(portal_type)
             size, width, height = self.sizes(obj)
 
-            title = obj.Title() or obj.getId()
+            title = (obj.Title() or obj.getId()).translate(NOCC)
             description = newline_to_br(html_quote(obj.Description()))
 
             linkable = None

From duncan at codespeak.net  Mon Feb 12 13:29:45 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Mon, 12 Feb 2007 13:29:45 +0100 (CET)
Subject: [kupu-checkins] r38550 - in kupu/trunk/kupu: Extensions plone
	plone/tests
Message-ID: <20070212122945.8B2C5100A3@code0.codespeak.net>

Author: duncan
Date: Mon Feb 12 13:29:43 2007
New Revision: 38550

Modified:
   kupu/trunk/kupu/Extensions/Install.py
   kupu/trunk/kupu/plone/html2captioned.py
   kupu/trunk/kupu/plone/plonedrawers.py
   kupu/trunk/kupu/plone/tests/framework.py
   kupu/trunk/kupu/plone/util.py
Log:
Make tests work again (at least on older Plones):
  Added installProduct('kupu') so we can create a test site
Let Install.py work if ResourceRegistries is present but not installed.
Fix html2captioned (broke a test and hadn't noticed)
remove_transform needs to be robust against no transform tool.


Modified: kupu/trunk/kupu/Extensions/Install.py
==============================================================================
--- kupu/trunk/kupu/Extensions/Install.py	(original)
+++ kupu/trunk/kupu/Extensions/Install.py	Mon Feb 12 13:29:43 2007
@@ -96,8 +96,10 @@
     data = _read_resources()
     
     CONDITION = '''python:portal.kupu_library_tool.isKupuEnabled(REQUEST=request)'''
-    csstool = getToolByName(self, CSSTOOLNAME)
-    jstool = getToolByName(self, JSTOOLNAME)
+    csstool = getToolByName(self, CSSTOOLNAME, None)
+    jstool = getToolByName(self, JSTOOLNAME, None)
+    if csstool is None or jstool is None:
+        return
 
     for id in css_files(data):
         print >>out, "CSS file", id

Modified: kupu/trunk/kupu/plone/html2captioned.py
==============================================================================
--- kupu/trunk/kupu/plone/html2captioned.py	(original)
+++ kupu/trunk/kupu/plone/html2captioned.py	Mon Feb 12 13:29:43 2007
@@ -138,10 +138,10 @@
                         d['tag'] = tag
                         if not width and srctail:
                             subtarget = getattr(target, srctail, None)
-                            try:
-                                width = subtarget.width
-                            except AttributeError:
-                                pass
+                            if hasattr(aq_base(subtarget), 'getWidth'):
+                                width = subtarget.getWidth()
+                            elif hasattr(aq_base(subtarget), 'width'):
+                                width = subtarget.getWidth()
                         if not width:
                             try:
                                 width = target.getWidth()

Modified: kupu/trunk/kupu/plone/plonedrawers.py
==============================================================================
--- kupu/trunk/kupu/plone/plonedrawers.py	(original)
+++ kupu/trunk/kupu/plone/plonedrawers.py	Mon Feb 12 13:29:43 2007
@@ -390,7 +390,7 @@
         icon = self.icon(portal_type)
         size, width, height = self.sizes(brain)
 
-        title = brain.Title or brain.getId
+        title = (brain.Title or brain.getId).translate(NOCC)
         description = newline_to_br(html_quote(brain.Description))
         linkable = None
         if allowLink:

Modified: kupu/trunk/kupu/plone/tests/framework.py
==============================================================================
--- kupu/trunk/kupu/plone/tests/framework.py	(original)
+++ kupu/trunk/kupu/plone/tests/framework.py	Mon Feb 12 13:29:43 2007
@@ -104,4 +104,5 @@
 print 'SOFTWARE_HOME: %s' % os.environ.get('SOFTWARE_HOME', 'Not set')
 print 'INSTANCE_HOME: %s' % os.environ.get('INSTANCE_HOME', 'Not set')
 sys.stdout.flush()
-
+from Testing import ZopeTestCase
+ZopeTestCase.installProduct('kupu')

Modified: kupu/trunk/kupu/plone/util.py
==============================================================================
--- kupu/trunk/kupu/plone/util.py	(original)
+++ kupu/trunk/kupu/plone/util.py	Mon Feb 12 13:29:43 2007
@@ -106,7 +106,9 @@
 
 def remove_transform(self):
     """Disable the UID transform: remove the policy but leave everything else intact."""
-    transform_tool = getToolByName(self, 'portal_transforms')
+    transform_tool = getToolByName(self, 'portal_transforms', None)
+    if transform_tool is None:
+        return
     policies = [ (mimetype, required) for (mimetype, required) in transform_tool.listPolicies() if mimetype==MT_SAFE ]
     if not policies:
         return

From duncan at codespeak.net  Tue Feb 13 13:03:51 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Tue, 13 Feb 2007 13:03:51 +0100 (CET)
Subject: [kupu-checkins] r38680 - in kupu/trunk/kupu: common
	plone/kupu_references
Message-ID: <20070213120351.A7EEE100A7@code0.codespeak.net>

Author: duncan
Date: Tue Feb 13 13:03:50 2007
New Revision: 38680

Modified:
   kupu/trunk/kupu/common/kupudrawers.js
   kupu/trunk/kupu/plone/kupu_references/referencebrowser.js
Log:
Bootstrap problem with Sarissa: on IE7 with native XMLHttp object we don't call getDomDocument on the result and that makes transformToDocument fail.
referencebrowser.js wasn't transforming a single node in an IE compatible way.

Modified: kupu/trunk/kupu/common/kupudrawers.js
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers.js	(original)
+++ kupu/trunk/kupu/common/kupudrawers.js	Tue Feb 13 13:03:50 2007
@@ -547,6 +547,7 @@
             will also make the first loadLibraries call
         */
         this.shared.xsl = dom;
+        Sarissa.getDomDocument(); /* Work round Sarissa initialisation glitch */
 
         // Change by Paul to have cached xslt transformers for reuse of 
         // multiple transforms and also xslt params

Modified: kupu/trunk/kupu/plone/kupu_references/referencebrowser.js
==============================================================================
--- kupu/trunk/kupu/plone/kupu_references/referencebrowser.js	(original)
+++ kupu/trunk/kupu/plone/kupu_references/referencebrowser.js	Tue Feb 13 13:03:50 2007
@@ -59,13 +59,21 @@
             var id = sel[i];
             var t = id;
             var node = xml.selectSingleNode("//resource[@id='"+id+"']");
-            var result = this.shared.xsltproc.transformToDocument(node);
-            var imp = window.document.importNode(result, true);
             div = document.createElement("div");
             div.className = i%2?'odd':'even';
             var link = document.createElement('a');
             link.href = node.selectSingleNode('uri/text()').nodeValue.strip()+'/view';
-            Sarissa.copyChildNodes(imp, link, true);
+
+            if (_SARISSA_IS_IE) {
+                /* IE won't take a node to transformToDocument */
+                var result = node.transformNode(this.shared.xsl);
+                link.innerHTML = result;
+            } else {
+                var result = this.shared.xsltproc.transformToDocument(node);
+                var imp = window.document.importNode(result, true);
+                Sarissa.copyChildNodes(imp, link, true);
+            };
+
             div.appendChild(link);
             preview.appendChild(div);
         }

From MAILER-DAEMON at codespeak.net  Wed Feb 14 12:54:05 2007
From: MAILER-DAEMON at codespeak.net (Post Office)
Date: Wed, 14 Feb 2007 12:54:05 +0100
Subject: [kupu-checkins] Returned mail: Data format error
Message-ID: <20070214114848.579C710074@code0.codespeak.net>

Your message was not delivered due to the following reason:

Your message was not delivered because the destination server was
not reachable within the allowed queue period. The amount of time
a message is queued before it is returned depends on local configura-
tion parameters.

Most likely there is a network problem that prevented delivery, but
it is also possible that the computer is turned off, or does not
have a mail system running right now.

Your message was not delivered within 3 days:
Server 107.205.247.180 is not responding.

The following recipients could not receive this message:
<kupu-checkins at codespeak.net>

Please reply to postmaster at codespeak.net
if you feel this message to be in error.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: mail.zip
Type: application/octet-stream
Size: 28978 bytes
Desc: not available
Url : http://codespeak.net/pipermail/kupu-checkins/attachments/20070214/be88db6f/attachment-0001.obj 

From duncan at codespeak.net  Wed Feb 14 13:14:59 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Wed, 14 Feb 2007 13:14:59 +0100 (CET)
Subject: [kupu-checkins] r38809 - kupu/trunk/kupu/plone
Message-ID: <20070214121459.4138F1007C@code0.codespeak.net>

Author: duncan
Date: Wed Feb 14 13:14:58 2007
New Revision: 38809

Modified:
   kupu/trunk/kupu/plone/plonedrawers.py
Log:
Protect against missing type information.

Modified: kupu/trunk/kupu/plone/plonedrawers.py
==============================================================================
--- kupu/trunk/kupu/plone/plonedrawers.py	(original)
+++ kupu/trunk/kupu/plone/plonedrawers.py	Wed Feb 14 13:14:58 2007
@@ -204,7 +204,10 @@
 
     def icon(self, portal_type):
         type = self.ttool.getTypeInfo(portal_type)
+        if type is None:
+            return None
         return "%s/%s" % (self.base, type.getIcon())
+            
 
     def sizes(self, obj):
         """Returns size, width, height"""

From yuppie at codespeak.net  Wed Feb 14 17:50:22 2007
From: yuppie at codespeak.net (yuppie at codespeak.net)
Date: Wed, 14 Feb 2007 17:50:22 +0100 (CET)
Subject: [kupu-checkins] r38856 - kupu/trunk/kupu
Message-ID: <20070214165022.A04DC1008A@code0.codespeak.net>

Author: yuppie
Date: Wed Feb 14 17:50:21 2007
New Revision: 38856

Modified:
   kupu/trunk/kupu/lint.py
Log:
- fixed python 2.4 compatibility

Modified: kupu/trunk/kupu/lint.py
==============================================================================
--- kupu/trunk/kupu/lint.py	(original)
+++ kupu/trunk/kupu/lint.py	Wed Feb 14 17:50:21 2007
@@ -60,9 +60,10 @@
     except (IOError, WindowsError):
         return {}
     try:
-        data = cPickle.load(f)
-    except EOFError:
-        return {}
+        try:
+            data = cPickle.load(f)
+        except EOFError:
+            return {}
     finally:
         f.close()
     return data

From yuppie at codespeak.net  Wed Feb 14 17:52:56 2007
From: yuppie at codespeak.net (yuppie at codespeak.net)
Date: Wed, 14 Feb 2007 17:52:56 +0100 (CET)
Subject: [kupu-checkins] r38857 - kupu/trunk/kupu/plone/kupu_plone_layer
Message-ID: <20070214165256.07257100B3@code0.codespeak.net>

Author: yuppie
Date: Wed Feb 14 17:52:55 2007
New Revision: 38857

Modified:
   kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneinit.js
Log:
- removed obsolete comment

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	Wed Feb 14 17:52:55 2007
@@ -17,8 +17,6 @@
     var textarea = getFromSelector(prefix+'textarea.kupu-editor-textarea');
     var l = new DummyLogger();
 
-    // XXX this should be fixed in stylesheets, but I don't know how to do 
-    // that without applying this change to the outter document. Damn iframes.
     var ibody = iframe.contentWindow.document.body;
     var form = textarea.form;
     var initialtext = textarea.value || (_SARISSA_IS_IE?'<p></p>':'<p><br></p>');

From duncan at codespeak.net  Fri Feb 16 17:00:55 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Fri, 16 Feb 2007 17:00:55 +0100 (CET)
Subject: [kupu-checkins] r39028 - kupu/trunk/kupu/plone/tests
Message-ID: <20070216160055.CE801100EE@code0.codespeak.net>

Author: duncan
Date: Fri Feb 16 17:00:53 2007
New Revision: 39028

Modified:
   kupu/trunk/kupu/plone/tests/test_librarymanager.py
Log:
Fix test that failed under Plone3

Modified: kupu/trunk/kupu/plone/tests/test_librarymanager.py
==============================================================================
--- kupu/trunk/kupu/plone/tests/test_librarymanager.py	(original)
+++ kupu/trunk/kupu/plone/tests/test_librarymanager.py	Fri Feb 16 17:00:53 2007
@@ -32,8 +32,8 @@
 
     __allow_access_to_unprotected_subobjects__ = True
     isPrincipiaFolderish = True
-    REQUEST = 42
-    absolute_url = lambda(self): "The answer is 42"
+    REQUEST = 'whatever'
+    absolute_url = lambda(self): u"The answer is 42"
 
 class TestILibraryManager(ZopeTestCase):
     """Test the implementation of ILibraryManger in KupuLibraryTool"""
@@ -69,7 +69,7 @@
         libs = self.libs
         context = self.context
         new_libs = (
-            dict(id='foo_id', title='Foobar', uri='python:request',
+            dict(id='foo_id', title='Foobar', uri='python:42',
                  src='foosrc', icon='fooicon'),
             dict(id='bar_id', title='Barfoo', uri='python:object',
                  src='barsrc', icon='baricon'),
@@ -83,10 +83,11 @@
                  src='foosrc', icon='fooicon'),
             dict(id='bar_id', title='Barfoo', uri=context,
                  src='barsrc', icon='baricon'),
-            dict(id='baz_id', title='Baz', uri="The answer is 42",
+            dict(id='baz_id', title='Baz', uri=u"The answer is 42",
                  src='bazsrc', icon='bazicon')
             )
-        self.assertEqual(libs.getLibraries(context), expected)
+        v = libs.getLibraries(context)
+        self.assertEqual(v, expected)
 
     def test_delete(self):
         libs = self.libs

From duncan at codespeak.net  Sun Feb 18 15:13:18 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Sun, 18 Feb 2007 15:13:18 +0100 (CET)
Subject: [kupu-checkins] r39156 - in kupu/trunk/kupu/plone: .
	kupu_plone_layer
Message-ID: <20070218141318.3C00A101EC@code0.codespeak.net>

Author: duncan
Date: Sun Feb 18 15:13:16 2007
New Revision: 39156

Modified:
   kupu/trunk/kupu/plone/body.kupu
   kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
Log:
Add id and name attributes to kupu iframe

Modified: kupu/trunk/kupu/plone/body.kupu
==============================================================================
--- kupu/trunk/kupu/plone/body.kupu	(original)
+++ kupu/trunk/kupu/plone/body.kupu	Sun Feb 18 15:13:16 2007
@@ -15,7 +15,9 @@
         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;"
+                        tabindex tabindex/next|nothing;
+			id string:kupu-editor-iframe-${fname};
+			name string:kupu-editor-iframe-${fname};"
         >
     </iframe>
      <input type="hidden" name="text_format:default" value="text/html"

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	Sun Feb 18 15:13:16 2007
@@ -13,15 +13,15 @@
     <!--$Id: sourceedit.kupu 9779 2005-03-15 11:34:47Z duncan $-->
     <!--$Id: contextmenu.kupu 9520 2005-02-26 16:30:23Z duncan $-->
     <!--$Id: toolbar.kupu 27597 2006-05-22 14:27:32Z guido $-->
-    <!--$Id: toolboxes.kupu 16467 2005-08-25 11:08:10Z guido $-->
+    <!--$Id: toolboxes.kupu 37754 2007-02-01 17:24:29Z yuppie $-->
     <!--$Id: colorchooser.kupu 35491 2006-12-08 15:41:49Z duncan $-->
     <!--$Id: save.kupu 9520 2005-02-26 16:30:23Z duncan $-->
-    <!--$Id: drawers.kupu 32938 2006-10-06 06:56:24Z guido $-->
+    <!--$Id: drawers.kupu 37754 2007-02-01 17:24:29Z yuppie $-->
     <!--$Id: include.kupu 35491 2006-12-08 15:41:49Z 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 35367 2006-12-06 09:06:21Z duncan $-->
-    <!--$Id: body.kupu 34311 2006-11-07 11:18:23Z duncan $-->
+    <!--$Id: body.kupu 35853 2006-12-18 15:33:46Z duncan $-->
     <!--$Id: toolbar.kupu 35491 2006-12-08 15:41:49Z duncan $-->
     <!--$Id: drawers.kupu 35477 2006-12-08 13:20:38Z duncan $-->
     <!--$Id: beforeunload.kupu 14546 2005-07-12 14:35:55Z duncan $-->
@@ -341,9 +341,10 @@
                   </td>
                 </tr>
                 <tr>
-                  <th class="kupu-toolbox-label" i18n:translate="tabledrawer_fix_table_label">Fix Table</th>
+                  <th class="kupu-toolbox-label" i18n:translate="tabledrawer_table_label">Table</th>
                   <td>
                     <button class="kupu-dialog-button" type="button" i18n:translate="tabledrawer_fix_button" onclick="drawertool.current_drawer.fixTable()">Fix</button> 
+                    <button class="kupu-dialog-button" type="button" i18n:translate="tabledrawer_remove_button" onclick="drawertool.current_drawer.delTable()">Remove</button> 
                   </td>
                 </tr>
               </table>
@@ -424,7 +425,7 @@
     </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;">
+    <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;    id string:kupu-editor-iframe-${fname};    name string:kupu-editor-iframe-${fname};">
     </iframe>
      <input type="hidden" name="text_format:default" value="text/html" tal:define="fieldName fieldName|inputname|nothing;                 val python:fieldName and 'text/html' or 'html';                 fieldName python:test(fieldName, fieldName+'_', '') + 'text_format:default';" tal:attributes="name fieldName;value val;"/>
 <tal:test condition="fieldName|nothing">

From duncan at codespeak.net  Sun Feb 18 15:29:59 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Sun, 18 Feb 2007 15:29:59 +0100 (CET)
Subject: [kupu-checkins] r39157 - in kupu/trunk/kupu/plone: .
	kupu_plone_layer
Message-ID: <20070218142959.A9198101F0@code0.codespeak.net>

Author: duncan
Date: Sun Feb 18 15:29:58 2007
New Revision: 39157

Modified:
   kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
   kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneinit.js
   kupu/trunk/kupu/plone/wysiwyg_support.kupu
Log:
Simplify initialisation

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	Sun Feb 18 15:29:58 2007
@@ -21,7 +21,7 @@
     <!--$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 35367 2006-12-06 09:06:21Z duncan $-->
-    <!--$Id: body.kupu 35853 2006-12-18 15:33:46Z duncan $-->
+    <!--$Id: body.kupu 39156 2007-02-18 14:13:16Z duncan $-->
     <!--$Id: toolbar.kupu 35491 2006-12-08 15:41:49Z duncan $-->
     <!--$Id: drawers.kupu 35477 2006-12-08 13:20:38Z duncan $-->
     <!--$Id: beforeunload.kupu 14546 2005-07-12 14:35:55Z duncan $-->
@@ -443,7 +443,7 @@
   
     </div>
   
-    <script type="text/javascript" tal:content="string:       addEventHandler(window, 'load',  function() {           window.kupu = initPloneKupu('${editorid}');           window.kupuui = window.kupu.getTool('ui');           window.drawertool = window.kupu.getTool('drawertool');           window.kupu.initialize();}  , document);"/>
+    <script type="text/javascript" tal:content="string:       addEventHandler(window, 'load',  function() { initPloneKupu('${editorid}'); }, document);"/>
   
       </div>
 

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	Sun Feb 18 15:29:58 2007
@@ -28,12 +28,13 @@
     var doc = new KupuDocument(iframe);
 
     // now we can create the controller
-    var kupu = new KupuEditor(doc, conf, l);
+    var kupu = window.kupu = new KupuEditor(doc, conf, l);
     kupu.setHTMLBody(initialtext);
 
     // now we can create a UI object which we can use from the UI
     var ui = new KupuUI(prefix+'select.kupu-tb-styles');
     kupu.registerTool('ui', ui);
+    window.kupuui = ui;
 
     // function that returns a function to execute a button command
     var execCommand = function(cmd) {
@@ -227,6 +228,7 @@
     // create some drawers, drawers are some sort of popups that appear when a 
     // toolbar button is clicked
     var drawertool = window.drawertool || new DrawerTool();
+    window.drawertool = drawertool;
     kupu.registerTool('drawertool', drawertool);
 
     var drawerparent = prefix+'div.kupu-librarydrawer-parent';
@@ -266,6 +268,7 @@
     };
     addEventHandler(textarea.form, 'submit', prepareForm, textarea);
 
+    kupu.initialize();
     return kupu;
 };
 

Modified: kupu/trunk/kupu/plone/wysiwyg_support.kupu
==============================================================================
--- kupu/trunk/kupu/plone/wysiwyg_support.kupu	(original)
+++ kupu/trunk/kupu/plone/wysiwyg_support.kupu	Sun Feb 18 15:29:58 2007
@@ -31,11 +31,7 @@
   <kupu:part name="eventhandler">
     <script type="text/javascript"
       tal:content="string:
-      addEventHandler(window, 'load',  function() {
-          window.kupu = initPloneKupu('${editorid}');
-          window.kupuui = window.kupu.getTool('ui');
-          window.drawertool = window.kupu.getTool('drawertool');
-          window.kupu.initialize();}  , document);"></script>
+      addEventHandler(window, 'load',  function() { initPloneKupu('${editorid}'); }, document);"></script>
   </kupu:part>
 
   <kupu:part name="textarea">

From duncan at codespeak.net  Sun Feb 18 15:38:03 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Sun, 18 Feb 2007 15:38:03 +0100 (CET)
Subject: [kupu-checkins] r39158 - kupu/trunk/kupu/plone/kupu_plone_layer
Message-ID: <20070218143803.8A9C5101EE@code0.codespeak.net>

Author: duncan
Date: Sun Feb 18 15:38:02 2007
New Revision: 39158

Modified:
   kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneinit.js
Log:
Avoid duplicate initialisation problems

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	Sun Feb 18 15:38:02 2007
@@ -14,6 +14,10 @@
     var prefix = '#'+editorId+' ';
 
     var iframe = getFromSelector(prefix+'iframe.kupu-editor-iframe');
+    if (iframe._kupuIsInitialized) {
+	    return window.kupu;
+    };
+    iframe._kupuIsInitialized = true;
     var textarea = getFromSelector(prefix+'textarea.kupu-editor-textarea');
     var l = new DummyLogger();
 

From duncan at codespeak.net  Sun Feb 18 16:10:54 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Sun, 18 Feb 2007 16:10:54 +0100 (CET)
Subject: [kupu-checkins] r39159 - in kupu/trunk/kupu/plone: . tests
Message-ID: <20070218151054.D1BBC101EE@code0.codespeak.net>

Author: duncan
Date: Sun Feb 18 16:10:53 2007
New Revision: 39159

Modified:
   kupu/trunk/kupu/plone/plonelibrarytool.py
   kupu/trunk/kupu/plone/tests/test_browserSupportsKupu.py
Log:
Enable kupu for development Safari version

Modified: kupu/trunk/kupu/plone/plonelibrarytool.py
==============================================================================
--- kupu/trunk/kupu/plone/plonelibrarytool.py	(original)
+++ kupu/trunk/kupu/plone/plonelibrarytool.py	Sun Feb 18 16:10:53 2007
@@ -334,6 +334,9 @@
                 verno = getver(' rv:')
                 if verno:
                     return verno >= (1,3,1)
+                verno = getver(' AppleWebKit/')
+                if verno:
+                    return verno >= (420,)
 
             verno = getver('MSIE')
             if verno:

Modified: kupu/trunk/kupu/plone/tests/test_browserSupportsKupu.py
==============================================================================
--- kupu/trunk/kupu/plone/tests/test_browserSupportsKupu.py	(original)
+++ kupu/trunk/kupu/plone/tests/test_browserSupportsKupu.py	Sun Feb 18 16:10:53 2007
@@ -43,16 +43,17 @@
 # 9, GALEON             -- not supported
 
 (MOZILLA, INTERNET_EXPLORER, OPERA, KONQUEROR, NETSCAPE, OTHER,
- GOOGLE, YAHOO, GALEON) = range(1,10)
+ GOOGLE, YAHOO, GALEON, SAFARI) = range(1,11)
 
 BROWSERNAMES = ['NOTUSED', 'Mozilla', 'Internet Explorer', 'Opera',
                 'Konqueror', 'Netscape', 'Other', 'Google',
-                'Yahoo', 'Galeon' ]
- 
+                'Yahoo', 'Galeon', 'Safari' ]
+
 SUPPORTED = {
     MOZILLA: (1,3,1),
     INTERNET_EXPLORER: (5,5),
     OPERA: (9,0),
+    SAFARI: (420,0),
 }
 
 # BROWSERS records contain:
@@ -86,7 +87,7 @@
     ('Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.6) Gecko/20040113', 'Windows XP', '1.6', MOZILLA),
     ('Mozilla/4.0 (compatible; MSIE 6.0; Windows 98) Opera 7.20  [en]', 'Windows 95', '7.20', OPERA),
     ('Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.0; YComp 5.0.0.0; Avalon Ltd.)', 'Windows 2000', '6.0', INTERNET_EXPLORER),
-    ('Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/85.7 (KHTML, like Gecko) Safari/85.7', 'Mac PPC', '5.0 (Macintosh; U; PPC Mac OS X; en', MOZILLA),
+    ('Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/85.7 (KHTML, like Gecko) Safari/85.7', 'Mac PPC', '5.0 (Macintosh; U; PPC Mac OS X; en', SAFARI),
     ('Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; Hotbar 4.4.2.0; .NET CLR 1.0.3705)', 'Windows XP', '6.0', INTERNET_EXPLORER),
     ('Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 5.0) Active Cache Request', 'Windows 2000', '5.5', INTERNET_EXPLORER),
     ('Mozilla/4.0 (compatible; MSIE 5.0; Windows 98; DigExt)', 'Windows 95', '5.0', INTERNET_EXPLORER),
@@ -112,7 +113,7 @@
     ('Lynx/2.8.4dev.16 libwww-FM/2.14 SSL-MM/1.4.1 OpenSSL/0.9.6', None, None, OTHER),
     ('Mozilla/4.0 (compatible; MSIE 5.5; Windows 98)', 'Windows 95', '5.5', INTERNET_EXPLORER),
     ('Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; TUCOWS; MyIE2)', 'Windows XP', '6.0', INTERNET_EXPLORER),
-    ('Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/124 (KHTML, like Gecko) Safari/125.1', 'Mac PPC', '5.0 (Macintosh; U; PPC Mac OS X; en', MOZILLA),
+    ('Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/124 (KHTML, like Gecko) Safari/125.1', 'Mac PPC', '5.0 (Macintosh; U; PPC Mac OS X; en', SAFARI),
     ('Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.0; H010818; .NET CLR 1.0.3705)', 'Windows 2000', '6.0', INTERNET_EXPLORER),
     ('Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.5) Gecko/20031007 Firebird/0.7', 'Windows 2000', '1.5', MOZILLA),
     ('Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; Hotbar 4.4.0.0)', 'Windows XP', '6.0', INTERNET_EXPLORER),
@@ -267,7 +268,7 @@
     ('Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; winweb; .NET CLR 1.0.3705)', 'Windows XP', '6.0', INTERNET_EXPLORER),
     ('Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; AUTOSIGN W2000 WNT VER03; .NET CLR 1.0.3705; .NET CLR 1.1.4322)', 'Windows XP', '6.0', INTERNET_EXPLORER),
     ('Mozilla/4.0 (compatible; MSIE 5.01; Windows 98; Feat Ext 15)', 'Windows 95', '5.01', INTERNET_EXPLORER),
-    ('Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/124 (KHTML, like Gecko) Safari/125', 'Mac PPC', '5.0 (Macintosh; U; PPC Mac OS X; en', MOZILLA),
+    ('Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/124 (KHTML, like Gecko) Safari/125', 'Mac PPC', '5.0 (Macintosh; U; PPC Mac OS X; en', SAFARI),
     ('Mozilla/4.0 compatible ZyBorg/1.0 (wn.zyborg at looksmart.net; http://www.WISEnutbot.com)', 'uknown OS', '4.0 compatible ZyBorg/1.0', 5),
     ('Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; YComp 5.0.2.6)', 'Windows XP', '6.0', INTERNET_EXPLORER),
     ('Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; AUTOSIGN W2000 WNT VER03; .NET CLR 1.1.4322; .NET CLR 1.0.3705)', 'Windows XP', '6.0', INTERNET_EXPLORER),
@@ -387,7 +388,9 @@
     ('Mozilla/5.0 (Windows NT 5.1; U; en; rv:1.8.1b1) Gecko/20060728 Firefox/2.0 Opera 9.20', 'Windows XP', '9.20', OPERA),
     ('Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.2; en) Opera 9.01', 'Windows XP', '9.01', OPERA),
     ('Mozilla/4.0 (compatible; MSIE 6.0; X11; Linux i686; en) Opera 9.00', 'Linux', '9.00', OPERA),
-     )
+    ('Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en) AppleWebKit/420+ (KHTML, like Gecko) Safari/419.3', 'Mac', '420.0', SAFARI),
+    ('Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en) AppleWebKit/418.9.1 (KHTML, like Gecko) Safari/419.3', 'Mac', '418.9.1', SAFARI),
+)
 
 def createTest(sig, isSupported, index, os, browser, version):
     def test(self):
@@ -409,8 +412,8 @@
 
         # Specifically exclude support for some browsers
         #XXX Hack
-        if 'Safari' in sig:
-            supported = False
+        #if 'Safari' in sig:
+        #    supported = False
 
         createTest(sig, supported, id, os, browser, version)
 

From duncan at codespeak.net  Sun Feb 18 17:09:32 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Sun, 18 Feb 2007 17:09:32 +0100 (CET)
Subject: [kupu-checkins] r39160 - kupu/trunk/kupu/plone/kupu_plone_layer
Message-ID: <20070218160932.BDB22101E9@code0.codespeak.net>

Author: duncan
Date: Sun Feb 18 17:09:29 2007
New Revision: 39160

Modified:
   kupu/trunk/kupu/plone/kupu_plone_layer/emptypage.pt
Log:
Fix emptypage failing on plone 3

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/emptypage.pt
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/emptypage.pt	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/emptypage.pt	Sun Feb 18 17:09:29 2007
@@ -3,9 +3,14 @@
     <title>Kupu contentarea</title>
     <link rel="stylesheet" type="text/css" href="#" tal:attributes="href string:${here/portal_url}/kupuplone.css" />
     <tal:plone21 condition="exists:here/portal_css">
-    <metal:css metal:use-macro="here/renderAllTheStylesheets/macros/cssrenderer|nothing">
-        <!-- Fetch stylesheets from the CSS Registry -->
-    </metal:css>
+       <tal:plone25 condition="exists:here/renderAllTheStylesheets">
+	    <metal:css metal:use-macro="here/renderAllTheStylesheets/macros/cssrenderer|nothing">
+		<!-- Fetch stylesheets from the CSS Registry -->
+	    </metal:css>
+       </tal:plone25>
+       <tal:plone3 condition="not:exists:here/renderAllTheStylesheets">
+	  <tal:styles replace="structure context/emptypageresources" />
+       </tal:plone3>
     </tal:plone21>
     <tal:plone20 condition="not:exists:here/portal_css">
     <link rel="stylesheet" type="text/css" href="#" tal:attributes="href string:${here/portal_url}/plone.css" />

From duncan at codespeak.net  Sun Feb 18 17:09:51 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Sun, 18 Feb 2007 17:09:51 +0100 (CET)
Subject: [kupu-checkins] r39161 - kupu/trunk/kupu/plone/kupu_plone_layer
Message-ID: <20070218160951.7A5AD101EA@code0.codespeak.net>

Author: duncan
Date: Sun Feb 18 17:09:46 2007
New Revision: 39161

Added:
   kupu/trunk/kupu/plone/kupu_plone_layer/emptypageresources.pt   (contents, props changed)
Log:
Fix emptypage failing on plone 3

Added: kupu/trunk/kupu/plone/kupu_plone_layer/emptypageresources.pt
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/emptypageresources.pt	Sun Feb 18 17:09:46 2007
@@ -0,0 +1 @@
+<tal:styles define="view context/@@plone|nothing" replace="structure provider:plone.resourceregistries.styles" />

From duncan at codespeak.net  Sun Feb 18 17:12:37 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Sun, 18 Feb 2007 17:12:37 +0100 (CET)
Subject: [kupu-checkins] r39163 - kupu/trunk/kupu/plone/kupu_plone_layer
Message-ID: <20070218161237.15ADA10081@code0.codespeak.net>

Author: duncan
Date: Sun Feb 18 17:12:36 2007
New Revision: 39163

Modified:
   kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneinit.js
Log:
Fix jslint warning

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	Sun Feb 18 17:12:36 2007
@@ -32,7 +32,7 @@
     var doc = new KupuDocument(iframe);
 
     // now we can create the controller
-    var kupu = window.kupu = new KupuEditor(doc, conf, l);
+    var kupu = (window.kupu = new KupuEditor(doc, conf, l));
     kupu.setHTMLBody(initialtext);
 
     // now we can create a UI object which we can use from the UI

From duncan at codespeak.net  Sun Feb 18 17:35:34 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Sun, 18 Feb 2007 17:35:34 +0100 (CET)
Subject: [kupu-checkins] r39164 - in kupu/trunk/kupu/plone: . tests
Message-ID: <20070218163534.1A2F6101F2@code0.codespeak.net>

Author: duncan
Date: Sun Feb 18 17:35:33 2007
New Revision: 39164

Modified:
   kupu/trunk/kupu/plone/plonelibrarytool.py
   kupu/trunk/kupu/plone/tests/test_browserSupportsKupu.py
Log:
Set Safari detection to not report it as being supported.


Modified: kupu/trunk/kupu/plone/plonelibrarytool.py
==============================================================================
--- kupu/trunk/kupu/plone/plonelibrarytool.py	(original)
+++ kupu/trunk/kupu/plone/plonelibrarytool.py	Sun Feb 18 17:35:33 2007
@@ -334,9 +334,9 @@
                 verno = getver(' rv:')
                 if verno:
                     return verno >= (1,3,1)
-                verno = getver(' AppleWebKit/')
-                if verno:
-                    return verno >= (420,)
+#                 verno = getver(' AppleWebKit/')
+#                 if verno:
+#                     return verno >= (420,)
 
             verno = getver('MSIE')
             if verno:

Modified: kupu/trunk/kupu/plone/tests/test_browserSupportsKupu.py
==============================================================================
--- kupu/trunk/kupu/plone/tests/test_browserSupportsKupu.py	(original)
+++ kupu/trunk/kupu/plone/tests/test_browserSupportsKupu.py	Sun Feb 18 17:35:33 2007
@@ -53,7 +53,7 @@
     MOZILLA: (1,3,1),
     INTERNET_EXPLORER: (5,5),
     OPERA: (9,0),
-    SAFARI: (420,0),
+    SAFARI: (999,9), #(420,0), # Safari not yet supported
 }
 
 # BROWSERS records contain:
@@ -395,7 +395,11 @@
 def createTest(sig, isSupported, index, os, browser, version):
     def test(self):
         actual = self.script(sig)
-        self.assertEquals(isSupported, actual)
+        if isSupported:
+            expect = "expected supported but it isn't"
+        else:
+            expect = "found supported when not expecting it"
+        self.assertEquals(isSupported, actual, expect)
     testname = 'test_%d %s %s %s' % (index, os, BROWSERNAMES[browser],
                                      '.'.join([str(v) for v in version]))
     setattr(TestBrowserSupportsKupu, testname.strip(), test)

From duncan at codespeak.net  Sun Feb 18 20:14:52 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Sun, 18 Feb 2007 20:14:52 +0100 (CET)
Subject: [kupu-checkins] r39182 - in kupu/trunk/kupu: common tests
Message-ID: <20070218191452.82D001021B@code0.codespeak.net>

Author: duncan
Date: Sun Feb 18 20:14:51 2007
New Revision: 39182

Modified:
   kupu/trunk/kupu/common/kupucontentfilters.js
   kupu/trunk/kupu/tests/test_xhtml.js
Log:
Strip trailing <br> from paragraphs. Enclose top-level no-style text inside <p>

Modified: kupu/trunk/kupu/common/kupucontentfilters.js
==============================================================================
--- kupu/trunk/kupu/common/kupucontentfilters.js	(original)
+++ kupu/trunk/kupu/common/kupucontentfilters.js	Sun Feb 18 20:14:51 2007
@@ -541,6 +541,26 @@
         };
     }(this, editor);
 
+    // Node filtering. May modify html node or xhtml parentNode.
+    // Return true to continue processing html node, false to skip it.
+    this.nodefilters = new function(editor) {
+        // Strip <br> at end of paragraph.
+        // Top level <br>: enclose preceding text (if any) in <p> and
+        // drop the <br>
+        this['br'] = function(node, parentNode) {
+            if (parentNode.tagName=='body') {
+                var p = parentNode.ownerDocument.createElement('p');
+                if (parentNode.lastChild && parentNode.lastChild.nodeType==3) {
+                    p.appendChild(parentNode.lastChild);
+                }
+                parentNode.appendChild(p);
+                return false;
+            }
+            if (!node.nextSibling) return false;
+            return true;
+        };
+    }
+
     // Exclude unwanted tags.
     this.excludeTags(['center']);
 
@@ -599,6 +619,12 @@
         var nodename = this._getTagName(htmlnode);
         var nostructure = !this.filterstructure;
 
+        var filter = this.nodefilters[nodename];
+        if (filter) {
+            if (!filter(htmlnode, xhtmlparent)) {
+                return;
+            }
+        }
         // TODO: This permits valid tags anywhere. it should use the state
         // table in xhtmlvalid to only permit tags where the XHTML DTD
         // says they are valid.

Modified: kupu/trunk/kupu/tests/test_xhtml.js
==============================================================================
--- kupu/trunk/kupu/tests/test_xhtml.js	(original)
+++ kupu/trunk/kupu/tests/test_xhtml.js	Sun Feb 18 20:14:51 2007
@@ -117,7 +117,29 @@
     this.testConvertToSarissa = function() {
         var data = '<p class="blue">This is a test</p>';
         this.conversionTest(data, data);
-    }
+    };
+    
+    this.testRemoveTrailingBr = function() {
+        var data = '<p class="blue">This is a test<br></p>';
+        var expected = '<p class="blue">This is a test</p>';
+        this.conversionTest(data, expected);
+    };
+    this.testRemoveTrailingBr2 = function() {
+        var data = '<p class="blue">This is a test<br>with more text<br></p>';
+        var expected = '<p class="blue">This is a test<br/>with more text</p>';
+        this.conversionTest(data, expected);
+    };
+    this.testFixTopLevelBr = function() {
+        var data = '<p>alpha</p>beta<br><p>gamma</p>';
+        var expected = '<p>alpha</p><p>beta</p><p>gamma</p>';
+        this.conversionTest(data, expected);
+    };
+    this.testNakedBr = function() {
+        var data = '<p>alpha</p><br><p>gamma</p>';
+        var expected = '<p>alpha</p><p/><p>gamma</p>';
+        this.conversionTest(data, expected);
+    };
+    
     this.testXmlAttrs = function() {
         var data = '<pre xml:space="preserve" xml:lang="fr">This is a test</pre>';
         var expected1 = '<pre xml:lang="fr" xml:space="preserve">This is a test</pre>';

From duncan at codespeak.net  Sun Feb 18 20:45:44 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Sun, 18 Feb 2007 20:45:44 +0100 (CET)
Subject: [kupu-checkins] r39185 - in kupu/trunk/kupu/plone: .
	kupu_plone_layer profiles/default
Message-ID: <20070218194544.0D40B1020D@code0.codespeak.net>

Author: duncan
Date: Sun Feb 18 20:45:42 2007
New Revision: 39185

Modified:
   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/kupuploneeditor.js
   kupu/trunk/kupu/plone/kupu_plone_layer/sample-kupu-customisation-policy.py
   kupu/trunk/kupu/plone/plonelibrarytool.py
   kupu/trunk/kupu/plone/profiles/default/kupu.xml
Log:
Remove spurious br tags

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	Sun Feb 18 20:45:42 2007
@@ -125,7 +125,9 @@
     <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>
-  
+
+    <button type="button" class="kupu-save" name="azax-save"
+	   value="Save">&#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>

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	Sun Feb 18 20:45:42 2007
@@ -181,7 +181,7 @@
 button.kupu-logo {background-image: url("&dtml-portal_url;/kupuimages/kupu_icon.gif");}
 .kupu-outdent {background-image: url("&dtml-portal_url;/plonekupuimages/outdent.gif");}
 .kupu-redo {background-image: url("&dtml-portal_url;/plonekupuimages/redo.gif");}
-.kupu-save {background-image: url("&dtml-portal_url;/plonekupuimages/save.png");}
+.kupu-save {background-image: url("&dtml-portal_url;/kupuimages/save.png");}
 .kupu-save-and-exit {background-image: url("&dtml-portal_url;/kupuimages/exit.gif");}
 .kupu-space {background-image: url("&dtml-portal_url;/plonekupuimages/space.gif");}
 .kupu-source {background-image: url("&dtml-portal_url;/plonekupuimages/view-source.gif");}

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneeditor.js
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneeditor.js	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneeditor.js	Sun Feb 18 20:45:42 2007
@@ -76,8 +76,8 @@
     // Remove empty links
     contents = contents.replace(/<a\s+href="[^"]*"\s*>\s*<\/a>/g, '');
     // Fixup empty paras.
-    contents = contents.replace(/<p[^>]*>\s*<\/p>(<br \/>)*/g, '<p$1><br /></p>').strip();
-    return contents;
+    contents = contents.replace(/<p[^>]*>\s*<\/p>(<br \/>)*/g, '<p$1>&#160;</p>').strip();
+    return contents;	
 };
 
 KupuEditor.prototype.saveDataToField = function(form, field) {

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/sample-kupu-customisation-policy.py
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/sample-kupu-customisation-policy.py	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/sample-kupu-customisation-policy.py	Sun Feb 18 20:45:42 2007
@@ -21,7 +21,7 @@
     )
 
 EXCLUDED_HTML = [
-  {'tags': ('center','tt','big','small','s','strike','basefont','font',),
+  {'tags': ('center','tt','big','small','basefont','font',),
    'attributes':(),
    'keep': 1 },
   

Modified: kupu/trunk/kupu/plone/plonelibrarytool.py
==============================================================================
--- kupu/trunk/kupu/plone/plonelibrarytool.py	(original)
+++ kupu/trunk/kupu/plone/plonelibrarytool.py	Sun Feb 18 20:45:42 2007
@@ -75,7 +75,7 @@
 
 # Tidy up html by exlcluding lots of things.
 _excluded_html = [
-  (('center', 'tt', 'big', 'small', 's', 'strike', 'basefont', 'font'), ()),
+  (('center', 'tt', 'big', 'small', 'basefont', 'font'), ()),
   ((), ('dir','lang','valign','halign','border','frame','rules','cellspacing','cellpadding','bgcolor')),
   (('table','th','td'),('width','height')),
 ]

Modified: kupu/trunk/kupu/plone/profiles/default/kupu.xml
==============================================================================
--- kupu/trunk/kupu/plone/profiles/default/kupu.xml	(original)
+++ kupu/trunk/kupu/plone/profiles/default/kupu.xml	Sun Feb 18 20:45:42 2007
@@ -17,7 +17,7 @@
     <style>Even row|tr|even</style>
     <style>Heading cell|th|</style>
     <filter attributes=""
-            tags="center tt big small s strike basefont font"/>
+            tags="center tt big small basefont font"/>
     <filter attributes="dir lang valign halign border frame rules cellspacing cellpadding bgcolor"
             tags=""/>
     <filter attributes="width height" tags="table th td"/>

From duncan at codespeak.net  Mon Feb 19 13:06:46 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Mon, 19 Feb 2007 13:06:46 +0100 (CET)
Subject: [kupu-checkins] r39202 - in kupu/trunk/kupu: . plone
	plone/kupu_plone_layer
Message-ID: <20070219120646.564AD10237@code0.codespeak.net>

Author: duncan
Date: Mon Feb 19 13:06:45 2007
New Revision: 39202

Modified:
   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
Log:
Added an invisible save button which does nothing


Modified: kupu/trunk/kupu/dist-plone.kupu
==============================================================================
--- kupu/trunk/kupu/dist-plone.kupu	(original)
+++ kupu/trunk/kupu/dist-plone.kupu	Mon Feb 19 13:06:45 2007
@@ -21,6 +21,5 @@
 
   <!-- Plone does not want to use certain features -->
   <kupu:disable-feature name="toolboxes" />
-  <kupu:disable-feature name="save" />
 
 </kupu:dist>

Modified: kupu/trunk/kupu/plone/helpers.py
==============================================================================
--- kupu/trunk/kupu/plone/helpers.py	(original)
+++ kupu/trunk/kupu/plone/helpers.py	Mon Feb 19 13:06:45 2007
@@ -8,7 +8,9 @@
 #
 ##############################################################################
 # Helper classes
+# Filter list: filter name, title, enabled by default, css class
 FILTERS = [
+    ('save-button', 'Save button', True, 'kupu-save'),
     ('bg-basicmarkup', 'Bold/Italic group', True, None),
     ('bold-button', 'Bold button', True, 'kupu-bold'),
     ('italic-button', 'Italic button', True, 'kupu-italic'),

Modified: kupu/trunk/kupu/plone/include.kupu
==============================================================================
--- kupu/trunk/kupu/plone/include.kupu	(original)
+++ kupu/trunk/kupu/plone/include.kupu	Mon Feb 19 13:06:45 2007
@@ -11,6 +11,7 @@
   <xi:include href="xmlconfig.kupu" />
   <xi:include href="body.kupu" />
   <xi:include href="toolbar.kupu" />
+  <xi:include href="save.kupu" />
   <xi:include href="drawers.kupu" />
   <xi:include href="beforeunload.kupu" />
   <xi:include href="sourceedit.kupu" />

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html	Mon Feb 19 13:06:45 2007
@@ -23,10 +23,11 @@
     <!--$Id: xmlconfig.kupu 35367 2006-12-06 09:06:21Z duncan $-->
     <!--$Id: body.kupu 39156 2007-02-18 14:13:16Z duncan $-->
     <!--$Id: toolbar.kupu 35491 2006-12-08 15:41:49Z duncan $-->
+    <!--$Id save.kupu (not yet in svn) $-->
     <!--$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 35477 2006-12-08 13:20:38Z duncan $-->
-    <!--$Id: wysiwyg_support.kupu 27722 2006-05-26 11:10:05Z duncan $-->
+    <!--$Id: wysiwyg_support.kupu 39157 2007-02-18 14:29:58Z duncan $-->
     
 
     <div xmlns:metal="http://xml.zope.org/namespaces/metal" xmlns:tal="http://xml.zope.org/namespaces/tal" metal:define-macro="wysiwygEditorBox" id="kupu-editor" tal:define="name fieldName|inputname;                 editorid string:kupu-editor-${name}" tal:attributes="id editorid">
@@ -125,9 +126,11 @@
     <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>
-
-    <button type="button" class="kupu-save" name="azax-save"
-	   value="Save">&#160;</button>
+  
+    <span class="kupu-tb-buttongroup" tal:condition="not:context/checkCreationFlag">
+      <button type="button" class="kupu-save" id="kupu-save-button" title="Save" i18n:attributes="title" accesskey="s" tal:condition="filter/save-button">&#160;</button>
+    </span>
+  
     <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>

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	Mon Feb 19 13:06:45 2007
@@ -181,7 +181,7 @@
 button.kupu-logo {background-image: url("&dtml-portal_url;/kupuimages/kupu_icon.gif");}
 .kupu-outdent {background-image: url("&dtml-portal_url;/plonekupuimages/outdent.gif");}
 .kupu-redo {background-image: url("&dtml-portal_url;/plonekupuimages/redo.gif");}
-.kupu-save {background-image: url("&dtml-portal_url;/kupuimages/save.png");}
+.kupu-save {background-image: url("&dtml-portal_url;/kupuimages/save.png");display:none;}
 .kupu-save-and-exit {background-image: url("&dtml-portal_url;/kupuimages/exit.gif");}
 .kupu-space {background-image: url("&dtml-portal_url;/plonekupuimages/space.gif");}
 .kupu-source {background-image: url("&dtml-portal_url;/plonekupuimages/view-source.gif");}

From duncan at codespeak.net  Mon Feb 19 13:13:13 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Mon, 19 Feb 2007 13:13:13 +0100 (CET)
Subject: [kupu-checkins] r39203 - kupu/trunk/kupu/plone
Message-ID: <20070219121313.298001023E@code0.codespeak.net>

Author: duncan
Date: Mon Feb 19 13:13:13 2007
New Revision: 39203

Added:
   kupu/trunk/kupu/plone/save.kupu
Log:
Added missing file

Added: kupu/trunk/kupu/plone/save.kupu
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/plone/save.kupu	Mon Feb 19 13:13:13 2007
@@ -0,0 +1,23 @@
+<?xml version="1.0" ?>
+<kupu:feature
+    name="save"
+    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 save.kupu (not yet in svn) $</kupu:id>
+
+  <kupu:part name="buttons">
+    <span class="kupu-tb-buttongroup" tal:condition="not:context/checkCreationFlag">
+      <button type="button" class="kupu-save" id="kupu-save-button"
+              title="Save" i18n:attributes="title" accesskey="s"
+	      tal:condition="filter/save-button">&#160;</button>
+    </span>
+  </kupu:part>
+
+  <!-- We will have the button tool configuration here, too, once we
+       do tool definitions in XML config. -->
+
+</kupu:feature>

From duncan at codespeak.net  Mon Feb 19 21:35:15 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Mon, 19 Feb 2007 21:35:15 +0100 (CET)
Subject: [kupu-checkins] r39216 - kupu/trunk/kupu/doc
Message-ID: <20070219203515.9947310272@code0.codespeak.net>

Author: duncan
Date: Mon Feb 19 21:35:15 2007
New Revision: 39216

Modified:
   kupu/trunk/kupu/doc/CHANGES.txt
Log:
Updates CHANGES.txt


Modified: kupu/trunk/kupu/doc/CHANGES.txt
==============================================================================
--- kupu/trunk/kupu/doc/CHANGES.txt	(original)
+++ kupu/trunk/kupu/doc/CHANGES.txt	Mon Feb 19 21:35:15 2007
@@ -18,6 +18,15 @@
 
   - Fixed some small issues in XhtmlValidation elements.
 
+  - Improved KSS integration:
+
+	* Added an invisible save button to Plone toolbar: KSS will link up
+	  events and make it visible when editing inline.
+
+	* Fixed site error on empty page (Plone 3 compatibility)
+
+  - HTML cleanup improved: spurious <br/> tags removed.
+
 - 1.4 Beta 3
 
   - Fixed a bug where createLink deleted the selected text.

From wiggy at codespeak.net  Tue Feb 20 10:59:48 2007
From: wiggy at codespeak.net (wiggy at codespeak.net)
Date: Tue, 20 Feb 2007 10:59:48 +0100 (CET)
Subject: [kupu-checkins] r39221 - in kupu/trunk/kupu: Extensions
	plone/profiles/default
Message-ID: <20070220095948.61E3810298@code0.codespeak.net>

Author: wiggy
Date: Tue Feb 20 10:59:46 2007
New Revision: 39221

Modified:
   kupu/trunk/kupu/Extensions/Install.py
   kupu/trunk/kupu/plone/profiles/default/controlpanel.xml
Log:
Move the kupu configlet to the Plone category

Modified: kupu/trunk/kupu/Extensions/Install.py
==============================================================================
--- kupu/trunk/kupu/Extensions/Install.py	(original)
+++ kupu/trunk/kupu/Extensions/Install.py	Tue Feb 20 10:59:46 2007
@@ -184,8 +184,8 @@
                , 'string:${portal_url}/%s/kupu_config' % TOOLNAME
                , ''                 # a condition   
                , 'Manage portal'    # access permission
-               , 'Products'         # section to which the configlet should be added: 
-                                    #(Plone,Products,Members) 
+               , 'Plone'            # category to which kupu should be added: 
+                                    # (Plone,Products,Members) 
                , 1                  # visibility
                , PROJECTNAME
                , 'kupuimages/kupu_icon.gif' # icon in control_panel

Modified: kupu/trunk/kupu/plone/profiles/default/controlpanel.xml
==============================================================================
--- kupu/trunk/kupu/plone/profiles/default/controlpanel.xml	(original)
+++ kupu/trunk/kupu/plone/profiles/default/controlpanel.xml	Tue Feb 20 10:59:46 2007
@@ -1,7 +1,7 @@
 <?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=""
+    category="Plone" condition_expr=""
     url_expr="string:${portal_url}/kupu_library_tool/kupu_config"
     visible="True">
   <permission>Manage portal</permission>

From duncan at codespeak.net  Tue Feb 20 13:07:34 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Tue, 20 Feb 2007 13:07:34 +0100 (CET)
Subject: [kupu-checkins] r39224 - kupu/trunk/kupu/plone
Message-ID: <20070220120734.B18A410299@code0.codespeak.net>

Author: duncan
Date: Tue Feb 20 13:07:32 2007
New Revision: 39224

Modified:
   kupu/trunk/kupu/plone/plonelibrarytool.py
Log:
Removed empty unused method


Modified: kupu/trunk/kupu/plone/plonelibrarytool.py
==============================================================================
--- kupu/trunk/kupu/plone/plonelibrarytool.py	(original)
+++ kupu/trunk/kupu/plone/plonelibrarytool.py	Tue Feb 20 13:07:32 2007
@@ -742,8 +742,5 @@
 
         if REQUEST:
             REQUEST.RESPONSE.redirect(self.absolute_url() + '/kupu_config')
-
-    def _enableuidtransform(self, enable):
-        """Enable or disable the uid transform."""
         
 InitializeClass(PloneKupuLibraryTool)

From gotcha at codespeak.net  Tue Feb 20 13:22:23 2007
From: gotcha at codespeak.net (gotcha at codespeak.net)
Date: Tue, 20 Feb 2007 13:22:23 +0100 (CET)
Subject: [kupu-checkins] r39226 - kupu/trunk/kupu/plone/kupu_plone_layer
Message-ID: <20070220122223.51EF91029F@code0.codespeak.net>

Author: gotcha
Date: Tue Feb 20 13:22:22 2007
New Revision: 39226

Modified:
   kupu/trunk/kupu/plone/kupu_plone_layer/emptypage.pt
Log:
Kupu should mention its empty page is loaded

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/emptypage.pt
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/emptypage.pt	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/emptypage.pt	Tue Feb 20 13:22:22 2007
@@ -27,5 +27,6 @@
       This template is an empty placeholder, used for loading contents
       into the Kupu editor-iframe.
    </tal:comment>
+   <script type="text/javascript">document._kssReadyForLoadEvent=1;</script> 
   </body>
 </html>

From duncan at codespeak.net  Tue Feb 20 15:36:52 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Tue, 20 Feb 2007 15:36:52 +0100 (CET)
Subject: [kupu-checkins] r39238 - kupu/trunk/kupu/plone
Message-ID: <20070220143652.5DA2810108@code0.codespeak.net>

Author: duncan
Date: Tue Feb 20 15:36:51 2007
New Revision: 39238

Modified:
   kupu/trunk/kupu/plone/plonelibrarytool.py
Log:
Added support method to get/set stripped tags for plone 3


Modified: kupu/trunk/kupu/plone/plonelibrarytool.py
==============================================================================
--- kupu/trunk/kupu/plone/plonelibrarytool.py	(original)
+++ kupu/trunk/kupu/plone/plonelibrarytool.py	Tue Feb 20 15:36:51 2007
@@ -677,6 +677,22 @@
             pass
         self.html_exclusions = exclusions
 
+    security.declareProtected("View", "get_stripped_tags")
+    def get_stripped_tags(self):
+        """Returns a list of tags to be stripped"""
+        stripped = []
+        for (tags, attrs) in self.html_exclusions:
+            if not attrs:
+                stripped.extend(list(tags))
+        return stripped
+
+    security.declareProtected(permissions.ManageLibraries, "set_stripped_tags")
+    def set_stripped_tags(self, stripped):
+        """Sets a list of tags to be stripped"""
+        exclusions = [(tags, attrs) for (tags, attrs) in self.html_exclusions if attrs]
+        exclusions.append((tuple(stripped), ()))
+        self.set_html_exclusions(exclusions)
+
     security.declareProtected(permissions.ManageLibraries,
                               "configure_kupu")
     def configure_kupu(self,

From duncan at codespeak.net  Fri Feb 23 14:21:01 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Fri, 23 Feb 2007 14:21:01 +0100 (CET)
Subject: [kupu-checkins] r39339 - in kupu/trunk/kupu/plone: .
	kupu_plone_layer
Message-ID: <20070223132101.961A51017A@code0.codespeak.net>

Author: duncan
Date: Fri Feb 23 14:20:58 2007
New Revision: 39339

Modified:
   kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
   kupu/trunk/kupu/plone/save.kupu
Log:
Need fallback for older Plones.

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 Feb 23 14:20:58 2007
@@ -127,7 +127,7 @@
       <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" tal:condition="not:context/checkCreationFlag">
+    <span class="kupu-tb-buttongroup" tal:condition="not:context/checkCreationFlag|python:True">
       <button type="button" class="kupu-save" id="kupu-save-button" title="Save" i18n:attributes="title" accesskey="s" tal:condition="filter/save-button">&#160;</button>
     </span>
   

Modified: kupu/trunk/kupu/plone/save.kupu
==============================================================================
--- kupu/trunk/kupu/plone/save.kupu	(original)
+++ kupu/trunk/kupu/plone/save.kupu	Fri Feb 23 14:20:58 2007
@@ -10,7 +10,7 @@
 <kupu:id>$Id save.kupu (not yet in svn) $</kupu:id>
 
   <kupu:part name="buttons">
-    <span class="kupu-tb-buttongroup" tal:condition="not:context/checkCreationFlag">
+    <span class="kupu-tb-buttongroup" tal:condition="not:context/checkCreationFlag|python:True">
       <button type="button" class="kupu-save" id="kupu-save-button"
               title="Save" i18n:attributes="title" accesskey="s"
 	      tal:condition="filter/save-button">&#160;</button>

From yuppie at codespeak.net  Fri Feb 23 19:29:29 2007
From: yuppie at codespeak.net (yuppie at codespeak.net)
Date: Fri, 23 Feb 2007 19:29:29 +0100 (CET)
Subject: [kupu-checkins] r39345 - in kupu/trunk/kupu: common
	plone/kupu_plone_layer roundup widgeteer
Message-ID: <20070223182929.64ABB101DF@code0.codespeak.net>

Author: yuppie
Date: Fri Feb 23 19:29:27 2007
New Revision: 39345

Modified:
   kupu/trunk/kupu/common/kupuinit.js
   kupu/trunk/kupu/common/kupuinit_experimental.js
   kupu/trunk/kupu/common/kupuinit_form.js
   kupu/trunk/kupu/common/kupuinit_genericelements.js
   kupu/trunk/kupu/common/kupuinit_multi.js
   kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneinit.js
   kupu/trunk/kupu/roundup/kupuinit.js
   kupu/trunk/kupu/widgeteer/kupuinit.js   (contents, props changed)
Log:
- synced and cleaned up init scripts (this should not change any behavior)

Modified: kupu/trunk/kupu/common/kupuinit.js
==============================================================================
--- kupu/trunk/kupu/common/kupuinit.js	(original)
+++ kupu/trunk/kupu/common/kupuinit.js	Fri Feb 23 19:29:27 2007
@@ -18,8 +18,8 @@
     /* Although this is meant to be a sample implementation, it can
         be used out-of-the box to run the sample pagetemplate or for simple
         implementations that just don't use some elements. When you want
-        to do some customization, this should probably be overridden. For 
-        larger customization actions you will have to subclass or roll your 
+        to do some customization, this should probably be overridden. For
+        larger customization actions you will have to subclass or roll your
         own UI object.
     */
 
@@ -59,7 +59,7 @@
 
     var boldchecker = parentWithStyleChecker(['b', 'strong'],
                                              'fontWeight', 'bold', 'bold');
-    var boldbutton = new KupuStateButton('kupu-bold-button', 
+    var boldbutton = new KupuStateButton('kupu-bold-button',
                                          execCommand('bold'),
                                          boldchecker,
                                          'kupu-bold',
@@ -68,19 +68,19 @@
 
     var italicschecker = parentWithStyleChecker(['i', 'em'],
                                               'fontStyle', 'italic', 'italic');
-    var italicsbutton = new KupuStateButton('kupu-italic-button', 
-                                           execCommand('italic'),
-                                           italicschecker, 
-                                           'kupu-italic', 
-                                           'kupu-italic-pressed');
+    var italicsbutton = new KupuStateButton('kupu-italic-button',
+                                            execCommand('italic'),
+                                            italicschecker,
+                                            'kupu-italic',
+                                            'kupu-italic-pressed');
     kupu.registerTool('italicsbutton', italicsbutton);
 
     var underlinechecker = parentWithStyleChecker(['u'],
                                    'textDecoration', 'underline', 'underline');
-    var underlinebutton = new KupuStateButton('kupu-underline-button', 
+    var underlinebutton = new KupuStateButton('kupu-underline-button',
                                               execCommand('underline'),
                                               underlinechecker,
-                                              'kupu-underline', 
+                                              'kupu-underline',
                                               'kupu-underline-pressed');
     kupu.registerTool('underlinebutton', underlinebutton);
 
@@ -95,10 +95,10 @@
 
     var superscriptchecker = parentWithStyleChecker(['super', 'sup'],
                                                     null, null, 'superscript');
-    var superscriptbutton = new KupuStateButton('kupu-superscript-button', 
+    var superscriptbutton = new KupuStateButton('kupu-superscript-button',
                                                 execCommand('superscript'),
                                                 superscriptchecker,
-                                                'kupu-superscript', 
+                                                'kupu-superscript',
                                                 'kupu-superscript-pressed');
     kupu.registerTool('superscriptbutton', superscriptbutton);
 
@@ -137,7 +137,6 @@
     kupu.registerTool('removelinkbutton', removelinkbutton);
 
     // add some tools
-    // XXX would it be better to pass along elements instead of ids?
     var colorchoosertool = new ColorchooserTool('kupu-forecolor-button',
                                                 'kupu-hilitecolor-button',
                                                 'kupu-colorchooser');
@@ -145,7 +144,8 @@
 
     var listtool = new ListTool('kupu-list-ul-addbutton',
                                 'kupu-list-ol-addbutton',
-                                'kupu-ulstyles', 'kupu-olstyles');
+                                'kupu-ulstyles',
+                                'kupu-olstyles');
     kupu.registerTool('listtool', listtool);
 
     var definitionlisttool = new DefinitionListTool('kupu-list-dl-addbutton');
@@ -161,8 +161,8 @@
 
     var imagetool = new ImageTool();
     kupu.registerTool('imagetool', imagetool);
-    var imagetoolbox = new ImageToolBox('kupu-image-input', 'kupu-image-addbutton', 
-                                        'kupu-image-float-select', 'kupu-toolbox-images', 
+    var imagetoolbox = new ImageToolBox('kupu-image-input', 'kupu-image-addbutton',
+                                        'kupu-image-float-select', 'kupu-toolbox-images',
                                         'kupu-toolbox', 'kupu-toolbox-active');
     imagetool.registerToolBox('imagetoolbox', imagetoolbox);
 
@@ -193,7 +193,9 @@
                                             'spellcheck.cgi');
     kupu.registerTool('spellchecker', spellchecker);
 
-    var zoom = new KupuZoomTool('kupu-zoom-button');
+    var zoom = new KupuZoomTool('kupu-zoom-button',
+                                'kupu-tb-styles',
+                                'kupu-logo-button');
     kupu.registerTool('zoomtool', zoom);
 
     var cleanupexpressions = new CleanupExpressionsTool(
@@ -222,26 +224,26 @@
     kupu.registerTool('linkdrawerbutton', linkdrawerbutton);
 
     var anchorbutton = new KupuButton('kupu-anchors',
-        opendrawer('anchordrawer'));
+                                      opendrawer('anchordrawer'));
     kupu.registerTool('anchorbutton', anchorbutton);
 
     var tabledrawerbutton = new KupuButton('kupu-tabledrawer-button',
                                            opendrawer('tabledrawer'));
     kupu.registerTool('tabledrawerbutton', tabledrawerbutton);
 
-    // create some drawers, drawers are some sort of popups that appear when a 
+    // create some drawers, drawers are some sort of popups that appear when a
     // toolbar button is clicked
     var drawertool = new DrawerTool();
     kupu.registerTool('drawertool', drawertool);
 
     try {
-        var linklibdrawer = new LinkLibraryDrawer(linktool, 
+        var linklibdrawer = new LinkLibraryDrawer(linktool,
                                                   conf.link_xsl_uri,
                                                   conf.link_libraries_uri,
                                                   conf.search_links_uri);
         drawertool.registerDrawer('linklibdrawer', linklibdrawer);
 
-        var imagelibdrawer = new ImageLibraryDrawer(imagetool, 
+        var imagelibdrawer = new ImageLibraryDrawer(imagetool,
                                                     conf.image_xsl_uri,
                                                     conf.image_libraries_uri,
                                                     conf.search_images_uri);

Modified: kupu/trunk/kupu/common/kupuinit_experimental.js
==============================================================================
--- kupu/trunk/kupu/common/kupuinit_experimental.js	(original)
+++ kupu/trunk/kupu/common/kupuinit_experimental.js	Fri Feb 23 19:29:27 2007
@@ -7,7 +7,6 @@
  * Contributors see CREDITS.txt.
  *
  *****************************************************************************/
-
 // $Id$
 
 
@@ -19,8 +18,8 @@
     /* Although this is meant to be a sample implementation, it can
         be used out-of-the box to run the sample pagetemplate or for simple
         implementations that just don't use some elements. When you want
-        to do some customization, this should probably be overridden. For 
-        larger customization actions you will have to subclass or roll your 
+        to do some customization, this should probably be overridden. For
+        larger customization actions you will have to subclass or roll your
         own UI object.
     */
 
@@ -60,7 +59,7 @@
 
     var boldchecker = parentWithStyleChecker(['b', 'strong'],
                                              'fontWeight', 'bold', 'bold');
-    var boldbutton = new KupuStateButton('kupu-bold-button', 
+    var boldbutton = new KupuStateButton('kupu-bold-button',
                                          execCommand('bold'),
                                          boldchecker,
                                          'kupu-bold',
@@ -69,19 +68,19 @@
 
     var italicschecker = parentWithStyleChecker(['i', 'em'],
                                               'fontStyle', 'italic', 'italic');
-    var italicsbutton = new KupuStateButton('kupu-italic-button', 
-                                           execCommand('italic'),
-                                           italicschecker, 
-                                           'kupu-italic', 
-                                           'kupu-italic-pressed');
+    var italicsbutton = new KupuStateButton('kupu-italic-button',
+                                            execCommand('italic'),
+                                            italicschecker,
+                                            'kupu-italic',
+                                            'kupu-italic-pressed');
     kupu.registerTool('italicsbutton', italicsbutton);
 
     var underlinechecker = parentWithStyleChecker(['u'],
                                    'textDecoration', 'underline', 'underline');
-    var underlinebutton = new KupuStateButton('kupu-underline-button', 
+    var underlinebutton = new KupuStateButton('kupu-underline-button',
                                               execCommand('underline'),
                                               underlinechecker,
-                                              'kupu-underline', 
+                                              'kupu-underline',
                                               'kupu-underline-pressed');
     kupu.registerTool('underlinebutton', underlinebutton);
 
@@ -96,10 +95,10 @@
 
     var superscriptchecker = parentWithStyleChecker(['super', 'sup'],
                                                     null, null, 'superscript');
-    var superscriptbutton = new KupuStateButton('kupu-superscript-button', 
+    var superscriptbutton = new KupuStateButton('kupu-superscript-button',
                                                 execCommand('superscript'),
                                                 superscriptchecker,
-                                                'kupu-superscript', 
+                                                'kupu-superscript',
                                                 'kupu-superscript-pressed');
     kupu.registerTool('superscriptbutton', superscriptbutton);
 
@@ -138,7 +137,6 @@
     kupu.registerTool('removelinkbutton', removelinkbutton);
 
     // add some tools
-    // XXX would it be better to pass along elements instead of ids?
     var colorchoosertool = new ColorchooserTool('kupu-forecolor-button',
                                                 'kupu-hilitecolor-button',
                                                 'kupu-colorchooser');
@@ -146,7 +144,8 @@
 
     var listtool = new ListTool('kupu-list-ul-addbutton',
                                 'kupu-list-ol-addbutton',
-                                'kupu-ulstyles', 'kupu-olstyles');
+                                'kupu-ulstyles',
+                                'kupu-olstyles');
     kupu.registerTool('listtool', listtool);
 
     // since we use the inspector we don't need much else ;)
@@ -193,17 +192,19 @@
                                            opendrawer('tabledrawer'));
     kupu.registerTool('tabledrawerbutton', tabledrawerbutton);
 
-    // create some drawers, drawers are some sort of popups that appear when a 
+    // create some drawers, drawers are some sort of popups that appear when a
     // toolbar button is clicked
     var drawertool = new DrawerTool();
     kupu.registerTool('drawertool', drawertool);
 
-    var linklibdrawer = new LinkLibraryDrawer(linktool, conf.link_xsl_uri,
+    var linklibdrawer = new LinkLibraryDrawer(linktool,
+                                              conf.link_xsl_uri,
                                               conf.link_libraries_uri,
                                               conf.search_links_uri);
     drawertool.registerDrawer('linklibdrawer', linklibdrawer);
 
-    var imagelibdrawer = new ImageLibraryDrawer(imagetool, conf.image_xsl_uri,
+    var imagelibdrawer = new ImageLibraryDrawer(imagetool,
+                                                conf.image_xsl_uri,
                                                 conf.image_libraries_uri,
                                                 conf.search_images_uri);
     drawertool.registerDrawer('imagelibdrawer', imagelibdrawer);

Modified: kupu/trunk/kupu/common/kupuinit_form.js
==============================================================================
--- kupu/trunk/kupu/common/kupuinit_form.js	(original)
+++ kupu/trunk/kupu/common/kupuinit_form.js	Fri Feb 23 19:29:27 2007
@@ -7,7 +7,6 @@
  * Contributors see CREDITS.txt.
  *
  *****************************************************************************/
-
 // $Id$
 
 
@@ -24,8 +23,8 @@
     /* Although this is meant to be a sample implementation, it can
         be used out-of-the box to run the sample pagetemplate or for simple
         implementations that just don't use some elements. When you want
-        to do some customization, this should probably be overridden. For 
-        larger customization actions you will have to subclass or roll your 
+        to do some customization, this should probably be overridden. For
+        larger customization actions you will have to subclass or roll your
         own UI object.
     */
 
@@ -60,7 +59,7 @@
 
     var boldchecker = parentWithStyleChecker(['b', 'strong'],
                                              'fontWeight', 'bold', 'bold');
-    var boldbutton = new KupuStateButton('kupu-bold-button', 
+    var boldbutton = new KupuStateButton('kupu-bold-button',
                                          execCommand('bold'),
                                          boldchecker,
                                          'kupu-bold',
@@ -69,19 +68,19 @@
 
     var italicschecker = parentWithStyleChecker(['i', 'em'],
                                               'fontStyle', 'italic', 'italic');
-    var italicsbutton = new KupuStateButton('kupu-italic-button', 
-                                           execCommand('italic'),
-                                           italicschecker, 
-                                           'kupu-italic', 
-                                           'kupu-italic-pressed');
+    var italicsbutton = new KupuStateButton('kupu-italic-button',
+                                            execCommand('italic'),
+                                            italicschecker,
+                                            'kupu-italic',
+                                            'kupu-italic-pressed');
     kupu.registerTool('italicsbutton', italicsbutton);
 
     var underlinechecker = parentWithStyleChecker(['u'],
                                    'textDecoration', 'underline', 'underline');
-    var underlinebutton = new KupuStateButton('kupu-underline-button', 
+    var underlinebutton = new KupuStateButton('kupu-underline-button',
                                               execCommand('underline'),
                                               underlinechecker,
-                                              'kupu-underline', 
+                                              'kupu-underline',
                                               'kupu-underline-pressed');
     kupu.registerTool('underlinebutton', underlinebutton);
 
@@ -96,10 +95,10 @@
 
     var superscriptchecker = parentWithStyleChecker(['super', 'sup'],
                                                     null, null, 'superscript');
-    var superscriptbutton = new KupuStateButton('kupu-superscript-button', 
+    var superscriptbutton = new KupuStateButton('kupu-superscript-button',
                                                 execCommand('superscript'),
                                                 superscriptchecker,
-                                                'kupu-superscript', 
+                                                'kupu-superscript',
                                                 'kupu-superscript-pressed');
     kupu.registerTool('superscriptbutton', superscriptbutton);
 
@@ -138,7 +137,6 @@
     kupu.registerTool('removelinkbutton', removelinkbutton);
 
     // add some tools
-    // XXX would it be better to pass along elements instead of ids?
     var colorchoosertool = new ColorchooserTool('kupu-forecolor-button',
                                                 'kupu-hilitecolor-button',
                                                 'kupu-colorchooser');
@@ -146,7 +144,8 @@
 
     var listtool = new ListTool('kupu-list-ul-addbutton',
                                 'kupu-list-ol-addbutton',
-                                'kupu-ulstyles', 'kupu-olstyles');
+                                'kupu-ulstyles',
+                                'kupu-olstyles');
     kupu.registerTool('listtool', listtool);
 
     var definitionlisttool = new DefinitionListTool('kupu-list-dl-addbutton');
@@ -162,8 +161,8 @@
 
     var imagetool = new ImageTool();
     kupu.registerTool('imagetool', imagetool);
-    var imagetoolbox = new ImageToolBox('kupu-image-input', 'kupu-image-addbutton', 
-                                        'kupu-image-float-select', 'kupu-toolbox-images', 
+    var imagetoolbox = new ImageToolBox('kupu-image-input', 'kupu-image-addbutton',
+                                        'kupu-image-float-select', 'kupu-toolbox-images',
                                         'kupu-toolbox', 'kupu-toolbox-active');
     imagetool.registerToolBox('imagetoolbox', imagetoolbox);
 
@@ -194,7 +193,9 @@
                                             'spellcheck.cgi');
     kupu.registerTool('spellchecker', spellchecker);
 
-    var zoom = new KupuZoomTool('kupu-zoom-button');
+    var zoom = new KupuZoomTool('kupu-zoom-button',
+                                'kupu-tb-styles',
+                                'kupu-logo-button');
     kupu.registerTool('zoomtool', zoom);
 
     var cleanupexpressions = new CleanupExpressionsTool(
@@ -223,26 +224,26 @@
     kupu.registerTool('linkdrawerbutton', linkdrawerbutton);
 
     var anchorbutton = new KupuButton('kupu-anchors',
-        opendrawer('anchordrawer'));
+                                      opendrawer('anchordrawer'));
     kupu.registerTool('anchorbutton', anchorbutton);
 
     var tabledrawerbutton = new KupuButton('kupu-tabledrawer-button',
                                            opendrawer('tabledrawer'));
     kupu.registerTool('tabledrawerbutton', tabledrawerbutton);
 
-    // create some drawers, drawers are some sort of popups that appear when a 
+    // create some drawers, drawers are some sort of popups that appear when a
     // toolbar button is clicked
     var drawertool = new DrawerTool();
     kupu.registerTool('drawertool', drawertool);
 
     try {
-        var linklibdrawer = new LinkLibraryDrawer(linktool, 
+        var linklibdrawer = new LinkLibraryDrawer(linktool,
                                                   conf.link_xsl_uri,
                                                   conf.link_libraries_uri,
                                                   conf.search_links_uri);
         drawertool.registerDrawer('linklibdrawer', linklibdrawer);
 
-        var imagelibdrawer = new ImageLibraryDrawer(imagetool, 
+        var imagelibdrawer = new ImageLibraryDrawer(imagetool,
                                                     conf.image_xsl_uri,
                                                     conf.image_libraries_uri,
                                                     conf.search_images_uri);
@@ -269,7 +270,7 @@
     // some bug in IE makes it crash on saving the form when a lib drawer
     // was added to the page at some point, remove it on form submit
     var savebutton = getFromSelector('kupu-save-button');
-    function prepareForm() {
+    function prepareForm(event) {
         var drawer = window.document.getElementById('kupu-librarydrawer');
         if (drawer) {
             drawer.parentNode.removeChild(drawer);

Modified: kupu/trunk/kupu/common/kupuinit_genericelements.js
==============================================================================
--- kupu/trunk/kupu/common/kupuinit_genericelements.js	(original)
+++ kupu/trunk/kupu/common/kupuinit_genericelements.js	Fri Feb 23 19:29:27 2007
@@ -19,8 +19,8 @@
     /* Although this is meant to be a sample implementation, it can
         be used out-of-the box to run the sample pagetemplate or for simple
         implementations that just don't use some elements. When you want
-        to do some customization, this should probably be overridden. For 
-        larger customization actions you will have to subclass or roll your 
+        to do some customization, this should probably be overridden. For
+        larger customization actions you will have to subclass or roll your
         own UI object.
     */
 
@@ -60,7 +60,7 @@
 
     var boldchecker = parentWithStyleChecker(['b', 'strong'],
                                              'fontWeight', 'bold', 'bold');
-    var boldbutton = new KupuStateButton('kupu-bold-button', 
+    var boldbutton = new KupuStateButton('kupu-bold-button',
                                          execCommand('bold'),
                                          boldchecker,
                                          'kupu-bold',
@@ -69,19 +69,19 @@
 
     var italicschecker = parentWithStyleChecker(['i', 'em'],
                                               'fontStyle', 'italic', 'italic');
-    var italicsbutton = new KupuStateButton('kupu-italic-button', 
-                                           execCommand('italic'),
-                                           italicschecker, 
-                                           'kupu-italic', 
-                                           'kupu-italic-pressed');
+    var italicsbutton = new KupuStateButton('kupu-italic-button',
+                                            execCommand('italic'),
+                                            italicschecker,
+                                            'kupu-italic',
+                                            'kupu-italic-pressed');
     kupu.registerTool('italicsbutton', italicsbutton);
 
     var underlinechecker = parentWithStyleChecker(['u'],
                                    'textDecoration', 'underline', 'underline');
-    var underlinebutton = new KupuStateButton('kupu-underline-button', 
+    var underlinebutton = new KupuStateButton('kupu-underline-button',
                                               execCommand('underline'),
                                               underlinechecker,
-                                              'kupu-underline', 
+                                              'kupu-underline',
                                               'kupu-underline-pressed');
     kupu.registerTool('underlinebutton', underlinebutton);
 
@@ -96,10 +96,10 @@
 
     var superscriptchecker = parentWithStyleChecker(['super', 'sup'],
                                                     null, null, 'superscript');
-    var superscriptbutton = new KupuStateButton('kupu-superscript-button', 
+    var superscriptbutton = new KupuStateButton('kupu-superscript-button',
                                                 execCommand('superscript'),
                                                 superscriptchecker,
-                                                'kupu-superscript', 
+                                                'kupu-superscript',
                                                 'kupu-superscript-pressed');
     kupu.registerTool('superscriptbutton', superscriptbutton);
 
@@ -138,7 +138,6 @@
     kupu.registerTool('removelinkbutton', removelinkbutton);
 
     // add some tools
-    // XXX would it be better to pass along elements instead of ids?
     var colorchoosertool = new ColorchooserTool('kupu-forecolor-button',
                                                 'kupu-hilitecolor-button',
                                                 'kupu-colorchooser');
@@ -146,7 +145,8 @@
 
     var listtool = new ListTool('kupu-list-ul-addbutton',
                                 'kupu-list-ol-addbutton',
-                                'kupu-ulstyles', 'kupu-olstyles');
+                                'kupu-ulstyles',
+                                'kupu-olstyles');
     kupu.registerTool('listtool', listtool);
 
     var definitionlisttool = new DefinitionListTool('kupu-list-dl-addbutton');
@@ -162,8 +162,8 @@
 
     var imagetool = new ImageTool();
     kupu.registerTool('imagetool', imagetool);
-    var imagetoolbox = new ImageToolBox('kupu-image-input', 'kupu-image-addbutton', 
-                                        'kupu-image-float-select', 'kupu-toolbox-images', 
+    var imagetoolbox = new ImageToolBox('kupu-image-input', 'kupu-image-addbutton',
+                                        'kupu-image-float-select', 'kupu-toolbox-images',
                                         'kupu-toolbox', 'kupu-toolbox-active');
     imagetool.registerToolBox('imagetoolbox', imagetoolbox);
 
@@ -172,11 +172,13 @@
     // custom TableToolBox for CNF, Codename Future
     var tabletoolbox = new CNFTableToolBox('kupu-toolbox-addtable', 
         'kupu-toolbox-edittable', 'kupu-table-newrows', 'kupu-table-newcols',
-        'kupu-table-makeheader', 'kupu-table-classchooser', 'kupu-table-alignchooser',
-        'kupu-table-addtable-button', 'kupu-table-addrow-button', 'kupu-table-delrow-button', 
+        'kupu-table-makeheader', 'kupu-table-classchooser',
+        'kupu-table-alignchooser', 'kupu-table-addtable-button',
+        'kupu-table-addrow-button', 'kupu-table-delrow-button',
         'kupu-table-setrowrepeat-button', 'kupu-table-delrowrepeat-button',
-        'kupu-table-addcolumn-button', 'kupu-table-delcolumn-button', 
-        'kupu-table-fix-button', 'kupu-table-fixall-button', 'kupu-toolbox-tables',
+        'kupu-table-addcolumn-button', 'kupu-table-delcolumn-button',
+        'kupu-table-fix-button',
+        'kupu-table-fixall-button', 'kupu-toolbox-tables',
         'kupu-toolbox', 'kupu-toolbox-active');
     tabletool.registerToolBox('tabletoolbox', tabletoolbox);
 
@@ -223,26 +225,26 @@
     kupu.registerTool('linkdrawerbutton', linkdrawerbutton);
 
     var anchorbutton = new KupuButton('kupu-anchors',
-        opendrawer('anchordrawer'));
+                                      opendrawer('anchordrawer'));
     kupu.registerTool('anchorbutton', anchorbutton);
 
     var tabledrawerbutton = new KupuButton('kupu-tabledrawer-button',
                                            opendrawer('tabledrawer'));
     kupu.registerTool('tabledrawerbutton', tabledrawerbutton);
 
-    // create some drawers, drawers are some sort of popups that appear when a 
+    // create some drawers, drawers are some sort of popups that appear when a
     // toolbar button is clicked
     var drawertool = new DrawerTool();
     kupu.registerTool('drawertool', drawertool);
 
     try {
-        var linklibdrawer = new LinkLibraryDrawer(linktool, 
+        var linklibdrawer = new LinkLibraryDrawer(linktool,
                                                   conf.link_xsl_uri,
                                                   conf.link_libraries_uri,
                                                   conf.search_links_uri);
         drawertool.registerDrawer('linklibdrawer', linklibdrawer);
 
-        var imagelibdrawer = new ImageLibraryDrawer(imagetool, 
+        var imagelibdrawer = new ImageLibraryDrawer(imagetool,
                                                     conf.image_xsl_uri,
                                                     conf.image_libraries_uri,
                                                     conf.search_images_uri);

Modified: kupu/trunk/kupu/common/kupuinit_multi.js
==============================================================================
--- kupu/trunk/kupu/common/kupuinit_multi.js	(original)
+++ kupu/trunk/kupu/common/kupuinit_multi.js	Fri Feb 23 19:29:27 2007
@@ -19,8 +19,8 @@
     /* Although this is meant to be a sample implementation, it can
         be used out-of-the box to run the sample pagetemplate or for simple
         implementations that just don't use some elements. When you want
-        to do some customization, this should probably be overridden. For 
-        larger customization actions you will have to subclass or roll your 
+        to do some customization, this should probably be overridden. For
+        larger customization actions you will have to subclass or roll your
         own UI object.
     */
 
@@ -60,7 +60,7 @@
 
     var boldchecker = parentWithStyleChecker(['b', 'strong'],
                                              'fontWeight', 'bold', 'bold');
-    var boldbutton = new KupuStateButton('kupu-bold-button', 
+    var boldbutton = new KupuStateButton('kupu-bold-button',
                                          execCommand('bold'),
                                          boldchecker,
                                          'kupu-bold',
@@ -69,19 +69,19 @@
 
     var italicschecker = parentWithStyleChecker(['i', 'em'],
                                               'fontStyle', 'italic', 'italic');
-    var italicsbutton = new KupuStateButton('kupu-italic-button', 
-                                           execCommand('italic'),
-                                           italicschecker, 
-                                           'kupu-italic', 
-                                           'kupu-italic-pressed');
+    var italicsbutton = new KupuStateButton('kupu-italic-button',
+                                            execCommand('italic'),
+                                            italicschecker,
+                                            'kupu-italic',
+                                            'kupu-italic-pressed');
     kupu.registerTool('italicsbutton', italicsbutton);
 
     var underlinechecker = parentWithStyleChecker(['u'],
                                    'textDecoration', 'underline', 'underline');
-    var underlinebutton = new KupuStateButton('kupu-underline-button', 
+    var underlinebutton = new KupuStateButton('kupu-underline-button',
                                               execCommand('underline'),
                                               underlinechecker,
-                                              'kupu-underline', 
+                                              'kupu-underline',
                                               'kupu-underline-pressed');
     kupu.registerTool('underlinebutton', underlinebutton);
 
@@ -96,10 +96,10 @@
 
     var superscriptchecker = parentWithStyleChecker(['super', 'sup'],
                                                     null, null, 'superscript');
-    var superscriptbutton = new KupuStateButton('kupu-superscript-button', 
+    var superscriptbutton = new KupuStateButton('kupu-superscript-button',
                                                 execCommand('superscript'),
                                                 superscriptchecker,
-                                                'kupu-superscript', 
+                                                'kupu-superscript',
                                                 'kupu-superscript-pressed');
     kupu.registerTool('superscriptbutton', superscriptbutton);
 
@@ -138,7 +138,6 @@
     kupu.registerTool('removelinkbutton', removelinkbutton);
 
     // add some tools
-    // XXX would it be better to pass along elements instead of ids?
     var colorchoosertool = new ColorchooserTool('kupu-forecolor-button',
                                                 'kupu-hilitecolor-button',
                                                 'kupu-colorchooser');
@@ -146,7 +145,8 @@
 
     var listtool = new ListTool('kupu-list-ul-addbutton',
                                 'kupu-list-ol-addbutton',
-                                'kupu-ulstyles', 'kupu-olstyles');
+                                'kupu-ulstyles',
+                                'kupu-olstyles');
     kupu.registerTool('listtool', listtool);
 
     var definitionlisttool = new DefinitionListTool('kupu-list-dl-addbutton');
@@ -164,8 +164,8 @@
 
     var imagetool = new ImageTool();
     kupu.registerTool('imagetool', imagetool);
-    var imagetoolbox = new ImageToolBox('kupu-image-input', 'kupu-image-addbutton', 
-                                        'kupu-image-float-select', 'kupu-toolbox-images', 
+    var imagetoolbox = new ImageToolBox('kupu-image-input', 'kupu-image-addbutton',
+                                        'kupu-image-float-select', 'kupu-toolbox-images',
                                         'kupu-toolbox', 'kupu-toolbox-active');
     imagetool.registerToolBox('imagetoolbox', imagetoolbox);
 
@@ -189,7 +189,7 @@
     kupu.registerTool('showpathtool', showpathtool);
 
     var sourceedittool = new MultiSourceEditTool('kupu-source-button',
-                                                    'kupu-editor-textarea-');
+                                                 'kupu-editor-textarea-');
     kupu.registerTool('sourceedittool', sourceedittool);
 
     var cleanupexpressions = new CleanupExpressionsTool(
@@ -218,26 +218,26 @@
     kupu.registerTool('linkdrawerbutton', linkdrawerbutton);
 
     var anchorbutton = new KupuButton('kupu-anchors',
-        opendrawer('anchordrawer'));
+                                      opendrawer('anchordrawer'));
     kupu.registerTool('anchorbutton', anchorbutton);
 
     var tabledrawerbutton = new KupuButton('kupu-tabledrawer-button',
                                            opendrawer('tabledrawer'));
     kupu.registerTool('tabledrawerbutton', tabledrawerbutton);
 
-    // create some drawers, drawers are some sort of popups that appear when a 
+    // create some drawers, drawers are some sort of popups that appear when a
     // toolbar button is clicked
     var drawertool = new DrawerTool();
     kupu.registerTool('drawertool', drawertool);
 
     try {
-        var linklibdrawer = new LinkLibraryDrawer(linktool, 
+        var linklibdrawer = new LinkLibraryDrawer(linktool,
                                                   conf.link_xsl_uri,
                                                   conf.link_libraries_uri,
                                                   conf.search_links_uri);
         drawertool.registerDrawer('linklibdrawer', linklibdrawer);
 
-        var imagelibdrawer = new ImageLibraryDrawer(imagetool, 
+        var imagelibdrawer = new ImageLibraryDrawer(imagetool,
                                                     conf.image_xsl_uri,
                                                     conf.image_libraries_uri,
                                                     conf.search_images_uri);

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 Feb 23 19:29:27 2007
@@ -19,12 +19,13 @@
     };
     iframe._kupuIsInitialized = true;
     var textarea = getFromSelector(prefix+'textarea.kupu-editor-textarea');
-    var l = new DummyLogger();
-
     var ibody = iframe.contentWindow.document.body;
     var form = textarea.form;
     var initialtext = textarea.value || (_SARISSA_IS_IE?'<p></p>':'<p><br></p>');
-    
+
+    // first we create a logger
+    var l = new DummyLogger();
+
     // now some config values
     var conf = loadDictFromXML(document, prefix+'xml.kupuconfig');
 
@@ -33,13 +34,17 @@
 
     // now we can create the controller
     var kupu = (window.kupu = new KupuEditor(doc, conf, l));
+
     kupu.setHTMLBody(initialtext);
 
     // now we can create a UI object which we can use from the UI
     var ui = new KupuUI(prefix+'select.kupu-tb-styles');
-    kupu.registerTool('ui', ui);
     window.kupuui = ui;
 
+    // the ui must be registered to the editor like a tool so it can be notified
+    // of state changes
+    kupu.registerTool('ui', ui); // XXX Should this be a different method?
+
     // function that returns a function to execute a button command
     var execCommand = function(cmd) {
         return function(button, editor) {
@@ -48,8 +53,8 @@
     };
 
     var boldchecker = parentWithStyleChecker(['b', 'strong'],
-					     'font-weight', 'bold');
-    var boldbutton = new KupuStateButton(prefix+'button.kupu-bold', 
+                                             'font-weight', 'bold');
+    var boldbutton = new KupuStateButton(prefix+'button.kupu-bold',
                                          execCommand('bold'),
                                          boldchecker,
                                          'kupu-bold',
@@ -57,20 +62,20 @@
     kupu.registerTool('boldbutton', boldbutton);
 
     var italicschecker = parentWithStyleChecker(['i', 'em'],
-						'font-style', 'italic');
-    var italicsbutton = new KupuStateButton(prefix+'button.kupu-italic', 
-                                           execCommand('italic'),
-                                           italicschecker, 
-                                           'kupu-italic', 
-                                           'kupu-italic-pressed');
+                                                'font-style', 'italic');
+    var italicsbutton = new KupuStateButton(prefix+'button.kupu-italic',
+                                            execCommand('italic'),
+                                            italicschecker,
+                                            'kupu-italic',
+                                            'kupu-italic-pressed');
     kupu.registerTool('italicsbutton', italicsbutton);
 
     /* disabled
     var underlinechecker = parentWithStyleChecker(['u']);
-    var underlinebutton = new KupuStateButton(prefix+'button.kupu-underline', 
+    var underlinebutton = new KupuStateButton(prefix+'button.kupu-underline',
                                               execCommand('underline'),
                                               underlinechecker,
-                                              'kupu-underline', 
+                                              'kupu-underline',
                                               'kupu-underline-pressed');
     kupu.registerTool('underlinebutton', underlinebutton);
     */
@@ -84,18 +89,13 @@
     kupu.registerTool('subscriptbutton', subscriptbutton);
 
     var superscriptchecker = parentWithStyleChecker(['super', 'sup']);
-    var superscriptbutton = new KupuStateButton(prefix+'button.kupu-superscript', 
+    var superscriptbutton = new KupuStateButton(prefix+'button.kupu-superscript',
                                                 execCommand('superscript'),
                                                 superscriptchecker,
-                                                'kupu-superscript', 
+                                                'kupu-superscript',
                                                 '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);
@@ -121,15 +121,20 @@
     kupu.registerTool('redobutton', redobutton);
 
     var removeimagebutton = new KupuRemoveElementButton(prefix+'button.kupu-removeimage',
-							'img',
-							'kupu-removeimage');
+                                                        'img',
+                                                        'kupu-removeimage');
     kupu.registerTool('removeimagebutton', removeimagebutton);
+
     var removelinkbutton = new KupuRemoveElementButton(prefix+'button.kupu-removelink',
-						       'a',
-						       'kupu-removelink');
+                                                       'a',
+                                                       'kupu-removelink');
     kupu.registerTool('removelinkbutton', removelinkbutton);
 
     // add some tools
+    var colorchoosertool = new ColorchooserTool(prefix+'button.kupu-forecolor',
+                                                prefix+'button.kupu-hilitecolor',
+                                                prefix+'table.kupu-colorchooser');
+    kupu.registerTool('colorchooser', colorchoosertool);
 
     var listtool = new ListTool(prefix+'button.kupu-insertunorderedlist',
                                 prefix+'button.kupu-insertorderedlist',
@@ -139,7 +144,7 @@
 
     var definitionlisttool = new DefinitionListTool(prefix+'button.kupu-insertdefinitionlist');
     kupu.registerTool('definitionlisttool', definitionlisttool);
-    
+
     var tabletool = new TableTool();
     kupu.registerTool('tabletool', tabletool);
 
@@ -160,8 +165,8 @@
     kupu.registerTool('linktool', linktool);
 
     var zoom = new KupuZoomTool(prefix+'button.kupu-zoom',
-        prefix+'select.kupu-tb-styles',
-        prefix+'button.kupu-logo');
+                                prefix+'select.kupu-tb-styles',
+                                prefix+'button.kupu-logo');
     kupu.registerTool('zoomtool', zoom);
 
     if (typeof KupuSpellChecker != 'undefined') {
@@ -222,14 +227,14 @@
     kupu.registerTool('linkdrawerbutton', linkdrawerbutton);
 
     var anchorbutton = new KupuButton(prefix+'button.kupu-anchors',
-                opendrawer('anchordrawer'));
+                                      opendrawer('anchordrawer'));
     kupu.registerTool('anchorbutton', anchorbutton);
 
     var tabledrawerbutton = new KupuButton(prefix+'button.kupu-table',
                                            opendrawer('tabledrawer'));
     kupu.registerTool('tabledrawerbutton', tabledrawerbutton);
 
-    // create some drawers, drawers are some sort of popups that appear when a 
+    // create some drawers, drawers are some sort of popups that appear when a
     // toolbar button is clicked
     var drawertool = window.drawertool || new DrawerTool();
     window.drawertool = drawertool;
@@ -242,14 +247,20 @@
     var lib_prefix = conf.lib_prefix;
     var search_prefix = conf.search_prefix;
     var select_prefix = conf.select_prefix;
-    var linklibdrawer = new LinkLibraryDrawer(linktool, xsl_uri,
-        lib_prefix+link_resource, search_prefix+link_resource,
-        drawerparent, select_prefix+link_resource);
+    var linklibdrawer = new LinkLibraryDrawer(linktool,
+                                              xsl_uri,
+                                              lib_prefix+link_resource,
+                                              search_prefix+link_resource,
+                                              drawerparent,
+                                              select_prefix+link_resource);
     drawertool.registerDrawer(prefix+'linklibdrawer', linklibdrawer, kupu);
 
-    var imagelibdrawer = new ImageLibraryDrawer(imagetool, xsl_uri,
-        lib_prefix+image_resource, search_prefix+image_resource,
-        drawerparent, select_prefix+image_resource);
+    var imagelibdrawer = new ImageLibraryDrawer(imagetool,
+                                                xsl_uri,
+                                                lib_prefix+image_resource,
+                                                search_prefix+image_resource,
+                                                drawerparent,
+                                                select_prefix+image_resource);
     drawertool.registerDrawer(prefix+'imagelibdrawer', imagelibdrawer, kupu);
 
     var linkdrawer = new LinkDrawer(prefix+'div.kupu-linkdrawer', linktool);
@@ -261,7 +272,7 @@
     var tabledrawer = new TableDrawer(prefix+'div.kupu-tabledrawer', tabletool);
     drawertool.registerDrawer(prefix+'tabledrawer', tabledrawer, kupu);
 
-    // register form submit handler, remove the drawer's contents before submitting 
+    // register form submit handler, remove the drawer's contents before submitting
     // the form since it seems to crash IE if we leave them alone
     function prepareForm(event) {
         kupu.saveDataToField(this.form, this);
@@ -279,4 +290,3 @@
 // modify LinkDrawer so links don't have a target
 LinkDrawer.prototype.target = '';
 LinkLibraryDrawer.prototype.target = '';
-

Modified: kupu/trunk/kupu/roundup/kupuinit.js
==============================================================================
--- kupu/trunk/kupu/roundup/kupuinit.js	(original)
+++ kupu/trunk/kupu/roundup/kupuinit.js	Fri Feb 23 19:29:27 2007
@@ -26,16 +26,16 @@
     /* Although this is meant to be a sample implementation, it can
         be used out-of-the box to run the sample pagetemplate or for simple
         implementations that just don't use some elements. When you want
-        to do some customization, this should probably be overridden. For 
-        larger customization actions you will have to subclass or roll your 
+        to do some customization, this should probably be overridden. For
+        larger customization actions you will have to subclass or roll your
         own UI object.
     */
 
     // first we create a logger
     var l = new DummyLogger();
-    
+
     // now some config values
-    // XXX To mimic the 'old' behaviour, vars should be retrieved from the 
+    // XXX To mimic the 'old' behaviour, vars should be retrieved from the
     // iframe (attributes)
     var src = iframe.getAttribute('src');
     var dst = iframe.getAttribute('dst');
@@ -49,7 +49,7 @@
     if (iframe.getAttribute('content_type')) {
         content_type = iframe.getAttribute('content_type');
     };
-    
+
     var conf = {'src': src,
                 'dst': dst,
                 'use_css': use_css,
@@ -57,20 +57,23 @@
                 'strict_output': strict_output,
                 'content_type': content_type
                 };
-    
+
     // the we create the document, hand it over the id of the iframe
     var doc = new KupuDocument(iframe);
-    
+
     // now we can create the controller
     var kupu = new KupuEditor(doc, conf, l);
 
     // add the contextmenu
-    var cm = new ContextMenu();
-    kupu.setContextMenu(cm);
+    var contextmenu = new ContextMenu();
+    kupu.setContextMenu(contextmenu);
 
-    var listtool = new ListTool('kupu-list-ul-addbutton', 'kupu-list-ol-addbutton', 'kupu-ulstyles', 'kupu-olstyles');
+    var listtool = new ListTool('kupu-list-ul-addbutton',
+                                'kupu-list-ol-addbutton',
+                                'kupu-ulstyles',
+                                'kupu-olstyles');
     kupu.registerTool('listtool', listtool);
-    
+
     var linktool = new RoundupLinkTool();
     kupu.registerTool('linktool', linktool);
 

Modified: kupu/trunk/kupu/widgeteer/kupuinit.js
==============================================================================
--- kupu/trunk/kupu/widgeteer/kupuinit.js	(original)
+++ kupu/trunk/kupu/widgeteer/kupuinit.js	Fri Feb 23 19:29:27 2007
@@ -7,8 +7,7 @@
  * Contributors see CREDITS.txt.
  *
  *****************************************************************************/
-
-// $Id: kupusilvainit.js 12187 2005-05-11 14:29:58Z guido $
+// $Id$
 
 // XXX Port this to the default dist?
 KupuEditor.prototype.afterInit = function() {
@@ -58,7 +57,7 @@
 
 WidgeteerDrawerTool.prototype.openDrawer = function(id) {
     /* open a drawer 
-    
+
         overridden so we can place the drawer in the parent document
     */
     if (this.current_drawer) {
@@ -68,7 +67,7 @@
     if (this.isIE) {
         drawer.editor._saveSelection();
     };
-    
+
     // make sure the right drawertool is available in parent
     parent.drawertool = window.drawertool;
     var parentdoc = parent.document;
@@ -91,14 +90,14 @@
             } else if(oNode.nodeType == 3){
                 oNew = doc.createTextNode(oNode.nodeValue);
             }
-            
+
             if(bImportChildren && oNode.hasChildNodes()){
                 for(var oChild = oNode.firstChild; oChild; 
                                 oChild = oChild.nextSibling){
                     oNew.appendChild(importNode(doc, oChild, true));
                 }
             }
-            
+
             return oNew;
         }
         var imported = importNode(parentdoc, drawer.element, 1);
@@ -165,18 +164,19 @@
 
     // now some config values
     var conf = loadDictFromXML(document, 'kupuconfig');
-    
+
     // the we create the document, hand it over the id of the iframe
     var doc = new KupuDocument(iframe);
 
     // now we can create the controller
     var kupu = new KupuEditor(doc, conf, l);
-    
-    var cm = new ContextMenu();
-    kupu.setContextMenu(cm);
+
+    var contextmenu = new ContextMenu();
+    kupu.setContextMenu(contextmenu);
 
     // now we can create a UI object which we can use from the UI
     var ui = new KupuUI('kupu-tb-styles');
+
     kupu.registerTool('ui', ui);
 
     // function that returns a function to execute a button command
@@ -188,7 +188,7 @@
 
     var boldchecker = parentWithStyleChecker(['b', 'strong'],
                                              'font-weight', 'bold');
-    var boldbutton = new KupuStateButton('kupu-bold-button', 
+    var boldbutton = new KupuStateButton('kupu-bold-button',
                                          execCommand('bold'),
                                          boldchecker,
                                          'kupu-bold',
@@ -197,18 +197,18 @@
 
     var italicschecker = parentWithStyleChecker(['i', 'em'],
                                                 'font-style', 'italic');
-    var italicsbutton = new KupuStateButton('kupu-italic-button', 
-                                           execCommand('italic'),
-                                           italicschecker, 
-                                           'kupu-italic', 
-                                           'kupu-italic-pressed');
+    var italicsbutton = new KupuStateButton('kupu-italic-button',
+                                            execCommand('italic'),
+                                            italicschecker,
+                                            'kupu-italic',
+                                            'kupu-italic-pressed');
     kupu.registerTool('italicsbutton', italicsbutton);
 
     var underlinechecker = parentWithStyleChecker(['u']);
-    var underlinebutton = new KupuStateButton('kupu-underline-button', 
+    var underlinebutton = new KupuStateButton('kupu-underline-button',
                                               execCommand('underline'),
                                               underlinechecker,
-                                              'kupu-underline', 
+                                              'kupu-underline',
                                               'kupu-underline-pressed');
     kupu.registerTool('underlinebutton', underlinebutton);
 
@@ -221,29 +221,43 @@
     kupu.registerTool('subscriptbutton', subscriptbutton);
 
     var superscriptchecker = parentWithStyleChecker(['super', 'sup']);
-    var superscriptbutton = new KupuStateButton('kupu-superscript-button', 
+    var superscriptbutton = new KupuStateButton('kupu-superscript-button',
                                                 execCommand('superscript'),
                                                 superscriptchecker,
-                                                'kupu-superscript', 
+                                                'kupu-superscript',
                                                 'kupu-superscript-pressed');
     kupu.registerTool('superscriptbutton', superscriptbutton);
 
     var undobutton = new KupuButton('kupu-undo-button', execCommand('undo'))
     kupu.registerTool('undobutton', undobutton);
 
-    var redobutton = new KupuButton('kupu-redo-button', execCommand('redo'))
+    var redobutton = new KupuButton('kupu-redo-button', execCommand('redo'));
     kupu.registerTool('redobutton', redobutton);
 
     var colorchoosertool = new ColorchooserTool('kupu-forecolor-button',
                                                 'kupu-hilitecolor-button',
                                                 'kupu-colorchooser');
     kupu.registerTool('colorchooser', colorchoosertool);
-    var listtool = new ListTool('kupu-list-ul-addbutton', 'kupu-list-ol-addbutton',
-                                'kupu-ulstyles', 'kupu-olstyles');
+
+    var listtool = new ListTool('kupu-list-ul-addbutton',
+                                'kupu-list-ol-addbutton',
+                                'kupu-ulstyles',
+                                'kupu-olstyles');
     kupu.registerTool('listtool', listtool);
 
-    var dltool = new DefinitionListTool('kupu-list-dl-addbutton');
-    kupu.registerTool('dltool', dltool);
+    var definitionlisttool = new DefinitionListTool('kupu-list-dl-addbutton');
+    kupu.registerTool('definitionlisttool', definitionlisttool);
+
+    var linktool = new LinkTool();
+    kupu.registerTool('linktool', linktool);
+    var handler = function() {
+        var create_handler = new ContextFixer(linktool.createLink, 
+                                                    linktool).execute;
+        parent.browser_manager.startBrowser(create_handler,
+                parentiframe.textarea.getAttribute('widget:linkpath'));
+    };
+    addEventHandler(document.getElementById('kupu-intlink-button'), 'click',
+                    handler);
 
     var imagetool = new ImageTool();
     kupu.registerTool('imagetool', imagetool);
@@ -258,18 +272,7 @@
     addEventHandler(document.getElementById('kupu-image-button'), 'click',
                     handler);
 
-    var linktool = new LinkTool();
-    kupu.registerTool('linktool', linktool);
-    var handler = function() {
-        var create_handler = new ContextFixer(linktool.createLink, 
-                                                    linktool).execute;
-        parent.browser_manager.startBrowser(create_handler,
-                parentiframe.textarea.getAttribute('widget:linkpath'));
-    };
-    addEventHandler(document.getElementById('kupu-intlink-button'), 'click',
-                    handler);
-
-    var tabletool = new TableTool(); 
+    var tabletool = new TableTool();
     kupu.registerTool('tabletool', tabletool);
 
     var showpathtool = new ShowPathTool();
@@ -285,7 +288,7 @@
 
     var viewsourcetool = new ViewSourceTool();
     kupu.registerTool('viewsourcetool', viewsourcetool);
-    
+
     /*
     // Function that returns function to open a drawer
     var opendrawer = function(drawerid) {
@@ -310,7 +313,7 @@
                                            opendrawer('tabledrawer'));
     kupu.registerTool('tabledrawerbutton', tabledrawerbutton);
 
-    // create some drawers, drawers are some sort of popups that appear when a 
+    // create some drawers, drawers are some sort of popups that appear when a
     // toolbar button is clicked
     var drawertool = new WidgeteerDrawerTool();
     kupu.registerTool('drawertool', drawertool);
@@ -324,7 +327,7 @@
                                                 conf['image_libraries_uri'],
                                                 conf['search_images_uri']);
     drawertool.registerDrawer('imagelibdrawer', imagelibdrawer);
-    
+
     var linkdrawer = new LinkDrawer('kupu-linkdrawer', linktool);
     drawertool.registerDrawer('linkdrawer', linkdrawer);
 
@@ -348,4 +351,4 @@
                                             'target', 'link']);
 
     return kupu;
-};
+}

From duncan at codespeak.net  Fri Feb 23 19:39:13 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Fri, 23 Feb 2007 19:39:13 +0100 (CET)
Subject: [kupu-checkins] r39346 - kupu/trunk/kupu/plone
Message-ID: <20070223183913.3DA95101DF@code0.codespeak.net>

Author: duncan
Date: Fri Feb 23 19:39:11 2007
New Revision: 39346

Modified:
   kupu/trunk/kupu/plone/plonelibrarytool.py
Log:
More accessors and mutators for Plone3


Modified: kupu/trunk/kupu/plone/plonelibrarytool.py
==============================================================================
--- kupu/trunk/kupu/plone/plonelibrarytool.py	(original)
+++ kupu/trunk/kupu/plone/plonelibrarytool.py	Fri Feb 23 19:39:11 2007
@@ -237,10 +237,18 @@
     security.declareProtected('View', "getHtmlExclusions")
     def getHtmlExclusions(self):
         try:
-            return self.html_exclusions
+            excl = self.html_exclusions
         except AttributeError:
-            self.html_exclusions = _excluded_html
-            return self.html_exclusions
+            excl = self.html_exclusions = _excluded_html
+
+        res = []
+        for (t,a) in excl:
+            if t and t[0]=='':
+                t = []
+            if a and a[0]=='':
+                a = []
+            res.append((t,a))
+        return res
 
     security.declareProtected('View', "getStyleWhitelist")
     def getStyleWhitelist(self):
@@ -673,26 +681,60 @@
         """Set the html_exclusions.
         Expects a list/tuple of 2-tuples [(tags,attrs),...]
         """
-        for (tag,attr) in exclusions:
-            pass
-        self.html_exclusions = exclusions
+        excl = []
+        for (tags,attrs) in exclusions:
+            if len(tags)==1 and tags[0]=="":
+                tags = []
+            if len(attrs)==1 and attrs[0]=="":
+                attrs = []
+            excl.append((tags, attrs))
+        self.html_exclusions = excl
 
     security.declareProtected("View", "get_stripped_tags")
     def get_stripped_tags(self):
         """Returns a list of tags to be stripped"""
         stripped = []
-        for (tags, attrs) in self.html_exclusions:
+        for (tags, attrs) in self.getHtmlExclusions():
             if not attrs:
-                stripped.extend(list(tags))
+                stripped.extend(tags)
         return stripped
 
     security.declareProtected(permissions.ManageLibraries, "set_stripped_tags")
     def set_stripped_tags(self, stripped):
         """Sets a list of tags to be stripped"""
-        exclusions = [(tags, attrs) for (tags, attrs) in self.html_exclusions if attrs]
+        exclusions = [(tags, attrs) for (tags, attrs) in self.getHtmlExclusions() if attrs]
         exclusions.append((tuple(stripped), ()))
         self.set_html_exclusions(exclusions)
 
+    security.declareProtected('View', "get_stripped_attributes")
+    def get_stripped_attributes(self):
+        """Returns a list of attributes to be stripped"""
+        stripped = []
+        for (tags, attrs) in self.getHtmlExclusions():
+            if not tags:
+                stripped.extend(attrs)
+        return stripped
+        
+    security.declareProtected(permissions.ManageLibraries, "set_stripped_attributes")
+    def set_stripped_attributes(self, stripped):
+        """Sets a list of attributes to be stripped"""
+        exclusions = [(tags, attrs) for (tags, attrs) in self.html_exclusions if tags]
+        exclusions.append(((), tuple(stripped)))
+        self.set_html_exclusions(exclusions)
+
+    security.declareProtected('View', "get_stripped_combinations")
+    def get_stripped_combinations(self):
+        """Returns a list of tag/attribute combinations to be stripped"""
+        stripped = [(tags, attrs) for (tags, attrs) in self.getHtmlExclusions() if tags and attrs]
+        return stripped
+
+    security.declareProtected(permissions.ManageLibraries, "set_stripped_combinations")
+    def set_stripped_combinations(self, stripped):
+        """Sets a list of tag/attribute pairs to be stripped"""
+        exclusions = [(tags, attrs) for (tags, attrs) in self.getHtmlExclusions() if not (tags and attrs)]
+        self.set_html_exclusions(stripped + exclusions)
+
+        
     security.declareProtected(permissions.ManageLibraries,
                               "configure_kupu")
     def configure_kupu(self,

From hannosch at codespeak.net  Sat Feb 24 11:42:11 2007
From: hannosch at codespeak.net (hannosch at codespeak.net)
Date: Sat, 24 Feb 2007 11:42:11 +0100 (CET)
Subject: [kupu-checkins] r39353 - kupu/trunk/kupu/plone
Message-ID: <20070224104211.675E9101D9@code0.codespeak.net>

Author: hannosch
Date: Sat Feb 24 11:42:09 2007
New Revision: 39353

Modified:
   kupu/trunk/kupu/plone/util.py
Log:
Hack around problems in CMF 2.1's new skin path registry.


Modified: kupu/trunk/kupu/plone/util.py
==============================================================================
--- kupu/trunk/kupu/plone/util.py	(original)
+++ kupu/trunk/kupu/plone/util.py	Sat Feb 24 11:42:09 2007
@@ -15,7 +15,13 @@
     skinstool = getToolByName(self, 'portal_skins')
     if name not in skinstool.objectIds():
         kupu_plone_skin_dir = minimalpath(os.path.join(kupu_package_dir, relpath))
-        createDirectoryView(skinstool, kupu_plone_skin_dir, name)
+        # XXX Hack around problems in CMF 2.1
+        try:
+            createDirectoryView(skinstool, kupu_plone_skin_dir, name)
+        except ValueError:
+            kupu_plone_skin_dir = 'Products.kupu:/%s' % relpath
+            createDirectoryView(skinstool, kupu_plone_skin_dir, name)
+        
         print >>out, "The layer '%s' was added to the skins tool" % name
 
     if not add:

From wiggy at codespeak.net  Sat Feb 24 15:38:24 2007
From: wiggy at codespeak.net (wiggy at codespeak.net)
Date: Sat, 24 Feb 2007 15:38:24 +0100 (CET)
Subject: [kupu-checkins] r39355 - kupu/trunk/kupu/plone
Message-ID: <20070224143824.DCAAF101B4@code0.codespeak.net>

Author: wiggy
Date: Sat Feb 24 15:38:22 2007
New Revision: 39355

Modified:
   kupu/trunk/kupu/plone/util.py
Log:
Remove CMF 2.1 workaround - CMF is fixed already

Modified: kupu/trunk/kupu/plone/util.py
==============================================================================
--- kupu/trunk/kupu/plone/util.py	(original)
+++ kupu/trunk/kupu/plone/util.py	Sat Feb 24 15:38:22 2007
@@ -15,13 +15,7 @@
     skinstool = getToolByName(self, 'portal_skins')
     if name not in skinstool.objectIds():
         kupu_plone_skin_dir = minimalpath(os.path.join(kupu_package_dir, relpath))
-        # XXX Hack around problems in CMF 2.1
-        try:
-            createDirectoryView(skinstool, kupu_plone_skin_dir, name)
-        except ValueError:
-            kupu_plone_skin_dir = 'Products.kupu:/%s' % relpath
-            createDirectoryView(skinstool, kupu_plone_skin_dir, name)
-        
+        createDirectoryView(skinstool, kupu_plone_skin_dir, name)
         print >>out, "The layer '%s' was added to the skins tool" % name
 
     if not add:

From wiggy at codespeak.net  Sat Feb 24 15:38:52 2007
From: wiggy at codespeak.net (wiggy at codespeak.net)
Date: Sat, 24 Feb 2007 15:38:52 +0100 (CET)
Subject: [kupu-checkins] r39356 - kupu/trunk/kupu/plone
Message-ID: <20070224143852.920F8101B4@code0.codespeak.net>

Author: wiggy
Date: Sat Feb 24 15:38:50 2007
New Revision: 39356

Modified:
   kupu/trunk/kupu/plone/__init__.py
Log:
register directories using globals instead of paths. path support will be removed in CMF 2.3

Modified: kupu/trunk/kupu/plone/__init__.py
==============================================================================
--- kupu/trunk/kupu/plone/__init__.py	(original)
+++ kupu/trunk/kupu/plone/__init__.py	Sat Feb 24 15:38:50 2007
@@ -28,10 +28,9 @@
 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)
-registerDirectory('tests', kupu_package_dir)
+registerDirectory('plone/kupu_plone_layer', kupu_globals)
+registerDirectory('plone/kupu_references', kupu_globals)
+registerDirectory('tests', kupu_globals)
 
 def initialize(context):
     try:

From fschulze at codespeak.net  Sun Feb 25 13:31:51 2007
From: fschulze at codespeak.net (fschulze at codespeak.net)
Date: Sun, 25 Feb 2007 13:31:51 +0100 (CET)
Subject: [kupu-checkins] r39382 - kupu/trunk/kupu/Extensions
Message-ID: <20070225123151.116A5101F8@code0.codespeak.net>

Author: fschulze
Date: Sun Feb 25 13:31:49 2007
New Revision: 39382

Modified:
   kupu/trunk/kupu/Extensions/Install.py
Log:
Never use -encode for big scripts if you don't know what it is.

Modified: kupu/trunk/kupu/Extensions/Install.py
==============================================================================
--- kupu/trunk/kupu/Extensions/Install.py	(original)
+++ kupu/trunk/kupu/Extensions/Install.py	Sun Feb 25 13:31:49 2007
@@ -120,7 +120,7 @@
     if SARISSA not in existing:
         jstool.manage_addScript(id=SARISSA, enabled=True,
             cookable=True,
-            compression='safe-encode',
+            compression='safe',
             cacheable=True)
         jstool.moveResourceAfter(SARISSA, 'plone_javascripts.js')
         print >>out, "JS file", SARISSA
@@ -131,7 +131,7 @@
         jstool.manage_addScript(id=id,
             expression=CONDITION,
             enabled=True,
-            compression='safe-encode',
+            compression='safe',
             cookable=True)
 
 def uninstall_resources(self, out):

From fschulze at codespeak.net  Sun Feb 25 13:51:35 2007
From: fschulze at codespeak.net (fschulze at codespeak.net)
Date: Sun, 25 Feb 2007 13:51:35 +0100 (CET)
Subject: [kupu-checkins] r39383 - kupu/trunk/kupu/plone/profiles/default
Message-ID: <20070225125135.BDD46101F4@code0.codespeak.net>

Author: fschulze
Date: Sun Feb 25 13:51:33 2007
New Revision: 39383

Modified:
   kupu/trunk/kupu/plone/profiles/default/jsregistry.xml
Log:
Keep the kupu files at the bottom of the registry.

Modified: kupu/trunk/kupu/plone/profiles/default/jsregistry.xml
==============================================================================
--- kupu/trunk/kupu/plone/profiles/default/jsregistry.xml	(original)
+++ kupu/trunk/kupu/plone/profiles/default/jsregistry.xml	Sun Feb 25 13:51:33 2007
@@ -3,53 +3,66 @@
  <javascript cacheable="True" compression="safe" cookable="True"
     enabled="True"
     expression="python:portal.kupu_library_tool.isKupuEnabled(REQUEST=request)"
-    id="kupunoi18n.js" inline="False"/>
+    id="kupunoi18n.js" inline="False"
+    position-bottom="" />
  <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"/>
+    id="sarissa_ieemu_xpath.js" inline="False"
+    position-bottom="" />
  <javascript cacheable="True" compression="safe" cookable="True"
     enabled="True"
     expression="python:portal.kupu_library_tool.isKupuEnabled(REQUEST=request)"
-    id="kupuhelpers.js" inline="False"/>
+    id="kupuhelpers.js" inline="False"
+    position-bottom="" />
  <javascript cacheable="True" compression="safe" cookable="True"
     enabled="True"
     expression="python:portal.kupu_library_tool.isKupuEnabled(REQUEST=request)"
-    id="kupueditor.js" inline="False"/>
+    id="kupueditor.js" inline="False"
+    position-bottom="" />
  <javascript cacheable="True" compression="safe" cookable="True"
     enabled="True"
     expression="python:portal.kupu_library_tool.isKupuEnabled(REQUEST=request)"
-    id="kupubasetools.js" inline="False"/>
+    id="kupubasetools.js" inline="False"
+    position-bottom="" />
  <javascript cacheable="True" compression="safe" cookable="True"
     enabled="True"
     expression="python:portal.kupu_library_tool.isKupuEnabled(REQUEST=request)"
-    id="kupuloggers.js" inline="False"/>
+    id="kupuloggers.js" inline="False"
+    position-bottom="" />
  <javascript cacheable="True" compression="safe" cookable="True"
     enabled="True"
     expression="python:portal.kupu_library_tool.isKupuEnabled(REQUEST=request)"
-    id="kupucontentfilters.js" inline="False"/>
+    id="kupucontentfilters.js" inline="False"
+    position-bottom="" />
  <javascript cacheable="True" compression="safe" cookable="True"
     enabled="True"
     expression="python:portal.kupu_library_tool.isKupuEnabled(REQUEST=request)"
-    id="kupucontextmenu.js" inline="False"/>
+    id="kupucontextmenu.js" inline="False"
+    position-bottom="" />
  <javascript cacheable="True" compression="safe" cookable="True"
     enabled="True"
     expression="python:portal.kupu_library_tool.isKupuEnabled(REQUEST=request)"
-    id="kupuploneeditor.js" inline="False"/>
+    id="kupuploneeditor.js" inline="False"
+    position-bottom="" />
  <javascript cacheable="True" compression="safe" cookable="True"
     enabled="True"
     expression="python:portal.kupu_library_tool.isKupuEnabled(REQUEST=request)"
-    id="kupuploneui.js" inline="False"/>
+    id="kupuploneui.js" inline="False"
+    position-bottom="" />
  <javascript cacheable="True" compression="safe" cookable="True"
     enabled="True"
     expression="python:portal.kupu_library_tool.isKupuEnabled(REQUEST=request)"
-    id="kupusourceedit.js" inline="False"/>
+    id="kupusourceedit.js" inline="False"
+    position-bottom="" />
  <javascript cacheable="True" compression="safe" cookable="True"
     enabled="True"
     expression="python:portal.kupu_library_tool.isKupuEnabled(REQUEST=request)"
-    id="kupudrawers.js" inline="False"/>
+    id="kupudrawers.js" inline="False"
+    position-bottom="" />
  <javascript cacheable="True" compression="safe" cookable="True"
     enabled="True"
     expression="python:portal.kupu_library_tool.isKupuEnabled(REQUEST=request)"
-    id="kupuploneinit.js" inline="False"/>
+    id="kupuploneinit.js" inline="False"
+    position-bottom="" />
 </object>

From fschulze at codespeak.net  Sun Feb 25 13:54:29 2007
From: fschulze at codespeak.net (fschulze at codespeak.net)
Date: Sun, 25 Feb 2007 13:54:29 +0100 (CET)
Subject: [kupu-checkins] r39384 - kupu/trunk/kupu/plone/profiles/default
Message-ID: <20070225125429.9D308101E9@code0.codespeak.net>

Author: fschulze
Date: Sun Feb 25 13:54:26 2007
New Revision: 39384

Modified:
   kupu/trunk/kupu/plone/profiles/default/cssregistry.xml
Log:
Keep the kupu files at the bottom of the registry.

Modified: kupu/trunk/kupu/plone/profiles/default/cssregistry.xml
==============================================================================
--- kupu/trunk/kupu/plone/profiles/default/cssregistry.xml	(original)
+++ kupu/trunk/kupu/plone/profiles/default/cssregistry.xml	Sun Feb 25 13:54:26 2007
@@ -3,13 +3,16 @@
  <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"/>
+    id="kupustyles.css" media="" rel="stylesheet" rendering="import"
+    position-bottom="" />
  <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"/>
+    id="kupuplone.css" media="" rel="stylesheet" rendering="import"
+    position-bottom="" />
  <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"/>
+    id="kupudrawerstyles.css" media="" rel="stylesheet" rendering="import"
+    position-bottom="" />
 </object>

From limi at codespeak.net  Sun Feb 25 14:56:10 2007
From: limi at codespeak.net (limi at codespeak.net)
Date: Sun, 25 Feb 2007 14:56:10 +0100 (CET)
Subject: [kupu-checkins] r39385 - kupu/trunk/kupu/plone/profiles/default
Message-ID: <20070225135610.6EDD5101F2@code0.codespeak.net>

Author: limi
Date: Sun Feb 25 14:56:07 2007
New Revision: 39385

Modified:
   kupu/trunk/kupu/plone/profiles/default/controlpanel.xml
Log:
More consistent title of control panel


Modified: kupu/trunk/kupu/plone/profiles/default/controlpanel.xml
==============================================================================
--- kupu/trunk/kupu/plone/profiles/default/controlpanel.xml	(original)
+++ kupu/trunk/kupu/plone/profiles/default/controlpanel.xml	Sun Feb 25 14:56:07 2007
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <object name="portal_controlpanel" meta_type="Plone Control Panel Tool">
- <configlet title="Kupu visual editor" action_id="kupu" appId="Kupu"
+ <configlet title="Visual editor" action_id="kupu" appId="Kupu"
     category="Plone" condition_expr=""
     url_expr="string:${portal_url}/kupu_library_tool/kupu_config"
     visible="True">

From fschulze at codespeak.net  Sun Feb 25 19:37:09 2007
From: fschulze at codespeak.net (fschulze at codespeak.net)
Date: Sun, 25 Feb 2007 19:37:09 +0100 (CET)
Subject: [kupu-checkins] r39389 - kupu/trunk/kupu
Message-ID: <20070225183709.586FE10147@code0.codespeak.net>

Author: fschulze
Date: Sun Feb 25 19:37:01 2007
New Revision: 39389

Modified:
   kupu/trunk/kupu/jslint.js
   kupu/trunk/kupu/lint.py
Log:
Some fixes for non windows machines.

Modified: kupu/trunk/kupu/jslint.js
==============================================================================
--- kupu/trunk/kupu/jslint.js	(original)
+++ kupu/trunk/kupu/jslint.js	Sun Feb 25 19:37:01 2007
@@ -3002,7 +3002,7 @@
     return result;
 }
 
-if (WScript) {
+if (typeof(WScript) != 'undefined') {
     var arguments = [];
     for (var arg = 0; arg < WScript.Arguments.Count(); arg++) {
         arguments.push(WScript.Arguments(arg));

Modified: kupu/trunk/kupu/lint.py
==============================================================================
--- kupu/trunk/kupu/lint.py	(original)
+++ kupu/trunk/kupu/lint.py	Sun Feb 25 19:37:01 2007
@@ -14,8 +14,10 @@
 import threading
 
 COMPILE_COMMAND = "java org.mozilla.javascript.tools.shell.Main %(lint)s --options %(options)s %(file)s"
+ERRORS = (IOError, )
 if sys.platform=='win32':
     COMPILE_COMMAND = "cscript /NoLogo %(lint)s --options %(options)s %(file)s"
+    ERRORS = (IOError, WindowsError)
 
 def lint(name):
     cmd = COMPILE_COMMAND % dict(lint=LINT, file=name, options=OPTIONS)
@@ -50,14 +52,14 @@
 def basetime(marker):
     try:
         mtime = os.stat(marker).st_mtime
-    except (IOError, WindowsError):
+    except ERRORS:
         mtime = 0.0
     return mtime
 
 def loadstatus(name):
     try:
         f = open(name, 'rb')
-    except (IOError, WindowsError):
+    except ERRORS:
         return {}
     try:
         try:

From duncan at codespeak.net  Mon Feb 26 13:56:58 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Mon, 26 Feb 2007 13:56:58 +0100 (CET)
Subject: [kupu-checkins] r39424 - kupu/trunk/kupu/common
Message-ID: <20070226125658.23D0E10138@code0.codespeak.net>

Author: duncan
Date: Mon Feb 26 13:56:50 2007
New Revision: 39424

Modified:
   kupu/trunk/kupu/common/sarissa.js
Log:
IE importNode not working for text nodes

Modified: kupu/trunk/kupu/common/sarissa.js
==============================================================================
--- kupu/trunk/kupu/common/sarissa.js	(original)
+++ kupu/trunk/kupu/common/sarissa.js	Mon Feb 26 13:56:50 2007
@@ -430,6 +430,9 @@
         * @returns the imported node for further use
         */
         document.importNode = function(oNode, bChildren){
+            if (oNode.nodeName=='#text') {
+		return document.createTextElement(oNode.data);
+	    }
             var tmp = document.createElement("div");
             if(bChildren){
                 tmp.innerHTML = oNode.xml ? oNode.xml : oNode.outerHTML;

From fschulze at codespeak.net  Wed Feb 28 14:34:05 2007
From: fschulze at codespeak.net (fschulze at codespeak.net)
Date: Wed, 28 Feb 2007 14:34:05 +0100 (CET)
Subject: [kupu-checkins] r39571 - kupu/trunk/kupu/Extensions
Message-ID: <20070228133405.7A92F10133@code0.codespeak.net>

Author: fschulze
Date: Wed Feb 28 14:34:03 2007
New Revision: 39571

Modified:
   kupu/trunk/kupu/Extensions/Install.py
Log:
Fix installation on Plone 2.5, now that GenericSetup is used.

Modified: kupu/trunk/kupu/Extensions/Install.py
==============================================================================
--- kupu/trunk/kupu/Extensions/Install.py	(original)
+++ kupu/trunk/kupu/Extensions/Install.py	Wed Feb 28 14:34:03 2007
@@ -122,7 +122,10 @@
             cookable=True,
             compression='safe',
             cacheable=True)
-        jstool.moveResourceAfter(SARISSA, 'plone_javascripts.js')
+        if 'plone_javascripts.js' in existing:
+            jstool.moveResourceAfter(SARISSA, 'plone_javascripts.js')
+        else:
+            jstool.moveResourceToBottom(SARISSA)
         print >>out, "JS file", SARISSA
 
     for id in js_files(data):