From guido at codespeak.net  Mon Jun  2 12:28:25 2008
From: guido at codespeak.net (guido at codespeak.net)
Date: Mon,  2 Jun 2008 12:28:25 +0200 (CEST)
Subject: [kupu-checkins] r55490 - kupu/trunk/kupu/common
Message-ID: <20080602102825.1B9442A00E3@codespeak.net>

Author: guido
Date: Mon Jun  2 12:28:24 2008
New Revision: 55490

Modified:
   kupu/trunk/kupu/common/kupubasetools.js
Log:
Made URLs to popups and popup sizes arguments to the tools to allow configuring
them.


Modified: kupu/trunk/kupu/common/kupubasetools.js
==============================================================================
--- kupu/trunk/kupu/common/kupubasetools.js	(original)
+++ kupu/trunk/kupu/common/kupubasetools.js	Mon Jun  2 12:28:24 2008
@@ -1025,8 +1025,12 @@
 
 PropertyTool.prototype = new KupuTool;
 
-function LinkTool() {
+function LinkTool(popupurl, popupheight, popupwidth) {
     /* Add and update hyperlinks */
+
+    this.popupurl = popupurl || 'kupupopups/link.html';
+    this.popupheight = popupheight || 300;
+    this.popupwidth = popupwidth || 200;
     
     this.initialize = function(editor) {
         this.editor = editor;
@@ -1220,8 +1224,12 @@
 
 LinkToolBox.prototype = new LinkToolBox;
 
-function ImageTool() {
+function ImageTool(popupurl, popupwidth, popupheight) {
     /* Image tool to add images */
+
+    this.popupurl = popupurl || 'kupupopups/image.html';
+    this.popupwidth = popupwidth || 300;
+    this.popupheight = popupheight || 200;
     
     this.initialize = function(editor) {
         /* attach the event handlers */
@@ -1230,7 +1238,8 @@
 
     this.createImageHandler = function(event) {
         /* create an image according to a url entered in a popup */
-        var imageWindow = openPopup('kupupopups/image.html', 300, 200);
+        var imageWindow = openPopup(this.popupurl, this.popupwidth,
+                                    this.popupheight);
         imageWindow.imagetool = this;
         imageWindow.focus();
     };

From guido at codespeak.net  Mon Jun  2 12:34:18 2008
From: guido at codespeak.net (guido at codespeak.net)
Date: Mon,  2 Jun 2008 12:34:18 +0200 (CEST)
Subject: [kupu-checkins] r55492 - kupu/trunk/kupu/common
Message-ID: <20080602103418.423332A00E3@codespeak.net>

Author: guido
Date: Mon Jun  2 12:34:17 2008
New Revision: 55492

Modified:
   kupu/trunk/kupu/common/kupubasetools.js
Log:
Modernized JS code, changed the object notation/method definitions so that 
methods are stored on objects' prototype rather than on the objects themselves.


Modified: kupu/trunk/kupu/common/kupubasetools.js
==============================================================================
--- kupu/trunk/kupu/common/kupubasetools.js	(original)
+++ kupu/trunk/kupu/common/kupubasetools.js	Mon Jun  2 12:34:17 2008
@@ -32,60 +32,61 @@
 
     this.toolboxes = {};
 
-    // methods
-    this.initialize = function(editor) {
-        /* Initialize the tool.
+    // private methods
+    addEventHandler = addEventHandler;
+};
 
-            Obviously this can be overriden but it will do
-            for the most simple cases
-        */
-        this.editor = editor;
-    };
+// methods
+KupuTool.prototype.initialize = function(editor) {
+    /* Initialize the tool.
 
-    this.registerToolBox = function(id, toolbox) {
-        /* register a ui box 
-        
-            Note that this needs to be called *after* the tool has been 
-            registered to the KupuEditor
-        */
-        this.toolboxes[id] = toolbox;
-        toolbox.initialize(this, this.editor);
-    };
+        Obviously this can be overriden but it will do
+        for the most simple cases
+    */
+    this.editor = editor;
+};
+
+KupuTool.prototype.registerToolBox = function(id, toolbox) {
+    /* register a ui box 
     
-    this.updateState = function(selNode, event) {
-        /* Is called when user moves cursor to other element 
+        Note that this needs to be called *after* the tool has been 
+        registered to the KupuEditor
+    */
+    this.toolboxes[id] = toolbox;
+    toolbox.initialize(this, this.editor);
+};
 
-            Calls the updateState for all toolboxes and may want perform
-            some actions itself
-        */
-        for (var id in this.toolboxes) {
-            this.toolboxes[id].updateState(selNode, event);
-        };
-    };
+KupuTool.prototype.updateState = function(selNode, event) {
+    /* Is called when user moves cursor to other element 
 
-    this.enable = function() {
-        // Called when the tool is enabled after a form is dismissed.
+        Calls the updateState for all toolboxes and may want perform
+        some actions itself
+    */
+    for (var id in this.toolboxes) {
+        this.toolboxes[id].updateState(selNode, event);
     };
+};
 
-    this.disable = function() {
-        // Called when the tool is disabled (e.g. for a modal form)
-    };
-    // private methods
-    addEventHandler = addEventHandler;
-}
+KupuTool.prototype.enable = function() {
+    // Called when the tool is enabled after a form is dismissed.
+};
+
+KupuTool.prototype.disable = function() {
+    // Called when the tool is disabled (e.g. for a modal form)
+};
 
 function KupuToolBox() {
     /* Superclass for a user-interface object that controls a tool */
+};
 
-    this.initialize = function(tool, editor) {
-        /* store a reference to the tool and the editor */
-        this.tool = tool;
-        this.editor = editor;
-    };
+KupuToolBox.prototype.initialize = function(tool, editor) {
+    /* store a reference to the tool and the editor */
+    this.tool = tool;
+    this.editor = editor;
+};
 
-    this.updateState = function(selNode, event) {
-        /* update the toolbox according to the current iframe's situation */
-    };
+KupuToolBox.prototype.updateState = function(selNode, event) {
+    /* update the toolbox according to the current iframe's situation */
 };
 
 function noContextMenu(object) {
@@ -103,15 +104,15 @@
         button.disabled = "disabled";
         button.className += ' disabled';
     }
-}
+};
+
 function kupuButtonEnable(button) {
     button = button || this.button;
     if (button) {
         button.disabled = "";
         button.className = button.className.replace(/ *\bdisabled\b/g, '');
     }
-}
-
+};
 
 //----------------------------------------------------------------------------
 // Implementations
@@ -192,18 +193,22 @@
  * Mozilla&Firefox have a bug on windows which can cause a crash if you
  * change CSS positioning styles on an element which has focus.
  */
-function KupuLateFocusStateButton(buttonid, commandfunc, checkfunc, offclass, onclass) {
-    KupuStateButton.apply(this, [buttonid, commandfunc, checkfunc, offclass, onclass]);
-    this.execCommand = function() {
-        /* exec this button's command */
-        this.button.className = (this.pressed ? this.offclass : this.onclass);
-        this.pressed = !this.pressed;
-        this.commandfunc(this, this.editor);
-        this.editor.focusDocument();
-    };
+function KupuLateFocusStateButton(buttonid, commandfunc, checkfunc,
+        offclass, onclass) {
+    KupuStateButton.apply(this, [buttonid, commandfunc, checkfunc,
+                                 offclass, onclass]);
 }
+
 KupuLateFocusStateButton.prototype = new KupuStateButton;
 
+KupuLateFocusStateButton.prototype.execCommand = function() {
+    /* exec this button's command */
+    this.button.className = (this.pressed ? this.offclass : this.onclass);
+    this.pressed = !this.pressed;
+    this.commandfunc(this, this.editor);
+    this.editor.focusDocument();
+};
+
 function KupuRemoveElementButton(buttonid, element_name, cssclass) {
     /* A button specialized in removing elements in the current node
        context. Typical usages include removing links, images, etc. */
@@ -211,20 +216,21 @@
     this.onclass = 'invisible';
     this.offclass = cssclass;
     this.pressed = false;
+};
 
-    this.commandfunc = function(button, editor) {
-        editor.focusDocument();
-        editor.removeNearestParentOfType(editor.getSelectedNode(), element_name);
-        editor.updateState();
-    };
+KupuRemoveElementButton.prototype = new KupuStateButton;
 
-    this.checkfunc = function(currnode, button, editor, event) {
-        var element = editor.getNearestParentOfType(currnode, element_name);
-        return (element ? false : true);
-    };
+KupuRemoveElementButton.prototype.commandfunc = function(button, editor) {
+    editor.focusDocument();
+    editor.removeNearestParentOfType(editor.getSelectedNode(), element_name);
+    editor.updateState();
 };
 
-KupuRemoveElementButton.prototype = new KupuStateButton;
+KupuRemoveElementButton.prototype.checkfunc = function(currnode, button,
+        editor, event) {
+    var element = editor.getNearestParentOfType(currnode, element_name);
+    return (element ? false : true);
+};
 
 function KupuUI(textstyleselectid) {
     /* View 
@@ -236,580 +242,585 @@
     
     // attributes
     this.tsselect = getFromSelector(textstyleselectid);
-    var paraoptions = [];
-    var tableoptions = [];
-    var styleoptions = [];
-    var tableoffset = 0;
-    var styleoffset = 0;
-    var tablegrp = null;
+    this.paraoptions = [];
+    this.tableoptions = [];
+    this.styleoptions = [];
+    this.tableoffset = 0;
+    this.styleoffset = 0;
+    this.tablegrp = null;
     this.optionstate = -1;
     this.otherstyle = null;
     this.tablestyles = {};
     this.charstyles = {};
     this.styles = {}; // use an object here so we can use the 'in' operator later on
-    var blocktagre = /^(p|div|h.|ul|ol|dl|menu|dir|pre|blockquote|address|center)$/i;
-    var spanre = /^span\b/i;
-    var tblre = /^thead|tbody|table|t[rdh]\b/i;
-    
-    this.initialize = function(editor) {
-        /* initialize the ui like tools */
-        this.editor = editor;
+    this.blocktagre = /^(p|div|h.|ul|ol|dl|menu|dir|pre|blockquote|address|center)$/i;
+    this.spanre = /^span\b/i;
+    this.tblre = /^thead|tbody|table|t[rdh]\b/i;
+};
+
+
+KupuUI.prototype = new KupuTool;
+
+KupuUI.prototype.initialize = function(editor) {
+    /* initialize the ui like tools */
+    this.editor = editor;
+    this.cleanStyles();
+    this.enableOptions(false);
+    if (this.tsselect) {
+        this._selectevent = addEventHandler(this.tsselect, 'change', this.setTextStyleHandler, this);
+    }
+};
+
+KupuUI.prototype.getStyles = function() {
+    if (!this.paraoptions) {
         this.cleanStyles();
-        this.enableOptions(false);
-        if (this.tsselect) {
-            this._selectevent = addEventHandler(this.tsselect, 'change', this.setTextStyleHandler, this);
-        }
-    };
+    }
+    return [ this.paraoptions, this.tableoptions ];
+};
 
-    this.getStyles = function() {
-        if (!paraoptions) {
-            this.cleanStyles();
-        }
-        return [ paraoptions, tableoptions ];
-    };
+KupuUI.prototype.setTextStyleHandler = function(event) {
+    this.setTextStyle(this.tsselect.options[this.tsselect.selectedIndex].value);
+};
 
-    this.setTextStyleHandler = function(event) {
-        this.setTextStyle(this.tsselect.options[this.tsselect.selectedIndex].value);
-    };
-    
-    // event handlers
-    this.basicButtonHandler = function(action) {
-        /* event handler for basic actions (toolbar buttons) */
-        this.editor.execCommand(action);
-        this.editor.updateState();
-    };
+// event handlers
+KupuUI.prototype.basicButtonHandler = function(action) {
+    /* event handler for basic actions (toolbar buttons) */
+    this.editor.execCommand(action);
+    this.editor.updateState();
+};
 
-    this.saveButtonHandler = function() {
-        /* handler for the save button */
-        this.editor.saveDocument();
-    };
-
-    this.saveAndExitButtonHandler = function(redirect_url) {
-        /* save the document and, if successful, redirect */
-        this.editor.saveDocument(redirect_url);
-    };
-
-    this.cutButtonHandler = function() {
-        try {
-            this.editor.execCommand('Cut');
-        } catch (e) {
-            if (this.editor.getBrowserName() == 'Mozilla') {
-                alert(_('Cutting from JavaScript is disabled on your Mozilla due to security settings. For more information, read http://www.mozilla.org/editor/midasdemo/securityprefs.html'));
-            } else {
-                throw e;
-            };
-        };
-        this.editor.updateState();
-    };
+KupuUI.prototype.saveButtonHandler = function() {
+    /* handler for the save button */
+    this.editor.saveDocument();
+};
 
-    this.copyButtonHandler = function() {
-        try {
-            this.editor.execCommand('Copy');
-        } catch (e) {
-            if (this.editor.getBrowserName() == 'Mozilla') {
-                alert(_('Copying from JavaScript is disabled on your Mozilla due to security settings. For more information, read http://www.mozilla.org/editor/midasdemo/securityprefs.html'));
-            } else {
-                throw e;
-            };
+KupuUI.prototype.saveAndExitButtonHandler = function(redirect_url) {
+    /* save the document and, if successful, redirect */
+    this.editor.saveDocument(redirect_url);
+};
+
+KupuUI.prototype.cutButtonHandler = function() {
+    try {
+        this.editor.execCommand('Cut');
+    } catch (e) {
+        if (this.editor.getBrowserName() == 'Mozilla') {
+            alert(_('Cutting from JavaScript is disabled on your Mozilla due to security settings. For more information, read http://www.mozilla.org/editor/midasdemo/securityprefs.html'));
+        } else {
+            throw e;
         };
-        this.editor.updateState();
     };
+    this.editor.updateState();
+};
 
-    this.pasteButtonHandler = function() {
-        try {
-            this.editor.execCommand('Paste');
-        } catch (e) {
-            if (this.editor.getBrowserName() == 'Mozilla') {
-                alert(_('Pasting from JavaScript is disabled on your Mozilla due to security settings. For more information, read http://www.mozilla.org/editor/midasdemo/securityprefs.html'));
-            } else {
-                throw e;
-            };
+KupuUI.prototype.copyButtonHandler = function() {
+    try {
+        this.editor.execCommand('Copy');
+    } catch (e) {
+        if (this.editor.getBrowserName() == 'Mozilla') {
+            alert(_('Copying from JavaScript is disabled on your Mozilla due to security settings. For more information, read http://www.mozilla.org/editor/midasdemo/securityprefs.html'));
+        } else {
+            throw e;
         };
-        this.editor.updateState();
     };
+    this.editor.updateState();
+};
 
-    this.cleanStyles = function() {
-        if (!this.tsselect) return;
-        var options = this.tsselect.options;
-        var parastyles = this.styles;
-        var tablestyles = this.tablestyles;
-        var charstyles = this.charstyles;
-        
-        var normal = ['Normal', 'p|'];
-        var td = ['Plain Cell', 'td|'];
-        var nostyle = ['(remove style)', ''];
-
-        var opts = [];
-        while (options.length) {
-            var opt = options[0];
-            options[0] = null;
-            var v = opt.value;
-            if (v.indexOf('|') > -1) {
-                var split = v.split('|');
-                v = split[0].toLowerCase() + "|" + split[1];
-            } else {
-                v = v.toLowerCase()+"|";
-            };
-            var optarray = [opt.text, v];
-            if (v=='td|') {
-                td = optarray;
-            } else if (v=='p|') {
-                normal = optarray;
-            } else if (v=='') {
-                nostyle = optarray;
-            } else {
-                opts.push([opt.text,v]);
-            }
-        }
-        tableoptions.push(td);
-        tablestyles[td[1]] = 0;
-        paraoptions.push(normal);
-        parastyles[normal[1]] = 0;
-
-        for (var i = 0; i < opts.length; i++) {
-            optarray = opts[i];
-            v = optarray[1];
-
-            if (spanre.test(v)) {
-                charstyles[v] = styleoptions.length;
-                styleoptions.push(optarray);
-            } else if (tblre.test(v)) {
-                tablestyles[v] = tableoptions.length;
-                tableoptions.push(optarray);
-            } else {
-                parastyles[v] = paraoptions.length;
-                paraoptions.push(optarray);
-            };
-        };
-        paraoptions.push(nostyle);
-        styleoffset = paraoptions.length;
-        tableoffset = styleoffset + styleoptions.length;
-    };
-
-    // Remove otherstyle and switch to appropriate style set.
-    this.enableOptions = function(inTable) {
-        if (!this.tsselect) return;
-        var select = this.tsselect;
-        var options = select.options;
-        if (this.otherstyle) {
-            options[0] = null;
-            this.otherstyle = null;
-        }
-        if (this.optionstate == inTable) return; /* No change */
-
-        // while (select.firstChild) select.removeChild(select.firstChild);
-
-        function option(info) {
-            return newElement('option', {'value': info[1]}, [info[0]]);
-        }
-        if (this.optionstate==-1) {
-            for (var i = 0; i < paraoptions.length; i++) {
-                select.appendChild(option(paraoptions[i]));
-            }
-            if (styleoptions.length) {
-                var grp = document.createElement('optgroup');
-                grp.label = 'Character styles';
-                for (var i = 0; i < styleoptions.length; i++) {
-                    grp.appendChild(option(styleoptions[i]));
-                }
-                select.appendChild(grp);
-            }
-        }
-        if (inTable) {
-            var grp = (tablegrp = document.createElement('optgroup'));
-            grp.label = 'Table elements';
-            for (var i = 0; i < tableoptions.length; i++) {
-                grp.appendChild(option(tableoptions[i]));
-            }
-            select.appendChild(grp);
+KupuUI.prototype.pasteButtonHandler = function() {
+    try {
+        this.editor.execCommand('Paste');
+    } catch (e) {
+        if (this.editor.getBrowserName() == 'Mozilla') {
+            alert(_('Pasting from JavaScript is disabled on your Mozilla due to security settings. For more information, read http://www.mozilla.org/editor/midasdemo/securityprefs.html'));
         } else {
-            while (select.options[tableoffset]) {
-                select.options[tableoffset] = null;
-            };
-            if (tablegrp) {
-                select.removeChild(tablegrp);
-                tablegrp = null;
-            };
+            throw e;
         };
-        this.optionstate = inTable;
     };
+    this.editor.updateState();
+};
+
+KupuUI.prototype.cleanStyles = function() {
+    if (!this.tsselect) return;
+    var options = this.tsselect.options;
+    var parastyles = this.styles;
+    var tablestyles = this.tablestyles;
+    var charstyles = this.charstyles;
     
-    this.setIndex = function(currnode, tag, index, styles) {
-        var className = currnode.className;
-        this.styletag = tag;
-        this.classname = className;
-        var style = tag+'|'+className;
+    var normal = ['Normal', 'p|'];
+    var td = ['Plain Cell', 'td|'];
+    var nostyle = ['(remove style)', ''];
 
-        if (style in styles) {
-            return styles[style];
-        } else if (!className && tag in styles) {
-            return styles[tag];
+    var opts = [];
+    while (options.length) {
+        var opt = options[0];
+        options[0] = null;
+        var v = opt.value;
+        if (v.indexOf('|') > -1) {
+            var split = v.split('|');
+            v = split[0].toLowerCase() + "|" + split[1];
+        } else {
+            v = v.toLowerCase()+"|";
+        };
+        var optarray = [opt.text, v];
+        if (v=='td|') {
+            td = optarray;
+        } else if (v=='p|') {
+            normal = optarray;
+        } else if (v=='') {
+            nostyle = optarray;
+        } else {
+            opts.push([opt.text,v]);
         }
-        return index;
-    };
-
-    this.nodeStyle = function(node) {
-        var currnode = node;
-        var index = -1;
-        this.styletag = undefined;
-        this.classname = '';
+    }
+    this.tableoptions.push(td);
+    tablestyles[td[1]] = 0;
+    this.paraoptions.push(normal);
+    parastyles[normal[1]] = 0;
+
+    for (var i = 0; i < opts.length; i++) {
+        optarray = opts[i];
+        v = optarray[1];
+
+        if (this.spanre.test(v)) {
+            charstyles[v] = this.styleoptions.length;
+            this.styleoptions.push(optarray);
+        } else if (this.tblre.test(v)) {
+            tablestyles[v] = this.tableoptions.length;
+            this.tableoptions.push(optarray);
+        } else {
+            parastyles[v] = this.paraoptions.length;
+            this.paraoptions.push(optarray);
+        };
+    };
+    this.paraoptions.push(nostyle);
+    this.styleoffset = this.paraoptions.length;
+    this.tableoffset = this.styleoffset + this.styleoptions.length;
+};
+
+// Remove otherstyle and switch to appropriate style set.
+KupuUI.prototype.enableOptions = function(inTable) {
+    if (!this.tsselect) return;
+    var select = this.tsselect;
+    var options = select.options;
+    if (this.otherstyle) {
+        options[0] = null;
+        this.otherstyle = null;
+    }
+    if (this.optionstate == inTable) return; /* No change */
 
-        // Set the table state correctly
-        this.intable = false;
+    // while (select.firstChild) select.removeChild(select.firstChild);
 
-        while(currnode) {
-            var tag = currnode.nodeName;
-            if (/^body$/i.test(tag)) break;
-            if (tblre.test(tag)) {
-                this.intable = true;
-                break;
-            };
-            currnode = currnode.parentNode;
-        };
-        currnode = node;
-        while (currnode) {
-            var tag = currnode.nodeName.toLowerCase();
-
-            if (/^body$/.test(tag)) {
-                if (!this.styletag) {
-                    // Forced style messes up in Firefox: return -1 to
-                    // indicate no style 
-                    return -1;
-                }
-                break;
-            }
-            if (spanre.test(tag)) {
-                index = this.setIndex(currnode, tag, index, this.charstyles);
-                if (index >= 0) return index+styleoffset; // span takes priority
-            } else if (blocktagre.test(tag)) {
-                index = this.setIndex(currnode, tag, index, this.styles);
-            } else if (tblre.test(tag)) {
-                if (index > 0) return index; // block or span takes priority.
-                index = this.setIndex(currnode, tag, index, this.tablestyles);
-                if (index >= 0 || tag=='table') {
-                    return index+tableoffset; // Stop processing if in a table
-                }
+    function option(info) {
+        return newElement('option', {'value': info[1]}, [info[0]]);
+    }
+    if (this.optionstate==-1) {
+        for (var i = 0; i < this.paraoptions.length; i++) {
+            select.appendChild(option(this.paraoptions[i]));
+        }
+        if (this.styleoptions.length) {
+            var grp = document.createElement('optgroup');
+            grp.label = 'Character styles';
+            for (var i = 0; i < this.styleoptions.length; i++) {
+                grp.appendChild(option(this.styleoptions[i]));
             }
-            currnode = currnode.parentNode;
+            select.appendChild(grp);
+        }
+    }
+    if (inTable) {
+        var grp = (this.tablegrp = document.createElement('optgroup'));
+        grp.label = 'Table elements';
+        for (var i = 0; i < this.tableoptions.length; i++) {
+            grp.appendChild(option(this.tableoptions[i]));
         }
-        return index;
+        select.appendChild(grp);
+    } else {
+        while (select.options[this.tableoffset]) {
+            select.options[this.tableoffset] = null;
+        };
+        if (this.tablegrp) {
+            select.removeChild(this.tablegrp);
+            this.tablegrp = null;
+        };
     };
+    this.optionstate = inTable;
+};
 
-    this.updateState = function(selNode) {
-        /* set the text-style pulldown */
-
-        // first get the nearest style
-        // search the list of nodes like in the original one, break if we encounter a match,
-        // this method does some more than the original one since it can handle commands in
-        // the form of '<style>|<classname>' next to the plain
-        // '<style>' commands
-        if (!this.tsselect) return;
-        var index = undefined;
-        var mixed = false;
-        var styletag, classname;
+KupuUI.prototype.setIndex = function(currnode, tag, index, styles) {
+    var className = currnode.className;
+    this.styletag = tag;
+    this.classname = className;
+    var style = tag+'|'+className;
 
-        var selection = this.editor.getSelection();
+    if (style in styles) {
+        return styles[style];
+    } else if (!className && tag in styles) {
+        return styles[tag];
+    }
+    return index;
+};
 
-        for (var el=selNode.firstChild; el; el=el.nextSibling) {
-            if (el.nodeType==1 && selection.containsNode(el)) {
-                var i = this.nodeStyle(el);
-                if (index===undefined) {
-                    index = i;
-                    styletag = this.styletag;
-                    classname = this.classname;
-                }
-                if (index != i || styletag!=this.styletag || classname != this.classname) {
-                    mixed = true;
-                    break;
-                }
+KupuUI.prototype.nodeStyle = function(node) {
+    var currnode = node;
+    var index = -1;
+    this.styletag = undefined;
+    this.classname = '';
+
+    // Set the table state correctly
+    this.intable = false;
+
+    while(currnode) {
+        var tag = currnode.nodeName;
+        if (/^body$/i.test(tag)) break;
+        if (this.tblre.test(tag)) {
+            this.intable = true;
+            break;
+        };
+        currnode = currnode.parentNode;
+    };
+    currnode = node;
+    while (currnode) {
+        var tag = currnode.nodeName.toLowerCase();
+
+        if (/^body$/.test(tag)) {
+            if (!this.styletag) {
+                // Forced style messes up in Firefox: return -1 to
+                // indicate no style 
+                return -1;
+            }
+            break;
+        }
+        if (this.spanre.test(tag)) {
+            index = this.setIndex(currnode, tag, index, this.charstyles);
+            if (index >= 0) return index+this.styleoffset; // span takes priority
+        } else if (this.blocktagre.test(tag)) {
+            index = this.setIndex(currnode, tag, index, this.styles);
+        } else if (this.tblre.test(tag)) {
+            if (index > 0) return index; // block or span takes priority.
+            index = this.setIndex(currnode, tag, index, this.tablestyles);
+            if (index >= 0 || tag=='table') {
+                return index+this.tableoffset; // Stop processing if in a table
             }
-        };
-
-        if (index===undefined) {
-            index = this.nodeStyle(selNode);
         }
-        this.enableOptions(this.intable);
+        currnode = currnode.parentNode;
+    }
+    return index;
+};
 
-        if (index < 0 || mixed) {
-            if (mixed) {
-                var caption = 'Mixed styles';
-            } else if (this.styletag) {
-                var caption = 'Other: ' + this.styletag + ' '+ this.classname;
-            } else {
-                var caption = '<no style>';
-            }
+KupuUI.prototype.updateState = function(selNode) {
+    /* set the text-style pulldown */
 
-            var opt = newElement('option');
-            opt.text = caption;
-            this.otherstyle = opt;
-            this.tsselect.options.add(opt,0);
-            index = 0;
+    // first get the nearest style
+    // search the list of nodes like in the original one, break if we encounter a match,
+    // this method does some more than the original one since it can handle commands in
+    // the form of '<style>|<classname>' next to the plain
+    // '<style>' commands
+    if (!this.tsselect) return;
+    var index = undefined;
+    var mixed = false;
+    var styletag, classname;
+
+    var selection = this.editor.getSelection();
+
+    for (var el=selNode.firstChild; el; el=el.nextSibling) {
+        if (el.nodeType==1 && selection.containsNode(el)) {
+            var i = this.nodeStyle(el);
+            if (index===undefined) {
+                index = i;
+                styletag = this.styletag;
+                classname = this.classname;
+            }
+            if (index != i || styletag!=this.styletag || classname != this.classname) {
+                mixed = true;
+                break;
+            }
         }
-        this.tsselect.selectedIndex = Math.max(index,0);
     };
 
-    this._cleanNode = function(node, preserveEmpty) {
-                /* Clean up a block style node (e.g. P, DIV, Hn)
-                 * Remove trailing whitespace, then also remove up to one
-                 * trailing <br>
-                 * If the node is now empty and no preserveEmpty, remove the node itself.
-                 */
-        function stripspace() {
-            var c;
-            while ((c = node.lastChild) && c.nodeType==3 && (/^\s*$/.test(c.data))) {
-                node.removeChild(c);
-            }
-        }
-        stripspace();
-        var c = node.lastChild;
-        if (c && c.nodeType==1 && c.tagName=='BR') {
+    if (index===undefined) {
+        index = this.nodeStyle(selNode);
+    }
+    this.enableOptions(this.intable);
+
+    if (index < 0 || mixed) {
+        if (mixed) {
+            var caption = 'Mixed styles';
+        } else if (this.styletag) {
+            var caption = 'Other: ' + this.styletag + ' '+ this.classname;
+        } else {
+            var caption = '<no style>';
+        }
+
+        var opt = newElement('option');
+        opt.text = caption;
+        this.otherstyle = opt;
+        this.tsselect.options.add(opt,0);
+        index = 0;
+    }
+    this.tsselect.selectedIndex = Math.max(index,0);
+};
+
+KupuUI.prototype._cleanNode = function(node, preserveEmpty) {
+            /* Clean up a block style node (e.g. P, DIV, Hn)
+             * Remove trailing whitespace, then also remove up to one
+             * trailing <br>
+             * If the node is now empty and no preserveEmpty, remove the node itself.
+             */
+    function stripspace() {
+        var c;
+        while ((c = node.lastChild) && c.nodeType==3 && (/^\s*$/.test(c.data))) {
             node.removeChild(c);
         }
-        stripspace();
-        if (node.childNodes.length==0 && !preserveEmpty) {
-            node.parentNode.removeChild(node);
-        };
+    }
+    stripspace();
+    var c = node.lastChild;
+    if (c && c.nodeType==1 && c.tagName=='BR') {
+        node.removeChild(c);
+    }
+    stripspace();
+    if (node.childNodes.length==0 && !preserveEmpty) {
+        node.parentNode.removeChild(node);
     };
+};
 
-    this._cleanCell = function(eltype, classname, strip) {
-        var alttype=eltype=='TD'?'TH':eltype=='TH'?'TD':null;
-        
-        var selNode = this.editor.getSelectedNode(true);
-        var el = this.editor.getNearestParentOfType(selNode, eltype);
-        if (!el && alttype) {
-            // Maybe changing type
-            el = this.editor.getNearestParentOfType(selNode, alttype);
-        }
+KupuUI.prototype._cleanCell = function(eltype, classname, strip) {
+    var alttype=eltype=='TD'?'TH':eltype=='TH'?'TD':null;
+    
+    var selNode = this.editor.getSelectedNode(true);
+    var el = this.editor.getNearestParentOfType(selNode, eltype);
+    if (!el && alttype) {
+        // Maybe changing type
+        el = this.editor.getNearestParentOfType(selNode, alttype);
+    }
 
-        //either the selection is inside a cell, spans cells, or includes
-        //a collection of cells
+    //either the selection is inside a cell, spans cells, or includes
+    //a collection of cells
 
-        //first, if contained in a cell
-        
-        if (el) {
-            if (eltype != el.tagName) {
-                    // Change node type.
-                var node = el.ownerDocument.createElement(eltype);
-                var parent = el.parentNode;
-                parent.insertBefore(node, el);
-                while (el.firstChild) {
-                    node.appendChild(el.firstChild);
-                }
-                parent.removeChild(el);
-                el = node;
-            }
-                // now set the classname
-            this._setClass(el, classname);
-            if (strip && el.childNodes.length==1) {
-                var node = el.firstChild;
-                if (blocktagre.test(node.nodeName)) {
-                    for (var n = node.firstChild; n;) {
-                        var nxt = n.nextSibling;
-                        el.insertBefore(n, node); // Move nodes out of block
-                        n = nxt;
-                    };
-                    nxt = node.nextSibling;
-                    el.removeChild(node);
-                    node = nxt;
+    //first, if contained in a cell
+    
+    if (el) {
+        if (eltype != el.tagName) {
+                // Change node type.
+            var node = el.ownerDocument.createElement(eltype);
+            var parent = el.parentNode;
+            parent.insertBefore(node, el);
+            while (el.firstChild) {
+                node.appendChild(el.firstChild);
+            }
+            parent.removeChild(el);
+            el = node;
+        }
+            // now set the classname
+        this._setClass(el, classname);
+        if (strip && el.childNodes.length==1) {
+            var node = el.firstChild;
+            if (this.blocktagre.test(node.nodeName)) {
+                for (var n = node.firstChild; n;) {
+                    var nxt = n.nextSibling;
+                    el.insertBefore(n, node); // Move nodes out of block
+                    n = nxt;
                 };
+                nxt = node.nextSibling;
+                el.removeChild(node);
+                node = nxt;
             };
-        } else {
-            //otherwise, find all cells that intersect the selection
-            var selection = this.editor.getSelection();
-            var nodes = selNode.getElementsByTagName(eltype);
+        };
+    } else {
+        //otherwise, find all cells that intersect the selection
+        var selection = this.editor.getSelection();
+        var nodes = selNode.getElementsByTagName(eltype);
 
-            var cellNodes = [];
+        var cellNodes = [];
+        for (var i = 0; i < nodes.length; i++) {
+            cellNodes.push(nodes.item(i));
+        };
+        if (alttype) {
+            nodes = selNode.getElementsByTagName(alttype);
             for (var i = 0; i < nodes.length; i++) {
                 cellNodes.push(nodes.item(i));
             };
-            if (alttype) {
-                nodes = selNode.getElementsByTagName(alttype);
-                for (var i = 0; i < nodes.length; i++) {
-                    cellNodes.push(nodes.item(i));
-                };
-            };
-            
-            for (var i = 0; i < cellNodes.length; i++) {
-                el = cellNodes[i];
+        };
+        
+        for (var i = 0; i < cellNodes.length; i++) {
+            el = cellNodes[i];
 
-                if(selection.intersectsNode(el)) {
-                    if (eltype != el.tagName) {
-                        // Change node type.
-                        var node = el.ownerDocument.createElement(eltype);
-                        var parent = el.parentNode;
-                        parent.insertBefore(node, el);
-                        while (el.firstChild) {
-                            node.appendChild(el.firstChild);
-                        };
-                        parent.removeChild(el);
-                        el = node;
+            if(selection.intersectsNode(el)) {
+                if (eltype != el.tagName) {
+                    // Change node type.
+                    var node = el.ownerDocument.createElement(eltype);
+                    var parent = el.parentNode;
+                    parent.insertBefore(node, el);
+                    while (el.firstChild) {
+                        node.appendChild(el.firstChild);
                     };
-                    this._setClass(el, classname);
-                }
+                    parent.removeChild(el);
+                    el = node;
+                };
+                this._setClass(el, classname);
             }
         }
-    };
+    }
+};
 
-    this._setClass = function(el, classname) {
-        var parent = el.parentNode;
-        if (parent.tagName=='DIV') {
-            // fixup buggy formatting
-            var gp = parent.parentNode;
-            if (el != parent.firstChild) {
-                var previous = parent.cloneNode(false);
-                while (el != parent.firstChild) {
-                    previous.appendChild(parent.firstChild);
-                }
-                gp.insertBefore(previous, parent);
-                this._cleanNode(previous);
-            }
-            gp.insertBefore(el, parent);
-            this._cleanNode(parent);
-        };
-        // now set the classname
-        if (classname) {
-            el.className = classname;
-        } else {
-            el.removeAttribute("class");
-            el.removeAttribute("className");
+KupuUI.prototype._setClass = function(el, classname) {
+    var parent = el.parentNode;
+    if (parent.tagName=='DIV') {
+        // fixup buggy formatting
+        var gp = parent.parentNode;
+        if (el != parent.firstChild) {
+            var previous = parent.cloneNode(false);
+            while (el != parent.firstChild) {
+                previous.appendChild(parent.firstChild);
+            }
+            gp.insertBefore(previous, parent);
+            this._cleanNode(previous);
+        }
+        gp.insertBefore(el, parent);
+        this._cleanNode(parent);
+    };
+    // now set the classname
+    if (classname) {
+        el.className = classname;
+    } else {
+        el.removeAttribute("class");
+        el.removeAttribute("className");
+    }
+};
+
+KupuUI.prototype._removeStyle = function() {
+    var self = this;
+    function needbreak(e) {
+        if (isblock && e) {
+            if (self.blocktagre.test(e.nodeName) || /^br$/i.test(e.nodeName)) return;
+            parent.insertBefore(ed.newElement('br'), n);
         }
-    };
-    this._removeStyle = function() {
-        function needbreak(e) {
-            if (isblock && e) {
-                if (blocktagre.test(e.nodeName) || /^br$/i.test(e.nodeName)) return;
-                parent.insertBefore(ed.newElement('br'), n);
-            }
-        }
-        var n = this.editor.getSelectedNode(true);
-        var ed = this.editor;
-        while(n) {
-            var tag = n.nodeName.toLowerCase();
-            var isblock = blocktagre.test(tag);
-            if (tblre.test(tag) && n.className) {
-                n.removeAttribute("class");
-                n.removeAttribute("className");
-                return;
-            }
-            if (isblock || tag == 'span') {
-                var parent = n.parentNode;
-                var el;
-                needbreak(n.previousSibling);
-                while ((el = n.firstChild)) {
-                    parent.insertBefore(el, n);
-                }
-                needbreak(n.nextSibling);
-                parent.removeChild(n);
-                return;
+    }
+    var n = this.editor.getSelectedNode(true);
+    var ed = this.editor;
+    while(n) {
+        var tag = n.nodeName.toLowerCase();
+        var isblock = this.blocktagre.test(tag);
+        if (this.tblre.test(tag) && n.className) {
+            n.removeAttribute("class");
+            n.removeAttribute("className");
+            return;
+        }
+        if (isblock || tag == 'span') {
+            var parent = n.parentNode;
+            var el;
+            needbreak(n.previousSibling);
+            while ((el = n.firstChild)) {
+                parent.insertBefore(el, n);
             }
-            n = n.parentNode;
-        };
+            needbreak(n.nextSibling);
+            parent.removeChild(n);
+            return;
+        }
+        n = n.parentNode;
     };
+};
 
-    this.setTextStyle = function(style, noupdate) {
-        /* parse the argument into a type and classname part
-           generate a block element accordingly 
-        */
-        var classname = '';
-        var eltype = style.toUpperCase();
-        if (style.indexOf('|') > -1) {
-            style = style.split('|');
-            eltype = style[0].toUpperCase();
-            classname = style[1];
-        };
-
-        var doc = this.editor.getDocument();
-        var command = eltype;
-            // first create the element, then find it and set the classname
-        if (this.editor.getBrowserName() == 'IE') {
-            command = '<' + eltype + '>';
-        };
-        if (!style) {
-            this._removeStyle();
-        } else if (tblre.test(eltype)) {
-            this._cleanCell(eltype, classname);
-        } else if (eltype=='SPAN') {
-            doc.execCommand('removeformat', null);
-            if (this.editor.getBrowserName()=='IE') {
-                // removeformat is broken in IE: it doesn't remove span
-                // tags
-                var selNode = this.editor.getSelectedNode();
-                var selection = this.editor.getSelection();
-                var elements = selNode.getElementsByTagName('span');
-                for (var i = 0; i < elements.length; i++) {
-                    var span = elements[i];
-                    if (selection.containsNode(span)) {
-                        var parent = span.parentNode;
-                        while (span.firstChild) {
-                            parent.insertBefore(span.firstChild, span);
-                        };
-                        parent.removeChild(span);
-                    };
-                };
-            }
-            if (classname) {
-                doc.execCommand('fontsize', '2');
-                // Now convert font tags to spans
-                var inner = doc.getDocument();
-                var elements = inner.getElementsByTagName('FONT');
-                while (elements.length > 0) {
-                    var font = elements[0];
-                    var span = inner.createElement('SPAN');
-                    span.className = classname;
-                    var parent = font.parentNode;
-                    parent.replaceChild(span, font);
-                    while (font.firstChild) {
-                        span.appendChild(font.firstChild);
+KupuUI.prototype.setTextStyle = function(style, noupdate) {
+    /* parse the argument into a type and classname part
+       generate a block element accordingly 
+    */
+    var classname = '';
+    var eltype = style.toUpperCase();
+    if (style.indexOf('|') > -1) {
+        style = style.split('|');
+        eltype = style[0].toUpperCase();
+        classname = style[1];
+    };
+
+    var doc = this.editor.getDocument();
+    var command = eltype;
+        // first create the element, then find it and set the classname
+    if (this.editor.getBrowserName() == 'IE') {
+        command = '<' + eltype + '>';
+    };
+    if (!style) {
+        this._removeStyle();
+    } else if (this.tblre.test(eltype)) {
+        this._cleanCell(eltype, classname);
+    } else if (eltype=='SPAN') {
+        doc.execCommand('removeformat', null);
+        if (this.editor.getBrowserName()=='IE') {
+            // removeformat is broken in IE: it doesn't remove span
+            // tags
+            var selNode = this.editor.getSelectedNode();
+            var selection = this.editor.getSelection();
+            var elements = selNode.getElementsByTagName('span');
+            for (var i = 0; i < elements.length; i++) {
+                var span = elements[i];
+                if (selection.containsNode(span)) {
+                    var parent = span.parentNode;
+                    while (span.firstChild) {
+                        parent.insertBefore(span.firstChild, span);
                     };
+                    parent.removeChild(span);
                 };
             };
         }
-        else {
-            doc.execCommand('formatblock', command);
+        if (classname) {
+            doc.execCommand('fontsize', '2');
+            // Now convert font tags to spans
+            var inner = doc.getDocument();
+            var elements = inner.getElementsByTagName('FONT');
+            while (elements.length > 0) {
+                var font = elements[0];
+                var span = inner.createElement('SPAN');
+                span.className = classname;
+                var parent = font.parentNode;
+                parent.replaceChild(span, font);
+                while (font.firstChild) {
+                    span.appendChild(font.firstChild);
+                };
+            };
+        };
+    }
+    else {
+        doc.execCommand('formatblock', command);
 
-                // now get a reference to the element just added
-            var selNode = this.editor.getSelectedNode(true);
-            var el = this.editor.getNearestParentOfType(selNode, eltype);
-            if (el) {
-                this._setClass(el, classname);
-            } else {
-                var selection = this.editor.getSelection();
-                var elements = selNode.getElementsByTagName(eltype);
-                for (var i = 0; i < elements.length; i++) {
-                    el = elements[i];
-                    if (selection.containsNode(el)) {
-                        this._setClass(el, classname);
-                    }
+            // now get a reference to the element just added
+        var selNode = this.editor.getSelectedNode(true);
+        var el = this.editor.getNearestParentOfType(selNode, eltype);
+        if (el) {
+            this._setClass(el, classname);
+        } else {
+            var selection = this.editor.getSelection();
+            var elements = selNode.getElementsByTagName(eltype);
+            for (var i = 0; i < elements.length; i++) {
+                el = elements[i];
+                if (selection.containsNode(el)) {
+                    this._setClass(el, classname);
                 }
             }
         }
-        if (el) {
-            this.editor.getSelection().selectNodeContents(el);
-        }
-        if (!noupdate) {
-            this.editor.updateState();
-        }
-    };
-  
-    this.createContextMenuElements = function(selNode, event) {
-        var ret = [];
-        ret.push(new ContextMenuElement(_('Cut'), 
-                    this.cutButtonHandler, this));
-        ret.push(new ContextMenuElement(_('Copy'), 
-                    this.copyButtonHandler, this));
-        ret.push(new ContextMenuElement(_('Paste'), 
-                    this.pasteButtonHandler, this));
-        return ret;
-    };
-    this.disable = function() {
-        if (this.tsselect) this.tsselect.disabled = "disabled";
-    };
-    this.enable = function() {
-        if (this.tsselect) this.tsselect.disabled = "";
-    };
-}
+    }
+    if (el) {
+        this.editor.getSelection().selectNodeContents(el);
+    }
+    if (!noupdate) {
+        this.editor.updateState();
+    }
+};
 
-KupuUI.prototype = new KupuTool;
+KupuUI.prototype.createContextMenuElements = function(selNode, event) {
+    var ret = [];
+    ret.push(new ContextMenuElement(_('Cut'), 
+                this.cutButtonHandler, this));
+    ret.push(new ContextMenuElement(_('Copy'), 
+                this.copyButtonHandler, this));
+    ret.push(new ContextMenuElement(_('Paste'), 
+                this.pasteButtonHandler, this));
+    return ret;
+};
+
+KupuUI.prototype.disable = function() {
+    if (this.tsselect) this.tsselect.disabled = "disabled";
+};
+
+KupuUI.prototype.enable = function() {
+    if (this.tsselect) this.tsselect.disabled = "";
+};
 
 function ColorchooserTool(fgcolorbuttonid, hlcolorbuttonid, colorchooserid) {
     /* the colorchooser */
@@ -818,350 +829,352 @@
     this.hlcolorbutton = getFromSelector(hlcolorbuttonid);
     this.ccwindow = getFromSelector(colorchooserid);
     this.command = null;
+}
 
-    this.initialize = function(editor) {
-        /* attach the event handlers */
-        this.editor = editor;
-        if (!(this.fgcolorbutton && this.hlcolorbutton && this.ccwindow)) return;
-        this.createColorchooser(this.ccwindow);
-
-        addEventHandler(this.fgcolorbutton, "click", this.openFgColorChooser, this);
-        addEventHandler(this.hlcolorbutton, "click", this.openHlColorChooser, this);
-        addEventHandler(this.ccwindow, "click", this.chooseColor, this);
-        this.hide();
-    };
-
-    this.updateState = function(selNode) {
-        /* update state of the colorchooser */
-        this.hide();
-    };
+ColorchooserTool.prototype = new KupuTool;
 
-    this.openFgColorChooser = function() {
-        /* event handler for opening the colorchooser */
-        this.command = "forecolor";
-        this.show();
-    };
+ColorchooserTool.prototype.initialize = function(editor) {
+    /* attach the event handlers */
+    this.editor = editor;
+    if (!(this.fgcolorbutton && this.hlcolorbutton && this.ccwindow)) return;
+    this.createColorchooser(this.ccwindow);
 
-    this.openHlColorChooser = function() {
-        /* event handler for closing the colorchooser */
-        if (this.editor.getBrowserName() == "IE") {
-            this.command = "backcolor";
-        } else {
-            this.command = "hilitecolor";
-        }
-        this.show();
-    };
+    addEventHandler(this.fgcolorbutton, "click", this.openFgColorChooser, this);
+    addEventHandler(this.hlcolorbutton, "click", this.openHlColorChooser, this);
+    addEventHandler(this.ccwindow, "click", this.chooseColor, this);
+    this.hide();
+};
 
-    this.chooseColor = function(event) {
-        /* event handler for choosing the color */
-        var target = _SARISSA_IS_MOZ ? event.target : event.srcElement;
-        var cell = this.editor.getNearestParentOfType(target, 'td');
-        var ed = this.editor;
-        var doc = ed.getDocument();
-        ed.execCommand('styleWithCSS', true);
-        doc.execCommand(this.command, cell.bgColor);
-        ed.execCommand('styleWithCSS', false);
-        // this.editor.execCommand(this.command, cell.bgColor);
-        this.hide();
-    
-        this.editor.logMessage(_('Color chosen'));
-    };
+ColorchooserTool.prototype.updateState = function(selNode) {
+    /* update state of the colorchooser */
+    this.hide();
+};
 
-    this.show = function(command) {
-        /* show the colorchooser */
-        this.ccwindow.style.display = "block";
-    };
+ColorchooserTool.prototype.openFgColorChooser = function() {
+    /* event handler for opening the colorchooser */
+    this.command = "forecolor";
+    this.show();
+};
 
-    this.hide = function() {
-        /* hide the colorchooser */
-        this.ccwindow.style.display = "none";
-    };
+ColorchooserTool.prototype.openHlColorChooser = function() {
+    /* event handler for closing the colorchooser */
+    if (this.editor.getBrowserName() == "IE") {
+        this.command = "backcolor";
+    } else {
+        this.command = "hilitecolor";
+    }
+    this.show();
+};
 
-    this.createColorchooser = function(table) {
-        /* create the colorchooser table */
-        
-        var chunks = ['00', '33', '66', '99', 'CC', 'FF'];
-        table.setAttribute('id', 'kupu-colorchooser-table');
-        table.style.borderWidth = '2px';
-        table.style.borderStyle = 'solid';
-        table.style.position = 'absolute';
-        table.style.cursor = 'default';
-        table.style.display = 'none';
-
-        var tbody = document.createElement('tbody');
-
-        for (var i=0; i < 6; i++) {
-            var tr = document.createElement('tr');
-            var r = chunks[i];
-            for (var j=0; j < 6; j++) {
-                var g = chunks[j];
-                for (var k=0; k < 6; k++) {
-                    var b = chunks[k];
-                    var color = '#' + r + g + b;
-                    var td = document.createElement('td');
-                    td.setAttribute('bgColor', color);
-                    td.style.backgroundColor = color;
-                    td.style.borderWidth = '1px';
-                    td.style.borderStyle = 'solid';
-                    td.style.fontSize = '1px';
-                    td.style.width = '10px';
-                    td.style.height = '10px';
-                    var text = document.createTextNode('\u00a0');
-                    td.appendChild(text);
-                    tr.appendChild(td);
-                }
+ColorchooserTool.prototype.chooseColor = function(event) {
+    /* event handler for choosing the color */
+    var target = _SARISSA_IS_MOZ ? event.target : event.srcElement;
+    var cell = this.editor.getNearestParentOfType(target, 'td');
+    var ed = this.editor;
+    var doc = ed.getDocument();
+    ed.execCommand('styleWithCSS', true);
+    doc.execCommand(this.command, cell.bgColor);
+    ed.execCommand('styleWithCSS', false);
+    // this.editor.execCommand(this.command, cell.bgColor);
+    this.hide();
+
+    this.editor.logMessage(_('Color chosen'));
+};
+
+ColorchooserTool.prototype.show = function(command) {
+    /* show the colorchooser */
+    this.ccwindow.style.display = "block";
+};
+
+ColorchooserTool.prototype.hide = function() {
+    /* hide the colorchooser */
+    this.ccwindow.style.display = "none";
+};
+
+ColorchooserTool.prototype.createColorchooser = function(table) {
+    /* create the colorchooser table */
+    
+    var chunks = ['00', '33', '66', '99', 'CC', 'FF'];
+    table.setAttribute('id', 'kupu-colorchooser-table');
+    table.style.borderWidth = '2px';
+    table.style.borderStyle = 'solid';
+    table.style.position = 'absolute';
+    table.style.cursor = 'default';
+    table.style.display = 'none';
+
+    var tbody = document.createElement('tbody');
+
+    for (var i=0; i < 6; i++) {
+        var tr = document.createElement('tr');
+        var r = chunks[i];
+        for (var j=0; j < 6; j++) {
+            var g = chunks[j];
+            for (var k=0; k < 6; k++) {
+                var b = chunks[k];
+                var color = '#' + r + g + b;
+                var td = document.createElement('td');
+                td.setAttribute('bgColor', color);
+                td.style.backgroundColor = color;
+                td.style.borderWidth = '1px';
+                td.style.borderStyle = 'solid';
+                td.style.fontSize = '1px';
+                td.style.width = '10px';
+                td.style.height = '10px';
+                var text = document.createTextNode('\u00a0');
+                td.appendChild(text);
+                tr.appendChild(td);
             }
-            tbody.appendChild(tr);
         }
-        table.appendChild(tbody);
+        tbody.appendChild(tr);
+    }
+    table.appendChild(tbody);
 
-        return table;
-    };
-    this.enable = function() {
-        kupuButtonEnable(this.fgcolorbutton);
-        kupuButtonEnable(this.hlcolorbutton);
-    };
-    this.disable = function() {
-        kupuButtonDisable(this.fgcolorbutton);
-        kupuButtonDisable(this.hlcolorbutton);
-    };
-}
+    return table;
+};
 
-ColorchooserTool.prototype = new KupuTool;
+ColorchooserTool.prototype.enable = function() {
+    kupuButtonEnable(this.fgcolorbutton);
+    kupuButtonEnable(this.hlcolorbutton);
+};
+
+ColorchooserTool.prototype.disable = function() {
+    kupuButtonDisable(this.fgcolorbutton);
+    kupuButtonDisable(this.hlcolorbutton);
+};
 
 function PropertyTool(titlefieldid, descfieldid) {
     /* The property tool */
 
     this.titlefield = getFromSelector(titlefieldid);
     this.descfield = getFromSelector(descfieldid);
+};
 
-    this.initialize = function(editor) {
-        /* attach the event handlers and set the initial values */
-        this.editor = editor;
-        addEventHandler(this.titlefield, "change", this.updateProperties, this);
-        addEventHandler(this.descfield, "change", this.updateProperties, this);
-        
-        // set the fields
-        var heads = this.editor.getInnerDocument().getElementsByTagName('head');
-        if (!heads[0]) {
-            this.editor.logMessage(_('No head in document!'), 1);
-        } else {
-            var head = heads[0];
-            var titles = head.getElementsByTagName('title');
-            if (titles.length) {
-                this.titlefield.value = titles[0].text;
-            }
-            var metas = head.getElementsByTagName('meta');
-            if (metas.length) {
-                for (var i=0; i < metas.length; i++) {
-                    var meta = metas[i];
-                    if (meta.getAttribute('name') && 
-                            meta.getAttribute('name').toLowerCase() == 
-                            'description') {
-                        this.descfield.value = meta.getAttribute('content');
-                        break;
-                    }
+PropertyTool.prototype = new KupuTool;
+
+PropertyTool.prototype.initialize = function(editor) {
+    /* attach the event handlers and set the initial values */
+    this.editor = editor;
+    addEventHandler(this.titlefield, "change", this.updateProperties, this);
+    addEventHandler(this.descfield, "change", this.updateProperties, this);
+    
+    // set the fields
+    var heads = this.editor.getInnerDocument().getElementsByTagName('head');
+    if (!heads[0]) {
+        this.editor.logMessage(_('No head in document!'), 1);
+    } else {
+        var head = heads[0];
+        var titles = head.getElementsByTagName('title');
+        if (titles.length) {
+            this.titlefield.value = titles[0].text;
+        }
+        var metas = head.getElementsByTagName('meta');
+        if (metas.length) {
+            for (var i=0; i < metas.length; i++) {
+                var meta = metas[i];
+                if (meta.getAttribute('name') && 
+                        meta.getAttribute('name').toLowerCase() == 
+                        'description') {
+                    this.descfield.value = meta.getAttribute('content');
+                    break;
                 }
             }
         }
-    };
+    }
+};
 
-    this.updateProperties = function() {
-        /* event handler for updating the properties form */
-        var doc = this.editor.getInnerDocument();
-        var heads = doc.getElementsByTagName('HEAD');
-        if (!heads) {
-            this.editor.logMessage(_('No head in document!'), 1);
-            return;
-        }
+PropertyTool.prototype.updateProperties = function() {
+    /* event handler for updating the properties form */
+    var doc = this.editor.getInnerDocument();
+    var heads = doc.getElementsByTagName('HEAD');
+    if (!heads) {
+        this.editor.logMessage(_('No head in document!'), 1);
+        return;
+    }
 
-        var head = heads[0];
+    var head = heads[0];
 
-        // set the title
-        var titles = head.getElementsByTagName('title');
-        if (!titles) {
-            var title = doc.createElement('title');
-            var text = doc.createTextNode(this.titlefield.value);
-            title.appendChild(text);
+    // set the title
+    var titles = head.getElementsByTagName('title');
+    if (!titles) {
+        var title = doc.createElement('title');
+        var text = doc.createTextNode(this.titlefield.value);
+        title.appendChild(text);
+        head.appendChild(title);
+    } else {
+        var title = titles[0];
+        // IE6 title has no children, and refuses appendChild.
+        // Delete and recreate the title.
+        if (title.childNodes.length == 0) {
+            title.removeNode(true);
+            title = doc.createElement('title');
+            title.innerText = this.titlefield.value;
             head.appendChild(title);
         } else {
-            var title = titles[0];
-            // IE6 title has no children, and refuses appendChild.
-            // Delete and recreate the title.
-            if (title.childNodes.length == 0) {
-                title.removeNode(true);
-                title = doc.createElement('title');
-                title.innerText = this.titlefield.value;
-                head.appendChild(title);
-            } else {
-                title.childNodes[0].nodeValue = this.titlefield.value;
-            }
-        }
-        document.title = this.titlefield.value;
-
-        // let's just fulfill the usecase, not think about more properties
-        // set the description
-        var metas = doc.getElementsByTagName('meta');
-        var descset = 0;
-        for (var i=0; i < metas.length; i++) {
-            var meta = metas[i];
-            if (meta.getAttribute('name') && 
-                    meta.getAttribute('name').toLowerCase() == 'description') {
-                meta.setAttribute('content', this.descfield.value);
-                descset = 1;
-            }
+            title.childNodes[0].nodeValue = this.titlefield.value;
         }
+    }
+    document.title = this.titlefield.value;
 
-        if (!descset) {
-            var meta = doc.createElement('meta');
-            meta.setAttribute('name', 'description');
+    // let's just fulfill the usecase, not think about more properties
+    // set the description
+    var metas = doc.getElementsByTagName('meta');
+    var descset = 0;
+    for (var i=0; i < metas.length; i++) {
+        var meta = metas[i];
+        if (meta.getAttribute('name') && 
+                meta.getAttribute('name').toLowerCase() == 'description') {
             meta.setAttribute('content', this.descfield.value);
-            head.appendChild(meta);
+            descset = 1;
         }
+    }
 
-        this.editor.logMessage(_('Properties modified'));
-    };
-}
+    if (!descset) {
+        var meta = doc.createElement('meta');
+        meta.setAttribute('name', 'description');
+        meta.setAttribute('content', this.descfield.value);
+        head.appendChild(meta);
+    }
 
-PropertyTool.prototype = new KupuTool;
+    this.editor.logMessage(_('Properties modified'));
+};
 
-function LinkTool(popupurl, popupheight, popupwidth) {
+function LinkTool(popupurl, popupwidth, popupheight) {
     /* Add and update hyperlinks */
-
     this.popupurl = popupurl || 'kupupopups/link.html';
-    this.popupheight = popupheight || 300;
-    this.popupwidth = popupwidth || 200;
-    
-    this.initialize = function(editor) {
-        this.editor = editor;
-    };
+    this.popupwidth = popupwidth || 300;
+    this.popupheight = popupheight || 200;
+}
+
+LinkTool.prototype = new KupuTool;
     
-    this.createLinkHandler = function(event) {
-        /* create a link according to a url entered in a popup */
-        var linkWindow = openPopup('kupupopups/link.html', 300, 200);
-        linkWindow.linktool = this;
-        linkWindow.focus();
-    };
+LinkTool.prototype.initialize = function(editor) {
+    this.editor = editor;
+};
+
+LinkTool.prototype.createLinkHandler = function(event) {
+    /* create a link according to a url entered in a popup */
+    var linkWindow = openPopup(this.popupurl, this.popupwidth,
+                               this.popupheight);
+    linkWindow.linktool = this;
+    linkWindow.focus();
+};
 
-    this.updateLink = function (linkel, url, type, name, target, title, className, bForce) {
-        if (type && type == 'anchor') {
-            linkel.removeAttribute('href');
-            linkel.setAttribute('name', name);
+LinkTool.prototype.updateLink = function (linkel, url, type, name, target, title, className, bForce) {
+    if (type && type == 'anchor') {
+        linkel.removeAttribute('href');
+        linkel.setAttribute('name', name);
+    } else {
+        linkel.href = url;
+        if (linkel.innerHTML == "" || (bForce && linkel.innerHTML==url)) {
+            var doc = this.editor.getInnerDocument();
+            while (linkel.firstChild) { linkel.removeChild(linkel.firstChild); };
+            linkel.appendChild(doc.createTextNode(title || url));
+        }
+        if (title) {
+            linkel.title = title;
         } else {
-            linkel.href = url;
-            if (linkel.innerHTML == "" || (bForce && linkel.innerHTML==url)) {
-                var doc = this.editor.getInnerDocument();
-                while (linkel.firstChild) { linkel.removeChild(linkel.firstChild); };
-                linkel.appendChild(doc.createTextNode(title || url));
-            }
-            if (title) {
-                linkel.title = title;
-            } else {
-                linkel.removeAttribute('title');
-            }
-            if (target) {
-                linkel.setAttribute('target', target);
-            }
-            else {
-                linkel.removeAttribute('target');
-            };
-            if (className===undefined) {
-                linkel.removeAttribute('className');
-            } else {
-                linkel.className = className;
-            }
-            linkel.style.color = this.linkcolor;
+            linkel.removeAttribute('title');
+        }
+        if (target) {
+            linkel.setAttribute('target', target);
+        }
+        else {
+            linkel.removeAttribute('target');
         };
+        if (className===undefined) {
+            linkel.removeAttribute('className');
+        } else {
+            linkel.className = className;
+        }
+        linkel.style.color = this.linkcolor;
     };
+};
 
-    this.formatSelectedLink = function(url, type, name, target, title, className, bForce) {
-        var currnode = this.editor.getSelectedNode();
+LinkTool.prototype.formatSelectedLink = function(url, type, name, target, title, className, bForce) {
+    var currnode = this.editor.getSelectedNode();
 
-        // selection inside link
-        var linkel = this.editor.getNearestParentOfType(currnode, 'A');
-        if (linkel) {
-            this.updateLink(linkel, url, type, name, target, title, className, bForce);
-            return true;
-        }
+    // selection inside link
+    var linkel = this.editor.getNearestParentOfType(currnode, 'A');
+    if (linkel) {
+        this.updateLink(linkel, url, type, name, target, title, className, bForce);
+        return true;
+    }
 
-        if (currnode.nodeType!=1) return false;
+    if (currnode.nodeType!=1) return false;
 
-        // selection contains links
-        var linkelements = currnode.getElementsByTagName('A');
-        var selection = this.editor.getSelection();
-        var containsLink = false;
-        for (var i = 0; i < linkelements.length; i++) {
-            linkel = linkelements[i];
-            if (selection.containsNode(linkel)) {
-                this.updateLink(linkel, url, type, name, target, title, className, bForce);
-                containsLink = true;
-            }
-        };
-        return containsLink;
-    };
-
-    // Can create a link in the following circumstances:
-    //   The selection is inside a link:
-    //      just update the link attributes.
-    //   The selection contains links:
-    //      update the attributes of the contained links
-    //   No links inside or outside the selection:
-    //      create a link around the selection
-    //   No selection:
-    //      insert a link containing the title
-    //
-    // the order of the arguments is a bit odd here because of backward
-    // compatibility
-    this.createLink = function(url, type, name, target, title, className) {
-        url = url.strip();
-        if (!url) {
-            this.deleteLink();
-            return;
-        };
-        if (!this.formatSelectedLink(url, type, name, target, title, className)) {
-            // No links inside or outside.
-            this.editor.execCommand("CreateLink", url);
-            if (!this.formatSelectedLink(url, type, name, target, title, className, true)) {
-                // Insert link with no text selected, insert the title
-                // or URI instead.
-                var doc = this.editor.getInnerDocument();
-                var linkel = doc.createElement("a");
-                linkel.setAttribute('href', url);
-                linkel.setAttribute('class', className || 'generated');
-                this.editor.getSelection().replaceWithNode(linkel, true);
-                this.updateLink(linkel, url, type, name, target, title, className);
-            };
+    // selection contains links
+    var linkelements = currnode.getElementsByTagName('A');
+    var selection = this.editor.getSelection();
+    var containsLink = false;
+    for (var i = 0; i < linkelements.length; i++) {
+        linkel = linkelements[i];
+        if (selection.containsNode(linkel)) {
+            this.updateLink(linkel, url, type, name, target, title, className, bForce);
+            containsLink = true;
         }
     };
-    
-    this.deleteLink = function() {
-        /* delete the current link */
-        var currnode = this.editor.getSelectedNode();
-        var linkel = this.editor.getNearestParentOfType(currnode, 'a');
-        if (!linkel) {
-            this.editor.logMessage(_('Not inside link'));
-            return;
-        };
-        while (linkel.childNodes.length) {
-            linkel.parentNode.insertBefore(linkel.childNodes[0], linkel);
-        };
-        linkel.parentNode.removeChild(linkel);
-    };
-    
-    this.createContextMenuElements = function(selNode, event) {
-        /* create the 'Create link' or 'Remove link' menu elements */
-        var ret = [];
-        var link = this.editor.getNearestParentOfType(selNode, 'a');
-        if (link) {
-            ret.push(new ContextMenuElement(_('Delete link'), this.deleteLink, this));
-        } else {
-            ret.push(new ContextMenuElement(_('Create link'), this.createLinkHandler, this));
+    return containsLink;
+};
+
+// Can create a link in the following circumstances:
+//   The selection is inside a link:
+//      just update the link attributes.
+//   The selection contains links:
+//      update the attributes of the contained links
+//   No links inside or outside the selection:
+//      create a link around the selection
+//   No selection:
+//      insert a link containing the title
+//
+// the order of the arguments is a bit odd here because of backward
+// compatibility
+LinkTool.prototype.createLink = function(url, type, name, target, title, className) {
+    url = url.strip();
+    if (!url) {
+        this.deleteLink();
+        return;
+    };
+    if (!this.formatSelectedLink(url, type, name, target, title, className)) {
+        // No links inside or outside.
+        this.editor.execCommand("CreateLink", url);
+        if (!this.formatSelectedLink(url, type, name, target, title, className, true)) {
+            // Insert link with no text selected, insert the title
+            // or URI instead.
+            var doc = this.editor.getInnerDocument();
+            var linkel = doc.createElement("a");
+            linkel.setAttribute('href', url);
+            linkel.setAttribute('class', className || 'generated');
+            this.editor.getSelection().replaceWithNode(linkel, true);
+            this.updateLink(linkel, url, type, name, target, title, className);
         };
-        return ret;
-    };
-}
+    }
+};
 
-LinkTool.prototype = new KupuTool;
+LinkTool.prototype.deleteLink = function() {
+    /* delete the current link */
+    var currnode = this.editor.getSelectedNode();
+    var linkel = this.editor.getNearestParentOfType(currnode, 'a');
+    if (!linkel) {
+        this.editor.logMessage(_('Not inside link'));
+        return;
+    };
+    while (linkel.childNodes.length) {
+        linkel.parentNode.insertBefore(linkel.childNodes[0], linkel);
+    };
+    linkel.parentNode.removeChild(linkel);
+};
+
+LinkTool.prototype.createContextMenuElements = function(selNode, event) {
+    /* create the 'Create link' or 'Remove link' menu elements */
+    var ret = [];
+    var link = this.editor.getNearestParentOfType(selNode, 'a');
+    if (link) {
+        ret.push(new ContextMenuElement(_('Delete link'), this.deleteLink, this));
+    } else {
+        ret.push(new ContextMenuElement(_('Create link'), this.createLinkHandler, this));
+    };
+    return ret;
+};
 
 function LinkToolBox(inputid, buttonid, toolboxid, plainclass, activeclass) {
     /* create and edit links */
@@ -1171,134 +1184,137 @@
     this.toolboxel = getFromSelector(toolboxid);
     this.plainclass = plainclass;
     this.activeclass = activeclass;
-    
-    this.initialize = function(tool, editor) {
-        /* attach the event handlers */
-        this.tool = tool;
-        this.editor = editor;
-        if (!this.button) return;
-        addEventHandler(this.input, "blur", this.updateLink, this);
-        addEventHandler(this.button, "click", this.addLink, this);
-    };
+};
 
-    this.updateState = function(selNode) {
-        /* if we're inside a link, update the input, else empty it */
-        var linkel = this.editor.getNearestParentOfType(selNode, 'a');
-        if (linkel) {
-            // check first before setting a class for backward compatibility
-            if (this.toolboxel) {
-                this.toolboxel.className = this.activeclass;
-            };
-            this.input.value = linkel.getAttribute('href');
-        } else {
-            // check first before setting a class for backward compatibility
-            if (this.toolboxel) {
-                this.toolboxel.className = this.plainclass;
-            };
-            this.input.value = '';
-        }
-    };
-    
-    this.addLink = function(event) {
-        /* add a link */
-        var url = this.input.value;
-        this.editor.focusDocument();
-        this.tool.createLink(url);
-        this.editor.updateState();
-    };
+LinkToolBox.prototype = new LinkToolBox;
     
-    this.updateLink = function() {
-        /* update the current link */
-        var currnode = this.editor.getSelectedNode();
-        var linkel = this.editor.getNearestParentOfType(currnode, 'A');
-        if (!linkel) {
-            return;
-        }
+LinkToolBox.prototype.initialize = function(tool, editor) {
+    /* attach the event handlers */
+    this.tool = tool;
+    this.editor = editor;
+    if (!this.button) return;
+    addEventHandler(this.input, "blur", this.updateLink, this);
+    addEventHandler(this.button, "click", this.addLink, this);
+};
 
-        var url = this.input.value;
-        linkel.setAttribute('href', url);
+LinkToolBox.prototype.updateState = function(selNode) {
+    /* if we're inside a link, update the input, else empty it */
+    var linkel = this.editor.getNearestParentOfType(selNode, 'a');
+    if (linkel) {
+        // check first before setting a class for backward compatibility
+        if (this.toolboxel) {
+            this.toolboxel.className = this.activeclass;
+        };
+        this.input.value = linkel.getAttribute('href');
+    } else {
+        // check first before setting a class for backward compatibility
+        if (this.toolboxel) {
+            this.toolboxel.className = this.plainclass;
+        };
+        this.input.value = '';
+    }
+};
 
-        this.editor.updateState();
-    };
+LinkToolBox.prototype.addLink = function(event) {
+    /* add a link */
+    var url = this.input.value;
+    this.editor.focusDocument();
+    this.tool.createLink(url);
+    this.editor.updateState();
 };
 
-LinkToolBox.prototype = new LinkToolBox;
+LinkToolBox.prototype.updateLink = function() {
+    /* update the current link */
+    var currnode = this.editor.getSelectedNode();
+    var linkel = this.editor.getNearestParentOfType(currnode, 'A');
+    if (!linkel) {
+        return;
+    }
+
+    var url = this.input.value;
+    linkel.setAttribute('href', url);
+
+    this.editor.updateState();
+};
 
 function ImageTool(popupurl, popupwidth, popupheight) {
     /* Image tool to add images */
-
     this.popupurl = popupurl || 'kupupopups/image.html';
     this.popupwidth = popupwidth || 300;
     this.popupheight = popupheight || 200;
-    
-    this.initialize = function(editor) {
-        /* attach the event handlers */
-        this.editor = editor;
-    };
+};
 
-    this.createImageHandler = function(event) {
-        /* create an image according to a url entered in a popup */
-        var imageWindow = openPopup(this.popupurl, this.popupwidth,
-                                    this.popupheight);
-        imageWindow.imagetool = this;
-        imageWindow.focus();
-    };
-
-    this.newNode = function(name, obj) {
-        var ed = this.editor;
-        var currobj = ed.getNearestParentOfType(ed.getSelectedNode(), name);
-        if (currobj) {
-            var p = currobj.parentNode;
-            p.insertBefore(obj, currobj);
-            p.removeChild(currobj);
-            return obj;
-        } else {
-            return ed.insertNodeAtSelection(obj, 1);
-        }
-    };
-    this.createImage = function(url, alttext, imgclass) {
-        /* create an image */
-        var img = this.editor.getInnerDocument().createElement('img');
-        img.src = url;
-        img.setAttribute('kupu-src', url);
-        img.removeAttribute('height');
-        img.removeAttribute('width');
-        if (alttext) {
-            img.alt = alttext;
-        };
-        if (imgclass) {
-            img.className = imgclass;
-        };
-        this.newNode('IMG', img);
-        return img;
-    };
+ImageTool.prototype = new KupuTool;
 
-    this.create_flash = function(url, alttext, className, width, height) {
-        var ed = this.editor;
-        var obj = ed.newElement('object',
-            {src:url, alt:alttext, className:className, width:width, height:height, type:'application/x-shockwave-flash',
-            'data':url},
-            [ed.newElement('param', {name:'movie', value:url})]);
-        this.newNode('OBJECT', obj);
-    };
+ImageTool.prototype.initialize = function(editor) {
+    /* attach the event handlers */
+    this.editor = editor;
+};
 
-    this.setImageClass = function(imgclass) {
-        /* set the class of the selected image */
-        var currnode = this.editor.getSelectedNode();
-        var currimg = this.editor.getNearestParentOfType(currnode, 'IMG');
-        if (currimg) {
-            currimg.className = imgclass;
-        };
+ImageTool.prototype.createImageHandler = function(event) {
+    /* create an image according to a url entered in a popup */
+    var imageWindow = openPopup(this.popupurl, this.popupwidth,
+                                this.popupheight);
+    imageWindow.imagetool = this;
+    imageWindow.focus();
+};
+
+ImageTool.prototype.newNode = function(name, obj) {
+    var ed = this.editor;
+    var currobj = ed.getNearestParentOfType(ed.getSelectedNode(), name);
+    if (currobj) {
+        var p = currobj.parentNode;
+        p.insertBefore(obj, currobj);
+        p.removeChild(currobj);
+        return obj;
+    } else {
+        return ed.insertNodeAtSelection(obj, 1);
+    }
+};
+
+ImageTool.prototype.createImage = function(url, alttext, imgclass) {
+    /* create an image */
+    var img = this.editor.getInnerDocument().createElement('img');
+    img.src = url;
+    img.setAttribute('kupu-src', url);
+    img.removeAttribute('height');
+    img.removeAttribute('width');
+    if (alttext) {
+        img.alt = alttext;
+    };
+    if (imgclass) {
+        img.className = imgclass;
     };
+    this.newNode('IMG', img);
+    return img;
+};
+
+ImageTool.prototype.create_flash = function(url, alttext, className, width, height) {
+    var ed = this.editor;
+    var obj = ed.newElement('object',
+        {src:url, alt:alttext, className:className, width:width,
+         height:height, type:'application/x-shockwave-flash',
+         'data':url},
+        [ed.newElement('param', {name:'movie', value:url})]);
+    this.newNode('OBJECT', obj);
+};
 
-    this.createContextMenuElements = function(selNode, event) {
-        return [new ContextMenuElement(_('Create image'), this.createImageHandler, this)];
+ImageTool.prototype.setImageClass = function(imgclass) {
+    /* set the class of the selected image */
+    var currnode = this.editor.getSelectedNode();
+    var currimg = this.editor.getNearestParentOfType(currnode, 'IMG');
+    if (currimg) {
+        currimg.className = imgclass;
     };
-}
+};
 
-ImageTool.prototype = new KupuTool;
+ImageTool.prototype.createContextMenuElements = function(selNode, event) {
+    return [new ContextMenuElement(_('Create image'), this.createImageHandler,
+                                   this)];
+};
 
-function ImageToolBox(inputfieldid, insertbuttonid, classselectid, toolboxid, plainclass, activeclass) {
+function ImageToolBox(inputfieldid, insertbuttonid, classselectid, toolboxid,
+                      plainclass, activeclass) {
     /* toolbox for adding images */
 
     this.inputfield = getFromSelector(inputfieldid);
@@ -1307,703 +1323,704 @@
     this.toolboxel = getFromSelector(toolboxid);
     this.plainclass = plainclass;
     this.activeclass = activeclass;
+};
 
-    this.initialize = function(tool, editor) {
-        this.tool = tool;
-        this.editor = editor;
-        addEventHandler(this.classselect, "change", this.setImageClass, this);
-        addEventHandler(this.insertbutton, "click", this.addImage, this);
-    };
+ImageToolBox.prototype = new KupuToolBox;
 
-    this.updateState = function(selNode, event) {
-        /* update the state of the toolbox element */
-        var imageel = this.editor.getNearestParentOfType(selNode, 'img');
-        if (imageel) {
-            // check first before setting a class for backward compatibility
-            if (this.toolboxel) {
-                this.toolboxel.className = this.activeclass;
-                this.inputfield.value = imageel.getAttribute('src');
-                var imgclass = imageel.className ? imageel.className : 'image-inline';
-                selectSelectItem(this.classselect, imgclass);
-            };
-        } else {
-            if (this.toolboxel) {
-                this.toolboxel.className = this.plainclass;
-            };
-        };
-    };
+ImageToolBox.prototype.initialize = function(tool, editor) {
+    this.tool = tool;
+    this.editor = editor;
+    addEventHandler(this.classselect, "change", this.setImageClass, this);
+    addEventHandler(this.insertbutton, "click", this.addImage, this);
+};
 
-    this.addImage = function() {
-        /* add an image */
-        var url = this.inputfield.value;
-        var sel_class = this.classselect.options[this.classselect.selectedIndex].value;
-        this.editor.focusDocument();
-        this.tool.createImage(url, null, sel_class);
-        this.editor.updateState();
+ImageToolBox.prototype.updateState = function(selNode, event) {
+    /* update the state of the toolbox element */
+    var imageel = this.editor.getNearestParentOfType(selNode, 'img');
+    if (imageel) {
+        // check first before setting a class for backward compatibility
+        if (this.toolboxel) {
+            this.toolboxel.className = this.activeclass;
+            this.inputfield.value = imageel.getAttribute('src');
+            var imgclass = imageel.className ? imageel.className : 'image-inline';
+            selectSelectItem(this.classselect, imgclass);
+        };
+    } else {
+        if (this.toolboxel) {
+            this.toolboxel.className = this.plainclass;
+        };
     };
+};
 
-    this.setImageClass = function() {
-        /* set the class for the current image */
-        var sel_class = this.classselect.options[this.classselect.selectedIndex].value;
-        this.editor.focusDocument();
-        this.tool.setImageClass(sel_class);
-        this.editor.updateState();
-    };
+ImageToolBox.prototype.addImage = function() {
+    /* add an image */
+    var url = this.inputfield.value;
+    var sel_class = this.classselect.options[this.classselect.selectedIndex].value;
+    this.editor.focusDocument();
+    this.tool.createImage(url, null, sel_class);
+    this.editor.updateState();
 };
 
-ImageToolBox.prototype = new KupuToolBox;
+ImageToolBox.prototype.setImageClass = function() {
+    /* set the class for the current image */
+    var sel_class = this.classselect.options[this.classselect.selectedIndex].value;
+    this.editor.focusDocument();
+    this.tool.setImageClass(sel_class);
+    this.editor.updateState();
+};
 
 function TableTool() {
     /* The table tool */
+};
 
-    // XXX There are some awfully long methods in here!!
-    this.createContextMenuElements = function(selNode, event) {
-        var table =  this.editor.getNearestParentOfType(selNode, 'table');
-        if (!table) {
-            var ret = [];
-            var el = new ContextMenuElement(_('Add table'), this.addPlainTable, this);
-            ret.push(el);
-            return ret;
-        } else {
-            var ret = [];
-            ret.push(new ContextMenuElement(_('Add row'), this.addTableRow, this));
-            ret.push(new ContextMenuElement(_('Delete row'), this.delTableRow, this));
-            ret.push(new ContextMenuElement(_('Add column'), this.addTableColumn, this));
-            ret.push(new ContextMenuElement(_('Delete column'), this.delTableColumn, this));
-            ret.push(new ContextMenuElement(_('Delete Table'), this.delTable, this));
-            return ret;
-        };
+TableTool.prototype = new KupuTool;
+
+// XXX There are some awfully long methods in here!!
+TableTool.prototype.createContextMenuElements = function(selNode, event) {
+    var table =  this.editor.getNearestParentOfType(selNode, 'table');
+    if (!table) {
+        var ret = [];
+        var el = new ContextMenuElement(_('Add table'), this.addPlainTable, this);
+        ret.push(el);
+        return ret;
+    } else {
+        var ret = [];
+        ret.push(new ContextMenuElement(_('Add row'), this.addTableRow, this));
+        ret.push(new ContextMenuElement(_('Delete row'), this.delTableRow, this));
+        ret.push(new ContextMenuElement(_('Add column'), this.addTableColumn, this));
+        ret.push(new ContextMenuElement(_('Delete column'), this.delTableColumn, this));
+        ret.push(new ContextMenuElement(_('Delete Table'), this.delTable, this));
+        return ret;
     };
+};
+
+TableTool.prototype.addPlainTable = function() {
+    /* event handler for the context menu */
+    this.createTable(2, 3, 1, 'plain');
+};
 
-    this.addPlainTable = function() {
-        /* event handler for the context menu */
-        this.createTable(2, 3, 1, 'plain');
+TableTool.prototype.createTable = function(rows, cols, makeHeader, tableclass) {
+    /* add a table */
+    if (rows < 1 || rows > 99 || cols < 1 || cols > 99) {
+        this.editor.logMessage(_('Invalid table size'), 1);
+        return;
     };
 
-    this.createTable = function(rows, cols, makeHeader, tableclass) {
-        /* add a table */
-        if (rows < 1 || rows > 99 || cols < 1 || cols > 99) {
-            this.editor.logMessage(_('Invalid table size'), 1);
-            return;
-        };
+    var doc = this.editor.getInnerDocument();
+    var table = doc.createElement("table");
+    table.className = tableclass;
 
-        var doc = this.editor.getInnerDocument();
-        var table = doc.createElement("table");
-        table.className = tableclass;
+    // If the user wants a row of headings, make them
+    if (makeHeader) {
+        var tr = doc.createElement("tr");
+        var thead = doc.createElement("thead");
+        for (var i=0; i < cols; i++) {
+            var th = doc.createElement("th");
+            th.appendChild(doc.createTextNode("Col " + i+1));
+            tr.appendChild(th);
+        }
+        thead.appendChild(tr);
+        table.appendChild(thead);
+    }
 
-        // If the user wants a row of headings, make them
-        if (makeHeader) {
-            var tr = doc.createElement("tr");
-            var thead = doc.createElement("thead");
-            for (var i=0; i < cols; i++) {
-                var th = doc.createElement("th");
-                th.appendChild(doc.createTextNode("Col " + i+1));
-                tr.appendChild(th);
-            }
-            thead.appendChild(tr);
-            table.appendChild(thead);
-        }
-
-        var tbody = doc.createElement("tbody");
-        for (var i=0; i < rows; i++) {
-            var tr = doc.createElement("tr");
-            for (var j=0; j < cols; j++) {
-                var td = doc.createElement("td");
-                var content = doc.createTextNode('\u00a0');
-                td.appendChild(content);
-                tr.appendChild(td);
-            }
-            tbody.appendChild(tr);
+    var tbody = doc.createElement("tbody");
+    for (var i=0; i < rows; i++) {
+        var tr = doc.createElement("tr");
+        for (var j=0; j < cols; j++) {
+            var td = doc.createElement("td");
+            var content = doc.createTextNode('\u00a0');
+            td.appendChild(content);
+            tr.appendChild(td);
         }
-        table.appendChild(tbody);
-        this.editor.insertNodeAtSelection(table);
+        tbody.appendChild(tr);
+    }
+    table.appendChild(tbody);
+    this.editor.insertNodeAtSelection(table);
 
-        this._setTableCellHandlers(table);
-        return table;
-    };
+    this._setTableCellHandlers(table);
+    return table;
+};
 
-    this._setTableCellHandlers = function(table) {
-        // make each cell select its full contents if it's clicked
-        addEventHandler(table, 'click', this._selectContentIfEmpty, this);
+TableTool.prototype._setTableCellHandlers = function(table) {
+    // make each cell select its full contents if it's clicked
+    addEventHandler(table, 'click', this._selectContentIfEmpty, this);
 
-        var cells = table.getElementsByTagName('td');
-        for (var i=0; i < cells.length; i++) {
-            addEventHandler(cells[i], 'click', this._selectContentIfEmpty, this);
-        };
-        
-        // select the nbsp in the first cell
-        var firstcell = cells[0];
-        if (firstcell) {
-            var children = firstcell.childNodes;
-            if (children.length == 1 && children[0].nodeType == 3 && 
-                    children[0].nodeValue == '\xa0') {
-                var selection = this.editor.getSelection();
-                selection.selectNodeContents(firstcell);
-            };
-        };
+    var cells = table.getElementsByTagName('td');
+    for (var i=0; i < cells.length; i++) {
+        addEventHandler(cells[i], 'click', this._selectContentIfEmpty, this);
     };
     
-    this._selectContentIfEmpty = function() {
-        var selNode = this.editor.getSelectedNode();
-        var cell = this.editor.getNearestParentOfType(selNode, 'td');
-        if (!cell) {
-            return;
-        };
-        var children = cell.childNodes;
+    // select the nbsp in the first cell
+    var firstcell = cells[0];
+    if (firstcell) {
+        var children = firstcell.childNodes;
         if (children.length == 1 && children[0].nodeType == 3 && 
                 children[0].nodeValue == '\xa0') {
             var selection = this.editor.getSelection();
-            selection.selectNodeContents(cell);
+            selection.selectNodeContents(firstcell);
         };
     };
+};
 
-    this.addTableRow = function() {
-        /* Find the current row and add a row after it */
-        var currnode = this.editor.getSelectedNode();
-        var currtbody = this.editor.getNearestParentOfType(currnode, "TBODY");
-        var bodytype = "tbody";
-        if (!currtbody) {
-            currtbody = this.editor.getNearestParentOfType(currnode, "THEAD");
-            bodytype = "thead";
-        }
-        var parentrow = this.editor.getNearestParentOfType(currnode, "TR");
-        var nextrow = parentrow.nextSibling;
-
-        // get the number of cells we should place
-        var colcount = 0;
-        for (var i=0; i < currtbody.childNodes.length; i++) {
-            var el = currtbody.childNodes[i];
-            if (el.nodeType != 1) {
-                continue;
-            }
-            if (el.nodeName.toLowerCase() == 'tr') {
-                var cols = 0;
-                for (var j=0; j < el.childNodes.length; j++) {
-                    if (el.childNodes[j].nodeType == 1) {
-                        cols++;
-                    }
-                }
-                if (cols > colcount) {
-                    colcount = cols;
-                }
-            }
-        }
+TableTool.prototype._selectContentIfEmpty = function() {
+    var selNode = this.editor.getSelectedNode();
+    var cell = this.editor.getNearestParentOfType(selNode, 'td');
+    if (!cell) {
+        return;
+    };
+    var children = cell.childNodes;
+    if (children.length == 1 && children[0].nodeType == 3 && 
+            children[0].nodeValue == '\xa0') {
+        var selection = this.editor.getSelection();
+        selection.selectNodeContents(cell);
+    };
+};
 
-        var newrow = this.editor.getInnerDocument().createElement("TR");
+TableTool.prototype.addTableRow = function() {
+    /* Find the current row and add a row after it */
+    var currnode = this.editor.getSelectedNode();
+    var currtbody = this.editor.getNearestParentOfType(currnode, "TBODY");
+    var bodytype = "tbody";
+    if (!currtbody) {
+        currtbody = this.editor.getNearestParentOfType(currnode, "THEAD");
+        bodytype = "thead";
+    }
+    var parentrow = this.editor.getNearestParentOfType(currnode, "TR");
+    var nextrow = parentrow.nextSibling;
 
-        for (var i = 0; i < colcount; i++) {
-            var newcell;
-            if (bodytype == 'tbody') {
-                newcell = this.editor.getInnerDocument().createElement("TD");
-            } else {
-                newcell = this.editor.getInnerDocument().createElement("TH");
+    // get the number of cells we should place
+    var colcount = 0;
+    for (var i=0; i < currtbody.childNodes.length; i++) {
+        var el = currtbody.childNodes[i];
+        if (el.nodeType != 1) {
+            continue;
+        }
+        if (el.nodeName.toLowerCase() == 'tr') {
+            var cols = 0;
+            for (var j=0; j < el.childNodes.length; j++) {
+                if (el.childNodes[j].nodeType == 1) {
+                    cols++;
+                }
+            }
+            if (cols > colcount) {
+                colcount = cols;
             }
-            var newcellvalue = this.editor.getInnerDocument().createTextNode("\u00a0");
-            newcell.appendChild(newcellvalue);
-            newrow.appendChild(newcell);
         }
+    }
 
-        if (!nextrow) {
-            currtbody.appendChild(newrow);
-        } else {
-            currtbody.insertBefore(newrow, nextrow);
-        }
-    };
+    var newrow = this.editor.getInnerDocument().createElement("TR");
 
-    this.delTableRow = function() {
-        /* Find the current row and delete it */
-        var currnode = this.editor.getSelectedNode();
-        var parentrow = this.editor.getNearestParentOfType(currnode, "TR");
-        if (!parentrow) {
-            this.editor.logMessage(_('No row to delete'), 1);
-            return;
-        }
+    for (var i = 0; i < colcount; i++) {
+        var newcell;
+        if (bodytype == 'tbody') {
+            newcell = this.editor.getInnerDocument().createElement("TD");
+        } else {
+            newcell = this.editor.getInnerDocument().createElement("TH");
+        }
+        var newcellvalue = this.editor.getInnerDocument().createTextNode("\u00a0");
+        newcell.appendChild(newcellvalue);
+        newrow.appendChild(newcell);
+    }
 
-        // move selection aside
-        // XXX: doesn't work if parentrow is the only row of thead/tbody/tfoot
-        // XXX: doesn't preserve the colindex
-        var selection = this.editor.getSelection();
-        if (parentrow.nextSibling) {
-            selection.selectNodeContents(parentrow.nextSibling.firstChild);
-        } else if (parentrow.previousSibling) {
-            selection.selectNodeContents(parentrow.previousSibling.firstChild);
-        };
+    if (!nextrow) {
+        currtbody.appendChild(newrow);
+    } else {
+        currtbody.insertBefore(newrow, nextrow);
+    }
+};
 
-        // remove the row
-        parentrow.parentNode.removeChild(parentrow);
-    };
+TableTool.prototype.delTableRow = function() {
+    /* Find the current row and delete it */
+    var currnode = this.editor.getSelectedNode();
+    var parentrow = this.editor.getNearestParentOfType(currnode, "TR");
+    if (!parentrow) {
+        this.editor.logMessage(_('No row to delete'), 1);
+        return;
+    }
 
-    this.addTableColumn = function() {
-        /* Add a new column after the current column */
-        var currnode = this.editor.getSelectedNode();
-        var currtd = this.editor.getNearestParentOfType(currnode, 'TD');
-        if (!currtd) {
-            currtd = this.editor.getNearestParentOfType(currnode, 'TH');
-        }
-        if (!currtd) {
-            this.editor.logMessage(_('No parentcolumn found!'), 1);
-            return;
-        }
-        var currtable = this.editor.getNearestParentOfType(currnode, 'TABLE');
-        
-        // get the current index
-        var tdindex = this._getColIndex(currtd);
+    // move selection aside
+    // XXX: doesn't work if parentrow is the only row of thead/tbody/tfoot
+    // XXX: doesn't preserve the colindex
+    var selection = this.editor.getSelection();
+    if (parentrow.nextSibling) {
+        selection.selectNodeContents(parentrow.nextSibling.firstChild);
+    } else if (parentrow.previousSibling) {
+        selection.selectNodeContents(parentrow.previousSibling.firstChild);
+    };
+
+    // remove the row
+    parentrow.parentNode.removeChild(parentrow);
+};
+
+TableTool.prototype.addTableColumn = function() {
+    /* Add a new column after the current column */
+    var currnode = this.editor.getSelectedNode();
+    var currtd = this.editor.getNearestParentOfType(currnode, 'TD');
+    if (!currtd) {
+        currtd = this.editor.getNearestParentOfType(currnode, 'TH');
+    }
+    if (!currtd) {
+        this.editor.logMessage(_('No parentcolumn found!'), 1);
+        return;
+    }
+    var currtable = this.editor.getNearestParentOfType(currnode, 'TABLE');
+    
+    // get the current index
+    var tdindex = this._getColIndex(currtd);
 
-        // now add a column to all rows
-        // first the thead
-        var theads = currtable.getElementsByTagName('THEAD');
-        if (theads) {
-            for (var i=0; i < theads.length; i++) {
-                // let's assume table heads only have ths
-                var currthead = theads[i];
-                for (var j=0; j < currthead.childNodes.length; j++) {
-                    var tr = currthead.childNodes[j];
-                    if (tr.nodeType != 1) {
-                        continue;
-                    }
-                    var currindex = 0;
-                    for (var k=0; k < tr.childNodes.length; k++) {
-                        var th = tr.childNodes[k];
-                        if (th.nodeType != 1) {
-                            continue;
-                        }
-                        if (currindex == tdindex) {
-                            var doc = this.editor.getInnerDocument();
-                            var newth = doc.createElement('th');
-                            var text = doc.createTextNode('\u00a0');
-                            newth.appendChild(text);
-                            if (tr.childNodes.length == k+1) {
-                                // the column will be on the end of the row
-                                tr.appendChild(newth);
-                            } else {
-                                tr.insertBefore(newth, tr.childNodes[k + 1]);
-                            }
-                            break;
-                        }
-                        currindex++;
-                    }
+    // now add a column to all rows
+    // first the thead
+    var theads = currtable.getElementsByTagName('THEAD');
+    if (theads) {
+        for (var i=0; i < theads.length; i++) {
+            // let's assume table heads only have ths
+            var currthead = theads[i];
+            for (var j=0; j < currthead.childNodes.length; j++) {
+                var tr = currthead.childNodes[j];
+                if (tr.nodeType != 1) {
+                    continue;
                 }
-            }
-        }
-
-        // then the tbody
-        var tbodies = currtable.getElementsByTagName('TBODY');
-        if (tbodies) {
-            for (var i=0; i < tbodies.length; i++) {
-                // let's assume table heads only have ths
-                var currtbody = tbodies[i];
-                for (var j=0; j < currtbody.childNodes.length; j++) {
-                    var tr = currtbody.childNodes[j];
-                    if (tr.nodeType != 1) {
+                var currindex = 0;
+                for (var k=0; k < tr.childNodes.length; k++) {
+                    var th = tr.childNodes[k];
+                    if (th.nodeType != 1) {
                         continue;
                     }
-                    var currindex = 0;
-                    for (var k=0; k < tr.childNodes.length; k++) {
-                        var td = tr.childNodes[k];
-                        if (td.nodeType != 1) {
-                            continue;
-                        }
-                        if (currindex == tdindex) {
-                            var doc = this.editor.getInnerDocument();
-                            var newtd = doc.createElement('td');
-                            var text = doc.createTextNode('\u00a0');
-                            newtd.appendChild(text);
-                            if (tr.childNodes.length == k+1) {
-                                // the column will be on the end of the row
-                                tr.appendChild(newtd);
-                            } else {
-                                tr.insertBefore(newtd, tr.childNodes[k + 1]);
-                            }
-                            break;
+                    if (currindex == tdindex) {
+                        var doc = this.editor.getInnerDocument();
+                        var newth = doc.createElement('th');
+                        var text = doc.createTextNode('\u00a0');
+                        newth.appendChild(text);
+                        if (tr.childNodes.length == k+1) {
+                            // the column will be on the end of the row
+                            tr.appendChild(newth);
+                        } else {
+                            tr.insertBefore(newth, tr.childNodes[k + 1]);
                         }
-                        currindex++;
+                        break;
                     }
+                    currindex++;
                 }
             }
         }
-    };
-
-    this.delTableColumn = function() {
-        /* remove a column */
-        var currnode = this.editor.getSelectedNode();
-        var currtd = this.editor.getNearestParentOfType(currnode, 'TD');
-        if (!currtd) {
-            currtd = this.editor.getNearestParentOfType(currnode, 'TH');
-        }
-        var currcolindex = this._getColIndex(currtd);
-        var currtable = this.editor.getNearestParentOfType(currnode, 'TABLE');
-
-        // move selection aside
-        var selection = this.editor.getSelection();
-        if (currtd.nextSibling) {
-            selection.selectNodeContents(currtd.nextSibling);
-        } else if (currtd.previousSibling) {
-            selection.selectNodeContents(currtd.previousSibling);
-        };
+    }
 
-        // remove the theaders
-        var heads = currtable.getElementsByTagName('THEAD');
-        if (heads.length) {
-            for (var i=0; i < heads.length; i++) {
-                var thead = heads[i];
-                for (var j=0; j < thead.childNodes.length; j++) {
-                    var tr = thead.childNodes[j];
-                    if (tr.nodeType != 1) {
+    // then the tbody
+    var tbodies = currtable.getElementsByTagName('TBODY');
+    if (tbodies) {
+        for (var i=0; i < tbodies.length; i++) {
+            // let's assume table heads only have ths
+            var currtbody = tbodies[i];
+            for (var j=0; j < currtbody.childNodes.length; j++) {
+                var tr = currtbody.childNodes[j];
+                if (tr.nodeType != 1) {
+                    continue;
+                }
+                var currindex = 0;
+                for (var k=0; k < tr.childNodes.length; k++) {
+                    var td = tr.childNodes[k];
+                    if (td.nodeType != 1) {
                         continue;
                     }
-                    var currindex = 0;
-                    for (var k=0; k < tr.childNodes.length; k++) {
-                        var th = tr.childNodes[k];
-                        if (th.nodeType != 1) {
-                            continue;
-                        }
-                        if (currindex == currcolindex) {
-                            tr.removeChild(th);
-                            break;
+                    if (currindex == tdindex) {
+                        var doc = this.editor.getInnerDocument();
+                        var newtd = doc.createElement('td');
+                        var text = doc.createTextNode('\u00a0');
+                        newtd.appendChild(text);
+                        if (tr.childNodes.length == k+1) {
+                            // the column will be on the end of the row
+                            tr.appendChild(newtd);
+                        } else {
+                            tr.insertBefore(newtd, tr.childNodes[k + 1]);
                         }
-                        currindex++;
+                        break;
                     }
+                    currindex++;
                 }
             }
         }
+    }
+};
 
-        // now we remove the column field, a bit harder since we need to take 
-        // colspan and rowspan into account XXX Not right, fix theads as well
-        var bodies = currtable.getElementsByTagName('TBODY');
-        for (var i=0; i < bodies.length; i++) {
-            var currtbody = bodies[i];
-            for (var j=0; j < currtbody.childNodes.length; j++) {
-                var tr = currtbody.childNodes[j];
+TableTool.prototype.delTableColumn = function() {
+    /* remove a column */
+    var currnode = this.editor.getSelectedNode();
+    var currtd = this.editor.getNearestParentOfType(currnode, 'TD');
+    if (!currtd) {
+        currtd = this.editor.getNearestParentOfType(currnode, 'TH');
+    }
+    var currcolindex = this._getColIndex(currtd);
+    var currtable = this.editor.getNearestParentOfType(currnode, 'TABLE');
+
+    // move selection aside
+    var selection = this.editor.getSelection();
+    if (currtd.nextSibling) {
+        selection.selectNodeContents(currtd.nextSibling);
+    } else if (currtd.previousSibling) {
+        selection.selectNodeContents(currtd.previousSibling);
+    };
+
+    // remove the theaders
+    var heads = currtable.getElementsByTagName('THEAD');
+    if (heads.length) {
+        for (var i=0; i < heads.length; i++) {
+            var thead = heads[i];
+            for (var j=0; j < thead.childNodes.length; j++) {
+                var tr = thead.childNodes[j];
                 if (tr.nodeType != 1) {
                     continue;
                 }
                 var currindex = 0;
                 for (var k=0; k < tr.childNodes.length; k++) {
-                    var cell = tr.childNodes[k];
-                    if (cell.nodeType != 1) {
+                    var th = tr.childNodes[k];
+                    if (th.nodeType != 1) {
                         continue;
                     }
                     if (currindex == currcolindex) {
-                        tr.removeChild(cell);
+                        tr.removeChild(th);
                         break;
                     }
                     currindex++;
                 }
             }
         }
-    };
-
-    this.delTable = function() {
-        /* delete the current table */
-        var currnode = this.editor.getSelectedNode();
-        var table = this.editor.getNearestParentOfType(currnode, 'table');
-        if (!table) {
-            this.editor.logMessage(_('Not inside a table!'));
-            return;
-        };
-        table.parentNode.removeChild(table);
-    };
+    }
 
-    this.setColumnAlign = function(newalign) {
-        /* change the alignment of a full column */
-        var currnode = this.editor.getSelectedNode();
-        var currtd = this.editor.getNearestParentOfType(currnode, "TD");
-        var bodytype = 'tbody';
-        if (!currtd) {
-            currtd = this.editor.getNearestParentOfType(currnode, "TH");
-            bodytype = 'thead';
-        }
-        var currcolindex = this._getColIndex(currtd);
-        var currtable = this.editor.getNearestParentOfType(currnode, "TABLE");
-
-        // unfortunately this is not enough to make the browsers display
-        // the align, we need to set it on individual cells as well and
-        // mind the rowspan...
-        for (var i=0; i < currtable.childNodes.length; i++) {
-            var currtbody = currtable.childNodes[i];
-            if (currtbody.nodeType != 1 || 
-                    (/^thead|tbody$/i.test(currtbody.nodeName))) {
+    // now we remove the column field, a bit harder since we need to take 
+    // colspan and rowspan into account XXX Not right, fix theads as well
+    var bodies = currtable.getElementsByTagName('TBODY');
+    for (var i=0; i < bodies.length; i++) {
+        var currtbody = bodies[i];
+        for (var j=0; j < currtbody.childNodes.length; j++) {
+            var tr = currtbody.childNodes[j];
+            if (tr.nodeType != 1) {
                 continue;
             }
-            for (var j=0; j < currtbody.childNodes.length; j++) {
-                var row = currtbody.childNodes[j];
-                if (row.nodeType != 1) {
+            var currindex = 0;
+            for (var k=0; k < tr.childNodes.length; k++) {
+                var cell = tr.childNodes[k];
+                if (cell.nodeType != 1) {
                     continue;
                 }
-                var index = 0;
-                for (var k=0; k < row.childNodes.length; k++) {
-                    var cell = row.childNodes[k];
-                    if (cell.nodeType != 1) {
-                        continue;
-                    }
-                    if (index == currcolindex) {
-                        if (this.editor.config.use_css) {
-                            cell.style.textAlign = newalign;
-                        } else {
-                            cell.setAttribute('align', newalign);
-                        }
-                        cell.className = 'align-' + newalign;
-                    }
-                    index++;
+                if (currindex == currcolindex) {
+                    tr.removeChild(cell);
+                    break;
                 }
+                currindex++;
             }
         }
-    };
+    }
+};
 
-    this.setTableClass = function(sel_class) {
-        /* set the class for the table */
-        var currnode = this.editor.getSelectedNode();
-        var currtable = this.editor.getNearestParentOfType(currnode, 'TABLE');
-
-        if (currtable) {
-            currtable.className = sel_class;
-        }
-    };
+TableTool.prototype.delTable = function() {
+    /* delete the current table */
+    var currnode = this.editor.getSelectedNode();
+    var table = this.editor.getNearestParentOfType(currnode, 'table');
+    if (!table) {
+        this.editor.logMessage(_('Not inside a table!'));
+        return;
+    };
+    table.parentNode.removeChild(table);
+};
+
+TableTool.prototype.setColumnAlign = function(newalign) {
+    /* change the alignment of a full column */
+    var currnode = this.editor.getSelectedNode();
+    var currtd = this.editor.getNearestParentOfType(currnode, "TD");
+    var bodytype = 'tbody';
+    if (!currtd) {
+        currtd = this.editor.getNearestParentOfType(currnode, "TH");
+        bodytype = 'thead';
+    }
+    var currcolindex = this._getColIndex(currtd);
+    var currtable = this.editor.getNearestParentOfType(currnode, "TABLE");
 
-    this._getColIndex = function(currcell) {
-        /* Given a node, return an integer for which column it is */
-        var prevsib = currcell.previousSibling;
-        var currcolindex = 0;
-        while (prevsib) {
-            if (prevsib.nodeType == 1 && 
-                    (prevsib.tagName.toUpperCase() == "TD" || 
-                        prevsib.tagName.toUpperCase() == "TH")) {
-                var colspan = prevsib.colSpan;
-                if (colspan) {
-                    currcolindex += parseInt(colspan);
-                } else {
-                    currcolindex++;
+    // unfortunately this is not enough to make the browsers display
+    // the align, we need to set it on individual cells as well and
+    // mind the rowspan...
+    for (var i=0; i < currtable.childNodes.length; i++) {
+        var currtbody = currtable.childNodes[i];
+        if (currtbody.nodeType != 1 || 
+                (/^thead|tbody$/i.test(currtbody.nodeName))) {
+            continue;
+        }
+        for (var j=0; j < currtbody.childNodes.length; j++) {
+            var row = currtbody.childNodes[j];
+            if (row.nodeType != 1) {
+                continue;
+            }
+            var index = 0;
+            for (var k=0; k < row.childNodes.length; k++) {
+                var cell = row.childNodes[k];
+                if (cell.nodeType != 1) {
+                    continue;
                 }
+                if (index == currcolindex) {
+                    if (this.editor.config.use_css) {
+                        cell.style.textAlign = newalign;
+                    } else {
+                        cell.setAttribute('align', newalign);
+                    }
+                    cell.className = 'align-' + newalign;
+                }
+                index++;
             }
-            prevsib = prevsib.previousSibling;
-            if (currcolindex > 30) {
-                alert("Recursion detected when counting column position");
-                return;
+        }
+    }
+};
+
+TableTool.prototype.setTableClass = function(sel_class) {
+    /* set the class for the table */
+    var currnode = this.editor.getSelectedNode();
+    var currtable = this.editor.getNearestParentOfType(currnode, 'TABLE');
+
+    if (currtable) {
+        currtable.className = sel_class;
+    }
+};
+
+TableTool.prototype._getColIndex = function(currcell) {
+    /* Given a node, return an integer for which column it is */
+    var prevsib = currcell.previousSibling;
+    var currcolindex = 0;
+    while (prevsib) {
+        if (prevsib.nodeType == 1 && 
+                (prevsib.tagName.toUpperCase() == "TD" || 
+                    prevsib.tagName.toUpperCase() == "TH")) {
+            var colspan = prevsib.colSpan;
+            if (colspan) {
+                currcolindex += parseInt(colspan);
+            } else {
+                currcolindex++;
             }
         }
+        prevsib = prevsib.previousSibling;
+        if (currcolindex > 30) {
+            alert("Recursion detected when counting column position");
+            return;
+        }
+    }
 
-        return currcolindex;
-    };
+    return currcolindex;
+};
 
-    this._getColumnAlign = function(selNode) {
-        /* return the alignment setting of the current column */
-        var align;
-        var td = this.editor.getNearestParentOfType(selNode, 'td');
-        if (!td) {
-            td = this.editor.getNearestParentOfType(selNode, 'th');
-        };
-        if (td) {
-            align = td.getAttribute('align');
-            if (this.editor.config.use_css) {
-                align = td.style.textAlign;
-            };
+TableTool.prototype._getColumnAlign = function(selNode) {
+    /* return the alignment setting of the current column */
+    var align;
+    var td = this.editor.getNearestParentOfType(selNode, 'td');
+    if (!td) {
+        td = this.editor.getNearestParentOfType(selNode, 'th');
+    };
+    if (td) {
+        align = td.getAttribute('align');
+        if (this.editor.config.use_css) {
+            align = td.style.textAlign;
         };
-        return align;
     };
+    return align;
+};
 
-    this.fixTable = function(event) {
-        /* fix the table so it can be processed by Kupu */
-        // since this can be quite a nasty creature we can't just use the
-        // helper methods
-        
-        // first we create a new tbody element
-        var currnode = this.editor.getSelectedNode();
-        var table = this.editor.getNearestParentOfType(currnode, 'TABLE');
-        if (!table) {
-            this.editor.logMessage(_('Not inside a table!'));
-            return;
-        };
-        this._fixTableHelper(table);
+TableTool.prototype.fixTable = function(event) {
+    /* fix the table so it can be processed by Kupu */
+    // since this can be quite a nasty creature we can't just use the
+    // helper methods
+    
+    // first we create a new tbody element
+    var currnode = this.editor.getSelectedNode();
+    var table = this.editor.getNearestParentOfType(currnode, 'TABLE');
+    if (!table) {
+        this.editor.logMessage(_('Not inside a table!'));
+        return;
     };
+    this._fixTableHelper(table);
+};
 
-    this._isBodyRow = function(row) {
-        for (var node = row.firstChild; node; node=node.nextSibling) {
-            if (/^td$/i.test(node.nodeName)) {
-                return true;
-            }
+TableTool.prototype._isBodyRow = function(row) {
+    for (var node = row.firstChild; node; node=node.nextSibling) {
+        if (/^td$/i.test(node.nodeName)) {
+            return true;
         }
-        return false;
-    };
+    }
+    return false;
+};
 
-    this._cleanCell = function(el) {
-        // Remove formatted div or p from a cell
-        var nxt, n;
-        for (var node = el.firstChild; node;) {
-            if (/^div|p$/i.test(node.nodeName)) {
-                for (var n = node.firstChild; n;) {
-                    var nxt = n.nextSibling;
-                    el.insertBefore(n, node); // Move nodes out of div
-                    n = nxt;
-                }
-                nxt = node.nextSibling;
-                el.removeChild(node);
-                node = nxt;
-            } else {
-                node = node.nextSibling;
-            }
+TableTool.prototype._cleanCell = function(el) {
+    // Remove formatted div or p from a cell
+    var nxt, n;
+    for (var node = el.firstChild; node;) {
+        if (/^div|p$/i.test(node.nodeName)) {
+            for (var n = node.firstChild; n;) {
+                var nxt = n.nextSibling;
+                el.insertBefore(n, node); // Move nodes out of div
+                n = nxt;
+            }
+            nxt = node.nextSibling;
+            el.removeChild(node);
+            node = nxt;
+        } else {
+            node = node.nextSibling;
         }
-        var c;
-        while (el.firstChild && (c = el.firstChild).nodeType==3 && (/^\s+/.test(c.data))) {
-            c.data = c.data.replace(/^\s+/, '');
-            if (!c.data) {
-                el.removeChild(c);
-            } else {
-                break;
-            };
-        };
-        while (el.lastChild && (c = el.lastChild).nodeType==3 && (/\s+$/.test(c.data))) {
-            c.data = c.data.replace(/\s+$/, '');
-            if (!c.data) {
-                el.removeChild(c);
-            } else {
-                break;
-            };
+    }
+    var c;
+    while (el.firstChild && (c = el.firstChild).nodeType==3 && (/^\s+/.test(c.data))) {
+        c.data = c.data.replace(/^\s+/, '');
+        if (!c.data) {
+            el.removeChild(c);
+        } else {
+            break;
         };
-        el.removeAttribute('colSpan');
-        el.removeAttribute('rowSpan');
     };
-    this._countCols = function(rows, numcols) {
-        for (var i=0; i < rows.length; i++) {
-            var row = rows[i];
-            var currnumcols = 0;
-            for (var node = row.firstChild; node; node=node.nextSibling) {
-                if (/^(td|th)$/i.test(node.nodeName)) {
-                    currnumcols += parseInt(node.getAttribute('colSpan') || '1');
-                };
-            };
-            if (currnumcols > numcols) {
-                numcols = currnumcols;
-            };
+    while (el.lastChild && (c = el.lastChild).nodeType==3 && (/\s+$/.test(c.data))) {
+        c.data = c.data.replace(/\s+$/, '');
+        if (!c.data) {
+            el.removeChild(c);
+        } else {
+            break;
         };
-        return numcols;
     };
+    el.removeAttribute('colSpan');
+    el.removeAttribute('rowSpan');
+};
 
-    this._cleanRows = function(rows, container, numcols) {
-        // now walk through all rows to clean them up
-        for (var i=0; i < rows.length; i++) {
-            var row = rows[i];
-            var doc = this.editor.getInnerDocument();
-            var newrow = doc.createElement('tr');
-            if (row.className) {
-                newrow.className = row.className;
-            }
-            for (var node = row.firstChild; node;) {
-                var nxt = node.nextSibling;
-                if (/^(td|th)$/i.test(node.nodeName)) {
-                    this._cleanCell(node);
-                    newrow.appendChild(node);
-                };
-                node = nxt;
-            };
-            if (newrow.childNodes.length) {
-                container.appendChild(newrow);
+TableTool.prototype._countCols = function(rows, numcols) {
+    for (var i=0; i < rows.length; i++) {
+        var row = rows[i];
+        var currnumcols = 0;
+        for (var node = row.firstChild; node; node=node.nextSibling) {
+            if (/^(td|th)$/i.test(node.nodeName)) {
+                currnumcols += parseInt(node.getAttribute('colSpan') || '1');
             };
         };
-        // now make sure all rows have the correct length
-        for (var row = container.firstChild; row; row=row.nextSibling) {
-            var cellname = row.lastChild.nodeName;
-            while (row.childNodes.length < numcols) {
-                var cell = doc.createElement(cellname);
-                var nbsp = doc.createTextNode('\u00a0');
-                cell.appendChild(nbsp);
-                row.appendChild(cell);
-            };
+        if (currnumcols > numcols) {
+            numcols = currnumcols;
         };
     };
+    return numcols;
+};
 
-    this._fixTableHelper = function(table) {
-        /* the code to actually fix tables */
+TableTool.prototype._cleanRows = function(rows, container, numcols) {
+    // now walk through all rows to clean them up
+    for (var i=0; i < rows.length; i++) {
+        var row = rows[i];
         var doc = this.editor.getInnerDocument();
-        var thead = doc.createElement('thead');
-        var tbody = doc.createElement('tbody');
-        var tfoot = doc.createElement('tfoot');
-
-        var table_classes = this.editor.config.table_classes;
-        function cleanClassName(name) {
-            var allowed_classes = table_classes['class'];
-            for (var i = 0; i < allowed_classes.length; i++) {
-                var classname = allowed_classes[i];
-                classname = classname.classname || classname;
-                if (classname==name) return name;
-            };
-            return allowed_classes[0];
+        var newrow = doc.createElement('tr');
+        if (row.className) {
+            newrow.className = row.className;
         }
-        if (table_classes) {
-            table.className = cleanClassName(table.className);
-        } else {
-            table.removeAttribute('class');
-            table.removeAttribute('className');
-        };
-        table.removeAttribute('border');
-        table.removeAttribute('cellpadding');
-        table.removeAttribute('cellPadding');
-        table.removeAttribute('cellspacing');
-        table.removeAttribute('cellSpacing');
-
-        // now get all the rows of the table, the rows can either be
-        // direct descendants of the table or inside a 'tbody', 'thead'
-        // or 'tfoot' element
-
-        var hrows = [], brows = [], frows = [];
-        for (var node = table.firstChild; node; node = node.nextSibling) {
-            var nodeName = node.nodeName.toLowerCase();
-            if (/tr/i.test(node.nodeName)) {
-                brows.push(node);
-            } else if (/thead|tbody|tfoot/i.test(node.nodeName)) {
-                var rows = nodeName=='thead' ? hrows : nodeName=='tfoot' ? frows : brows;
-                for (var inode = node.firstChild; inode; inode = inode.nextSibling) {
-                    if (/tr/i.test(inode.nodeName)) {
-                        rows.push(inode);
-                    };
-                };
+        for (var node = row.firstChild; node;) {
+            var nxt = node.nextSibling;
+            if (/^(td|th)$/i.test(node.nodeName)) {
+                this._cleanCell(node);
+                newrow.appendChild(node);
             };
+            node = nxt;
+        };
+        if (newrow.childNodes.length) {
+            container.appendChild(newrow);
+        };
+    };
+    // now make sure all rows have the correct length
+    for (var row = container.firstChild; row; row=row.nextSibling) {
+        var cellname = row.lastChild.nodeName;
+        while (row.childNodes.length < numcols) {
+            var cell = doc.createElement(cellname);
+            var nbsp = doc.createTextNode('\u00a0');
+            cell.appendChild(nbsp);
+            row.appendChild(cell);
         };
-        /* Extract thead and tfoot from tbody */
-        while (brows.length && !this._isBodyRow(brows[0])) {
-            hrows.push(brows[0]);
-            brows.shift();
-        }
-        while (brows.length && !this._isBodyRow(brows[brows.length-1])) {
-            var last = brows[brows.length-1];
-            brows.length -= 1;
-            frows.unshift(last);
-        }
-        // now find out how many cells our rows should have
-        var numcols = this._countCols(hrows, 0);
-        numcols = this._countCols(brows, numcols);
-        numcols = this._countCols(frows, numcols);
-
-        // now walk through all rows to clean them up
-        this._cleanRows(hrows, thead);
-        this._cleanRows(brows, tbody);
-        this._cleanRows(frows, tfoot);
-
-        // now remove all the old stuff from the table and add the new
-        // tbody
-        while (table.firstChild) {
-            table.removeChild(table.firstChild);
-        }
-        if (hrows.length) {
-            table.appendChild(thead);
-        }
-        if (brows.length) {
-            table.appendChild(tbody);
-        }
-        if (frows.length) {
-            table.appendChild(tfoot);
-        }
     };
+};
 
-    this.fixAllTables = function() {
-        /* fix all the tables in the document at once */
-        var tables = this.editor.getInnerDocument().getElementsByTagName('table');
-        for (var i=0; i < tables.length; i++) {
-            this._fixTableHelper(tables[i]);
+TableTool.prototype._fixTableHelper = function(table) {
+    /* the code to actually fix tables */
+    var doc = this.editor.getInnerDocument();
+    var thead = doc.createElement('thead');
+    var tbody = doc.createElement('tbody');
+    var tfoot = doc.createElement('tfoot');
+
+    var table_classes = this.editor.config.table_classes;
+    function cleanClassName(name) {
+        var allowed_classes = table_classes['class'];
+        for (var i = 0; i < allowed_classes.length; i++) {
+            var classname = allowed_classes[i];
+            classname = classname.classname || classname;
+            if (classname==name) return name;
+        };
+        return allowed_classes[0];
+    }
+    if (table_classes) {
+        table.className = cleanClassName(table.className);
+    } else {
+        table.removeAttribute('class');
+        table.removeAttribute('className');
+    };
+    table.removeAttribute('border');
+    table.removeAttribute('cellpadding');
+    table.removeAttribute('cellPadding');
+    table.removeAttribute('cellspacing');
+    table.removeAttribute('cellSpacing');
+
+    // now get all the rows of the table, the rows can either be
+    // direct descendants of the table or inside a 'tbody', 'thead'
+    // or 'tfoot' element
+
+    var hrows = [], brows = [], frows = [];
+    for (var node = table.firstChild; node; node = node.nextSibling) {
+        var nodeName = node.nodeName.toLowerCase();
+        if (/tr/i.test(node.nodeName)) {
+            brows.push(node);
+        } else if (/thead|tbody|tfoot/i.test(node.nodeName)) {
+            var rows = nodeName=='thead' ? hrows : nodeName=='tfoot' ? frows : brows;
+            for (var inode = node.firstChild; inode; inode = inode.nextSibling) {
+                if (/tr/i.test(inode.nodeName)) {
+                    rows.push(inode);
+                };
+            };
         };
     };
+    /* Extract thead and tfoot from tbody */
+    while (brows.length && !this._isBodyRow(brows[0])) {
+        hrows.push(brows[0]);
+        brows.shift();
+    }
+    while (brows.length && !this._isBodyRow(brows[brows.length-1])) {
+        var last = brows[brows.length-1];
+        brows.length -= 1;
+        frows.unshift(last);
+    }
+    // now find out how many cells our rows should have
+    var numcols = this._countCols(hrows, 0);
+    numcols = this._countCols(brows, numcols);
+    numcols = this._countCols(frows, numcols);
+
+    // now walk through all rows to clean them up
+    this._cleanRows(hrows, thead);
+    this._cleanRows(brows, tbody);
+    this._cleanRows(frows, tfoot);
+
+    // now remove all the old stuff from the table and add the new
+    // tbody
+    while (table.firstChild) {
+        table.removeChild(table.firstChild);
+    }
+    if (hrows.length) {
+        table.appendChild(thead);
+    }
+    if (brows.length) {
+        table.appendChild(tbody);
+    }
+    if (frows.length) {
+        table.appendChild(tfoot);
+    }
 };
 
-TableTool.prototype = new KupuTool;
+TableTool.prototype.fixAllTables = function() {
+    /* fix all the tables in the document at once */
+    var tables = this.editor.getInnerDocument().getElementsByTagName('table');
+    for (var i=0; i < tables.length; i++) {
+        this._fixTableHelper(tables[i]);
+    };
+};
 
 function TableToolBox(addtabledivid, edittabledivid, newrowsinputid, 
                     newcolsinputid, makeheaderinputid, classselectid, alignselectid, addtablebuttonid,
@@ -2031,140 +2048,140 @@
     this.toolboxel = getFromSelector(toolboxid);
     this.plainclass = plainclass;
     this.activeclass = activeclass;
+};
 
-    // register event handlers
-    this.initialize = function(tool, editor) {
-        /* attach the event handlers */
-        this.tool = tool;
-        this.editor = editor;
-        // build the select list of table classes if configured
-        if (this.editor.config.table_classes) {
-            var classes = this.editor.config.table_classes['class'];
-            while (this.classselect.hasChildNodes()) {
-                this.classselect.removeChild(this.classselect.firstChild);
-            };
-            for (var i=0; i < classes.length; i++) {
-                var classname = classes[i];
-                classname = classname.classname || classname;
-                var option = document.createElement('option');
-                var content = document.createTextNode(classname);
-                option.appendChild(content);
-                option.setAttribute('value', classname);
-                this.classselect.appendChild(option);
-            };
+TableToolBox.prototype = new KupuToolBox;
+
+// register event handlers
+TableToolBox.prototype.initialize = function(tool, editor) {
+    /* attach the event handlers */
+    this.tool = tool;
+    this.editor = editor;
+    // build the select list of table classes if configured
+    if (this.editor.config.table_classes) {
+        var classes = this.editor.config.table_classes['class'];
+        while (this.classselect.hasChildNodes()) {
+            this.classselect.removeChild(this.classselect.firstChild);
+        };
+        for (var i=0; i < classes.length; i++) {
+            var classname = classes[i];
+            classname = classname.classname || classname;
+            var option = document.createElement('option');
+            var content = document.createTextNode(classname);
+            option.appendChild(content);
+            option.setAttribute('value', classname);
+            this.classselect.appendChild(option);
+        };
+    };
+    addEventHandler(this.addtablebutton, "click", this.addTable, this);
+    addEventHandler(this.addrowbutton, "click", this.addTableRow, this);
+    addEventHandler(this.delrowbutton, "click", this.delTableRow, this);
+    addEventHandler(this.addcolbutton, "click", this.addTableColumn, this);
+    addEventHandler(this.delcolbutton, "click", this.delTableColumn, this);
+    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";
+};
+
+TableToolBox.prototype.updateState = function(selNode) {
+    /* update the state (add/edit) and update the pulldowns (if required) */
+    var table = this.editor.getNearestParentOfType(selNode, 'table');
+    if (table) {
+        this.addtablediv.style.display = "none";
+        this.edittablediv.style.display = "block";
+
+        var align = this.tool._getColumnAlign(selNode);
+        selectSelectItem(this.alignselect, align);
+        selectSelectItem(this.classselect, table.className);
+        if (this.toolboxel) {
+            this.toolboxel.className = this.activeclass;
         };
-        addEventHandler(this.addtablebutton, "click", this.addTable, this);
-        addEventHandler(this.addrowbutton, "click", this.addTableRow, this);
-        addEventHandler(this.delrowbutton, "click", this.delTableRow, this);
-        addEventHandler(this.addcolbutton, "click", this.addTableColumn, this);
-        addEventHandler(this.delcolbutton, "click", this.delTableColumn, this);
-        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";
+    } else {
         this.edittablediv.style.display = "none";
-    };
-
-    this.updateState = function(selNode) {
-        /* update the state (add/edit) and update the pulldowns (if required) */
-        var table = this.editor.getNearestParentOfType(selNode, 'table');
-        if (table) {
-            this.addtablediv.style.display = "none";
-            this.edittablediv.style.display = "block";
-
-            var align = this.tool._getColumnAlign(selNode);
-            selectSelectItem(this.alignselect, align);
-            selectSelectItem(this.classselect, table.className);
-            if (this.toolboxel) {
-                this.toolboxel.className = this.activeclass;
-            };
-        } else {
-            this.edittablediv.style.display = "none";
-            this.addtablediv.style.display = "block";
-            this.alignselect.selectedIndex = 0;
-            this.classselect.selectedIndex = 0;
-            if (this.toolboxel) {
-                this.toolboxel.className = this.plainclass;
-            };
+        this.addtablediv.style.display = "block";
+        this.alignselect.selectedIndex = 0;
+        this.classselect.selectedIndex = 0;
+        if (this.toolboxel) {
+            this.toolboxel.className = this.plainclass;
         };
     };
+};
 
-    this.addTable = function() {
-        /* add a table */
-        var rows = this.newrowsinput.value;
-        var cols = this.newcolsinput.value;
-        var makeHeader = this.makeheaderinput.checked;
-        var tableclass = this.classselect.options[this.classselect.selectedIndex].value;
-
-        this.tool.createTable(rows, cols, makeHeader, tableclass);
-        this.editor.focusDocument();
-        this.editor.updateState();
-    };
+TableToolBox.prototype.addTable = function() {
+    /* add a table */
+    var rows = this.newrowsinput.value;
+    var cols = this.newcolsinput.value;
+    var makeHeader = this.makeheaderinput.checked;
+    var tableclass = this.classselect.options[this.classselect.selectedIndex].value;
 
-    this.setColumnAlign = function() {
-        /* set the alignment of the current column */
-        var newalign = this.alignselect.options[this.alignselect.selectedIndex].value;
-        this.editor.focusDocument();
-        this.tool.setColumnAlign(newalign);
-        this.editor.updateState();
-    };
+    this.tool.createTable(rows, cols, makeHeader, tableclass);
+    this.editor.focusDocument();
+    this.editor.updateState();
+};
 
-    this.setTableClass = function() {
-        /* set the class for the current table */
-        var sel_class = this.classselect.options[this.classselect.selectedIndex].value;
-        if (sel_class) {
-            this.editor.focusDocument();
-            this.tool.setTableClass(sel_class);
-            this.editor.updateState();
-        };
-    };
+TableToolBox.prototype.setColumnAlign = function() {
+    /* set the alignment of the current column */
+    var newalign = this.alignselect.options[this.alignselect.selectedIndex].value;
+    this.editor.focusDocument();
+    this.tool.setColumnAlign(newalign);
+    this.editor.updateState();
+};
 
-    this.addTableRow = function() {
+TableToolBox.prototype.setTableClass = function() {
+    /* set the class for the current table */
+    var sel_class = this.classselect.options[this.classselect.selectedIndex].value;
+    if (sel_class) {
         this.editor.focusDocument();
-        this.tool.addTableRow();
+        this.tool.setTableClass(sel_class);
         this.editor.updateState();
     };
+};
 
-    this.delTableRow = function() {
-        this.editor.focusDocument();
-        this.tool.delTableRow();
-        this.editor.updateState();
-    };
+TableToolBox.prototype.addTableRow = function() {
+    this.editor.focusDocument();
+    this.tool.addTableRow();
+    this.editor.updateState();
+};
 
-    this.addTableColumn = function() {
-        this.editor.focusDocument();
-        this.tool.addTableColumn();
-        this.editor.updateState();
-    };
+TableToolBox.prototype.delTableRow = function() {
+    this.editor.focusDocument();
+    this.tool.delTableRow();
+    this.editor.updateState();
+};
 
-    this.delTableColumn = function() {
-        this.editor.focusDocument();
-        this.tool.delTableColumn();
-        this.editor.updateState();
-    };
+TableToolBox.prototype.addTableColumn = function() {
+    this.editor.focusDocument();
+    this.tool.addTableColumn();
+    this.editor.updateState();
+};
 
-    this.fixTable = function() {
-        this.editor.focusDocument();
-        this.tool.fixTable();
-        this.editor.updateState();
-    };
+TableToolBox.prototype.delTableColumn = function() {
+    this.editor.focusDocument();
+    this.tool.delTableColumn();
+    this.editor.updateState();
+};
 
-    this.fixAllTables = function() {
-        this.editor.focusDocument();
-        this.tool.fixAllTables();
-        this.editor.updateState();
-    };
+TableToolBox.prototype.fixTable = function() {
+    this.editor.focusDocument();
+    this.tool.fixTable();
+    this.editor.updateState();
+};
 
-    this.delTable = function() {
-        this.editor.focusDocument();
-        this.tool.delTable();
-        this.editor.updateState();
-    };
+TableToolBox.prototype.fixAllTables = function() {
+    this.editor.focusDocument();
+    this.tool.fixAllTables();
+    this.editor.updateState();
 };
 
-TableToolBox.prototype = new KupuToolBox;
+TableToolBox.prototype.delTable = function() {
+    this.editor.focusDocument();
+    this.tool.delTable();
+    this.editor.updateState();
+};
 
 function ListTool(addulbuttonid, addolbuttonid, ulstyleselectid, olstyleselectid) {
     /* tool to set list styles */
@@ -2173,7 +2190,7 @@
     this.addolbutton = getFromSelector(addolbuttonid);
     this.ulselect = getFromSelector(ulstyleselectid);
     this.olselect = getFromSelector(olstyleselectid);
-
+    
     this.style_to_type = {'decimal': '1',
                             'lower-alpha': 'a',
                             'upper-alpha': 'A',
@@ -2194,188 +2211,190 @@
                             'circle': 'circle',
                             'none': 'none'
                             };
-    
-    this.initialize = function(editor) {
-        /* attach event handlers */
-        this.editor = editor;
-        if (this.addulbutton) {
-            addEventHandler(this.addulbutton, "click", this.addUnorderedList, this);
-        }
-        if (this.addolbutton) {
-            addEventHandler(this.addolbutton, "click", this.addOrderedList, this);
-        }
-        if (this.ulselect) {
-            addEventHandler(this.ulselect, "change", this.setUnorderedListStyle, this);
-            this.ulselect.style.display = "none";
-        }
-        if (this.olselect) {
-            addEventHandler(this.olselect, "change", this.setOrderedListStyle, this);
-            this.olselect.style.display = "none";
-        }
-    };
+};
 
-    this._handleStyles = function(currnode, onselect, offselect) {
-        if (this.editor.config.use_css) {
-            var currstyle = currnode.style.listStyleType;
-        } else {
-            var currstyle = this.type_to_style[currnode.getAttribute('type')];
-        }
-        if (onselect) {
-            selectSelectItem(onselect, currstyle);
-            onselect.style.display = "inline";
-        }
-        if (offselect) {
-            offselect.style.display = "none";
-            offselect.selectedIndex = 0;
-        }
-    };
+ListTool.prototype = new KupuTool;
 
-    this.updateState = function(selNode) {
-        /* update the visibility and selection of the list type pulldowns */
-        // we're going to walk through the tree manually since we want to 
-        // check on 2 items at the same time
-        for (var currnode=selNode; currnode; currnode=currnode.parentNode) {
-            var tag = currnode.nodeName.toLowerCase();
-            if (tag == 'ul') {
-                this._handleStyles(currnode, this.ulselect, this.olselect);
-                return;
-            } else if (tag == 'ol') {
-                this._handleStyles(currnode, this.olselect, this.ulselect);
-                return;
-            }
-        }
-        if (this.ulselect) {
-            this.ulselect.selectedIndex = 0;
-            this.ulselect.style.display = "none";
-        };
-        if (this.olselect) {
-            this.olselect.selectedIndex = 0;
-            this.olselect.style.display = "none";
-        };
-    };
+ListTool.prototype.initialize = function(editor) {
+    /* attach event handlers */
+    this.editor = editor;
+    if (this.addulbutton) {
+        addEventHandler(this.addulbutton, "click", this.addUnorderedList, this);
+    }
+    if (this.addolbutton) {
+        addEventHandler(this.addolbutton, "click", this.addOrderedList, this);
+    }
+    if (this.ulselect) {
+        addEventHandler(this.ulselect, "change", this.setUnorderedListStyle, this);
+        this.ulselect.style.display = "none";
+    }
+    if (this.olselect) {
+        addEventHandler(this.olselect, "change", this.setOrderedListStyle, this);
+        this.olselect.style.display = "none";
+    }
+};
 
-    this.addList = function(command) {
-        if (this.ulselect) this.ulselect.style.display = "inline";
-        if (this.olselect) this.olselect.style.display = "none";
-        this.editor.execCommand(command);
-        this.editor.focusDocument();
-    };
-    this.addUnorderedList = function() {
-        /* add an unordered list */
-        this.addList("insertunorderedlist");
-    };
-
-    this.addOrderedList = function() {
-        /* add an ordered list */
-        this.addList("insertorderedlist");
-    };
-
-    this.setListStyle = function(tag, select) {
-        /* set the type of an ul */
-        if (!select) return;
-        var currnode = this.editor.getSelectedNode();
-        var l = this.editor.getNearestParentOfType(currnode, tag);
-        var style = select.options[select.selectedIndex].value;
-        if (this.editor.config.use_css) {
-            l.style.listStyleType = style;
-        } else {
-            l.setAttribute('type', this.style_to_type[style]);
+ListTool.prototype._handleStyles = function(currnode, onselect, offselect) {
+    if (this.editor.config.use_css) {
+        var currstyle = currnode.style.listStyleType;
+    } else {
+        var currstyle = this.type_to_style[currnode.getAttribute('type')];
+    }
+    if (onselect) {
+        selectSelectItem(onselect, currstyle);
+        onselect.style.display = "inline";
+    }
+    if (offselect) {
+        offselect.style.display = "none";
+        offselect.selectedIndex = 0;
+    }
+};
+
+ListTool.prototype.updateState = function(selNode) {
+    /* update the visibility and selection of the list type pulldowns */
+    // we're going to walk through the tree manually since we want to 
+    // check on 2 items at the same time
+    for (var currnode=selNode; currnode; currnode=currnode.parentNode) {
+        var tag = currnode.nodeName.toLowerCase();
+        if (tag == 'ul') {
+            this._handleStyles(currnode, this.ulselect, this.olselect);
+            return;
+        } else if (tag == 'ol') {
+            this._handleStyles(currnode, this.olselect, this.ulselect);
+            return;
         }
-        this.editor.focusDocument();
+    }
+    if (this.ulselect) {
+        this.ulselect.selectedIndex = 0;
+        this.ulselect.style.display = "none";
     };
-
-    this.setUnorderedListStyle = function() {
-        /* set the type of an ul */
-        this.setListStyle('ul', this.ulselect);
-    };
-
-    this.setOrderedListStyle = function() {
-        /* set the type of an ol */
-        this.setListStyle('ol', this.olselect);
-    };
-
-    this.enable = function() {
-        kupuButtonEnable(this.addulbutton);
-        kupuButtonEnable(this.addolbutton);
-        if (this.ulselect) this.ulselect.disabled = "";
-        if (this.olselect) this.olselect.disabled = "";
-    };
-    this.disable = function() {
-        kupuButtonDisable(this.addulbutton);
-        kupuButtonDisable(this.addolbutton);
-        if (this.ulselect) this.ulselect.disabled = "disabled";
-        if (this.olselect) this.olselect.disabled = "disabled";
+    if (this.olselect) {
+        this.olselect.selectedIndex = 0;
+        this.olselect.style.display = "none";
     };
 };
 
-ListTool.prototype = new KupuTool;
+ListTool.prototype.addList = function(command) {
+    if (this.ulselect) this.ulselect.style.display = "inline";
+    if (this.olselect) this.olselect.style.display = "none";
+    this.editor.execCommand(command);
+    this.editor.focusDocument();
+};
+
+ListTool.prototype.addUnorderedList = function() {
+    /* add an unordered list */
+    this.addList("insertunorderedlist");
+};
+
+ListTool.prototype.addOrderedList = function() {
+    /* add an ordered list */
+    this.addList("insertorderedlist");
+};
+
+ListTool.prototype.setListStyle = function(tag, select) {
+    /* set the type of an ul */
+    if (!select) return;
+    var currnode = this.editor.getSelectedNode();
+    var l = this.editor.getNearestParentOfType(currnode, tag);
+    var style = select.options[select.selectedIndex].value;
+    if (this.editor.config.use_css) {
+        l.style.listStyleType = style;
+    } else {
+        l.setAttribute('type', this.style_to_type[style]);
+    }
+    this.editor.focusDocument();
+};
+
+ListTool.prototype.setUnorderedListStyle = function() {
+    /* set the type of an ul */
+    this.setListStyle('ul', this.ulselect);
+};
+
+ListTool.prototype.setOrderedListStyle = function() {
+    /* set the type of an ol */
+    this.setListStyle('ol', this.olselect);
+};
+
+ListTool.prototype.enable = function() {
+    kupuButtonEnable(this.addulbutton);
+    kupuButtonEnable(this.addolbutton);
+    if (this.ulselect) this.ulselect.disabled = "";
+    if (this.olselect) this.olselect.disabled = "";
+};
+
+ListTool.prototype.disable = function() {
+    kupuButtonDisable(this.addulbutton);
+    kupuButtonDisable(this.addolbutton);
+    if (this.ulselect) this.ulselect.disabled = "disabled";
+    if (this.olselect) this.olselect.disabled = "disabled";
+};
 
 function ShowPathTool() {
     /* shows the path to the current element in the status bar */
+};
 
-    this.updateState = function(selNode) {
-        /* calculate and display the path */
-        var path = '';
-        var url = null; // for links we want to display the url too
-        var currnode = selNode;
-        var nn;
-        while (currnode != null && (nn=currnode.nodeName.toLowerCase()) != '#document') {
-            if (nn=='a') {
-                url = currnode.getAttribute('href');
-            };
-            path = '/' + nn + path;
-            currnode = currnode.parentNode;
-        }
-        
-        try {
-            window.status = url ? 
-                    (path.toString() + ' - contains link to \'' + 
-                        url.toString() + '\'') :
-                    path;
-        } catch (e) {
-            this.editor.logMessage(_('Could not set status bar message, ' +
-                                    'check your browser\'s security settings.'), 1);
+ShowPathTool.prototype = new KupuTool;
+
+ShowPathTool.prototype.updateState = function(selNode) {
+    /* calculate and display the path */
+    var path = '';
+    var url = null; // for links we want to display the url too
+    var currnode = selNode;
+    var nn;
+    while (currnode != null && (nn=currnode.nodeName.toLowerCase()) != '#document') {
+        if (nn=='a') {
+            url = currnode.getAttribute('href');
         };
+        path = '/' + nn + path;
+        currnode = currnode.parentNode;
+    }
+    
+    try {
+        window.status = url ? 
+                (path.toString() + ' - contains link to \'' + 
+                    url.toString() + '\'') :
+                path;
+    } catch (e) {
+        this.editor.logMessage(_('Could not set status bar message, ' +
+                                'check your browser\'s security settings.'), 1);
     };
 };
 
-ShowPathTool.prototype = new KupuTool;
-
 function ViewSourceTool() {
     /* tool to provide a 'show source' context menu option */
     this.sourceWindow = null;
-    
-    this.viewSource = function() {
-        /* open a window and write the current contents of the iframe to it */
-        if (this.sourceWindow) {
-            this.sourceWindow.close();
-        };
-        this.sourceWindow = window.open('#', 'sourceWindow');
-        
-        //var transform = this.editor._filterContent(this.editor.getInnerDocument().documentElement);
-        //var contents = transform.xml; 
-        var contents = '<html>\n' + this.editor.getInnerDocument().documentElement.innerHTML + '\n</html>';
-        
-        var doc = this.sourceWindow.document;
-        doc.write('\xa0');
-        doc.close();
-        var body = doc.getElementsByTagName("body")[0];
-        while (body.hasChildNodes()) {
-            body.removeChild(body.firstChild);
-        };
-        var pre = doc.createElement('pre');
-        var textNode = doc.createTextNode(contents);
-        body.appendChild(pre);
-        pre.appendChild(textNode);
-    };
-    
-    this.createContextMenuElements = function(selNode, event) {
-        /* create the context menu element */
-        return [new ContextMenuElement(_('View source'), this.viewSource, this)];
-    };
 };
 
 ViewSourceTool.prototype = new KupuTool;
+    
+ViewSourceTool.prototype.viewSource = function() {
+    /* open a window and write the current contents of the iframe to it */
+    if (this.sourceWindow) {
+        this.sourceWindow.close();
+    };
+    this.sourceWindow = window.open('#', 'sourceWindow');
+    
+    //var transform = this.editor._filterContent(this.editor.getInnerDocument().documentElement);
+    //var contents = transform.xml; 
+    var contents = '<html>\n' + this.editor.getInnerDocument().documentElement.innerHTML + '\n</html>';
+    
+    var doc = this.sourceWindow.document;
+    doc.write('\xa0');
+    doc.close();
+    var body = doc.getElementsByTagName("body")[0];
+    while (body.hasChildNodes()) {
+        body.removeChild(body.firstChild);
+    };
+    var pre = doc.createElement('pre');
+    var textNode = doc.createTextNode(contents);
+    body.appendChild(pre);
+    pre.appendChild(textNode);
+};
+
+ViewSourceTool.prototype.createContextMenuElements = function(selNode, event) {
+    /* create the context menu element */
+    return [new ContextMenuElement(_('View source'), this.viewSource, this)];
+};
 
 function DefinitionListTool(dlbuttonid) {
     /* a tool for managing definition lists
@@ -2385,306 +2404,306 @@
     */
 
     this.dlbutton = getFromSelector(dlbuttonid);
-    
-    this.initialize = function(editor) {
-        /* initialize the tool */
-        this.editor = editor;
-        if (!this.dlbutton) return;
-        addEventHandler(this.dlbutton, 'click', this.createDefinitionList, this);
-        addEventHandler(editor.getInnerDocument(), 'keyup', this._keyDownHandler, this);
-        addEventHandler(editor.getInnerDocument(), 'keypress', this._keyPressHandler, this);
-    };
-
-    // even though the following methods may seem view related, they belong 
-    // here, since they describe core functionality rather then view-specific
-    // stuff
-    this.handleEnterPress = function(selNode) {
-        var dl = this.editor.getNearestParentOfType(selNode, 'dl');
-        if (dl) {
-            var dt = this.editor.getNearestParentOfType(selNode, 'dt');
-            if (dt) {
-                if (dt.childNodes.length == 1 && dt.childNodes[0].nodeValue == '\xa0') {
-                    this.escapeFromDefinitionList(dl, dt, selNode);
-                    return;
-                };
+};
 
-                var selection = this.editor.getSelection();
-                var startoffset = selection.startOffset();
-                var endoffset = selection.endOffset(); 
-                if (endoffset > startoffset) {
-                    // throw away any selected stuff
-                    selection.cutChunk(startoffset, endoffset);
-                    selection = this.editor.getSelection();
-                    startoffset = selection.startOffset();
-                };
-                
-                var ellength = selection.getElementLength(selection.parentElement());
-                if (startoffset >= ellength - 1) {
-                    // create a new element
-                    this.createDefinition(dl, dt);
-                } else {
-                    var doc = this.editor.getInnerDocument();
-                    var newdt = selection.splitNodeAtSelection(dt);
-                    var newdd = doc.createElement('dd');
-                    while (newdt.hasChildNodes()) {
-                        if (newdt.firstChild != newdt.lastChild || newdt.firstChild.nodeName.toLowerCase() != 'br') {
-                            newdd.appendChild(newdt.firstChild);
-                        };
+DefinitionListTool.prototype = new KupuTool;
+
+DefinitionListTool.prototype.initialize = function(editor) {
+    /* initialize the tool */
+    this.editor = editor;
+    if (!this.dlbutton) return;
+    addEventHandler(this.dlbutton, 'click', this.createDefinitionList, this);
+    addEventHandler(editor.getInnerDocument(), 'keyup', this._keyDownHandler, this);
+    addEventHandler(editor.getInnerDocument(), 'keypress', this._keyPressHandler, this);
+};
+
+// even though the following methods may seem view related, they belong 
+// here, since they describe core functionality rather then view-specific
+// stuff
+DefinitionListTool.prototype.handleEnterPress = function(selNode) {
+    var dl = this.editor.getNearestParentOfType(selNode, 'dl');
+    if (dl) {
+        var dt = this.editor.getNearestParentOfType(selNode, 'dt');
+        if (dt) {
+            if (dt.childNodes.length == 1 && dt.childNodes[0].nodeValue == '\xa0') {
+                this.escapeFromDefinitionList(dl, dt, selNode);
+                return;
+            };
+
+            var selection = this.editor.getSelection();
+            var startoffset = selection.startOffset();
+            var endoffset = selection.endOffset(); 
+            if (endoffset > startoffset) {
+                // throw away any selected stuff
+                selection.cutChunk(startoffset, endoffset);
+                selection = this.editor.getSelection();
+                startoffset = selection.startOffset();
+            };
+            
+            var ellength = selection.getElementLength(selection.parentElement());
+            if (startoffset >= ellength - 1) {
+                // create a new element
+                this.createDefinition(dl, dt);
+            } else {
+                var doc = this.editor.getInnerDocument();
+                var newdt = selection.splitNodeAtSelection(dt);
+                var newdd = doc.createElement('dd');
+                while (newdt.hasChildNodes()) {
+                    if (newdt.firstChild != newdt.lastChild || newdt.firstChild.nodeName.toLowerCase() != 'br') {
+                        newdd.appendChild(newdt.firstChild);
                     };
-                    newdt.parentNode.replaceChild(newdd, newdt);
-                    selection.selectNodeContents(newdd);
-                    selection.collapse();
                 };
+                newdt.parentNode.replaceChild(newdd, newdt);
+                selection.selectNodeContents(newdd);
+                selection.collapse();
+            };
+        } else {
+            var dd = this.editor.getNearestParentOfType(selNode, 'dd');
+            if (!dd) {
+                this.editor.logMessage(_('Not inside a definition list element!'));
+                return;
+            };
+            if (dd.childNodes.length == 1 && dd.childNodes[0].nodeValue == '\xa0') {
+                this.escapeFromDefinitionList(dl, dd, selNode);
+                return;
+            };
+            var selection = this.editor.getSelection();
+            var startoffset = selection.startOffset();
+            var endoffset = selection.endOffset();
+            if (endoffset > startoffset) {
+                // throw away any selected stuff
+                selection.cutChunk(startoffset, endoffset);
+                selection = this.editor.getSelection();
+                startoffset = selection.startOffset();
+            };
+            var ellength = selection.getElementLength(selection.parentElement());
+            if (startoffset >= ellength - 1) {
+                // create a new element
+                this.createDefinitionTerm(dl, dd);
             } else {
-                var dd = this.editor.getNearestParentOfType(selNode, 'dd');
-                if (!dd) {
-                    this.editor.logMessage(_('Not inside a definition list element!'));
-                    return;
-                };
-                if (dd.childNodes.length == 1 && dd.childNodes[0].nodeValue == '\xa0') {
-                    this.escapeFromDefinitionList(dl, dd, selNode);
-                    return;
-                };
-                var selection = this.editor.getSelection();
-                var startoffset = selection.startOffset();
-                var endoffset = selection.endOffset();
-                if (endoffset > startoffset) {
-                    // throw away any selected stuff
-                    selection.cutChunk(startoffset, endoffset);
-                    selection = this.editor.getSelection();
-                    startoffset = selection.startOffset();
-                };
-                var ellength = selection.getElementLength(selection.parentElement());
-                if (startoffset >= ellength - 1) {
-                    // create a new element
-                    this.createDefinitionTerm(dl, dd);
-                } else {
-                    // add a break and continue in this element
-                    var br = this.editor.getInnerDocument().createElement('br');
-                    this.editor.insertNodeAtSelection(br, 1);
-                    //var selection = this.editor.getSelection();
-                    //selection.moveStart(1);
-                    selection.collapse(true);
-                };
+                // add a break and continue in this element
+                var br = this.editor.getInnerDocument().createElement('br');
+                this.editor.insertNodeAtSelection(br, 1);
+                //var selection = this.editor.getSelection();
+                //selection.moveStart(1);
+                selection.collapse(true);
             };
         };
     };
+};
 
-    this.handleTabPress = function(selNode) {
-    };
+DefinitionListTool.prototype.handleTabPress = function(selNode) {
+};
 
-    this._keyDownHandler = function(event) {
-        var selNode = this.editor.getSelectedNode();
-        var dl = this.editor.getNearestParentOfType(selNode, 'dl');
-        if (!dl) {
-            return;
+DefinitionListTool.prototype._keyDownHandler = function(event) {
+    var selNode = this.editor.getSelectedNode();
+    var dl = this.editor.getNearestParentOfType(selNode, 'dl');
+    if (!dl) {
+        return;
+    };
+    if (event.keyCode) {
+        if (event.preventDefault) {
+            event.preventDefault();
+        } else {
+            event.returnValue = false;
         };
-        if (event.keyCode) {
+    };
+};
+
+DefinitionListTool.prototype._keyPressHandler = function(event) {
+    var selNode = this.editor.getSelectedNode();
+    var dl = this.editor.getNearestParentOfType(selNode, 'dl');
+    if (!dl) {
+        return;
+    };
+    switch (event.keyCode) {
+        case 13:
+            this.handleEnterPress(selNode);
             if (event.preventDefault) {
                 event.preventDefault();
             } else {
                 event.returnValue = false;
             };
-        };
+            break;
+        case 9:
+            if (event.preventDefault) {
+                event.preventDefault();
+            } else {
+                event.returnValue = false;
+            };
+            this.handleTabPress(selNode);
     };
+};
 
-    this._keyPressHandler = function(event) {
-        var selNode = this.editor.getSelectedNode();
-        var dl = this.editor.getNearestParentOfType(selNode, 'dl');
-        if (!dl) {
-            return;
+DefinitionListTool.prototype.createDefinitionList = function() {
+    /* create a new definition list (dl) */
+    var selection = this.editor.getSelection();
+    var doc = this.editor.getInnerDocument();
+
+    var selection = this.editor.getSelection();
+    var cloned = selection.cloneContents();
+    // first get the 'first line' (until the first break) and use it
+    // as the dt's content
+    var iterator = new NodeIterator(cloned);
+    var currnode = null;
+    var remove = false;
+    while ((currnode = iterator.next())) {
+        if (currnode.nodeName.toLowerCase() == 'br') {
+            remove = true;
         };
-        switch (event.keyCode) {
-            case 13:
-                this.handleEnterPress(selNode);
-                if (event.preventDefault) {
-                    event.preventDefault();
-                } else {
-                    event.returnValue = false;
-                };
-                break;
-            case 9:
-                if (event.preventDefault) {
-                    event.preventDefault();
-                } else {
-                    event.returnValue = false;
-                };
-                this.handleTabPress(selNode);
+        if (remove) {
+            var next = currnode;
+            while (!next.nextSibling) {
+                next = next.parentNode;
+            };
+            next = next.nextSibling;
+            iterator.setCurrent(next);
+            currnode.parentNode.removeChild(currnode);
         };
     };
 
-    this.createDefinitionList = function() {
-        /* create a new definition list (dl) */
-        var selection = this.editor.getSelection();
-        var doc = this.editor.getInnerDocument();
-
-        var selection = this.editor.getSelection();
-        var cloned = selection.cloneContents();
-        // first get the 'first line' (until the first break) and use it
-        // as the dt's content
-        var iterator = new NodeIterator(cloned);
-        var currnode = null;
-        var remove = false;
-        while ((currnode = iterator.next())) {
-            if (currnode.nodeName.toLowerCase() == 'br') {
-                remove = true;
-            };
-            if (remove) {
-                var next = currnode;
-                while (!next.nextSibling) {
-                    next = next.parentNode;
-                };
-                next = next.nextSibling;
-                iterator.setCurrent(next);
-                currnode.parentNode.removeChild(currnode);
-            };
+    var dtcontentcontainer = cloned;
+    var collapsetoend = false;
+    
+    var dl = doc.createElement('dl');
+    this.editor.insertNodeAtSelection(dl);
+    var dt = this.createDefinitionTerm(dl);
+    if (dtcontentcontainer.hasChildNodes()) {
+        collapsetoend = true;
+        while (dt.hasChildNodes()) {
+            dt.removeChild(dt.firstChild);
         };
-
-        var dtcontentcontainer = cloned;
-        var collapsetoend = false;
-        
-        var dl = doc.createElement('dl');
-        this.editor.insertNodeAtSelection(dl);
-        var dt = this.createDefinitionTerm(dl);
-        if (dtcontentcontainer.hasChildNodes()) {
-            collapsetoend = true;
-            while (dt.hasChildNodes()) {
-                dt.removeChild(dt.firstChild);
-            };
-            while (dtcontentcontainer.hasChildNodes()) {
-                dt.appendChild(dtcontentcontainer.firstChild);
-            };
+        while (dtcontentcontainer.hasChildNodes()) {
+            dt.appendChild(dtcontentcontainer.firstChild);
         };
-
-        var selection = this.editor.getSelection();
-        selection.selectNodeContents(dt);
-        selection.collapse(collapsetoend);
     };
 
-    this.createDefinitionTerm = function(dl, dd) {
-        /* create a new definition term inside the current dl */
-        var doc = this.editor.getInnerDocument();
-        var dt = doc.createElement('dt');
-        // somehow Mozilla seems to add breaks to all elements...
-        if (dd) {
-            if (dd.lastChild.nodeName.toLowerCase() == 'br') {
-                dd.removeChild(dd.lastChild);
-            };
+    var selection = this.editor.getSelection();
+    selection.selectNodeContents(dt);
+    selection.collapse(collapsetoend);
+};
+
+DefinitionListTool.prototype.createDefinitionTerm = function(dl, dd) {
+    /* create a new definition term inside the current dl */
+    var doc = this.editor.getInnerDocument();
+    var dt = doc.createElement('dt');
+    // somehow Mozilla seems to add breaks to all elements...
+    if (dd) {
+        if (dd.lastChild.nodeName.toLowerCase() == 'br') {
+            dd.removeChild(dd.lastChild);
         };
-        // dd may be null here, if so we assume this is the first element in 
-        // the dl
-        if (!dd || dl == dd.lastChild) {
-            dl.appendChild(dt);
+    };
+    // dd may be null here, if so we assume this is the first element in 
+    // the dl
+    if (!dd || dl == dd.lastChild) {
+        dl.appendChild(dt);
+    } else {
+        var nextsibling = dd.nextSibling;
+        if (nextsibling) {
+            dl.insertBefore(dt, nextsibling);
         } else {
-            var nextsibling = dd.nextSibling;
-            if (nextsibling) {
-                dl.insertBefore(dt, nextsibling);
-            } else {
-                dl.appendChild(dt);
-            };
+            dl.appendChild(dt);
         };
-        var nbsp = doc.createTextNode('\xa0');
-        dt.appendChild(nbsp);
-        var selection = this.editor.getSelection();
-        selection.selectNodeContents(dt);
-        selection.collapse();
-
-        this.editor.focusDocument();
-        return dt;
     };
+    var nbsp = doc.createTextNode('\xa0');
+    dt.appendChild(nbsp);
+    var selection = this.editor.getSelection();
+    selection.selectNodeContents(dt);
+    selection.collapse();
 
-    this.createDefinition = function(dl, dt, initial_content) {
-        var doc = this.editor.getInnerDocument();
-        var dd = doc.createElement('dd');
-        var nextsibling = dt.nextSibling;
-        // somehow Mozilla seems to add breaks to all elements...
-        if (dt) {
-            if (dt.lastChild.nodeName.toLowerCase() == 'br') {
-                dt.removeChild(dt.lastChild);
-            };
-        };
-        while (nextsibling) {
-            var name = nextsibling.nodeName.toLowerCase();
-            if (name == 'dd' || name == 'dt') {
-                break;
-            } else {
-                nextsibling = nextsibling.nextSibling;
-            };
+    this.editor.focusDocument();
+    return dt;
+};
+
+DefinitionListTool.prototype.createDefinition = function(dl, dt, initial_content) {
+    var doc = this.editor.getInnerDocument();
+    var dd = doc.createElement('dd');
+    var nextsibling = dt.nextSibling;
+    // somehow Mozilla seems to add breaks to all elements...
+    if (dt) {
+        if (dt.lastChild.nodeName.toLowerCase() == 'br') {
+            dt.removeChild(dt.lastChild);
         };
-        if (nextsibling) {
-            dl.insertBefore(dd, nextsibling);
-            //this._fixStructure(doc, dl, nextsibling);
+    };
+    while (nextsibling) {
+        var name = nextsibling.nodeName.toLowerCase();
+        if (name == 'dd' || name == 'dt') {
+            break;
         } else {
-            dl.appendChild(dd);
+            nextsibling = nextsibling.nextSibling;
         };
-        if (initial_content) {
-            for (var i=0; i < initial_content.length; i++) {
-                dd.appendChild(initial_content[i]);
-            };
+    };
+    if (nextsibling) {
+        dl.insertBefore(dd, nextsibling);
+        //this._fixStructure(doc, dl, nextsibling);
+    } else {
+        dl.appendChild(dd);
+    };
+    if (initial_content) {
+        for (var i=0; i < initial_content.length; i++) {
+            dd.appendChild(initial_content[i]);
         };
-        var nbsp = doc.createTextNode('\xa0');
-        dd.appendChild(nbsp);
-        var selection = this.editor.getSelection();
-        selection.selectNodeContents(dd);
-        selection.collapse();
     };
+    var nbsp = doc.createTextNode('\xa0');
+    dd.appendChild(nbsp);
+    var selection = this.editor.getSelection();
+    selection.selectNodeContents(dd);
+    selection.collapse();
+};
 
-    this.escapeFromDefinitionList = function(dl, currel, selNode) {
-        var doc = this.editor.getInnerDocument();
-        var p = doc.createElement('p');
-        var nbsp = doc.createTextNode('\xa0');
-        p.appendChild(nbsp);
+DefinitionListTool.prototype.escapeFromDefinitionList = function(dl, currel, selNode) {
+    var doc = this.editor.getInnerDocument();
+    var p = doc.createElement('p');
+    var nbsp = doc.createTextNode('\xa0');
+    p.appendChild(nbsp);
 
-        if (dl.lastChild == currel) {
-            dl.parentNode.insertBefore(p, dl.nextSibling);
-        } else {
-            for (var i=0; i < dl.childNodes.length; i++) {
-                var child = dl.childNodes[i];
-                if (child == currel) {
-                    var newdl = this.editor.getInnerDocument().createElement('dl');
-                    while (currel.nextSibling) {
-                        newdl.appendChild(currel.nextSibling);
-                    };
-                    dl.parentNode.insertBefore(newdl, dl.nextSibling);
-                    dl.parentNode.insertBefore(p, dl.nextSibling);
+    if (dl.lastChild == currel) {
+        dl.parentNode.insertBefore(p, dl.nextSibling);
+    } else {
+        for (var i=0; i < dl.childNodes.length; i++) {
+            var child = dl.childNodes[i];
+            if (child == currel) {
+                var newdl = this.editor.getInnerDocument().createElement('dl');
+                while (currel.nextSibling) {
+                    newdl.appendChild(currel.nextSibling);
                 };
+                dl.parentNode.insertBefore(newdl, dl.nextSibling);
+                dl.parentNode.insertBefore(p, dl.nextSibling);
             };
         };
-        currel.parentNode.removeChild(currel);
-        var selection = this.editor.getSelection();
-        selection.selectNodeContents(p);
-        selection.collapse();
-        this.editor.focusDocument();
     };
-
-    this._fixStructure = function(doc, dl, offsetnode) {
-        /* makes sure the order of the elements is correct */
-        var currname = offsetnode.nodeName.toLowerCase();
-        var currnode = offsetnode.nextSibling;
-        while (currnode) {
-            if (currnode.nodeType == 1) {
-                var nodename = currnode.nodeName.toLowerCase();
-                if (currname == 'dt' && nodename == 'dt') {
-                    var dd = doc.createElement('dd');
-                    while (currnode.hasChildNodes()) {
-                        dd.appendChild(currnode.childNodes[0]);
-                    };
-                    currnode.parentNode.replaceChild(dd, currnode);
-                } else if (currname == 'dd' && nodename == 'dd') {
-                    var dt = doc.createElement('dt');
-                    while (currnode.hasChildNodes()) {
-                        dt.appendChild(currnode.childNodes[0]);
-                    };
-                    currnode.parentNode.replaceChild(dt, currnode);
+    currel.parentNode.removeChild(currel);
+    var selection = this.editor.getSelection();
+    selection.selectNodeContents(p);
+    selection.collapse();
+    this.editor.focusDocument();
+};
+
+DefinitionListTool.prototype._fixStructure = function(doc, dl, offsetnode) {
+    /* makes sure the order of the elements is correct */
+    var currname = offsetnode.nodeName.toLowerCase();
+    var currnode = offsetnode.nextSibling;
+    while (currnode) {
+        if (currnode.nodeType == 1) {
+            var nodename = currnode.nodeName.toLowerCase();
+            if (currname == 'dt' && nodename == 'dt') {
+                var dd = doc.createElement('dd');
+                while (currnode.hasChildNodes()) {
+                    dd.appendChild(currnode.childNodes[0]);
                 };
+                currnode.parentNode.replaceChild(dd, currnode);
+            } else if (currname == 'dd' && nodename == 'dd') {
+                var dt = doc.createElement('dt');
+                while (currnode.hasChildNodes()) {
+                    dt.appendChild(currnode.childNodes[0]);
+                };
+                currnode.parentNode.replaceChild(dt, currnode);
             };
-            currnode = currnode.nextSibling;
         };
+        currnode = currnode.nextSibling;
     };
 };
 
-DefinitionListTool.prototype = new KupuTool;
-
 function KupuZoomTool(buttonid, firsttab, lasttab) {
     this.button = getFromSelector(buttonid);
     firsttab = firsttab || 'kupu-tb-styles';
@@ -2872,7 +2891,7 @@
         if (m) { inuse[decodeURIComponent(m[2])] = 1; };
     }
     return inuse;
-}
+};
 
 proto.removeAnchor = function(node) {
     var anchors = node.getElementsByTagName('a');
@@ -2882,7 +2901,8 @@
         if (anchor.href) return;
         anchor.parentNode.removeChild(anchor);
     };
-}
+};
+
 proto.getAnchor = function(node, ifexists) {
     /* Returns the anchor for a node, creating one if reqd. unless
      * ifexists is set*/
@@ -2917,7 +2937,11 @@
     return anchor;
 };
 
+proto.createContextMenuElements = function() {
+    return [];
+};
+
 /* IE doesn't have a dump function */
 if (window.dump===undefined) {
     var dump = function(msg) { };
-}
+};

From guido at codespeak.net  Mon Jun  2 16:12:20 2008
From: guido at codespeak.net (guido at codespeak.net)
Date: Mon,  2 Jun 2008 16:12:20 +0200 (CEST)
Subject: [kupu-checkins] r55498 - kupu/trunk/kupu/common
Message-ID: <20080602141220.056332A805C@codespeak.net>

Author: guido
Date: Mon Jun  2 16:12:19 2008
New Revision: 55498

Modified:
   kupu/trunk/kupu/common/kupubasetools.js
   kupu/trunk/kupu/common/kupuhelpers.js
Log:
Allowing to set additional attributes (besides width, height) on popups.


Modified: kupu/trunk/kupu/common/kupubasetools.js
==============================================================================
--- kupu/trunk/kupu/common/kupubasetools.js	(original)
+++ kupu/trunk/kupu/common/kupubasetools.js	Mon Jun  2 16:12:19 2008
@@ -1038,11 +1038,12 @@
     this.editor.logMessage(_('Properties modified'));
 };
 
-function LinkTool(popupurl, popupwidth, popupheight) {
+function LinkTool(popupurl, popupwidth, popupheight, popupprops) {
     /* Add and update hyperlinks */
     this.popupurl = popupurl || 'kupupopups/link.html';
     this.popupwidth = popupwidth || 300;
     this.popupheight = popupheight || 200;
+    this.popupprops = popupprops || '';
 }
 
 LinkTool.prototype = new KupuTool;
@@ -1054,7 +1055,7 @@
 LinkTool.prototype.createLinkHandler = function(event) {
     /* create a link according to a url entered in a popup */
     var linkWindow = openPopup(this.popupurl, this.popupwidth,
-                               this.popupheight);
+                               this.popupheight, this.popupprops);
     linkWindow.linktool = this;
     linkWindow.focus();
 };
@@ -1237,11 +1238,12 @@
     this.editor.updateState();
 };
 
-function ImageTool(popupurl, popupwidth, popupheight) {
+function ImageTool(popupurl, popupwidth, popupheight, popupprops) {
     /* Image tool to add images */
     this.popupurl = popupurl || 'kupupopups/image.html';
     this.popupwidth = popupwidth || 300;
     this.popupheight = popupheight || 200;
+    this.popupprops = popupprops || '';
 };
 
 ImageTool.prototype = new KupuTool;
@@ -1254,7 +1256,7 @@
 ImageTool.prototype.createImageHandler = function(event) {
     /* create an image according to a url entered in a popup */
     var imageWindow = openPopup(this.popupurl, this.popupwidth,
-                                this.popupheight);
+                                this.popupheight, this.popupprops);
     imageWindow.imagetool = this;
     imageWindow.focus();
 };

Modified: kupu/trunk/kupu/common/kupuhelpers.js
==============================================================================
--- kupu/trunk/kupu/common/kupuhelpers.js	(original)
+++ kupu/trunk/kupu/common/kupuhelpers.js	Mon Jun  2 16:12:19 2008
@@ -184,14 +184,17 @@
     return null;
 }
 
-function openPopup(url, width, height) {
+function openPopup(url, width, height, properties) {
     /* open and center a popup window */
     var sw = screen.width;
     var sh = screen.height;
     var left = sw / 2 - width / 2;
     var top = sh / 2 - height / 2;
-    var win = window.open(url, 'someWindow', 
-                'width=' + width + ',height=' + height + ',left=' + left + ',top=' + top);
+    var allprops = 'width=' + width + ',height=' + height;
+    if (properties) {
+        allprops += ',' + properties;
+    };
+    var win = window.open(url, 'someWindow', allprops);
     return win;
 };
 

From eric at codespeak.net  Fri Jun  6 14:34:08 2008
From: eric at codespeak.net (eric at codespeak.net)
Date: Fri,  6 Jun 2008 14:34:08 +0200 (CEST)
Subject: [kupu-checkins] r55625 - kupu/branch/kupu-1.3.6-silva-1.5
Message-ID: <20080606123408.CFE8B16844B@codespeak.net>

Author: eric
Date: Fri Jun  6 14:34:07 2008
New Revision: 55625

Removed:
   kupu/branch/kupu-1.3.6-silva-1.5/
Log:
bogus branch

From eric at codespeak.net  Fri Jun  6 14:35:06 2008
From: eric at codespeak.net (eric at codespeak.net)
Date: Fri,  6 Jun 2008 14:35:06 +0200 (CEST)
Subject: [kupu-checkins] r55626 - kupu/branch/kupu-1.3-silva-1.5
Message-ID: <20080606123506.2CD0816844B@codespeak.net>

Author: eric
Date: Fri Jun  6 14:35:05 2008
New Revision: 55626

Added:
   kupu/branch/kupu-1.3-silva-1.5/
      - copied from r55625, kupu/tag/kupu-1.3.6-silva-1.5.9/
Log:
making a silva 1.5 branch


From eric at codespeak.net  Fri Jun  6 14:52:03 2008
From: eric at codespeak.net (eric at codespeak.net)
Date: Fri,  6 Jun 2008 14:52:03 +0200 (CEST)
Subject: [kupu-checkins] r55627 - in kupu/branch/kupu-1.3-silva-1.5: .
	common common/kupudrawers common/kupuimages doc doc/reference
	i18n mmbase mmbase/drawers mmbase/drawers/kupuimages
	mmbase/i18n mmbase/icons mmbase/tools plone
	plone/kupu_plone_layer plone/kupu_plone_layer/plonekupuimages
	plone/kupu_references plone/tests
Message-ID: <20080606125203.C3A9216844B@codespeak.net>

Author: eric
Date: Fri Jun  6 14:52:00 2008
New Revision: 55627

Added:
   kupu/branch/kupu-1.3-silva-1.5/common/kupudrawers/libraries.rng
   kupu/branch/kupu-1.3-silva-1.5/common/kupudrawers/test-drawer.xsl
   kupu/branch/kupu-1.3-silva-1.5/common/kupuimages/anchor.png   (contents, props changed)
   kupu/branch/kupu-1.3-silva-1.5/common/kupuimages/bookmark.png   (contents, props changed)
   kupu/branch/kupu-1.3-silva-1.5/common/kupuimages/treeCollapsed.gif   (contents, props changed)
   kupu/branch/kupu-1.3-silva-1.5/doc/SPELLCHECKER.txt
   kupu/branch/kupu-1.3-silva-1.5/doc/reference/
   kupu/branch/kupu-1.3-silva-1.5/doc/reference/errors.txt
   kupu/branch/kupu-1.3-silva-1.5/doc/reference/glossary.txt
   kupu/branch/kupu-1.3-silva-1.5/doc/reference/kupuconfig.txt
   kupu/branch/kupu-1.3-silva-1.5/doc/reference/readme.txt
   kupu/branch/kupu-1.3-silva-1.5/i18n/kupu-it.po
   kupu/branch/kupu-1.3-silva-1.5/i18n/kupu-vi.po
   kupu/branch/kupu-1.3-silva-1.5/i18n/kupuconfig-it.po
   kupu/branch/kupu-1.3-silva-1.5/i18n/kupuconfig-vi.po
   kupu/branch/kupu-1.3-silva-1.5/kupu.xpr
   kupu/branch/kupu-1.3-silva-1.5/mmbase/
   kupu/branch/kupu-1.3-silva-1.5/mmbase/Makefile
   kupu/branch/kupu-1.3-silva-1.5/mmbase/body.kupu
   kupu/branch/kupu-1.3-silva-1.5/mmbase/contextmenu.kupu
   kupu/branch/kupu-1.3-silva-1.5/mmbase/cross-browser.js
   kupu/branch/kupu-1.3-silva-1.5/mmbase/dist-mmbase.kupu
   kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/
   kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers.kupu
   kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/attachments.items.jspx
   kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/collection.jspx
   kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/drawer.jspx
   kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/drawer.xsl.jspx
   kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/images.items.jspx
   kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/kupudrawerstyles.css
   kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/kupuimages/
   kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/kupuimages/kupublank.html
   kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/kupuimages/kupulibrary.png   (contents, props changed)
   kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/libraries.jspx
   kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/library.jspx
   kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/search.constraints.jspx
   kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/search.library.jspx
   kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/segments.items.jspx
   kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/test.post.jspx
   kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/texts.items.jspx
   kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/upload.jspx
   kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/urls.items.jspx
   kupu/branch/kupu-1.3-silva-1.5/mmbase/error.jspx
   kupu/branch/kupu-1.3-silva-1.5/mmbase/head.kupu
   kupu/branch/kupu-1.3-silva-1.5/mmbase/html.kupu
   kupu/branch/kupu-1.3-silva-1.5/mmbase/i18n/
   kupu/branch/kupu-1.3-silva-1.5/mmbase/i18n/de.po
   kupu/branch/kupu-1.3-silva-1.5/mmbase/i18n/en.po
   kupu/branch/kupu-1.3-silva-1.5/mmbase/i18n/eo.po
   kupu/branch/kupu-1.3-silva-1.5/mmbase/i18n/fr.po
   kupu/branch/kupu-1.3-silva-1.5/mmbase/i18n/it.po
   kupu/branch/kupu-1.3-silva-1.5/mmbase/i18n/nl.po
   kupu/branch/kupu-1.3-silva-1.5/mmbase/icons/
   kupu/branch/kupu-1.3-silva-1.5/mmbase/icons/map-open.gif   (contents, props changed)
   kupu/branch/kupu-1.3-silva-1.5/mmbase/icons/map.gif   (contents, props changed)
   kupu/branch/kupu-1.3-silva-1.5/mmbase/include.kupu
   kupu/branch/kupu-1.3-silva-1.5/mmbase/index.kupu
   kupu/branch/kupu-1.3-silva-1.5/mmbase/kupuinit.js
   kupu/branch/kupu-1.3-silva-1.5/mmbase/kupustyle.css
   kupu/branch/kupu-1.3-silva-1.5/mmbase/layout.css
   kupu/branch/kupu-1.3-silva-1.5/mmbase/layout.js
   kupu/branch/kupu-1.3-silva-1.5/mmbase/make.jspx
   kupu/branch/kupu-1.3-silva-1.5/mmbase/mmbase.css
   kupu/branch/kupu-1.3-silva-1.5/mmbase/mmbase.js
   kupu/branch/kupu-1.3-silva-1.5/mmbase/mmbase.kupu
   kupu/branch/kupu-1.3-silva-1.5/mmbase/mmbase.png   (contents, props changed)
   kupu/branch/kupu-1.3-silva-1.5/mmbase/mmbasedrawers.js
   kupu/branch/kupu-1.3-silva-1.5/mmbase/mmbasetools.js
   kupu/branch/kupu-1.3-silva-1.5/mmbase/mymessages.jspx
   kupu/branch/kupu-1.3-silva-1.5/mmbase/node.body.jspx
   kupu/branch/kupu-1.3-silva-1.5/mmbase/node.jspx
   kupu/branch/kupu-1.3-silva-1.5/mmbase/override.js
   kupu/branch/kupu-1.3-silva-1.5/mmbase/preview.jspx
   kupu/branch/kupu-1.3-silva-1.5/mmbase/receive.jspx
   kupu/branch/kupu-1.3-silva-1.5/mmbase/saveonpart.kupu
   kupu/branch/kupu-1.3-silva-1.5/mmbase/spellcheck.jspx
   kupu/branch/kupu-1.3-silva-1.5/mmbase/start.jspx
   kupu/branch/kupu-1.3-silva-1.5/mmbase/test.kupu
   kupu/branch/kupu-1.3-silva-1.5/mmbase/toolbar.kupu
   kupu/branch/kupu-1.3-silva-1.5/mmbase/toolboxes.kupu
   kupu/branch/kupu-1.3-silva-1.5/mmbase/tools/
   kupu/branch/kupu-1.3-silva-1.5/mmbase/tools/create-subnode.jspx
   kupu/branch/kupu-1.3-silva-1.5/mmbase/tools/empty.jspx
   kupu/branch/kupu-1.3-silva-1.5/mmbase/tools/related-type.jspx
   kupu/branch/kupu-1.3-silva-1.5/mmbase/tools/related.jspx
   kupu/branch/kupu-1.3-silva-1.5/mmbase/tools/search-node.jspx
   kupu/branch/kupu-1.3-silva-1.5/mmbase/tools/test.jspx
   kupu/branch/kupu-1.3-silva-1.5/mmbase/tools/tree.jspx
   kupu/branch/kupu-1.3-silva-1.5/mmbase/wire.kupu
   kupu/branch/kupu-1.3-silva-1.5/mmbase/xmlconfig.kupu
   kupu/branch/kupu-1.3-silva-1.5/plone/kupu_plone_layer/kupulocate.xml.pt
   kupu/branch/kupu-1.3-silva-1.5/plone/kupu_plone_layer/kupuselection.xml.pt
   kupu/branch/kupu-1.3-silva-1.5/plone/kupu_plone_layer/plonekupuimages/fullscreencollapse_icon.gif   (contents, props changed)
   kupu/branch/kupu-1.3-silva-1.5/plone/kupu_plone_layer/plonekupuimages/fullscreencollapse_icon.gif.metadata
   kupu/branch/kupu-1.3-silva-1.5/plone/kupu_plone_layer/plonekupuimages/fullscreenexpand_icon.gif   (contents, props changed)
   kupu/branch/kupu-1.3-silva-1.5/plone/kupu_plone_layer/plonekupuimages/fullscreenexpand_icon.gif.metadata
   kupu/branch/kupu-1.3-silva-1.5/plone/kupu_references/
   kupu/branch/kupu-1.3-silva-1.5/plone/kupu_references/referencebrowser.js
   kupu/branch/kupu-1.3-silva-1.5/plone/kupu_references/referencebrowser.pt
   kupu/branch/kupu-1.3-silva-1.5/plone/plonedrawers.py
   kupu/branch/kupu-1.3-silva-1.5/plone/tests/TestContent.py
   kupu/branch/kupu-1.3-silva-1.5/plone/tests/test_plonedrawer.py
   kupu/branch/kupu-1.3-silva-1.5/plone/util.py
Modified:
   kupu/branch/kupu-1.3-silva-1.5/common/kupuhelpers.js
Log:
no idea what 1.3.6-silva-1.5.9 was, but it *sure* wasn't the version of kupu
used by silva...



Added: kupu/branch/kupu-1.3-silva-1.5/common/kupudrawers/libraries.rng
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/common/kupudrawers/libraries.rng	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,205 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grammar xmlns="http://relaxng.org/ns/structure/1.0"
+    datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
+    xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">
+    <start>
+        <choice>
+            <ref name="libraries"/>
+            <ref name="library"/>
+            <ref name="collection"/>
+        </choice>
+    </start>
+    <define name="libraries">
+        <a:documentation>
+            The libraries element is the top level for the XML used in Kupu.
+            library elements which it contains are listed in the first column of the drawer.
+        </a:documentation>
+        <element name="libraries">
+            <zeroOrMore>
+                <ref name="library"/>
+            </zeroOrMore>
+        </element>
+    </define>
+    <define name="library">
+        <a:documentation> 
+            A library is static or dynamic collection of resources and collections defined at a top level.
+            Libraries have no parents from a UI perspective, where as the collection they represent might have a parent collection.
+            A library may be returned as a top-level element from a search or canned query.
+        </a:documentation>
+        <element name="library">
+            <interleave>
+                <ref name="commonToAllItems"/>
+                <choice>
+                    <ref name="collectionItems"/>
+                    <ref name="itemsSource"/>
+                </choice>
+            </interleave>
+        </element>
+    </define>
+    <define name="commonToAllItems">
+        <attribute name="id">
+            <!-- Must be unique among all libraries, resources and collections. -->
+            <data type="ID"/>
+        </attribute>
+        <optional>
+            <attribute name="class">
+                <data type="NMTOKENS"/>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="selected">
+                <value>selected</value>
+            </attribute>
+        </optional>
+        <interleave>
+            <element name="uri">
+                <a:documentation>The url to use when linking to this object</a:documentation>
+                <data type="anyURI"/>
+            </element>
+            <element name="title">
+                <a:documentation>Title to display in properties pane</a:documentation>
+                <text/>
+            </element>
+            <optional>
+                <element name="label">
+                    <text/>
+                </element>
+            </optional>
+            <optional>
+                <element name="icon">
+                    <a:documentation>Icon to use in resource pane</a:documentation>
+                    <data type="anyURI"/>
+                </element>
+            </optional>
+        </interleave>
+    </define>
+    <define name="collectionItems">
+        <a:documentation>A list of collections and resources with an optional upload button at the end.</a:documentation>
+        <element name="items">
+            <zeroOrMore>
+                <ref name="collectionItem"/>
+            </zeroOrMore>
+            <optional>
+                <element name="uploadbutton">
+                    <element name="uri">
+                        <data type="anyURI"/>
+                    </element>
+                </element>
+            </optional>
+        </element>
+    </define>
+    <define name="itemsSource">
+        <a:documentation>URI to retrieve the contents of the collection.</a:documentation>
+        <element name="src">
+            <text/>
+        </element>
+    </define>
+    <define name="collectionItem">
+        <choice>
+            <ref name="resource"/>
+            <ref name="collection"/>
+        </choice>
+    </define>
+    <define name="resource">
+        <a:documentation>A named and URI-locatable object with associated metadata, such as title, description, preview, size, etc.</a:documentation>
+        <element name="resource">
+            <interleave>
+                <ref name="commonToAllItems"/>
+                <ref name="extraResourceInfo"/>
+                <optional><a:documentation>src element only if the resource is also a collection</a:documentation><ref name="itemsSource"></ref></optional>
+            </interleave>
+        </element>
+    </define>
+    <define name="collection">
+        <a:documentation>
+            A static or dynamic collection of resources and collections, modelled after WebDAV collections.
+        </a:documentation>
+        <element name="collection">
+            <interleave>
+                <ref name="commonToAllItems"/>
+                <ref name="itemsSource"/>
+                <optional><ref name="breadcrumbs"></ref></optional>
+                <zeroOrMore>
+                    <ref name="collectionItems"/>
+                </zeroOrMore>
+            </interleave>
+        </element>
+    </define>
+    <define name="extraResourceInfo">
+        <interleave>
+            <optional>
+                <element name="preview">
+                    <data type="anyURI"/>
+                </element>
+            </optional>
+            <zeroOrMore>
+                <ref name="status"/>
+            </zeroOrMore>
+            <optional>
+                <element name="size">
+                    <ref name="sizeType"/>
+                </element>
+            </optional>
+            <optional>
+                <element name="type">
+                    <text/>
+                </element>
+            </optional>
+            <optional>
+                <element name="description">
+                    <text/>
+                </element>
+            </optional>
+            <optional>
+                <element name="height">
+                    <data type="positiveInteger"/>
+                </element>
+            </optional>
+            <optional>
+                <element name="width">
+                    <data type="positiveInteger"/>
+                </element>
+            </optional>
+            <optional>
+                <a:documentation>Set if this resource could contain anchors</a:documentation>
+                <element name="anchor">
+                    <empty/>
+                </element>
+            </optional>
+        </interleave>
+    </define>
+    <define name="sizeType">
+        <data type="string">
+            <param name="pattern">[0-9]+([KkMmGgTt]?b)?</param>
+        </data>
+    </define>
+    <define name="status">
+        <element name="status">
+            <a:documentation>Additional text to display in drawer</a:documentation>
+            <attribute name="class">
+                <data type="NMTOKENS"></data>
+            </attribute>
+            <text/>
+        </element>
+    </define>
+    <define name="breadcrumbs">
+        <a:documentation>
+            The optional breadcrumbs element may be used to provide a breadcrumb bar at the top of the drawer.
+        </a:documentation>
+        <element name="breadcrumbs">
+            <optional>
+              <attribute name="class">
+                  <data type="NMTOKENS"></data>
+              </attribute>
+            </optional>
+            <zeroOrMore>
+                <element name="crumb">
+                    <attribute name="href">
+                        <data type="anyURI"/>
+                    </attribute>
+                </element>
+            </zeroOrMore>
+            <text/>
+        </element>
+    </define>
+</grammar>

Added: kupu/branch/kupu-1.3-silva-1.5/common/kupudrawers/test-drawer.xsl
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/common/kupudrawers/test-drawer.xsl	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+    <xsl:output indent="yes"/>
+    <xsl:strip-space elements="libraries library items resource collection"/>
+    <xsl:param name="selectid">buttons.png</xsl:param>
+    <xsl:template match="/libraries">
+        <xsl:processing-instruction name="oxygen">
+            RNGSchema="file:libraries.rng"
+            type="xml"
+        </xsl:processing-instruction>
+        <xsl:processing-instruction name="xml-stylesheet">href="drawer.xsl"</xsl:processing-instruction>
+        <xsl:copy>
+            <param name="drawertype">link</param>
+            <param name="drawertitle">Test Link Drawer</param>
+            <param name="showupload">yes</param>
+            <param name="usecaptions">yes</param>
+                <xsl:apply-templates/>
+        </xsl:copy>
+    </xsl:template>
+    <xsl:template match="*">
+        <xsl:copy>
+            <xsl:apply-templates/>
+        </xsl:copy>
+    </xsl:template>
+    <xsl:template match="text()|@*">
+        <xsl:value-of select="."/>
+    </xsl:template>
+    <xsl:template match="status">
+        <status>
+        <xsl:attribute name="class"><xsl:value-of select="@class"/></xsl:attribute>
+        <xsl:apply-templates/>
+        </status>
+    </xsl:template>
+    <xsl:template match="*[@id]">
+        <xsl:copy>
+            <xsl:attribute name="id">
+                <xsl:value-of select="@id"/>
+            </xsl:attribute>
+            <xsl:choose>
+                <xsl:when test="@id='allimages'">
+                    <xsl:attribute name="selected">selected</xsl:attribute>
+                    <xsl:apply-templates select="uri|title|icon"/>
+                    <xsl:copy-of select="document(concat('../',src))/collection/breadcrumbs"/>
+                    <xsl:apply-templates select="document(concat('../',src))/collection/items"/>
+                </xsl:when>
+                <xsl:when test="@id='kupubuttons'">
+                    <xsl:attribute name="selected">selected</xsl:attribute>
+                    <xsl:apply-templates select="uri|title|icon"/>
+                        <xsl:apply-templates select="document(concat('../',src))/collection/items"/>
+                </xsl:when>
+                <xsl:when test="@id='collection-allimages.xml'">
+                    <xsl:attribute name="selected">selected</xsl:attribute>
+                    <xsl:apply-templates/>
+                </xsl:when>
+                <xsl:when test="@id=$selectid">
+                    <xsl:attribute name="selected">selected</xsl:attribute>
+                    <xsl:apply-templates/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:apply-templates/>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:copy>
+    </xsl:template>
+</xsl:stylesheet>

Modified: kupu/branch/kupu-1.3-silva-1.5/common/kupuhelpers.js
==============================================================================
--- kupu/branch/kupu-1.3-silva-1.5/common/kupuhelpers.js	(original)
+++ kupu/branch/kupu-1.3-silva-1.5/common/kupuhelpers.js	Fri Jun  6 14:52:00 2008
@@ -728,7 +728,7 @@
             while (child) {
                 // XXX the additional conditions catch some invisible
                 // intersections, but still not all of them
-                if (range.intersectsNode(child) &&
+                if (rangeIntersectsNode(range, child) &&
                     !(child == startNode && startOffset == child.length) &&
                     !(child == endNode && endOffset == 0)) {
                     if (selectedChild) {
@@ -1343,3 +1343,20 @@
 // update, may be required in situations where updateState changes the structure
 // of the document (e.g. does a cleanup or so)
 UpdateStateCancelBubble = new Exception();
+
+// Following function is to replace the deprecated range.intersectsNode
+// see http://developer.mozilla.org/en/docs/DOM:range.intersectsNode
+// for more info
+
+function rangeIntersectsNode(range, node) {
+  var nodeRange = node.ownerDocument.createRange();
+  try {
+    nodeRange.selectNode(node);
+  }
+  catch (e) {
+    nodeRange.selectNodeContents(node);
+  }
+
+  return range.compareBoundaryPoints(Range.END_TO_START, nodeRange) == -1 &&
+         range.compareBoundaryPoints(Range.START_TO_END, nodeRange) == 1;
+}

Added: kupu/branch/kupu-1.3-silva-1.5/common/kupuimages/anchor.png
==============================================================================
Binary file. No diff available.

Added: kupu/branch/kupu-1.3-silva-1.5/common/kupuimages/bookmark.png
==============================================================================
Binary file. No diff available.

Added: kupu/branch/kupu-1.3-silva-1.5/common/kupuimages/treeCollapsed.gif
==============================================================================
Binary file. No diff available.

Added: kupu/branch/kupu-1.3-silva-1.5/doc/SPELLCHECKER.txt
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/doc/SPELLCHECKER.txt	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,7 @@
+=====================
+Spellchecking in Kupu
+=====================
+
+After Kupu 1.3 was released, Guido began support for a spellchecker.
+This document explains how the spellchecker works and collects ideas
+for improving it.

Added: kupu/branch/kupu-1.3-silva-1.5/doc/reference/errors.txt
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/doc/reference/errors.txt	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,23 @@
+This documents errors you're likely to see with Kupu.
+
+"Couldn't set design mode. Kupu will not work with this	browser"
+
+  This occurs when the contents of the main <iframe> ends up being
+  something that doesn't smell like html. This could be because it
+  actually isn't html, or because it is being served with the wrong
+  content type.
+
+"no cleanup expressions configured"
+
+  This happens when the cleanup tool doesn't find any expressions in
+  the xml config block. It can be cured by either removing the cleanup
+  tool or inserting the sample expressions from the top of
+  kupucleanupexpressions.js into the <kupuconfig> xml block at the top
+  of your editing template.
+
+"Error loading kupudrawers/drawel.xsl:404"
+
+  This applies to any .xsl or .js file that returns a 404. It means
+  that the urls inside your editing template aren't being correctly
+  generated. View the source of your editing template, check where the
+  urls are pointing andadjust them so they actually find the right thing.
\ No newline at end of file

Added: kupu/branch/kupu-1.3-silva-1.5/doc/reference/glossary.txt
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/doc/reference/glossary.txt	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,17 @@
+This is a list of terms and their meaning in a Kupu context.
+If you know any of the following to be wrong, or would like to see a
+definition for a particular term, please notify
+kupu-dev at codespeak.net! 
+
+toolbar
+
+  This is the bar of buttons at the top of a Kupu editing template.
+
+toolbox
+ 
+  These appear on the right of the Kupu editing template.
+
+drawer
+
+  A type of pop-up window that appears when you click on certain
+  buttons in the toolbar.

Added: kupu/branch/kupu-1.3-silva-1.5/doc/reference/kupuconfig.txt
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/doc/reference/kupuconfig.txt	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,64 @@
+This is a reference for the various sections that can be set in the
+<kupuconfig> xml block at the top of your editing template. It is
+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>
+
+  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>
+
+  ??
+
+<reload_after_save>0</reload_after_save>
+  
+  ??
+
+<strict_output>1</strict_output>
+ 
+  ??
+
+<content_type>text/html</content_type>
+
+  ??
+
+<compatible_singletons>1</compatible_singletons>
+  
+  ??
+
+<image_xsl_uri>http://www.example.com/kupu/kupudrawers/drawer.xsl</image_xsl_uri>
+
+  ??
+              
+<link_xsl_uri>http://www.example.com/kupu/kupudrawers/drawer.xsl</link_xsl_uri>
+
+  ??
+              
+<image_libraries_uri>http://www.example.com/kupu/kupudrawers/imagelibrary.xml</image_libraries_uri>
+
+  ??
+              
+<link_libraries_uri>http://www.example.com/kupu/kupudrawers/linklibrary.xml</link_libraries_uri>
+
+  ??
+              
+<search_images_uri> </search_images_uri>
+
+  ??
+              
+<search_links_uri> </search_links_uri>
+
+  ??
+              
+<cleanup_expressions>...</cleanup_expressions>
+
+  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

Added: kupu/branch/kupu-1.3-silva-1.5/doc/reference/readme.txt
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/doc/reference/readme.txt	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,22 @@
+This is designed to be more of a reference than the procedural
+documentation in the folder above.
+
+It's currently only just beginning, so please feel free to submit
+patches, comments and suggestions to kupu-dev at codespeak.net.
+
+The files are as follows:
+
+errors.txt
+
+  - A list of the errors commonly emitted by Kupu and the common ways
+    to solve them.
+
+glossary.txt
+
+  - A glossary of the terms you're likely to encounter when dealing
+    with Kupu.
+
+kupuconfig.txt
+
+  - This is a reference for the various sections that can be set in
+    the <kupuconfig> xml block at the top of your editing template. 
\ No newline at end of file

Added: kupu/branch/kupu-1.3-silva-1.5/i18n/kupu-it.po
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/i18n/kupu-it.po	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,1013 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: kupu\n"
+"POT-Creation-Date: Mon Oct 31 17:09:34 2005\n"
+"PO-Revision-Date: 2006-01-26 15:41+0100\n"
+"Last-Translator: Fabrizio Reale <fabrizio.reale at redomino.com>\n"
+"Language-Team: Redomino team <info at redomino.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language-code: it\n"
+"Language-name: Italian\n"
+"Preferred-encodings: utf-8 latin1\n"
+"Domain: kupu\n"
+"X-Is-Fallback-For: it-ch\n"
+
+
+#: /common/kupu.pox:None
+msgid "Command ${command} executed with parameter ${param}"
+msgstr "Comando ${command} eseguito col parametro ${param}"
+
+#: /common/kupu.pox:None
+msgid "Add table"
+msgstr "Aggiungi tabella"
+
+#: /common/kupu.pox:None
+msgid "Table added"
+msgstr "Tabella aggiunta"
+
+#: /common/kupu.pox:None
+msgid "Source edit tool initialized"
+msgstr "Tool codice HTML inizializzato"
+
+#: /common/kupu.pox:None
+msgid "Delete row"
+msgstr "Cancella riga"
+
+#: /common/kupu.pox:None
+msgid "Recursion detected when counting column position"
+msgstr "Ricorsivit? rilevata calcolando la posizione della colonna"
+
+#: /common/kupu.pox:None
+msgid "List style changed"
+msgstr "Stile della lista modificato"
+
+#: /common/kupu.pox:None
+msgid "Properties modified"
+msgstr "Propriet? modificate"
+
+#: /common/kupu.pox:None
+msgid "click to unfold"
+msgstr "cliccare per estrarre"
+
+#: /common/kupu.pox:None
+msgid "You have unsaved changes. Do you want to save before leaving the page?"
+msgstr "Ci sono delle modifiche non salvate. Vuoi salvare prima di chiudere la pagina?"
+
+#: /common/kupu.pox:None
+msgid "Table row removed"
+msgstr "Riga di tabella eliminata"
+
+#: /common/kupu.pox:None
+msgid "Document saved"
+msgstr "Documento salvato"
+
+#: /common/kupu.pox:None
+msgid "Color chosen"
+msgstr "Colore scelto"
+
+#: /common/kupu.pox:None
+msgid "Table row added"
+msgstr "Aggiunta riga di tabella"
+
+#: /common/kupu.pox:None
+msgid "Error saving document"
+msgstr "Errore di salvataggio del documento"
+
+#: /common/kupu.pox:None
+msgid "No destination URL available!"
+msgstr "Nessun URL di destinazione disponibile"
+
+#: /common/kupu.pox:None
+msgid "Link removed"
+msgstr "Link rimosso"
+
+#: /common/kupu.pox:None
+msgid "No row to delete"
+msgstr "Nessuna riga da eliminare"
+
+#: /common/kupu.pox:None
+msgid "Delete Table"
+msgstr "Elimina Tabella"
+
+#: /common/kupu.pox:None
+msgid "Cleanup done, sending document to server"
+msgstr "Pulizia effettuata, invio del documento al server"
+
+#: /common/kupu.pox:None
+msgid "Image tool initialized"
+msgstr "Tool di immagine inizializzato"
+
+#: /common/kupu.pox:None
+msgid "End offset out of range!"
+msgstr "Offset finale fuori misura"
+
+#: /common/kupu.pox:None
+msgid "tdindex: ${tdindex}"
+msgstr "tdindex: ${tdindex}"
+
+#: /common/kupu.pox:None
+msgid "Create link"
+msgstr "Crea link"
+
+#: /common/kupu.pox:None
+msgid "Starting HTML cleanup"
+msgstr "Avvio della pulizia dell'HTML"
+
+#: /common/kupu.pox:None
+msgid "Not inside a definition list element!"
+msgstr "Non in una lista di definizione"
+
+#: /common/kupu.pox:None
+msgid "Link modified"
+msgstr "Link modificato"
+
+#: /common/kupu.pox:None
+msgid "Illegal or missing width entry in column info!"
+msgstr "Entry della larghezza irregolare o mancante nelle info della colonna!"
+
+#: /common/kupu.pox:None
+msgid "Request sent to server"
+msgstr "Richiesta inviata al server"
+
+#: /common/kupu.pox:None
+msgid "There were no errors."
+msgstr "Non ci sono stati errori"
+
+#: /common/kupu.pox:None
+msgid "exception ${message} while registering an event handler for element ${element}, event ${event}, method ${method}"
+msgstr "eccezione ${message} durante la registrazione di un gestore di eventi per l'elemento ${element}, l'evento ${event}, il metodo ${method}"
+
+#: /common/kupu.pox:None
+msgid "Error loading translation (status ${status} ), falling back to english"
+msgstr "Errore di caricamento della traduzione (status ${status} ), inglese di default"
+
+#: /common/kupu.pox:None
+msgid "Start node offset detected in a node without children!"
+msgstr "Offset del nodo di avvio rilevato in un nodo senza figli"
+
+#: /common/kupu.pox:None
+msgid "Deprecation warning: KupuTool._selectSelectItem"
+msgstr "Avviso, deprecato: KupuTool._selectSelectItem"
+
+#: /common/kupu.pox:None
+msgid "Couldn\\'t set design mode. Kupu will not work on this browser."
+msgstr "Modalit? di design inaccessibile. Kupu non funzioner? con questo browser"
+
+#: /common/kupu.pox:None
+msgid "No element found in the config island!"
+msgstr "Nessun elemento trovato nel config"
+
+#: /common/kupu.pox:None
+msgid "Start offset out of range!"
+msgstr "Offset d'avvio fuori misura"
+
+#: /common/kupu.pox:None
+msgid "Pasting from JavaScript is disabled on your Mozilla due to security settings. For more information, read http://www.mozilla.org/editor/midasdemo/securityprefs.html"
+msgstr "Incollare da Javascript non ? permesso sul tuo Mozilla a causa di impostazione di sicurezza. Per maggiori informazioni, consultare http://www.mozilla.org/editor/midasdemo/securityprefs.html"
+
+#: /common/kupu.pox:None
+msgid "Property tool initialized"
+msgstr "Tool di propriet? inizializzato"
+
+#: /common/kupu.pox:None
+msgid "Colorchooser tool initialized"
+msgstr "Tool per la scelta del colore inizializzato"
+
+#: /common/kupu.pox:None
+msgid "No parentcolumn found!"
+msgstr "Non ? stata trovata nessuna colonna"
+
+#: /common/kupu.pox:None
+msgid "items"
+msgstr "items"
+
+#: /common/kupu.pox:None
+msgid "Row repeated"
+msgstr "Riga ripetuta"
+
+#: /common/kupu.pox:None
+msgid "Cut"
+msgstr "Taglia"
+
+#: /common/kupu.pox:None
+msgid "Table removed"
+msgstr "Tabella eliminata"
+
+#: /common/kupu.pox:None
+msgid "Unsupported browser!"
+msgstr "Browser non supportato"
+
+#: /common/kupu.pox:None
+msgid "Add row"
+msgstr "Aggiungere riga"
+
+#: /common/kupu.pox:None
+msgid "Link tool initialized"
+msgstr "Tool dei link inizializzato"
+
+#: /common/kupu.pox:None
+msgid "Sending request to server"
+msgstr "Invio richiesta al server"
+
+#: /common/kupu.pox:None
+msgid "Invalid table size"
+msgstr "Dimensioni delle tabella errata"
+
+#: /common/kupu.pox:None
+msgid "Error placing back selection"
+msgstr "Errore per ristabilire la selezione"
+
+#: /common/kupu.pox:None
+msgid "Image inserted"
+msgstr "Immagine inserita"
+
+#: /common/kupu.pox:None
+msgid "Add column"
+msgstr "Aggiungere colonna"
+
+#: /common/kupu.pox:None
+msgid "Cutting from JavaScript is disabled on your Mozilla due to security settings. For more information, read http://www.mozilla.org/editor/midasdemo/securityprefs.html"
+msgstr "Tagliare da JavaScript non ? permesso sul tuo Mozilla a causa di impostazioni di sicurezza. Per maggiori informazioni, consultare http://www.mozilla.org/editor/midasdemo/securityprefs.html"
+
+#: /common/kupu.pox:None
+msgid "Exception while processing updateState on ${id}: ${msg}"
+msgstr "Eccezione durante il processo updateState su ${id}: ${msg}"
+
+#: /common/kupu.pox:None
+msgid "Cleaning up HTML..."
+msgstr "Pulizia dell'HTML..."
+
+#: /common/kupu.pox:None
+msgid "List style tool initialized"
+msgstr "Tool di stile della lista inizializzata"
+
+#: /common/kupu.pox:None
+msgid "Row repeat turned off"
+msgstr "Copia della riga interrotta"
+
+#: /common/kupu.pox:None
+msgid "There was a problem initializing the drawers. Most likely the XSLT or XML files aren\\'t available. If this is not the Kupu demo version, check your files or the service that provide them (error: ${error})."
+msgstr "Si ? verificato un problema nell'inizializzazione dei cassetti. Probabilmente i file XSLT o XML non sono disponibili. Se non si tratta della versione demo di Kupu, verificare i file o il servizio che li fornisce (error: ${error})."
+
+#: /common/kupu.pox:None
+msgid "Deprecation warning: KupuToolBox._selectSelectItem"
+msgstr "Avviso, deprecato:  KupuToolBox._selectSelectItem"
+
+#: /common/kupu.pox:None
+msgid "Copying from JavaScript is disabled on your Mozilla due to security settings. For more information, read http://www.mozilla.org/editor/midasdemo/securityprefs.html"
+msgstr "Copiare da JavaScript non ? permesso sul tuo Mozilla a causa di impostazioni di sicurezza. Per maggiori informazioni, consultare http://www.mozilla.org/editor/midasdemo/securityprefs.html"
+
+#: /common/kupu.pox:None
+msgid "Command ${command} executed"
+msgstr "Comando ${command} eseguito"
+
+#: /common/kupu.pox:None
+msgid "Delete column"
+msgstr "Cancella colonna"
+
+#: /common/kupu.pox:None
+msgid "Error saving your data.\\nResponse status: ${status}.\\nCheck your server log for more information."
+msgstr "Errore nel salvataggio dei dati.\\nStato della risposta: ${status}.\\nVerificare il tuo giornale del server per maggiori informazioni."
+
+#: /common/kupu.pox:None
+msgid "This feature requires pop-ups to be enabled on your browser!"
+msgstr "Questa funzionalit? richiede dei pop-up per essere abilitata sul tuo browser"
+
+#: /common/kupu.pox:None
+msgid "Not inside link"
+msgstr "Nessun link interno"
+
+#: /common/kupu.pox:None
+msgid "View source"
+msgstr "Vista del codice"
+
+#: /common/kupu.pox:None
+msgid "Table tool initialized"
+msgstr "Tool della tabella inizializzata"
+
+#: /common/kupu.pox:None
+msgid "Browser not supported!"
+msgstr "Browser non supportato"
+
+#: /common/kupu.pox:None
+msgid "Please wait while saving document..."
+msgstr "Attendere durante il salvataggio del documento..."
+
+#: /common/kupu.pox:None
+msgid "Editor initialized"
+msgstr "Editor inizializzato"
+
+#: /common/kupu.pox:None
+msgid "click to fold"
+msgstr "cliccare per chiudere"
+
+#: /common/kupu.pox:None
+msgid "Create image"
+msgstr "Creare immagine"
+
+#: /common/kupu.pox:None
+msgid "Copy"
+msgstr "Copiare"
+
+#: /common/kupu.pox:None
+msgid "Zoom tool initialized"
+msgstr "Tool di zoom inizializzato"
+
+#: /common/kupu.pox:None
+msgid "Table column deleted"
+msgstr "Colonna della tabella cancellata"
+
+#: /common/kupu.pox:None
+msgid "Offset out of document range"
+msgstr "Offset fuori misura del documento"
+
+#: /common/kupu.pox:None
+msgid "Table cleaned up"
+msgstr "Tabella pulita"
+
+#: /common/kupu.pox:None
+msgid "Error loading data, status ${status}"
+msgstr "Errore di caricamento dei dati, stato ${status}"
+
+#: /common/kupu.pox:None
+msgid "Could not set status bar message, check your browser\\'s security settings."
+msgstr "Impossibile impostare il messaggio della barra di stato, verificare le impostazioni di sicurezza del tuo browser"
+
+#: /common/kupu.pox:None
+msgid "End node offset detected in a node without children!"
+msgstr "Offset del nodo finale in un nodo senza figli!"
+
+#: /common/kupu.pox:None
+msgid "Your form has not been saved. All changes you have made will be lost"
+msgstr "Il tuo form non ? satto salvato. Tutte le modifiche effettuate andranno perse"
+
+#: /common/kupu.pox:None
+msgid "Link added"
+msgstr "Link aggiunto"
+
+#: /common/kupu.pox:None
+msgid "No head in document!"
+msgstr "Nessun head nel documento"
+
+#: /common/kupu.pox:None
+msgid "Not inside a row!"
+msgstr "Non in una riga!"
+
+#: /common/kupu.pox:None
+msgid "Not inside a table!"
+msgstr "Non in una tabella!"
+
+#: /common/kupu.pox:None
+msgid "Selection not inside the node!"
+msgstr "Selezione non nel nodo!"
+
+#: /common/kupu.pox:None
+msgid "Delete link"
+msgstr "Cancella link"
+
+#: /common/kupu.pox:None
+msgid "Editor not initialized yet!"
+msgstr "Editor non ancora inizializzato"
+
+#: /common/kupu.pox:None
+msgid "Table column added"
+msgstr "Colonna della tabella aggiunta"
+
+#: /common/kupu.pox:None
+msgid "Paste"
+msgstr "Incolla"
+
+#: /common/kupudrawers/drawer.xsl:None
+# Default: "Caption"
+msgid "imagedrawer_caption_label"
+msgstr "Sottotitolo"
+
+#: /common/kupudrawers/drawer.xsl:None
+# Default: "Insert Link"
+msgid "linkdrawer_title"
+msgstr "Inserire link"
+
+#: /common/kupudrawers/drawer.xsl:None
+# Default: "Left"
+msgid "imagedrawer_left"
+msgstr "Sinistra"
+
+#: /common/kupudrawers/drawer.xsl:None
+# Default: "(${width} by ${height})"
+msgid "imagedrawer_size"
+msgstr "Dimensioni"
+
+#: /common/kupudrawers/drawer.xsl:None
+# Default: "Insert Image"
+msgid "imagedrawer_title"
+msgstr "Inserire immagine"
+
+#: /common/kupudrawers/drawer.xsl:None
+# Default: "Upload to: ${folder}"
+msgid "imagedrawer_upload_to_label"
+msgstr "Caricare in ${folder} "
+
+#: /common/kupudrawers/drawer.xsl:None
+# Default: "Name"
+msgid "linkdrawer_name_label"
+msgstr "etichetta del nome"
+
+#: /common/kupudrawers/drawer.xsl:None
+# Default: "Title:"
+msgid "imagedrawer_upload_title_label"
+msgstr "caricare etichetta del titolo"
+
+#: /common/kupudrawers/drawer.xsl:None
+# Default: "Preview"
+msgid "imagedrawer_upload_preview_label"
+msgstr "caricare etichetta anteprima"
+
+#: /common/kupudrawers/drawer.xsl:None
+# Default: ""
+# "Select an image from your computer and click ok to have it\n"
+# "            automatically uploaded to selected folder and inserted into the\n"
+# "            editor."
+msgid "imagedrawer_upload_instructions"
+msgstr "selezionare un'immagine dal computer e confermare per caricarla nella cartella selezionata e inserirla nell'editor"
+
+#: /common/kupudrawers/drawer.xsl:None
+# Default: "Upload ..."
+msgid "imagedrawer_upload_link"
+msgstr "caricare..."
+
+#: /common/kupudrawers/drawer.xsl:None
+# Default: "Title"
+msgid "linkdrawer_title_label"
+msgstr "Titolo"
+
+#: /common/kupudrawers/drawer.xsl:None
+# Default: "Description"
+msgid "linkdrawer_description_label"
+msgstr "Descrizione"
+
+#: /common/kupudrawers/drawer.xsl:None
+# Default: "ALT-text"
+msgid "imagedrawer_upload_alt_text"
+msgstr "testo ALT"
+
+#: /common/kupudrawers/drawer.xsl:None
+# Default: "search"
+msgid "kupudrawer_search"
+msgstr "ricerca"
+
+#: /common/kupudrawers/drawer.xsl:None
+# Default: "Inline"
+msgid "imagedrawer_inline"
+msgstr "inline"
+
+#: /common/kupudrawers/drawer.xsl:None
+# Default: "Target"
+msgid "linkdrawer_target_label"
+msgstr "Target"
+
+#: /common/kupudrawers/drawer.xsl:None
+# Default: "Right"
+msgid "imagedrawer_right"
+msgstr "Destra"
+
+#: /default/body.kupu:None
+msgid "Kupu Editor Test Page"
+msgstr "Pagina di test dell'editor Kupu"
+
+#: /default/colorchooser.kupu:None
+msgid "text color: alt-f"
+msgstr "colore del testo: alt-f"
+
+#: /default/colorchooser.kupu:None
+msgid "background color: alt-h"
+msgstr "colore di sfondo: alt-h"
+
+#: /default/drawers.kupu:None
+# Default: "Row"
+msgid "tabledrawer_row_label"
+msgstr "Riga"
+
+#: /default/drawers.kupu:None
+# Default: "Right"
+msgid "tabledrawer_right_option"
+msgstr "Destra"
+
+#: /default/drawers.kupu:None
+# Default: "Current column alignment"
+msgid "tabledrawer_alignment_label"
+msgstr "allinemento della colonna"
+
+#: /default/drawers.kupu:None
+msgid "external link"
+msgstr "link esterno"
+
+#: /default/drawers.kupu:None
+# Default: "Columns"
+msgid "tabledrawer_columns_label"
+msgstr "Colonne"
+
+#: /default/drawers.kupu:None
+# Default: "Center"
+msgid "tabledrawer_center_option"
+msgstr "Centro"
+
+#: /default/drawers.kupu:None
+# Default: "Fix All Tables"
+msgid "tabledrawer_fix_tables_button"
+msgstr "applica a tutte le tabelle"
+
+#: /default/drawers.kupu:None
+msgid "External Link"
+msgstr "Link Esterno"
+
+#: /default/drawers.kupu:None
+# Default: "Left"
+msgid "tabledrawer_left_option"
+msgstr "Sinistra"
+
+#: /default/drawers.kupu:None
+msgid "Preview"
+msgstr "Anteprima"
+
+#: /default/drawers.kupu:None
+# Default: "Rows"
+msgid "tabledrawer_rows_label"
+msgstr "Righe"
+
+#: /default/drawers.kupu:None
+msgid "internal link"
+msgstr "link interno"
+
+#: /default/drawers.kupu:None
+# Default: "Table"
+msgid "tabledrawer_title"
+msgstr "Tabella"
+
+#: /default/drawers.kupu:None
+# Default: "Add Table"
+msgid "tabledrawer_add_table_button"
+msgstr "Aggiungi tabella"
+
+#: /default/drawers.kupu:None
+# Default: "Close"
+msgid "tabledrawer_close_button"
+msgstr "Chiudi"
+
+#: /default/drawers.kupu:None
+# Default: "Column"
+msgid "tabledrawer_column_label"
+msgstr "Colonna"
+
+#: /default/drawers.kupu:None
+# Default: "Create Headings"
+msgid "tabledrawer_headings_label"
+msgstr "Crea titolo"
+
+#: /default/drawers.kupu:None
+# Default: "Fix"
+msgid "tabledrawer_fix_button"
+msgstr "Correggi"
+
+#: /default/drawers.kupu:None
+# Default: "Fix Table"
+msgid "tabledrawer_fix_table_label"
+msgstr "Correggi tabella"
+
+#: /default/drawers.kupu:None
+#: /common/kupudrawers/drawer.xsl:None
+msgid "(none)"
+msgstr "(niente)"
+
+#: /default/drawers.kupu:None
+#: /common/kupudrawers/drawer.xsl:None
+msgid "Ok"
+msgstr "Ok"
+
+#: /default/drawers.kupu:None
+#: /common/kupudrawers/drawer.xsl:None
+msgid "Cancel"
+msgstr "Cancella"
+
+#: /default/drawers.kupu:None
+#: /default/drawers.kupu:None
+msgid "Listing"
+msgstr "Elenca"
+
+#: /default/drawers.kupu:None
+#: /default/drawers.kupu:None
+# Default: "Add"
+msgid "tabledrawer_add_button"
+msgstr "Aggiungi"
+
+#: /default/drawers.kupu:None
+#: /default/drawers.kupu:None
+msgid "Grid"
+msgstr "Griglia"
+
+#: /default/drawers.kupu:None
+#: /default/drawers.kupu:None
+# Default: "Remove"
+msgid "tabledrawer_remove_button"
+msgstr "Elimina"
+
+#: /default/drawers.kupu:None
+#: /default/drawers.kupu:None
+msgid "Data"
+msgstr "Dati"
+
+#: /default/drawers.kupu:None
+#: /default/drawers.kupu:None
+msgid "Plain"
+msgstr "Testo semplice"
+
+#: /default/drawers.kupu:None
+#: /default/drawers.kupu:None
+# Default: "Table Class"
+msgid "tabledrawer_class_label"
+msgstr "Classe della tabella"
+
+#: /default/drawers.kupu:None
+#: /default/toolboxes.kupu:None
+msgid "Link the highlighted text to this URL:"
+msgstr "Collega il testo evidenziato a questo URL:"
+
+#: /default/drawers.kupu:None
+#: /silva/toolboxes.kupu:None
+msgid "image"
+msgstr "immagine"
+
+#: /default/drawers.kupu:None
+#: /silva/toolboxes.kupu:None
+msgid "table"
+msgstr "tabella"
+
+#: /default/save.kupu:None
+msgid "save: alt-s"
+msgstr "salva: alt-s"
+
+#: /default/sourceedit.kupu:None
+# Default: "change between Kupu and HTML views"
+msgid "toggle_source_view"
+msgstr "modifica codice"
+
+#: /default/spellchecker.kupu:None
+msgid "check spelling"
+msgstr "controllo ortografico"
+
+#: /default/toolbar.kupu:None
+msgid "zoom: alt-x"
+msgstr "zoom: alt-x"
+
+#: /default/toolbar.kupu:None
+# Default: "1"
+msgid "list-decimal"
+msgstr "lista decimali"
+
+#: /default/toolbar.kupu:None
+# Default: "A"
+msgid "list-upperalpha"
+msgstr "lista maiuscolo"
+
+#: /default/toolbar.kupu:None
+msgid "Heading 1"
+msgstr "Titolo 1"
+
+#: /default/toolbar.kupu:None
+msgid "superscript: alt-+"
+msgstr "apice: alt-+"
+
+#: /default/toolbar.kupu:None
+# Default: "&#9675;"
+msgid "list-circle"
+msgstr "lista cerchio"
+
+#: /default/toolbar.kupu:None
+msgid "bold: alt-b"
+msgstr "grassetto: alt-b"
+
+#: /default/toolbar.kupu:None
+msgid "Formatted"
+msgstr "Formattato"
+
+#: /default/toolbar.kupu:None
+# Default: "a"
+msgid "list-loweralpha"
+msgstr "lista minuscolo"
+
+#: /default/toolbar.kupu:None
+# Default: "no bullet"
+msgid "list-nobullet"
+msgstr "nessun modificatore"
+
+#: /default/toolbar.kupu:None
+# Default: "i"
+msgid "list-lowerroman"
+msgstr "lista romano minuscolo"
+
+#: /default/toolbar.kupu:None
+msgid "Kupu SVN/unreleased"
+msgstr "Kupu"
+
+#: /default/toolbar.kupu:None
+msgid "Remove image"
+msgstr "Elimina immagine"
+
+#: /default/toolbar.kupu:None
+msgid "undo: alt-z"
+msgstr "annulla: alt-z"
+
+#: /default/toolbar.kupu:None
+# Default: "&#9679;"
+msgid "list-disc"
+msgstr "lista disco"
+
+#: /default/toolbar.kupu:None
+msgid "definition list: alt-="
+msgstr "definizioni: alt-="
+
+#: /default/toolbar.kupu:None
+msgid "indent: alt->"
+msgstr "indentazione: alt->"
+
+#: /default/toolbar.kupu:None
+msgid "Remove link"
+msgstr "Rimuovi link"
+
+#: /default/toolbar.kupu:None
+msgid "Normal"
+msgstr "Normale"
+
+#: /default/toolbar.kupu:None
+msgid "left justify: alt-l"
+msgstr "Allineamento a sinistra: alt-l"
+
+#: /default/toolbar.kupu:None
+msgid "right justify: alt-r"
+msgstr "allineamento a destra: alt-r"
+
+#: /default/toolbar.kupu:None
+msgid "outdent: alt-<"
+msgstr "diminuisci indentazione: alt-<"
+
+#: /default/toolbar.kupu:None
+# Default: "&#9632;"
+msgid "list-square"
+msgstr "lista square"
+
+#: /default/toolbar.kupu:None
+msgid "underline: alt-u"
+msgstr "sottolineato: alt-u"
+
+#: /default/toolbar.kupu:None
+msgid "redo: alt-y"
+msgstr "ripristina: alt-y"
+
+#: /default/toolbar.kupu:None
+msgid "subscript: alt--"
+msgstr "pedice: alt--"
+
+#: /default/toolbar.kupu:None
+msgid "center justify: alt-c"
+msgstr "Giustificazione al centro: alt-c"
+
+#: /default/toolbar.kupu:None
+msgid "unordered list: alt-*"
+msgstr "elenco puntato: alt-*"
+
+#: /default/toolbar.kupu:None
+msgid "Heading 3"
+msgstr "Titolo 3"
+
+#: /default/toolbar.kupu:None
+msgid "Heading 2"
+msgstr "Titolo 2"
+
+#: /default/toolbar.kupu:None
+msgid "Heading 6"
+msgstr "Titolo 6"
+
+#: /default/toolbar.kupu:None
+msgid "Heading 5"
+msgstr "Titolo 5"
+
+#: /default/toolbar.kupu:None
+msgid "Heading 4"
+msgstr "Titolo 4"
+
+#: /default/toolbar.kupu:None
+msgid "numbered list: alt-#"
+msgstr "elenco numerato: alt-#"
+
+#: /default/toolbar.kupu:None
+msgid "italic: alt-i"
+msgstr "corsivo: alt-i"
+
+#: /default/toolbar.kupu:None
+# Default: "I"
+msgid "list-upperroman"
+msgstr "lista romano minuscolo"
+
+#: /default/toolboxes.kupu:None
+msgid "Headings:"
+msgstr "Titoli:"
+
+#: /default/toolboxes.kupu:None
+msgid "Fix"
+msgstr "Correggi"
+
+#: /default/toolboxes.kupu:None
+msgid "Remove Column"
+msgstr "Elimina colonna"
+
+#: /default/toolboxes.kupu:None
+msgid "Select a cleanup action:"
+msgstr "Seleziona comando per pulizia:"
+
+#: /default/toolboxes.kupu:None
+msgid "Links"
+msgstr "Link"
+
+#: /default/toolboxes.kupu:None
+msgid "Rows:"
+msgstr "Righe:"
+
+#: /default/toolboxes.kupu:None
+msgid "Remove Row"
+msgstr "Elimina riga:"
+
+#: /default/toolboxes.kupu:None
+msgid "Tables"
+msgstr "Tabelle"
+
+#: /default/toolboxes.kupu:None
+msgid "Create"
+msgstr "Crea"
+
+#: /default/toolboxes.kupu:None
+msgid "Insert image at the following URL:"
+msgstr "Inserisci immagine nel seguente URL:"
+
+#: /default/toolboxes.kupu:None
+msgid "Title:"
+msgstr "Titolo:"
+
+#: /default/toolboxes.kupu:None
+msgid "Description:"
+msgstr "Descrizione:"
+
+#: /default/toolboxes.kupu:None
+msgid "Image class:"
+msgstr "Classe dell'immagine"
+
+#: /default/toolboxes.kupu:None
+msgid "Add Column"
+msgstr "Aggiungi colonna"
+
+#: /default/toolboxes.kupu:None
+msgid "Fix Table"
+msgstr "Correggi tabella"
+
+#: /default/toolboxes.kupu:None
+msgid "Images"
+msgstr "Immagini"
+
+#: /default/toolboxes.kupu:None
+msgid "Insert Image"
+msgstr "Inserisci immagine"
+
+#: /default/toolboxes.kupu:None
+msgid "Inline"
+msgstr "Inline"
+
+#: /default/toolboxes.kupu:None
+msgid "Add Table"
+msgstr "Aggiungi tabella"
+
+#: /default/toolboxes.kupu:None
+msgid "Add Row"
+msgstr "Aggiungi riga"
+
+#: /default/toolboxes.kupu:None
+msgid "Properties"
+msgstr "Propriet?"
+
+#: /default/toolboxes.kupu:None
+msgid "Col Align:"
+msgstr "Allineamento colonna:"
+
+#: /default/toolboxes.kupu:None
+msgid "Center"
+msgstr "Centro"
+
+#: /default/toolboxes.kupu:None
+msgid "Debug Log"
+msgstr "Log di debug"
+
+#: /default/toolboxes.kupu:None
+msgid "Make Link"
+msgstr "Crea link"
+
+#: /default/toolboxes.kupu:None
+msgid "Cleanup expressions"
+msgstr "Espessioni di pulizia"
+
+#: /default/toolboxes.kupu:None
+msgid "Columns:"
+msgstr "Colonne:"
+
+#: /default/toolboxes.kupu:None
+msgid "Table Class:"
+msgstr "Classe della tabella"
+
+#: /default/toolboxes.kupu:None
+#: /default/toolboxes.kupu:None
+msgid "Right"
+msgstr "Destra"
+
+#: /default/toolboxes.kupu:None
+#: /default/toolboxes.kupu:None
+msgid "Left"
+msgstr "Sinistra"
+
+#: /silva/drawers.kupu:None
+msgid "Insert image"
+msgstr "Inserisci immagine"
+
+#: /silva/drawers.kupu:None
+msgid "Insert link"
+msgstr "Inserisci link"
+
+#: /silva/toolboxes.kupu:None
+msgid "typographical characters"
+msgstr "caratteri tipografici"
+
+#: /silva/toolboxes.kupu:None
+msgid "external source"
+msgstr "codice esterno"
+
+#: /silva/toolboxes.kupu:None
+msgid "abbreviations and acronyms"
+msgstr "Abbreviazioni e acronimi"
+
+#: /silva/toolboxes.kupu:None
+msgid "save"
+msgstr "salva"
+
+#: /silva/toolboxes.kupu:None
+msgid "index item"
+msgstr "item di indice"
+
+#: /silva/toolboxes.kupu:None
+msgid "properties"
+msgstr "propriet?"
+
+#: /silva/toolboxes.kupu:None
+msgid "non-standard characters"
+msgstr "caratteri non standard"
+
+#: /silva/toolboxes.kupu:None
+msgid "link"
+msgstr "link"
+
+#: /silva/toolboxes.kupu:None
+msgid "citation"
+msgstr "citazione"
+
+#: /silva/toolboxes.kupu:None
+msgid "cleanup"
+msgstr "pulizia"
+
+#: /silva/toolboxes.kupu:None
+msgid "table of contents"
+msgstr "tabella dei contenuti"
+
+#: /silva/xmlconfig.kupu:None
+msgid "Convert single quotes to curly ones"
+msgstr "Converti virgolette singole in curve"
+
+#: /silva/xmlconfig.kupu:None
+msgid "Reduce whitespace in source"
+msgstr "Riduci spazi nel sorgente"
+
+#: /silva/xmlconfig.kupu:None
+msgid "Convert double dashes to m-dashes"
+msgstr "Converti trattino doppio in tratto lungo"
+
+#: /silva/xmlconfig.kupu:None
+msgid "Convert single dashes to n-dashes"
+msgstr "Converti trattino singolo in un tratto breve"
+
+#: /silva/xmlconfig.kupu:None
+msgid "Convert double quotes to curly ones"
+msgstr "Converti virgolette doppie in curve"
+
+#: /widgeteer/browser.kupu:None
+msgid "link: alt-a"
+msgstr "link: alt-a"
+
+#: /widgeteer/browser.kupu:None
+msgid "image: alt-m"
+msgstr "immagine: alt-m"
+

Added: kupu/branch/kupu-1.3-silva-1.5/i18n/kupu-vi.po
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/i18n/kupu-vi.po	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,942 @@
+# Translation of kupu.pot to Vietnamese
+# Thanh Hai, Ha <thanhhai.ha at gmail.com>, 2005
+msgid ""
+msgstr ""
+"Project-Id-Version: Kupu 1.3.1\n"
+"POT-Creation-Date: 2005-08-17 20:34+0000\n"
+"PO-Revision-Date: 2005-12-07 14:19+0700\n"
+"Last-Translator: Thanh Hai, Ha <thanhhai.ha at gmail.com>\n"
+"Language-Team: Vietnamese i18n Team\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+"Language-Code: vi\n"
+"Language-Name: Vietnamese\n"
+"Preferred-Encodings: utf-8\n"
+"Domain: kupu\n"
+"X-Poedit-Language: Vietnamese\n"
+"X-Poedit-Country: VIET NAM\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#: /common/kupu.pox:None
+msgid "Properties modified"
+msgstr "Thu?c t?nh ?? ???c thay ??i"
+
+#: /common/kupu.pox:None
+msgid "Command ${command} executed with parameter ${param}"
+msgstr "L?nh ${command} ?? ???c th?c thi v?i tham s? ${param}"
+
+#: /common/kupu.pox:None
+msgid "Not inside a definition list element!"
+msgstr "Kh?ng ? b?n trong ?? m?c c?a danh s?ch x?c ??nh"
+
+#: /common/kupu.pox:None
+msgid "Add table"
+msgstr "Th?m b?ng"
+
+#: /common/kupu.pox:None
+msgid "Table added"
+msgstr "B?ng ?? ???c th?m"
+
+#: /common/kupu.pox:None
+msgid "Source edit tool initialized"
+msgstr "C?ng c? bi?n t?p m? ?? ???c kh?i t?o"
+
+#: /common/kupu.pox:None
+msgid "Delete row"
+msgstr "X?a d?ng"
+
+#: /common/kupu.pox:None
+msgid "Recursion detected when counting column position"
+msgstr "?? quy khi t?nh to?n v? tr? c?a c?t"
+
+#: /common/kupu.pox:None
+msgid "List style changed"
+msgstr "Ki?u danh s?ch ?? ???c thay ??i"
+
+#: /common/kupu.pox:None
+msgid "Create image"
+msgstr "T?o h?nh ?nh"
+
+#: /common/kupu.pox:None
+msgid "You have unsaved changes. Do you want to save before leaving the page?"
+msgstr "Thay ??i ch?a ???c l?u l?i. B?n c? mu?n l?u l?i c?c thay ??i tr??c khi chuy?n sang trang kh?c?"
+
+#: /common/kupu.pox:None
+msgid "Table row removed"
+msgstr "H?ng trong b?ng ?? ???c x?a."
+
+#: /common/kupu.pox:None
+msgid "Document saved"
+msgstr "T?i li?u ?? ???c l?u l?i"
+
+#: /common/kupu.pox:None
+msgid "Color chosen"
+msgstr "M?u ?? ???c ch?n"
+
+#: /common/kupu.pox:None
+msgid "Table row added"
+msgstr "H?ng trong b?ng ?? ???c th?m"
+
+#: /common/kupu.pox:None
+msgid "Error saving document"
+msgstr "L?i x?y ra khi l?u t?i li?u"
+
+#: /common/kupu.pox:None
+msgid "No destination URL available!"
+msgstr "Kh?ng c? URL ??ch!"
+
+#: /common/kupu.pox:None
+msgid "Link removed"
+msgstr "Li?n k?t ?? ???c g? b?"
+
+#: /common/kupu.pox:None
+msgid "No row to delete"
+msgstr "Kh?ng c? h?ng n?o ?? x?a."
+
+#: /common/kupu.pox:None
+msgid "Delete Table"
+msgstr "X?a b?ng"
+
+#: /common/kupu.pox:None
+msgid "Cleanup done, sending document to server"
+msgstr "?? d?n m? HTML xong, ?ang g?i t?i li?u ??n m?y ch?"
+
+#: /common/kupu.pox:None
+msgid "Image tool initialized"
+msgstr "C?ng c? H?nh ?nh ?? ???c kh?i t?o"
+
+#: /common/kupu.pox:None
+msgid "End offset out of range!"
+msgstr "End offset v??t qu? gi?i h?n!"
+
+#: /common/kupu.pox:None
+msgid "tdindex: ${tdindex}"
+msgstr "tdindex: ${tdindex}"
+
+#: /common/kupu.pox:None
+msgid "Create link"
+msgstr "T?o li?n k?t"
+
+#: /common/kupu.pox:None
+msgid "Starting HTML cleanup"
+msgstr "B?t ??u d?n m? HTML."
+
+#: /common/kupu.pox:None
+msgid "Link modified"
+msgstr "Li?n k?t ?? ???c thay ??i"
+
+#: /common/kupu.pox:None
+msgid "Request sent to server"
+msgstr "Y?u c?u ?? ???c g?i ??n m?y ch?"
+
+#: /common/kupu.pox:None
+msgid "Table tool initialized"
+msgstr "C?ng c? B?ng ?? ???c kh?i t?o"
+
+#: /common/kupu.pox:None
+msgid "There were no errors."
+msgstr "Kh?ng c? l?i n?o."
+
+#: /common/kupu.pox:None
+msgid "exception ${message} while registering an event handler for element ${element}, event ${event}, method ${method}"
+msgstr "l?i ${message} trong qu? tr?nh ??ng k? ${element} v?i b? qu?n l? s? ki?n, s? ki?n ${event}, ph??ng th?c ${method}"
+
+#: /common/kupu.pox:None
+msgid "Error loading translation (status ${status} ), falling back to english"
+msgstr "L?i khi t?i b?n d?ch (${status} ), s? d?ng b?n d?ch ti?ng Anh"
+
+#: /common/kupu.pox:None
+msgid "Start node offset detected in a node without children!"
+msgstr "Start node offset ???c t?m th?y trong m?t node kh?ng c? node con!"
+
+#: /common/kupu.pox:None
+msgid "Deprecation warning: KupuTool._selectSelectItem"
+msgstr "C?nh b?o Deprecation: KupuTool._selectSelectItem"
+
+#: /common/kupu.pox:None
+msgid "Couldn\\'t set design mode. Kupu will not work on this browser."
+msgstr "Kh?ng th? ??t ch? ?? design. Kupu s? kh?ng l?m vi?c ???c tr?n tr?nh duy?t n?y."
+
+#: /common/kupu.pox:None
+msgid "No element found in the config island!"
+msgstr "Kh?ng t?m th?y y?u t? c?n thi?t trong c?u h?nh"
+
+#: /common/kupu.pox:None
+msgid "Start offset out of range!"
+msgstr "Start offset v??t qu? gi?i h?n"
+
+#: /common/kupu.pox:None
+msgid "Pasting from JavaScript is disabled on your Mozilla due to security settings. For more information, read http://www.mozilla.org/editor/midasdemo/securityprefs.html"
+msgstr "Thao t?c d?n t? JavaScript ?? b? v? hi?u h?a ? tr?nh duy?t Mozilla v? c?c thi?t l?p li?n quan ??n b?o m?t. ?? bi?t th?m th?ng tin, h?y xem th?m t?i: http://www.mozilla.org/editor/midasdemo/securityprefs.html"
+
+#: /common/kupu.pox:None
+msgid "Property tool initialized"
+msgstr "C?ng c? Property ?? ???c kh?i t?o"
+
+#: /common/kupu.pox:None
+msgid "Colorchooser tool initialized"
+msgstr "C?ng c? B?ng m?u ?? ???c kh?i t?o"
+
+#: /common/kupu.pox:None
+msgid "No parentcolumn found!"
+msgstr "Kh?ng t?m th?y c?t ? c?p cao h?n"
+
+#: /common/kupu.pox:None
+msgid "Row repeated"
+msgstr "D?ng ?? ???c l?p l?i"
+
+#: /common/kupu.pox:None
+msgid "Table removed"
+msgstr "X?a b?ng"
+
+#: /common/kupu.pox:None
+msgid "Cut"
+msgstr "C?t"
+
+#: /common/kupu.pox:None
+msgid "Unsupported browser!"
+msgstr "Tr?nh duy?t kh?ng ???c h? tr?!"
+
+#: /common/kupu.pox:None
+msgid "Add row"
+msgstr "Th?m d?ng"
+
+#: /common/kupu.pox:None
+msgid "Link tool initialized"
+msgstr "C?ng c? Li?n k?t ?? ???c kh?i t?o"
+
+#: /common/kupu.pox:None
+msgid "Sending request to server"
+msgstr "?ang g?i y?u c?u ??n m?y ch?"
+
+#: /common/kupu.pox:None
+msgid "Invalid table size"
+msgstr "K?ch th??c c?a b?ng kh?ng ??ng"
+
+#: /common/kupu.pox:None
+msgid "Error placing back selection"
+msgstr "L?i khi ??t ch?n l?i"
+
+#: /common/kupu.pox:None
+msgid "Delete link"
+msgstr "X?a li?n k?t"
+
+#: /common/kupu.pox:None
+msgid "Add column"
+msgstr "Th?m c?t"
+
+#: /common/kupu.pox:None
+msgid "Cutting from JavaScript is disabled on your Mozilla due to security settings. For more information, read http://www.mozilla.org/editor/midasdemo/securityprefs.html"
+msgstr "Thao t?c c?t t? JavaScript ?? b? v? hi?u h?a ? tr?nh duy?t Mozilla v? c?c thi?t l?p li?n quan ??n b?o m?t. ?? bi?t th?m th?ng tin, h?y xem th?m t?i: http://www.mozilla.org/editor/midasdemo/securityprefs.html"
+
+#: /common/kupu.pox:None
+msgid "Exception while processing updateState on ${id}: ${msg}"
+msgstr "L?i trong qu? tr?nh th?c hi?n l?nh updateState cho ${id}: ${msg}"
+
+#: /common/kupu.pox:None
+msgid "Cleaning up HTML..."
+msgstr "?ang d?n m? HTML..."
+
+#: /common/kupu.pox:None
+msgid "List style tool initialized"
+msgstr "C?ng c? Danh s?ch ?? ???c kh?i t?o"
+
+#: /common/kupu.pox:None
+msgid "Row repeat turned off"
+msgstr "Ch?c n?ng l?p l?i d?ng ?? ???c t?t"
+
+#: /common/kupu.pox:None
+msgid "There was a problem initializing the drawers. Most likely the XSLT or XML files aren\\'t available. If this is not the Kupu demo version, check your files or the service that provide them (error: ${error})."
+msgstr "L?i khi kh?i t?o drawers. C? kh? n?ng t?p tin XSLT ho?c XML kh?ng t?n t?i. N?u ??y kh?ng ph?i l? phi?n b?n demo c?a Kupu, h?y ki?m tra l?i c?c t?p tin ho?c c?c d?ch v? c?a ch?ng (l?i: ${error})."
+
+#: /common/kupu.pox:None
+msgid "Deprecation warning: KupuToolBox._selectSelectItem"
+msgstr "C?nh b?o Deprecation: KupuToolBox._selectSelectItem"
+
+#: /common/kupu.pox:None
+msgid "Copying from JavaScript is disabled on your Mozilla due to security settings. For more information, read http://www.mozilla.org/editor/midasdemo/securityprefs.html"
+msgstr "Thao t?c sao ch?p t? JavaScript ?? b? v? hi?u h?a ? tr?nh duy?t Mozilla v? c?c thi?t l?p li?n quan ??n b?o m?t. ?? bi?t th?m th?ng tin, h?y xem th?m t?i: http://www.mozilla.org/editor/midasdemo/securityprefs.html"
+
+#: /common/kupu.pox:None
+msgid "Command ${command} executed"
+msgstr "L?nh ${command}  ?? ???c th?c hi?n"
+
+#: /common/kupu.pox:None
+msgid "Delete column"
+msgstr "X?a c?t"
+
+#: /common/kupu.pox:None
+msgid ""
+"Error saving your data.\\n"
+"Response status: ${status}.\\n"
+"Check your server log for more information."
+msgstr ""
+"L?i khi l?u t?i li?u.\\n"
+"Tr?ng th?i: ${status}.\\n"
+"H?y ki?m tra b?n ghi (log) tr?n m?y ch? ?? bi?t th?m th?ng tin."
+
+#: /common/kupu.pox:None
+msgid "This feature requires pop-ups to be enabled on your browser!"
+msgstr "Ch?c n?ng n?y y?u c?u tr?nh duy?t ph?i cho ph?p m? c?a s? pop-up"
+
+#: /common/kupu.pox:None
+msgid "Not inside link"
+msgstr "Kh?ng ? trong li?n k?t"
+
+#: /common/kupu.pox:None
+msgid "View source"
+msgstr "Xem m?"
+
+#: /common/kupu.pox:None
+msgid "Image inserted"
+msgstr "H?nh ?nh ?? ???c ch?n v?o"
+
+#: /common/kupu.pox:None
+msgid "Browser not supported!"
+msgstr "Tr?nh duy?t kh?ng ???c h? tr?"
+
+#: /common/kupu.pox:None
+msgid "Please wait while saving document..."
+msgstr "T?i li?u ?ang ???c l?u l?i. Vui l?ng ??i trong gi?y l?t..."
+
+#: /common/kupu.pox:None
+msgid "Editor initialized"
+msgstr "Tr?nh bi?n t?p ?? ???c kh?i t?o"
+
+#: /common/kupu.pox:None
+msgid "Copy"
+msgstr "Sao ch?p"
+
+#: /common/kupu.pox:None
+msgid "Paste"
+msgstr "D?n"
+
+#: /common/kupu.pox:None
+msgid "Zoom tool initialized"
+msgstr "C?ng c? Ph?ng ?? ???c kh?i t?o"
+
+#: /common/kupu.pox:None
+msgid "Table column deleted"
+msgstr "C?t ?? ???c x?a"
+
+#: /common/kupu.pox:None
+msgid "Offset out of document range"
+msgstr "Offset n?m ngo?i gi?i h?n c?a t?i li?u"
+
+#: /common/kupu.pox:None
+msgid "Table cleaned up"
+msgstr "B?ng d? ???c d?n m?"
+
+#: /common/kupu.pox:None
+msgid "Error loading data, status ${status}"
+msgstr "L?i khi t?i d? li?u, tr?ng th?i ${status}"
+
+#: /common/kupu.pox:None
+msgid "Could not set status bar message, check your browser\\'s security settings."
+msgstr "Kh?ng th? ??t th?ng ?i?p cho thanh tr?ng th?i, h?y ki?m tra c?c c?i ??t b?o m?t c?a tr?nh duy?t"
+
+#: /common/kupu.pox:None
+msgid "End node offset detected in a node without children!"
+msgstr "End node offset ???c t?m th?y trong m?t node kh?ng c? node con!"
+
+#: /common/kupu.pox:None
+msgid "Your form has not been saved. All changes you have made will be lost"
+msgstr "N?i dung bi?n t?p c?a b?n ch?a ???c l?u l?i. C?c thay ??i s? b? m?t"
+
+#: /common/kupu.pox:None
+msgid "Link added"
+msgstr "Li?n k?t ?? ???c th?m"
+
+#: /common/kupu.pox:None
+msgid "No head in document!"
+msgstr "V?n b?n kh?ng c? ph?n ??u ??"
+
+#: /common/kupu.pox:None
+msgid "Not inside a row!"
+msgstr "Kh?ng ? b?n trong d?ng"
+
+#: /common/kupu.pox:None
+msgid "Not inside a table!"
+msgstr "Kh?ng ? b?n trong b?ng"
+
+#: /common/kupu.pox:None
+msgid "Selection not inside the node!"
+msgstr "Ph?n ???c ch?n kh?ng ? b?n trong node"
+
+#: /common/kupu.pox:None
+msgid "Editor not initialized yet!"
+msgstr "Tr?nh bi?n t?p ch?a ???c kh?i t?o"
+
+#: /common/kupu.pox:None
+msgid "Table column added"
+msgstr "C?t ?? ???c th?m"
+
+# Default: "Caption"
+#: /common/kupudrawers/drawer.xsl:None
+msgid "imagedrawer_caption_label"
+msgstr "??u ??"
+
+# Default: "Insert Link"
+#: /common/kupudrawers/drawer.xsl:None
+msgid "linkdrawer_title"
+msgstr "Ch?n li?n k?t"
+
+# Default: "Left"
+#: /common/kupudrawers/drawer.xsl:None
+msgid "imagedrawer_left"
+msgstr "Tr?i"
+
+# Default: "(${width} by ${height})"
+#: /common/kupudrawers/drawer.xsl:None
+msgid "imagedrawer_size"
+msgstr "(${width} - ${height})"
+
+# Default: "Insert Image"
+#: /common/kupudrawers/drawer.xsl:None
+msgid "imagedrawer_title"
+msgstr "Ch?n h?nh ?nh"
+
+# Default: "Upload to: ${folder}"
+#: /common/kupudrawers/drawer.xsl:None
+msgid "imagedrawer_upload_to_label"
+msgstr "T?i v?o: ${folder}"
+
+# Default: "Name"
+#: /common/kupudrawers/drawer.xsl:None
+msgid "linkdrawer_name_label"
+msgstr "T?n"
+
+# Default: "Preview"
+#: /common/kupudrawers/drawer.xsl:None
+msgid "imagedrawer_upload_preview_label"
+msgstr "Xem tr??c"
+
+# Default: ""
+# "Select an image from your computer and click ok to have it\n"
+# "            automatically uploaded to selected folder and inserted into the\n"
+# "            editor."
+#: /common/kupudrawers/drawer.xsl:None
+msgid "imagedrawer_upload_instructions"
+msgstr "Ch?n h?nh ?nh t? m?y c?a b?n ?? n? ???c t? ??ng t?i l?n th? m?c ?? ch?n v? ch?n v?o tr?nh bi?n t?p."
+
+# Default: "Upload ..."
+#: /common/kupudrawers/drawer.xsl:None
+msgid "imagedrawer_upload_link"
+msgstr "T?i l?n..."
+
+# Default: "Title:"
+#: /common/kupudrawers/drawer.xsl:None
+msgid "imagedrawer_upload_title_label"
+msgstr "Ti?u ??:"
+
+# Default: "Title"
+#: /common/kupudrawers/drawer.xsl:None
+msgid "linkdrawer_title_label"
+msgstr "Ti?u ??"
+
+# Default: "Description"
+#: /common/kupudrawers/drawer.xsl:None
+msgid "linkdrawer_description_label"
+msgstr "M? t?"
+
+# Default: "ALT-text"
+#: /common/kupudrawers/drawer.xsl:None
+msgid "imagedrawer_upload_alt_text"
+msgstr "ALT-text"
+
+# Default: "search"
+#: /common/kupudrawers/drawer.xsl:None
+msgid "kupudrawer_search"
+msgstr "t?m ki?m"
+
+# Default: "Inline"
+#: /common/kupudrawers/drawer.xsl:None
+msgid "imagedrawer_inline"
+msgstr "B?n trong"
+
+# Default: "Target"
+#: /common/kupudrawers/drawer.xsl:None
+msgid "linkdrawer_target_label"
+msgstr "??ch"
+
+# Default: "Right"
+#: /common/kupudrawers/drawer.xsl:None
+msgid "imagedrawer_right"
+msgstr "Ph?i"
+
+#: /default/body.kupu:None
+msgid "Kupu Editor Test Page"
+msgstr "Kupu Editor Test Page"
+
+#: /default/colorchooser.kupu:None
+msgid "text color: alt-f"
+msgstr "m?u ch?: alt-f"
+
+#: /default/colorchooser.kupu:None
+msgid "background color: alt-h"
+msgstr "m?u n?n: alt-h"
+
+# Default: "Row"
+#: /default/drawers.kupu:None
+msgid "tabledrawer_row_label"
+msgstr "H?ng"
+
+# Default: "Right"
+#: /default/drawers.kupu:None
+msgid "tabledrawer_right_option"
+msgstr "Ph?i"
+
+# Default: "Current column alignment"
+#: /default/drawers.kupu:None
+msgid "tabledrawer_alignment_label"
+msgstr "Canh l? c?t"
+
+#: /default/drawers.kupu:None
+msgid "external link"
+msgstr "li?n k?t b?n ngo?i"
+
+# Default: "Center"
+#: /default/drawers.kupu:None
+msgid "tabledrawer_center_option"
+msgstr "Gi?a"
+
+# Default: "Fix All Tables"
+#: /default/drawers.kupu:None
+msgid "tabledrawer_fix_tables_button"
+msgstr "S?a T?t c? c?c b?ng"
+
+#: /default/drawers.kupu:None
+msgid "External Link"
+msgstr "Li?n k?t b?n ngo?i"
+
+# Default: "Columns"
+#: /default/drawers.kupu:None
+msgid "tabledrawer_columns_label"
+msgstr "C?t"
+
+# Default: "Left"
+#: /default/drawers.kupu:None
+msgid "tabledrawer_left_option"
+msgstr "Tr?i"
+
+#: /default/drawers.kupu:None
+msgid "image"
+msgstr "h?nh ?nh"
+
+#: /default/drawers.kupu:None
+msgid "table"
+msgstr "b?ng"
+
+#: /default/drawers.kupu:None
+msgid "Preview"
+msgstr "Xem tr??c"
+
+# Default: "Rows"
+#: /default/drawers.kupu:None
+msgid "tabledrawer_rows_label"
+msgstr "D?ng"
+
+#: /default/drawers.kupu:None
+msgid "internal link"
+msgstr "li?n k?t b?n trong"
+
+# Default: "Table"
+#: /default/drawers.kupu:None
+msgid "tabledrawer_title"
+msgstr "B?ng"
+
+# Default: "Add Table"
+#: /default/drawers.kupu:None
+msgid "tabledrawer_add_table_button"
+msgstr "Th?m b?ng"
+
+# Default: "Close"
+#: /default/drawers.kupu:None
+msgid "tabledrawer_close_button"
+msgstr "??ng"
+
+# Default: "Column"
+#: /default/drawers.kupu:None
+msgid "tabledrawer_column_label"
+msgstr "C?t"
+
+# Default: "Create Headings"
+#: /default/drawers.kupu:None
+msgid "tabledrawer_headings_label"
+msgstr "T?o ti?u ??"
+
+# Default: "Fix"
+#: /default/drawers.kupu:None
+msgid "tabledrawer_fix_button"
+msgstr "S?a"
+
+# Default: "Fix Table"
+#: /default/drawers.kupu:None
+msgid "tabledrawer_fix_table_label"
+msgstr "S?a B?ng"
+
+#: /default/drawers.kupu:None
+#: /common/kupudrawers/drawer.xsl:None
+msgid "Ok"
+msgstr "Ch?p nh?n"
+
+#: /default/drawers.kupu:None
+#: /common/kupudrawers/drawer.xsl:None
+msgid "Cancel"
+msgstr "H?y b?"
+
+# Default: "Add"
+#: /default/drawers.kupu:None
+msgid "tabledrawer_add_button"
+msgstr "Th?m"
+
+# Default: "Remove"
+#: /default/drawers.kupu:None
+msgid "tabledrawer_remove_button"
+msgstr "X?a"
+
+# Default: "Table Class"
+#: /default/drawers.kupu:None
+msgid "tabledrawer_class_label"
+msgstr "L?p c?a B?ng"
+
+#: /default/drawers.kupu:None
+#: /default/toolboxes.kupu:None
+msgid "Link the highlighted text to this URL:"
+msgstr "Li?n k?t ?o?n ch? ???c ??nh d?u v?o ??a ch? URL n?y"
+
+#: /default/save.kupu:None
+msgid "save: alt-s"
+msgstr "l?u: alt-s"
+
+#: /default/sourceedit.kupu:None
+msgid "edit HTML code"
+msgstr "bi?n t?p m? HTML"
+
+#: /default/spellchecker.kupu:None
+msgid "check spelling"
+msgstr "ki?m tra ch?nh t?"
+
+# Default: "1"
+#: /default/toolbar.kupu:None
+msgid "list-decimal"
+msgstr "1"
+
+# Default: "A"
+#: /default/toolbar.kupu:None
+msgid "list-upperalpha"
+msgstr "A"
+
+#: /default/toolbar.kupu:None
+msgid "bold: alt-b"
+msgstr "in ??m: alt-b"
+
+#: /default/toolbar.kupu:None
+msgid "superscript: alt-+"
+msgstr "ch? s? tr?n: alt-+"
+
+# Default: "&#9675;"
+#: /default/toolbar.kupu:None
+msgid "list-circle"
+msgstr "&#9675"
+
+#: /default/toolbar.kupu:None
+msgid "Formatted"
+msgstr "Formatted"
+
+# Default: "a"
+#: /default/toolbar.kupu:None
+msgid "list-loweralpha"
+msgstr "a"
+
+# Default: "no bullet"
+#: /default/toolbar.kupu:None
+msgid "list-nobullet"
+msgstr "kh?ng c? ch?m"
+
+# Default: "i"
+#: /default/toolbar.kupu:None
+msgid "list-lowerroman"
+msgstr "i"
+
+#: /default/toolbar.kupu:None
+msgid "Kupu SVN/unreleased"
+msgstr "Kupu SVN/unreleased"
+
+#: /default/toolbar.kupu:None
+msgid "Remove image"
+msgstr "X?a h?nh ?nh"
+
+#: /default/toolbar.kupu:None
+msgid "undo: alt-z"
+msgstr "kh?i ph?c: alt-z"
+
+# Default: "&#9679;"
+#: /default/toolbar.kupu:None
+msgid "list-disc"
+msgstr "&#9679;"
+
+#: /default/toolbar.kupu:None
+msgid "definition list: alt-="
+msgstr "danh s?ch x?c ??nh: alt-="
+
+#: /default/toolbar.kupu:None
+msgid "indent: alt->"
+msgstr "d?ch ph?i: alt->"
+
+#: /default/toolbar.kupu:None
+msgid "Remove link"
+msgstr "X?a li?n k?t"
+
+#: /default/toolbar.kupu:None
+msgid "Normal"
+msgstr "Normal"
+
+#: /default/toolbar.kupu:None
+msgid "Heading"
+msgstr "Heading"
+
+#: /default/toolbar.kupu:None
+msgid "Subheading"
+msgstr "Subheading"
+
+#: /default/toolbar.kupu:None
+msgid "left justify: alt-l"
+msgstr "canh tr?i: alt-l"
+
+#: /default/toolbar.kupu:None
+msgid "right justify: alt-r"
+msgstr "canh ph?i: alt-r"
+
+#: /default/toolbar.kupu:None
+msgid "outdent: alt-<"
+msgstr "d?ch tr?i: alt-<"
+
+# Default: "&#9632;"
+#: /default/toolbar.kupu:None
+msgid "list-square"
+msgstr "&#9632;"
+
+#: /default/toolbar.kupu:None
+msgid "underline: alt-u"
+msgstr "g?ch ch?n: alt-u"
+
+#: /default/toolbar.kupu:None
+msgid "redo: alt-y"
+msgstr "l?m l?i: alt-y"
+
+#: /default/toolbar.kupu:None
+msgid "subscript: alt--"
+msgstr "ch? s? d??i: alt--"
+
+#: /default/toolbar.kupu:None
+msgid "center justify: alt-c"
+msgstr "canh gi?a: alt-c"
+
+#: /default/toolbar.kupu:None
+msgid "unordered list: alt-*"
+msgstr "danh s?ch kh?ng th? t?: alt-*"
+
+#: /default/toolbar.kupu:None
+msgid "Heading 3"
+msgstr "Heading 3"
+
+#: /default/toolbar.kupu:None
+msgid "Heading 2"
+msgstr "Heading 2"
+
+#: /default/toolbar.kupu:None
+msgid "Heading 1"
+msgstr "Heading 1"
+
+#: /default/toolbar.kupu:None
+msgid "Heading 6"
+msgstr "Heading 6"
+
+#: /default/toolbar.kupu:None
+msgid "Heading 5"
+msgstr "Heading 5"
+
+#: /default/toolbar.kupu:None
+msgid "Heading 4"
+msgstr "Heading 5"
+
+#: /default/toolbar.kupu:None
+msgid "numbered list: alt-#"
+msgstr "danh s?ch th? t?: alt-#"
+
+#: /default/toolbar.kupu:None
+msgid "italic: alt-i"
+msgstr "in nghi?ng: alt-i"
+
+# Default: "I"
+#: /default/toolbar.kupu:None
+msgid "list-upperroman"
+msgstr "I"
+
+#: /default/toolbar.kupu
+msgid "zoom: alt-x"
+msgstr "ph?ng to / thu nh?: alt-x"
+
+#: /default/toolboxes.kupu:None
+msgid "Headings:"
+msgstr "Ti?u ??:"
+
+#: /default/toolboxes.kupu:None
+msgid "Fix"
+msgstr "S?a"
+
+#: /default/toolboxes.kupu:None
+msgid "Remove Column"
+msgstr "X?a c?t"
+
+#: /default/toolboxes.kupu:None
+msgid "Inline"
+msgstr "B?n trong"
+
+#: /default/toolboxes.kupu:None
+msgid "Select a cleanup action:"
+msgstr "Ch?n thao t?c d?n m?"
+
+#: /default/toolboxes.kupu:None
+msgid "Links"
+msgstr "Li?n k?t"
+
+#: /default/toolboxes.kupu:None
+msgid "Rows:"
+msgstr "D?ng:"
+
+#: /default/toolboxes.kupu:None
+msgid "Remove Row"
+msgstr "X?a d?ng"
+
+#: /default/toolboxes.kupu:None
+msgid "Tables"
+msgstr "B?ng"
+
+#: /default/toolboxes.kupu:None
+msgid "Create"
+msgstr "T?o"
+
+#: /default/toolboxes.kupu:None
+msgid "Insert image at the following URL:"
+msgstr "Ch?n h?nh ?nh t?i ??a ch? URL:"
+
+#: /default/toolboxes.kupu:None
+msgid "Title:"
+msgstr "Ti?u ??:"
+
+#: /default/toolboxes.kupu:None
+msgid "Description:"
+msgstr "M? t?:"
+
+#: /default/toolboxes.kupu:None
+msgid "Image class:"
+msgstr "L?p c?a H?nh ?nh"
+
+#: /default/toolboxes.kupu:None
+msgid "Add Column"
+msgstr "Th?m c?t"
+
+#: /default/toolboxes.kupu:None
+msgid "Fix Table"
+msgstr "S?a B?ng"
+
+#: /default/toolboxes.kupu:None
+msgid "Images"
+msgstr "H?nh ?nh"
+
+#: /default/toolboxes.kupu:None
+msgid "Insert Image"
+msgstr "Ch?n h?nh ?nh"
+
+#: /default/toolboxes.kupu:None
+msgid "Add Table"
+msgstr "Th?m b?ng"
+
+#: /default/toolboxes.kupu:None
+msgid "Add Row"
+msgstr "Th?m d?ng"
+
+#: /default/toolboxes.kupu:None
+msgid "Properties"
+msgstr "C?c thu?c t?nh"
+
+#: /default/toolboxes.kupu:None
+msgid "Col Align:"
+msgstr "Canh l? c?t:"
+
+#: /default/toolboxes.kupu:None
+msgid "Center"
+msgstr "Canh gi?a"
+
+#: /default/toolboxes.kupu:None
+msgid "Debug Log"
+msgstr "B?n ghi G? l?i"
+
+#: /default/toolboxes.kupu:None
+msgid "Make Link"
+msgstr "T?o li?n k?t"
+
+#: /default/toolboxes.kupu:None
+msgid "Cleanup expressions"
+msgstr "Bi?u th?c d?n m?"
+
+#: /default/toolboxes.kupu:None
+msgid "Columns:"
+msgstr "C?t:"
+
+#: /default/toolboxes.kupu:None
+msgid "Table Class:"
+msgstr "L?p c?a B?ng"
+
+#: /default/toolboxes.kupu:None
+msgid "Right"
+msgstr "Ph?i"
+
+#: /default/toolboxes.kupu:None
+msgid "Left"
+msgstr "Tr?i"
+
+#: /plone/body.kupu
+msgid "force-kupu"
+msgstr "force-kupu"
+
+#: /plone/body.kupu
+msgid "suppress-kupu"
+msgstr "suppress-kupu"
+
+#: Libraries
+msgid "Home"
+msgstr "Trang ch?"
+
+msgid "Current folder"
+msgstr "Th? m?c hi?n t?i"
+
+msgid "My recent items"
+msgstr "C?c m?c g?n ??y c?a t?i"
+
+msgid "Recent items"
+msgstr "C?c m?c g?n ??y"
+
+#: Default Table classes
+msgid "plain"
+msgstr "plain"
+
+msgid "listing"
+msgstr "listing"
+
+msgid "vertical listing"
+msgstr "vertical listing"
+
+msgid "unsorted listing"
+msgstr "unsorted listing"
+
+msgid "grid"
+msgstr "grid"
+
+msgid "data"
+msgstr "data"
+

Added: kupu/branch/kupu-1.3-silva-1.5/i18n/kupuconfig-it.po
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/i18n/kupuconfig-it.po	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,482 @@
+
+msgid ""
+msgstr ""
+
+"Project-Id-Version: kupu\n"
+"POT-Creation-Date: Mon Oct 31 17:09:34 2005\n"
+"PO-Revision-Date: 2006-01-26 15:41+0100\n"
+"Last-Translator: Fabrizio Reale <fabrizio.reale at redomino.com>\n"
+"Language-Team: Redomino team <info at redomino.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language-code: it\n"
+"Language-name: Italian\n"
+"Preferred-encodings: utf-8 latin1\n"
+"Domain: kupuconfig\n"
+"X-Is-Fallback-For: it-ch\n"
+
+
+
+
+
+#: c:\zopep21\Products\kupu\plone\libraries.pt
+#. <input class="context" i18n:attributes="value" type="submit" value="Add"/>
+#: c:\zopep21\Products\kupu\plone\resource_types.pt
+#. <input class="context" i18n:attributes="value" name="zmi_add_resource_type:method" type="submit" value="Add"/>
+msgid "Add"
+msgstr "Aggiungi"
+
+
+#: c:\zopep21\Products\kupu\plone\libraries.pt
+#. <input class="context" i18n:attributes="value" name="zmi_delete_libraries:method" type="submit" value="Delete"/>
+#: c:\zopep21\Products\kupu\plone\resource_types.pt
+#. <input class="context" i18n:attributes="value" name="zmi_delete_resource_types:method" type="submit" value="Delete"/>
+msgid "Delete"
+msgstr "Cancella"
+
+
+#: c:\zopep21\Products\kupu\plone\libraries.pt
+#. <input class="context" i18n:attributes="value" name="zmi_move_down:method" type="submit" value="Move Down"/>
+msgid "Move Down"
+msgstr "Sposta verso il basso"
+
+
+#: c:\zopep21\Products\kupu\plone\libraries.pt
+#. <input class="context" i18n:attributes="value" name="zmi_move_up:method" type="submit" value="Move Up"/>
+msgid "Move Up"
+msgstr "Sposta verso l'alto"
+
+
+#: c:\zopep21\Products\kupu\plone\kupu_config.pt
+#. <input class="context" i18n:attributes="value" name="configure_kupu:method" tabindex="" tal:attributes="tabindex tabindex|nothing;" type="submit" value="Save"/>
+#: c:\zopep21\Products\kupu\plone\libraries.pt
+#. <input class="context" i18n:attributes="value" name="zmi_update_libraries:method" type="submit" value="Save"/>
+#: c:\zopep21\Products\kupu\plone\resource_types.pt
+#. <input class="context" i18n:attributes="value" name="zmi_update_resource_types:method" type="submit" value="Save"/>
+msgid "Save"
+msgstr "Salva"
+
+
+#: c:\zopep21\Products\kupu\plone\libraries.pt
+#. <input class="context" i18n:attributes="value" type="submit" value="Set"/>
+msgid "Set"
+msgstr "Imposta"
+
+
+#: c:\zopep21\Products\kupu\plone\kupu_config.pt
+#. <em i18n:translate="any_tag" tal:condition="not:tags">
+#.  Any tag
+#. </em>
+msgid "any_tag"
+msgstr "Qualsiasi tag"
+
+
+#: c:\zopep21\Products\kupu\plone\libraries.pt
+#. <td i18n:translate="authenticated_member">
+#.  Authenticated member
+#. </td>
+msgid "authenticated_member"
+msgstr "Membro autenticato"
+
+
+#: c:\zopep21\Products\kupu\plone\libraries.pt
+#. <p i18n:translate="available_tales">
+#.  The following variables are available in the TALES expressions:
+#. </p>
+msgid "available_tales"
+msgstr "Le seguenti variabili sono disponibili nelle espressioni TALES:"
+
+
+#: c:\zopep21\Products\kupu\plone\libraries.pt
+#. <td i18n:translate="context_folder">
+#.  The folder the context object is located in
+#. </td>
+msgid "context_folder"
+msgstr "Cartella in cui si trova l'oggetto contesto"
+
+
+#: c:\zopep21\Products\kupu\plone\libraries.pt
+#. <td i18n:translate="context_folder_uri">
+#.  The URL of the folder the context object is located in
+#. </td>
+msgid "context_folder_uri"
+msgstr "L'URL della cartella in cui si trova l'oggetto contesto"
+
+
+#: c:\zopep21\Products\kupu\plone\libraries.pt
+#. <td i18n:translate="current_context">
+#.  The current context object
+#. </td>
+msgid "current_context"
+msgstr "L'attuale oggetto contesto"
+
+
+#: c:\zopep21\Products\kupu\plone\libraries.pt
+#. <td i18n:translate="current_context_url">
+#.  The URL of the current context object
+#. </td>
+msgid "current_context_url"
+msgstr "L'URL dell'attuale oggetto contesto"
+
+
+#: c:\zopep21\Products\kupu\plone\libraries.pt
+#. <th i18n:translate="default">
+#.  Default
+#. </th>
+msgid "default"
+msgstr "Default"
+
+
+#: c:\zopep21\Products\kupu\plone\kupu_config.pt
+#. <h3 i18n:translate="heading_configuration">
+#.  Kupu Configuration
+#. </h3>
+msgid "heading_configuration"
+msgstr "Configurazione di Kupu"
+
+
+#: c:\zopep21\Products\kupu\plone\libraries.pt
+#. <h3 i18n:translate="heading_kupu_configuration">
+#.  Kupu Configuration
+#. </h3>
+## 1 more: c:\zopep21\Products\kupu\plone\resource_types.pt
+msgid "heading_kupu_configuration"
+msgstr "Configurazione di Kupu"
+
+
+#: c:\zopep21\Products\kupu\plone\kupu_config.pt
+#. <div class="formHelp" i18n:translate="help_class_blacklist">
+#.  Enter a list of classnames to be excluded (one per line)
+#. </div>
+msgid "help_class_blacklist"
+msgstr "Inserisci una lista di nomi di classi da escludere (una per linea)"
+
+
+#: c:\zopep21\Products\kupu\plone\kupu_config.pt
+#. <div class="formHelp" i18n:translate="help_link_uid">
+#.  Links to objects on this site created by Kupu can use unique
+#. object ids so that the links remain valid even if the target object is
+#. renamed or moved elsewhere on the site.
+#. </div>
+msgid "help_link_uid"
+msgstr "Dei link a oggetti nel sito creati da Kupu possono usare id univoci di modo che i link rimangano validi anche se l'oggetto target ? rinominato o spostato in un'altra parte del sito."
+
+
+#: c:\zopep21\Products\kupu\plone\kupu_config.pt
+#. <div class="formHelp" i18n:translate="help_navigate_away">
+#.  Kupu can install a handler to warn before navigating
+#. away from a page where a form (even the non-Kupu fields) has been edited.
+#. Turn this off to prevent Kupu loading its own handler.
+#. </div>
+msgid "help_navigate_away"
+msgstr "Kupu pu? installare un meccanismo che, prima di chiudere una pagina, avverta che un form (anche con campi esterni all'editor) ? stato modificato ma non salvato. Disabilitalo per evitare che Kupu carichi il proprio meccanismo."
+
+
+#: c:\zopep21\Products\kupu\plone\kupu_config.pt
+#. <div class="formHelp" i18n:translate="help_paragraph_styles">
+#.  Enter a list of paragraph styles to appear in the style pulldown. Format is title|tag or title|tag|className, one per line.
+#. </div>
+msgid "help_paragraph_styles"
+msgstr "Inserisci una lista di stili per i paragrafi che appariranno nella lista a tendina. Il formato ? titolo|tag o titolo|tag|nome della classe, una per linea."
+
+
+#: c:\zopep21\Products\kupu\plone\kupu_config.pt
+#. <div class="formHelp" i18n:translate="help_remove_entities">
+#.  Enter HTML tags and attributes to be removed when saving documents. (Uncheck to remove entries)
+#. </div>
+msgid "help_remove_entities"
+msgstr "Inserisci tag e attributi HTML da eliminare nel salvataggio dei documenti. (Deselezionare per eliminare le entry)"
+
+
+#: c:\zopep21\Products\kupu\plone\kupu_config.pt
+#. <div class="formHelp" i18n:translate="help_style_whitelist">
+#.  Enter a list of style elements to be permitted (one per line)
+#. </div>
+msgid "help_style_whitelist"
+msgstr "Inserisci una lista di elementi di stile consentiti (uno per linea)"
+
+
+#: c:\zopep21\Products\kupu\plone\kupu_config.pt
+#. <div class="formHelp" i18n:translate="help_table_classes">
+#.  Enter a list of class names to be made available in the table drawer
+#. </div>
+msgid "help_table_classes"
+msgstr "Inserisci una lista di nomi di classi da rendere disponibili nella scheda della tabella"
+
+
+#: c:\zopep21\Products\kupu\plone\libraries.pt
+#. <th i18n:translate="icon_uri">
+#.  Icon URI
+#. </th>
+msgid "icon_uri"
+msgstr "Icona URI"
+
+
+#: c:\zopep21\Products\kupu\plone\kupu_config.pt
+#. <th i18n:translate="label_attributes">
+#.  Attributes
+#. </th>
+msgid "label_attributes"
+msgstr "Attributi"
+
+
+#: c:\zopep21\Products\kupu\plone\kupu_config.pt
+#. <th colspan="2" i18n:translate="label_class_blacklist">
+#.  Class Blacklist
+#. </th>
+msgid "label_class_blacklist"
+msgstr "Lista delle classi da escludere"
+
+
+#: c:\zopep21\Products\kupu\plone\libraries.pt
+#. <th i18n:translate="label_icon_uri">
+#.  Icon URI
+#. </th>
+msgid "label_icon_uri"
+msgstr "Icona URI"
+
+
+#: c:\zopep21\Products\kupu\plone\kupu_config.pt
+#. <label for="kupu_installBeforeUnload" i18n:translate="label_install_kupu">
+#.  Install Kupu code to detect form changes
+#. </label>
+msgid "label_install_kupu"
+msgstr "Installa il codice di Kupu per rilevare le modifiche al form"
+
+
+#: c:\zopep21\Products\kupu\plone\kupu_config.pt
+#. <label for="kupu_linkbyuid" i18n:translate="label_link_uid">
+#.  Link using UIDs
+#. </label>
+msgid "label_link_uid"
+msgstr "Link usando gli UID"
+
+
+#: c:\zopep21\Products\kupu\plone\libraries.pt
+#. <h4 i18n:translate="label_manage_libraries">
+#.  Manage libraries
+#. </h4>
+msgid "label_manage_libraries"
+msgstr "Gestione librerie"
+
+
+#: c:\zopep21\Products\kupu\plone\kupu_config.pt
+#. <label for="parastyles" i18n:translate="label_paragraph_styles">
+#.  Paragraph Styles
+#. </label>
+msgid "label_paragraph_styles"
+msgstr "Stili dei paragrafi"
+
+
+#: c:\zopep21\Products\kupu\plone\libraries.pt
+#. <th i18n:translate="label_source_uri">
+#.  Source URI
+#. </th>
+msgid "label_source_uri"
+msgstr "Sorgente URI"
+
+
+#: c:\zopep21\Products\kupu\plone\kupu_config.pt
+#. <th colspan="2" i18n:translate="label_style_whitelist">
+#.  Style Whitelist
+#. </th>
+msgid "label_style_whitelist"
+msgstr "Lista degli stili ammessi"
+
+
+#: c:\zopep21\Products\kupu\plone\kupu_config.pt
+#. <label for="table_classnames" i18n:translate="label_tables">
+#.  Tables
+#. </label>
+msgid "label_tables"
+msgstr "Tabelle"
+
+
+#: c:\zopep21\Products\kupu\plone\kupu_config.pt
+#. <th i18n:translate="label_tags">
+#.  Tags
+#. </th>
+msgid "label_tags"
+msgstr "Tags"
+
+
+#: c:\zopep21\Products\kupu\plone\libraries.pt
+#. <th i18n:translate="label_title">
+#.  Title
+#. </th>
+msgid "label_title"
+msgstr "Titolo"
+
+
+#: c:\zopep21\Products\kupu\plone\resource_types.pt
+#. <legend i18n:translate="legend_add_resource_type">
+#.  Add new resource type
+#. </legend>
+msgid "legend_add_resource_type"
+msgstr "Aggiungi nuovo tipo di risorsa"
+
+
+#: c:\zopep21\Products\kupu\plone\kupu_config.pt
+#. <legend i18n:translate="legend_html_filter">
+#.  HTML Filter
+#. </legend>
+msgid "legend_html_filter"
+msgstr "Filtro HTML"
+
+
+#: c:\zopep21\Products\kupu\plone\kupu_config.pt
+#. <legend i18n:translate="legend_link_options">
+#.  Link options
+#. </legend>
+msgid "legend_link_options"
+msgstr "Opzioni dei link"
+
+
+#: c:\zopep21\Products\kupu\plone\resource_types.pt
+#. <legend i18n:translate="legend_map_resource_types">
+#.  Map resource types
+#. </legend>
+msgid "legend_map_resource_types"
+msgstr "Associare tipi di risorsa"
+
+
+#: c:\zopep21\Products\kupu\plone\kupu_config.pt
+#. <legend i18n:translate="legend_styles">
+#.  Styles
+#. </legend>
+msgid "legend_styles"
+msgstr "Stili"
+
+
+#: c:\zopep21\Products\kupu\plone\kupu_config.pt
+#. <legend i18n:translate="legend_warning">
+#.  Warn before losing changes
+#. </legend>
+msgid "legend_warning"
+msgstr "Avviso prima di perdere le modifiche"
+
+
+#: c:\zopep21\Products\kupu\plone\libraries.pt
+#. <td i18n:translate="portal_object">
+#.  The portal object
+#. </td>
+msgid "portal_object"
+msgstr "Oggetto del portale"
+
+
+#: c:\zopep21\Products\kupu\plone\libraries.pt
+#. <td i18n:translate="portal_object_url">
+#.  URL of the portal
+#. </td>
+msgid "portal_object_url"
+msgstr "URL del portale"
+
+
+#: c:\zopep21\Products\kupu\plone\resource_types.pt
+#. <th i18n:translate="portal_types">
+#.  Portal types
+#. </th>
+## 1 more: c:\zopep21\Products\kupu\plone\resource_types.pt
+msgid "portal_types"
+msgstr "Tipi del portale"
+
+
+#: c:\zopep21\Products\kupu\plone\libraries.pt
+#. <td i18n:translate="request">
+#.  Request
+#. </td>
+msgid "request"
+msgstr "Richiesta"
+
+
+#: c:\zopep21\Products\kupu\plone\resource_types.pt
+#. <th i18n:translate="resource_type">
+#.  Resource type
+#. </th>
+## 1 more: c:\zopep21\Products\kupu\plone\resource_types.pt
+msgid "resource_type"
+msgstr "Tipo di risorsa"
+
+
+#: c:\zopep21\Products\kupu\plone\libraries.pt
+#. <th i18n:translate="source_uri">
+#.  Source URI
+#. </th>
+msgid "source_uri"
+msgstr "URI sorgente"
+
+
+#: c:\zopep21\Products\kupu\plone\libraries.pt
+#. <p i18n:translate="text_kupu_drawers">
+#.  In the below form, you may manage the list of drawer libraries for
+#. the kupu editor. Each property of a library is dynamically expanded at
+#. execution time using TALES expressions. That way it is possible, to
+#. support libraries like
+#.  <em>
+#.   Current folder
+#.  </em>
+#.   or
+#.  <em>
+#.   My folder
+#.  </em>
+#. very easily.
+#. </p>
+msgid "text_kupu_drawers"
+msgstr "Nel form sottostante, puoi gestire la lista delle librerie delle schede di Kupu. Ogni propriet? di una libreria ? calcolata in modo dinamico durante l'esecuzione, usando delle espressioni TALES. In questo modo ? possibile supportare facilmente librerie come <em>Cartella attuale</em> o <em>Mia cartella</em>."
+
+
+#: c:\zopep21\Products\kupu\plone\resource_types.pt
+#. <p i18n:translate="text_resource_types">
+#.  While libraries provide abstract locations for objects of any type,
+#. Kupu distinguishes objects by resource type. For example, a user might
+#. request a library showing objects to link to or a library showing
+#. objects to be inserted into a document. The abstract location
+#. (library) might be the same, but the former library would contain
+#. documents, the latter images.
+#. </p>
+msgid "text_resource_types"
+msgstr "Mentre le librerie permettono di proporre delle posizioni per oggetti di ogni tipo, Kupu distingue gli oggetti in base al tipo di risorsa. Ad esempio, un utente potrebbe richiedere una libreria mostrando gli oggetti da linkare o una libreria di oggetti da inserire in un documento. La posizione astratta (libreria) potrebbe essere la stessa, ma la prima libreria conterrebbe documenti, mentre la seconda immagini."
+
+
+#: c:\zopep21\Products\kupu\plone\resource_types.pt
+#. <p i18n:translate="text_resource_types2">
+#.  This management screen allows you to define resource types using a
+#. list of portal types. A special resource type,
+#.  <code>
+#.   collection
+#.  </code>
+#.  ,
+#. identifies portal types that are to be treated as collections.
+#. </p>
+msgid "text_resource_types2"
+msgstr "Questa schermata di configurazione permette di definire dei tipi di risorsa usando una lista di tipi del portale. Un tipo speciale di risorsa, <code>raccolta</code> identifica dei tipi del portale che devono essere trattati come delle raccolte."
+
+
+#: c:\zopep21\Products\kupu\plone\libraries.pt
+#. <th i18n:translate="uri">
+#.  URI
+#. </th>
+msgid "uri"
+msgstr "URI"
+
+
+#: c:\zopep21\Products\kupu\plone\kupu_config.pt
+#. <em i18n:translate="whole_tag_removed" tal:condition="not:attributes">
+#.  Whole tag removed
+#. </em>
+msgid "whole_tag_removed"
+msgstr "Eliminato intero tag"
+
+msgid "Config"
+msgstr "Configurazione"
+
+msgid "Libraries"
+msgstr "Librerie"
+
+msgid "Resource Types"
+msgstr "Tipi di risorsa"
+
+msgid "Documentation"
+msgstr "Documentazione"
+

Added: kupu/branch/kupu-1.3-silva-1.5/i18n/kupuconfig-vi.po
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/i18n/kupuconfig-vi.po	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,429 @@
+# Translation of kupuconfig.pot to Vietnamese
+# Thanh Hai, Ha <thanhhai.ha at gmail.com>, 2005
+msgid ""
+msgstr ""
+"Project-Id-Version: Kupu 1.3.1\n"
+"POT-Creation-Date: 2005-08-17 20:34+0000\n"
+"PO-Revision-Date: 2005-11-07 15:17+0700\n"
+"Last-Translator: Thanh Hai, Ha <thanhhai.ha at gmail.com>\n"
+"Language-Team: Vietnamese i18n Team\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+"Language-Code: vi\n"
+"Language-Name: Vietnamese\n"
+"Preferred-Encodings: utf-8\n"
+"Domain: kupuconfig\n"
+"X-Poedit-Language: Vietnamese\n"
+"X-Poedit-Country: VIET NAM\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#. <input class="context" i18n:attributes="value" type="submit" value="Add"/>
+#. <input class="context" i18n:attributes="value" name="zmi_add_resource_type:method" type="submit" value="Add"/>
+#: c:\zopep21\Products\kupu\plone\libraries.pt
+#: c:\zopep21\Products\kupu\plone\resource_types.pt
+msgid "Add"
+msgstr "Th?m"
+
+#. <input class="context" i18n:attributes="value" name="zmi_delete_libraries:method" type="submit" value="Delete"/>
+#. <input class="context" i18n:attributes="value" name="zmi_delete_resource_types:method" type="submit" value="Delete"/>
+#: c:\zopep21\Products\kupu\plone\libraries.pt
+#: c:\zopep21\Products\kupu\plone\resource_types.pt
+msgid "Delete"
+msgstr "X?a"
+
+#. <input class="context" i18n:attributes="value" name="zmi_move_down:method" type="submit" value="Move Down"/>
+#: c:\zopep21\Products\kupu\plone\libraries.pt
+msgid "Move Down"
+msgstr "Chuy?n xu?ng"
+
+#. <input class="context" i18n:attributes="value" name="zmi_move_up:method" type="submit" value="Move Up"/>
+#: c:\zopep21\Products\kupu\plone\libraries.pt
+msgid "Move Up"
+msgstr "Chuy?n l?n"
+
+#. <input class="context" i18n:attributes="value" name="configure_kupu:method" tabindex="" tal:attributes="tabindex tabindex|nothing;" type="submit" value="Save"/>
+#. <input class="context" i18n:attributes="value" name="zmi_update_libraries:method" type="submit" value="Save"/>
+#. <input class="context" i18n:attributes="value" name="zmi_update_resource_types:method" type="submit" value="Save"/>
+#: c:\zopep21\Products\kupu\plone\kupu_config.pt
+#: c:\zopep21\Products\kupu\plone\libraries.pt
+#: c:\zopep21\Products\kupu\plone\resource_types.pt
+msgid "Save"
+msgstr "L?u"
+
+#. <input class="context" i18n:attributes="value" type="submit" value="Set"/>
+#: c:\zopep21\Products\kupu\plone\libraries.pt
+msgid "Set"
+msgstr "Thi?t l?p"
+
+#. <em i18n:translate="any_tag" tal:condition="not:tags">
+#.  Any tag
+#. </em>
+#: c:\zopep21\Products\kupu\plone\kupu_config.pt
+msgid "any_tag"
+msgstr "B?t k? th? n?o"
+
+#. <td i18n:translate="authenticated_member">
+#.  Authenticated member
+#. </td>
+#: c:\zopep21\Products\kupu\plone\libraries.pt
+msgid "authenticated_member"
+msgstr "Th?nh vi?n ?? ???c x?c th?c"
+
+#. <p i18n:translate="available_tales">
+#.  The following variables are available in the TALES expressions:
+#. </p>
+#: c:\zopep21\Products\kupu\plone\libraries.pt
+msgid "available_tales"
+msgstr "C?c bi?n sau ???c ph?p d?ng trong bi?u th?c TALES:"
+
+#. <td i18n:translate="context_folder">
+#.  The folder the context object is located in
+#. </td>
+#: c:\zopep21\Products\kupu\plone\libraries.pt
+msgid "context_folder"
+msgstr "Th? m?c ch?a ??i t??ng ???c ?? c?p"
+
+#. <td i18n:translate="context_folder_uri">
+#.  The URL of the folder the context object is located in
+#. </td>
+#: c:\zopep21\Products\kupu\plone\libraries.pt
+msgid "context_folder_uri"
+msgstr "??a ch? URL c?a th? m?c ch?a ??i t??ng ???c ?? c?p"
+
+#. <td i18n:translate="current_context">
+#.  The current context object
+#. </td>
+#: c:\zopep21\Products\kupu\plone\libraries.pt
+msgid "current_context"
+msgstr "??i t??ng ?? c?p hi?n t?i"
+
+#. <td i18n:translate="current_context_url">
+#.  The URL of the current context object
+#. </td>
+#: c:\zopep21\Products\kupu\plone\libraries.pt
+msgid "current_context_url"
+msgstr "??a ch? URL c?a ??ii t??ng ?? c?p hi?n t?i"
+
+#. <th i18n:translate="default">
+#.  Default
+#. </th>
+#: c:\zopep21\Products\kupu\plone\libraries.pt
+msgid "default"
+msgstr "M?c ??nh"
+
+#. <h3 i18n:translate="heading_configuration">
+#.  Kupu Configuration
+#. </h3>
+#: c:\zopep21\Products\kupu\plone\kupu_config.pt
+msgid "heading_configuration"
+msgstr "C?u h?nh Kupu"
+
+## 1 more: c:\zopep21\Products\kupu\plone\resource_types.pt
+#. <h3 i18n:translate="heading_kupu_configuration">
+#.  Kupu Configuration
+#. </h3>
+#: c:\zopep21\Products\kupu\plone\libraries.pt
+msgid "heading_kupu_configuration"
+msgstr "C?u h?nh Kupu"
+
+#. <div class="formHelp" i18n:translate="help_class_blacklist">
+#.  Enter a list of classnames to be excluded (one per line)
+#. </div>
+#: c:\zopep21\Products\kupu\plone\kupu_config.pt
+msgid "help_class_blacklist"
+msgstr "Nh?p danh s?ch c?c t?n l?p ???c ngo?i tr? (m?i l?p tr?n m?t d?ng)"
+
+#. <div class="formHelp" i18n:translate="help_link_uid">
+#.  Links to objects on this site created by Kupu can use unique
+#. object ids so that the links remain valid even if the target object is
+#. renamed or moved elsewhere on the site.
+#. </div>
+#: c:\zopep21\Products\kupu\plone\kupu_config.pt
+msgid "help_link_uid"
+msgstr "Li?n k?t ??n c?c ??i t??ng trong h? th?ng ???c t?o b?i Kupu c? th? d?ng ch? m?c (id) ??c nh?t v? v?y li?n k?t lu?n ??ng cho d? ??i t??ng ??ch b? ??i t?n ho?c di chuy?n ??n v? tr? kh?c tr?n h? th?ng."
+
+#. <div class="formHelp" i18n:translate="help_navigate_away">
+#.  Kupu can install a handler to warn before navigating
+#. away from a page where a form (even the non-Kupu fields) has been edited.
+#. Turn this off to prevent Kupu loading its own handler.
+#. </div>
+#: c:\zopep21\Products\kupu\plone\kupu_config.pt
+msgid "help_navigate_away"
+msgstr "Kupu c? th? c?i ??t b? ?i?u khi?n ?? c?nh b?o tr??c khi chuy?n sang m?t trang kh?c khi bi?n t?p n?i dung. B?n c? th? t?t ch?c n?ng n?y ?? Kupu kh?ng b? ch?y ?i?u khi?n n?y."
+
+#. <div class="formHelp" i18n:translate="help_paragraph_styles">
+#.  Enter a list of paragraph styles to appear in the style pulldown. Format is title|tag or title|tag|className, one per line.
+#. </div>
+#: c:\zopep21\Products\kupu\plone\kupu_config.pt
+msgid "help_paragraph_styles"
+msgstr "Nh?p danh s?ch c?c ki?u (style) ?o?n v?n (paragraph) cho ph?p ch?n theo ??nh d?ng Ti?u??|th? ho?c Ti?u??|th?|t?nL?p , m?i ??nh d?ng tr?n m?t d?ng"
+
+#. <div class="formHelp" i18n:translate="help_remove_entities">
+#.  Enter HTML tags and attributes to be removed when saving documents. (Uncheck to remove entries)
+#. </div>
+#: c:\zopep21\Products\kupu\plone\kupu_config.pt
+msgid "help_remove_entities"
+msgstr "Nh?p th? HTML v? thu?c t?nh s? ???c l??c b? khi l?u t?i li?u. (B? ch?n ?? x?a b?t)"
+
+#. <div class="formHelp" i18n:translate="help_style_whitelist">
+#.  Enter a list of style elements to be permitted (one per line)
+#. </div>
+#: c:\zopep21\Products\kupu\plone\kupu_config.pt
+msgid "help_style_whitelist"
+msgstr "Nh?p danh s?ch c?c ki?u (style) cho ph?p (m?i ki?u tr?n m?t d?ng)"
+
+#. <div class="formHelp" i18n:translate="help_table_classes">
+#.  Enter a list of class names to be made available in the table drawer
+#. </div>
+#: c:\zopep21\Products\kupu\plone\kupu_config.pt
+msgid "help_table_classes"
+msgstr "Nh?p danh s?ch c?c t?n l?p cho ph?p khi thao t?c trong B?ng"
+
+#. <th i18n:translate="icon_uri">
+#.  Icon URI
+#. </th>
+#: c:\zopep21\Products\kupu\plone\libraries.pt
+msgid "icon_uri"
+msgstr "Bi?u t??ng URI"
+
+#. <th i18n:translate="label_attributes">
+#.  Attributes
+#. </th>
+#: c:\zopep21\Products\kupu\plone\kupu_config.pt
+msgid "label_attributes"
+msgstr "Thu?c t?nh"
+
+#. <th colspan="2" i18n:translate="label_class_blacklist">
+#.  Class Blacklist
+#. </th>
+#: c:\zopep21\Products\kupu\plone\kupu_config.pt
+msgid "label_class_blacklist"
+msgstr "L?p lo?i tr?"
+
+#. <th i18n:translate="label_icon_uri">
+#.  Icon URI
+#. </th>
+#: c:\zopep21\Products\kupu\plone\libraries.pt
+msgid "label_icon_uri"
+msgstr "Bi?u t??ng URI"
+
+#. <label for="kupu_installBeforeUnload" i18n:translate="label_install_kupu">
+#.  Install Kupu code to detect form changes
+#. </label>
+#: c:\zopep21\Products\kupu\plone\kupu_config.pt
+msgid "label_install_kupu"
+msgstr "C?i ??t m? Kupu ?? ph?t hi?n s? thay ??i khi bi?n t?p"
+
+#. <label for="kupu_linkbyuid" i18n:translate="label_link_uid">
+#.  Link using UIDs
+#. </label>
+#: c:\zopep21\Products\kupu\plone\kupu_config.pt
+msgid "label_link_uid"
+msgstr "Li?n k?t s? d?ng UIDs"
+
+#. <h4 i18n:translate="label_manage_libraries">
+#.  Manage libraries
+#. </h4>
+#: c:\zopep21\Products\kupu\plone\libraries.pt
+msgid "label_manage_libraries"
+msgstr "Qu?n l? th? vi?n"
+
+#. <label for="parastyles" i18n:translate="label_paragraph_styles">
+#.  Paragraph Styles
+#. </label>
+#: c:\zopep21\Products\kupu\plone\kupu_config.pt
+msgid "label_paragraph_styles"
+msgstr "Ki?u ?o?n v?n (Paragraph Styles)"
+
+#. <th i18n:translate="label_source_uri">
+#.  Source URI
+#. </th>
+#: c:\zopep21\Products\kupu\plone\libraries.pt
+msgid "label_source_uri"
+msgstr "URI ngu?n"
+
+#. <th colspan="2" i18n:translate="label_style_whitelist">
+#.  Style Whitelist
+#. </th>
+#: c:\zopep21\Products\kupu\plone\kupu_config.pt
+msgid "label_style_whitelist"
+msgstr "Danh s?ch c?c Style cho ph?p"
+
+#. <label for="table_classnames" i18n:translate="label_tables">
+#.  Tables
+#. </label>
+#: c:\zopep21\Products\kupu\plone\kupu_config.pt
+msgid "label_tables"
+msgstr "B?ng"
+
+#. <th i18n:translate="label_tags">
+#.  Tags
+#. </th>
+#: c:\zopep21\Products\kupu\plone\kupu_config.pt
+msgid "label_tags"
+msgstr "Th?"
+
+#. <th i18n:translate="label_title">
+#.  Title
+#. </th>
+#: c:\zopep21\Products\kupu\plone\libraries.pt
+msgid "label_title"
+msgstr "Ti?u ??"
+
+#. <legend i18n:translate="legend_add_resource_type">
+#.  Add new resource type
+#. </legend>
+#: c:\zopep21\Products\kupu\plone\resource_types.pt
+msgid "legend_add_resource_type"
+msgstr "Th?m ki?u t?i nguy?n"
+
+#. <legend i18n:translate="legend_html_filter">
+#.  HTML Filter
+#. </legend>
+#: c:\zopep21\Products\kupu\plone\kupu_config.pt
+msgid "legend_html_filter"
+msgstr "B? l?c HTML"
+
+#. <legend i18n:translate="legend_link_options">
+#.  Link options
+#. </legend>
+#: c:\zopep21\Products\kupu\plone\kupu_config.pt
+msgid "legend_link_options"
+msgstr "T?y ch?n v? Li?n k?t"
+
+#. <legend i18n:translate="legend_map_resource_types">
+#.  Map resource types
+#. </legend>
+#: c:\zopep21\Products\kupu\plone\resource_types.pt
+msgid "legend_map_resource_types"
+msgstr "C?i ??t c?c ki?u t?i nguy?n"
+
+#. <legend i18n:translate="legend_styles">
+#.  Styles
+#. </legend>
+#: c:\zopep21\Products\kupu\plone\kupu_config.pt
+msgid "legend_styles"
+msgstr "Ki?u (Styles)"
+
+#. <legend i18n:translate="legend_warning">
+#.  Warn before losing changes
+#. </legend>
+#: c:\zopep21\Products\kupu\plone\kupu_config.pt
+msgid "legend_warning"
+msgstr "C?nh b?o khi thay ??i ch?a ???c l?u l?i"
+
+#. <td i18n:translate="portal_object">
+#.  The portal object
+#. </td>
+#: c:\zopep21\Products\kupu\plone\libraries.pt
+msgid "portal_object"
+msgstr "??i t??ng c?ng"
+
+#. <td i18n:translate="portal_object_url">
+#.  URL of the portal
+#. </td>
+#: c:\zopep21\Products\kupu\plone\libraries.pt
+msgid "portal_object_url"
+msgstr "URL c?a c?ng"
+
+## 1 more: c:\zopep21\Products\kupu\plone\resource_types.pt
+#. <th i18n:translate="portal_types">
+#.  Portal types
+#. </th>
+#: c:\zopep21\Products\kupu\plone\resource_types.pt
+msgid "portal_types"
+msgstr "Portal types"
+
+#. <td i18n:translate="request">
+#.  Request
+#. </td>
+#: c:\zopep21\Products\kupu\plone\libraries.pt
+msgid "request"
+msgstr "Y?u c?u"
+
+## 1 more: c:\zopep21\Products\kupu\plone\resource_types.pt
+#. <th i18n:translate="resource_type">
+#.  Resource type
+#. </th>
+#: c:\zopep21\Products\kupu\plone\resource_types.pt
+msgid "resource_type"
+msgstr "Ki?u t?i nguy?n"
+
+#. <th i18n:translate="source_uri">
+#.  Source URI
+#. </th>
+#: c:\zopep21\Products\kupu\plone\libraries.pt
+msgid "source_uri"
+msgstr "URI ngu?n"
+
+#. <p i18n:translate="text_kupu_drawers">
+#.  In the below form, you may manage the list of drawer libraries for
+#. the kupu editor. Each property of a library is dynamically expanded at
+#. execution time using TALES expressions. That way it is possible, to
+#. support libraries like
+#.  <em>
+#.   Current folder
+#.  </em>
+#.   or
+#.  <em>
+#.   My folder
+#.  </em>
+#. very easily.
+#. </p>
+#: c:\zopep21\Products\kupu\plone\libraries.pt
+msgid "text_kupu_drawers"
+msgstr "? m?u bi?u ph?a d??i, b?n c? th? qu?n l? danh s?ch c?c th? vi?n cho tr?nh bi?n t?p Kupu. M?i m?t thu?c t?nh c?a th? vi?n s? ???c m? r?ng khi th?c hi?n s? d?ng bi?u th?c TALES. B?ng c?ch ?? c? th? h? tr? c?c th? vi?n nh? l? <em>Th? m?c hi?n t?i</em> ho?c <em>Th? m?c c?a t?i</em> r?t d? d?ng."
+
+#. <p i18n:translate="text_resource_types">
+#.  While libraries provide abstract locations for objects of any type,
+#. Kupu distinguishes objects by resource type. For example, a user might
+#. request a library showing objects to link to or a library showing
+#. objects to be inserted into a document. The abstract location
+#. (library) might be the same, but the former library would contain
+#. documents, the latter images.
+#. </p>
+#: c:\zopep21\Products\kupu\plone\resource_types.pt
+msgid "text_resource_types"
+msgstr "Nh? th? vi?n cung c?p v? tr? l? thuy?t c?a c?c ??i t??ng thu?c b?t k? ki?u n?o, Kupu ph?n bi?t c?c ??i t??ng b?ng ki?u t?i nguy?n. V? d?, ng??i d?ng c? th? y?u c?u th? vi?n hi?n th? ??i t??ng ?? li?n k?t ??n ho?c ??i t??ng ?? ch?n v?o t?i li?u. V? tr? l? thuy?t (th? vi?n) c? th? gi?ng, nh?ng th? vi?n tr??c c? th? ch?a t?i li?u ho?c h?nh ?nh sau n?y."
+
+#. <p i18n:translate="text_resource_types2">
+#.  This management screen allows you to define resource types using a
+#. list of portal types. A special resource type,
+#.  <code>
+#.   collection
+#.  </code>
+#.  ,
+#. identifies portal types that are to be treated as collections.
+#. </p>
+#: c:\zopep21\Products\kupu\plone\resource_types.pt
+msgid "text_resource_types2"
+msgstr "M?n h?nh qu?n l? n?y cho ph?p b?n ??nh ki?u t?i nguy?n b?ng c?ch s? d?ng danh s?ch c?c portal types. M?t ki?u t?i nguy?n ??c bi?t <code>collection</code> , x?c ??nh portal types ???c xem nh? l? t?p h?p (collection)."
+
+#. <th i18n:translate="uri">
+#.  URI
+#. </th>
+#: c:\zopep21\Products\kupu\plone\libraries.pt
+msgid "uri"
+msgstr "URI"
+
+#. <em i18n:translate="whole_tag_removed" tal:condition="not:attributes">
+#.  Whole tag removed
+#. </em>
+#: c:\zopep21\Products\kupu\plone\kupu_config.pt
+msgid "whole_tag_removed"
+msgstr "B? to?n b? th?"
+
+msgid "Config"
+msgstr "C?u h?nh"
+
+msgid "Libraries"
+msgstr "Th? vi?n"
+
+msgid "Resource Types"
+msgstr "Ki?u t?i nguy?n"
+
+msgid "Documentation"
+msgstr "T?i li?u"
+

Added: kupu/branch/kupu-1.3-silva-1.5/kupu.xpr
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/kupu.xpr	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,585 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <meta>
+        <filters directoryPatterns="" filePatterns=""/>
+    </meta>
+    <projectTree name="kupu.xpr">
+        <folder name="kupu_plone_layer">
+            <folder name=".svn">
+                <folder name="prop-base">
+                    <file
+                        name="plone/kupu_plone_layer/.svn/prop-base/contentUsesKupu.py.svn-base"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/prop-base/convertContentForKupu.py.svn-base"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/prop-base/emptypage.pt.svn-base"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/prop-base/kupuGetResourceTypes.py.svn-base"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/prop-base/kupuInfoForBrains.py.svn-base"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/prop-base/kupuMyItems.py.svn-base"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/prop-base/kupuRecentItems.py.svn-base"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/prop-base/kupuSearch.py.svn-base"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/prop-base/kupuUploadImage.py.metadata.svn-base"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/prop-base/kupuUploadImage.py.svn-base"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/prop-base/kupublank.html.html.svn-base"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/prop-base/kupucollection.xml.pt.metadata.svn-base"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/prop-base/kupucollection.xml.pt.svn-base"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/prop-base/kupulibraries.xml.pt.svn-base"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/prop-base/kupumyitems.xml.pt.svn-base"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/prop-base/kupuplone.css.dtml.svn-base"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/prop-base/kupuploneeditor.js.svn-base"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/prop-base/kupuploneinit.js.svn-base"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/prop-base/kupuploneui.js.svn-base"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/prop-base/kupurecentitems.xml.pt.svn-base"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/prop-base/kupusaveonpart.js.svn-base"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/prop-base/kupusearch.xml.pt.svn-base"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/prop-base/resolveuid.py.svn-base"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/prop-base/sample-kupu-customisation-policy.py.svn-base"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/prop-base/wysiwyg_support.pt.svn-base"
+                    />
+                </folder>
+                <folder name="props">
+                    <file
+                        name="plone/kupu_plone_layer/.svn/props/contentUsesKupu.py.svn-work"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/props/convertContentForKupu.py.svn-work"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/props/emptypage.pt.svn-work"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/props/kupuGetResourceTypes.py.svn-work"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/props/kupuInfoForBrains.py.svn-work"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/props/kupuMyItems.py.svn-work"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/props/kupuRecentItems.py.svn-work"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/props/kupuSearch.py.svn-work"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/props/kupuUploadImage.py.metadata.svn-work"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/props/kupuUploadImage.py.svn-work"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/props/kupublank.html.html.svn-work"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/props/kupucollection.xml.pt.metadata.svn-work"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/props/kupucollection.xml.pt.svn-work"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/props/kupulibraries.xml.pt.svn-work"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/props/kupumyitems.xml.pt.svn-work"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/props/kupuplone.css.dtml.svn-work"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/props/kupuploneeditor.js.svn-work"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/props/kupuploneinit.js.svn-work"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/props/kupuploneui.js.svn-work"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/props/kupurecentitems.xml.pt.svn-work"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/props/kupusaveonpart.js.svn-work"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/props/kupusearch.xml.pt.svn-work"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/props/resolveuid.py.svn-work"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/props/sample-kupu-customisation-policy.py.svn-work"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/props/wysiwyg_support.pt.svn-work"
+                    />
+                </folder>
+                <folder name="text-base">
+                    <file
+                        name="plone/kupu_plone_layer/.svn/text-base/contentUsesKupu.py.svn-base"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/text-base/convertContentForKupu.py.svn-base"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/text-base/emptypage.pt.svn-base"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/text-base/kupuGetResourceTypes.py.svn-base"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/text-base/kupuInfoForBrains.py.svn-base"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/text-base/kupuMyItems.py.svn-base"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/text-base/kupuRecentItems.py.svn-base"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/text-base/kupuSearch.py.svn-base"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/text-base/kupuUploadImage.py.metadata.svn-base"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/text-base/kupuUploadImage.py.svn-base"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/text-base/kupublank.html.html.svn-base"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/text-base/kupucollection.xml.pt.metadata.svn-base"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/text-base/kupucollection.xml.pt.svn-base"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/text-base/kupulibraries.xml.pt.svn-base"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/text-base/kupumyitems.xml.pt.svn-base"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/text-base/kupuplone.css.dtml.svn-base"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/text-base/kupuploneeditor.js.svn-base"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/text-base/kupuploneinit.js.svn-base"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/text-base/kupuploneui.js.svn-base"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/text-base/kupurecentitems.xml.pt.svn-base"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/text-base/kupusaveonpart.js.svn-base"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/text-base/kupusearch.xml.pt.svn-base"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/text-base/resolveuid.py.svn-base"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/text-base/sample-kupu-customisation-policy.py.svn-base"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/text-base/wysiwyg_support.pt.svn-base"
+                    />
+                </folder>
+                <folder name="tmp">
+                    <folder name="prop-base"/>
+                    <folder name="props"/>
+                    <folder name="text-base"/>
+                    <folder name="wcprops"/>
+                </folder>
+                <folder name="wcprops">
+                    <file
+                        name="plone/kupu_plone_layer/.svn/wcprops/contentUsesKupu.py.svn-work"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/wcprops/convertContentForKupu.py.svn-work"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/wcprops/emptypage.pt.svn-work"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/wcprops/kupuGetResourceTypes.py.svn-work"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/wcprops/kupuInfoForBrains.py.svn-work"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/wcprops/kupuMyItems.py.svn-work"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/wcprops/kupuRecentItems.py.svn-work"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/wcprops/kupuSearch.py.svn-work"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/wcprops/kupuUploadImage.py.metadata.svn-work"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/wcprops/kupuUploadImage.py.svn-work"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/wcprops/kupublank.html.html.svn-work"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/wcprops/kupucollection.xml.pt.metadata.svn-work"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/wcprops/kupucollection.xml.pt.svn-work"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/wcprops/kupulibraries.xml.pt.svn-work"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/wcprops/kupumyitems.xml.pt.svn-work"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/wcprops/kupuplone.css.dtml.svn-work"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/wcprops/kupuploneeditor.js.svn-work"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/wcprops/kupuploneinit.js.svn-work"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/wcprops/kupuploneui.js.svn-work"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/wcprops/kupurecentitems.xml.pt.svn-work"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/wcprops/kupusaveonpart.js.svn-work"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/wcprops/kupusearch.xml.pt.svn-work"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/wcprops/resolveuid.py.svn-work"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/wcprops/sample-kupu-customisation-policy.py.svn-work"/>
+                    <file
+                        name="plone/kupu_plone_layer/.svn/wcprops/wysiwyg_support.pt.svn-work"
+                    />
+                </folder>
+                <file name="plone/kupu_plone_layer/.svn/README.txt"/>
+                <file name="plone/kupu_plone_layer/.svn/dir-prop-base"/>
+                <file name="plone/kupu_plone_layer/.svn/dir-props"/>
+                <file name="plone/kupu_plone_layer/.svn/dir-wcprops"/>
+                <file name="plone/kupu_plone_layer/.svn/empty-file"/>
+                <file name="plone/kupu_plone_layer/.svn/entries"/>
+                <file name="plone/kupu_plone_layer/.svn/format"/>
+            </folder>
+            <folder name="plonekupuimages">
+                <folder name=".svn">
+                    <folder name="prop-base">
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/prop-base/anchor.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/prop-base/bgcolor.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/prop-base/bold.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/prop-base/center.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/prop-base/definitionlist.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/prop-base/delete_icon.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/prop-base/hr.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/prop-base/hyperlink.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/prop-base/indent.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/prop-base/italic.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/prop-base/left_just.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/prop-base/list.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/prop-base/numbered_list.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/prop-base/outdent.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/prop-base/redo.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/prop-base/right_just.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/prop-base/space.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/prop-base/strikethrough.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/prop-base/subscript.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/prop-base/superscript.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/prop-base/table.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/prop-base/textcolor.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/prop-base/tools.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/prop-base/underline.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/prop-base/undo.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/prop-base/unformat.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/prop-base/view-source.gif.svn-base"
+                        />
+                    </folder>
+                    <folder name="props">
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/props/anchor.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/props/bgcolor.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/props/bold.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/props/center.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/props/definitionlist.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/props/delete_icon.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/props/hr.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/props/hyperlink.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/props/indent.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/props/italic.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/props/left_just.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/props/list.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/props/numbered_list.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/props/outdent.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/props/redo.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/props/right_just.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/props/space.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/props/strikethrough.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/props/subscript.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/props/superscript.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/props/table.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/props/textcolor.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/props/tools.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/props/underline.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/props/undo.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/props/unformat.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/props/view-source.gif.svn-work"
+                        />
+                    </folder>
+                    <folder name="text-base">
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/text-base/anchor.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/text-base/bgcolor.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/text-base/bold.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/text-base/center.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/text-base/definitionlist.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/text-base/delete_icon.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/text-base/hr.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/text-base/hyperlink.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/text-base/indent.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/text-base/italic.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/text-base/left_just.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/text-base/list.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/text-base/numbered_list.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/text-base/outdent.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/text-base/redo.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/text-base/right_just.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/text-base/space.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/text-base/strikethrough.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/text-base/subscript.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/text-base/superscript.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/text-base/table.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/text-base/textcolor.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/text-base/tools.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/text-base/underline.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/text-base/undo.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/text-base/unformat.gif.svn-base"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/text-base/view-source.gif.svn-base"
+                        />
+                    </folder>
+                    <folder name="tmp">
+                        <folder name="prop-base"/>
+                        <folder name="props"/>
+                        <folder name="text-base"/>
+                        <folder name="wcprops"/>
+                    </folder>
+                    <folder name="wcprops">
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/wcprops/anchor.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/wcprops/bgcolor.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/wcprops/bold.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/wcprops/center.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/wcprops/definitionlist.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/wcprops/delete_icon.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/wcprops/hr.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/wcprops/hyperlink.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/wcprops/indent.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/wcprops/italic.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/wcprops/left_just.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/wcprops/list.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/wcprops/numbered_list.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/wcprops/outdent.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/wcprops/redo.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/wcprops/right_just.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/wcprops/space.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/wcprops/strikethrough.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/wcprops/subscript.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/wcprops/superscript.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/wcprops/table.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/wcprops/textcolor.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/wcprops/tools.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/wcprops/underline.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/wcprops/undo.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/wcprops/unformat.gif.svn-work"/>
+                        <file
+                            name="plone/kupu_plone_layer/plonekupuimages/.svn/wcprops/view-source.gif.svn-work"
+                        />
+                    </folder>
+                    <file
+                        name="plone/kupu_plone_layer/plonekupuimages/.svn/README.txt"/>
+                    <file
+                        name="plone/kupu_plone_layer/plonekupuimages/.svn/dir-wcprops"/>
+                    <file
+                        name="plone/kupu_plone_layer/plonekupuimages/.svn/empty-file"/>
+                    <file
+                        name="plone/kupu_plone_layer/plonekupuimages/.svn/entries"/>
+                    <file
+                        name="plone/kupu_plone_layer/plonekupuimages/.svn/format"
+                    />
+                </folder>
+                <file
+                    name="plone/kupu_plone_layer/plonekupuimages/anchor.gif"/>
+                <file
+                    name="plone/kupu_plone_layer/plonekupuimages/bgcolor.gif"/>
+                <file
+                    name="plone/kupu_plone_layer/plonekupuimages/bold.gif"/>
+                <file
+                    name="plone/kupu_plone_layer/plonekupuimages/center.gif"/>
+                <file
+                    name="plone/kupu_plone_layer/plonekupuimages/definitionlist.gif"/>
+                <file
+                    name="plone/kupu_plone_layer/plonekupuimages/delete_icon.gif"/>
+                <file
+                    name="plone/kupu_plone_layer/plonekupuimages/hr.gif"/>
+                <file
+                    name="plone/kupu_plone_layer/plonekupuimages/hyperlink.gif"/>
+                <file
+                    name="plone/kupu_plone_layer/plonekupuimages/indent.gif"/>
+                <file
+                    name="plone/kupu_plone_layer/plonekupuimages/italic.gif"/>
+                <file name="plone/kupu_plone_layer/krb_drawer.xsl.pt"/>
+                <file
+                    name="plone/kupu_plone_layer/plonekupuimages/left_just.gif"/>
+                <file
+                    name="plone/kupu_plone_layer/plonekupuimages/list.gif"/>
+                <file
+                    name="plone/kupu_plone_layer/plonekupuimages/numbered_list.gif"/>
+                <file
+                    name="plone/kupu_plone_layer/plonekupuimages/outdent.gif"/>
+                <file
+                    name="plone/kupu_plone_layer/plonekupuimages/redo.gif"/>
+                <file
+                    name="plone/kupu_plone_layer/plonekupuimages/right_just.gif"/>
+                <file
+                    name="plone/kupu_plone_layer/plonekupuimages/space.gif"/>
+                <file
+                    name="plone/kupu_plone_layer/plonekupuimages/strikethrough.gif"/>
+                <file
+                    name="plone/kupu_plone_layer/plonekupuimages/subscript.gif"/>
+                <file
+                    name="plone/kupu_plone_layer/plonekupuimages/superscript.gif"/>
+                <file
+                    name="plone/kupu_plone_layer/plonekupuimages/table.gif"/>
+                <file
+                    name="plone/kupu_plone_layer/plonekupuimages/textcolor.gif"/>
+                <file
+                    name="plone/kupu_plone_layer/plonekupuimages/tools.gif"/>
+                <file
+                    name="plone/kupu_plone_layer/plonekupuimages/underline.gif"/>
+                <file
+                    name="plone/kupu_plone_layer/plonekupuimages/undo.gif"/>
+                <file
+                    name="plone/kupu_plone_layer/plonekupuimages/unformat.gif"/>
+                <file
+                    name="plone/kupu_plone_layer/plonekupuimages/view-source.gif"
+                />
+            </folder>
+            <file name="plone/kupu_plone_layer/contentUsesKupu.py"/>
+            <file name="plone/kupu_plone_layer/convertContentForKupu.py"/>
+            <file name="plone/kupu_plone_layer/emptypage.pt"/>
+            <file name="plone/kupu_plone_layer/kupuGetResourceTypes.py"/>
+            <file name="plone/kupu_plone_layer/kupuInfoForBrains.py"/>
+            <file name="plone/kupu_plone_layer/kupuMyItems.py"/>
+            <file name="plone/kupu_plone_layer/kupuRecentItems.py"/>
+            <file name="plone/kupu_plone_layer/kupuSearch.py"/>
+            <file name="plone/kupu_plone_layer/kupuUploadImage.py"/>
+            <file
+                name="plone/kupu_plone_layer/kupuUploadImage.py.metadata"/>
+            <file
+                name="plone/kupu_plone_layer/kupu_wysiwyg_support.html"/>
+            <file name="plone/kupu_plone_layer/kupublank.html.html"/>
+            <file name="plone/kupu_plone_layer/kupucollection.xml.pt"/>
+            <file
+                name="plone/kupu_plone_layer/kupucollection.xml.pt.metadata"/>
+            <file name="plone/kupu_plone_layer/kupulibraries.xml.pt"/>
+            <file name="plone/kupu_plone_layer/kupumyitems.xml.pt"/>
+            <file name="plone/kupu_plone_layer/kupuplone.css.dtml"/>
+            <file name="plone/kupu_plone_layer/kupuploneeditor.js"/>
+            <file name="plone/kupu_plone_layer/kupuploneinit.js"/>
+            <file name="plone/kupu_plone_layer/kupuploneui.js"/>
+            <file name="plone/kupu_plone_layer/kupurecentitems.xml.pt"/>
+            <file name="plone/kupu_plone_layer/kupusaveonpart.js"/>
+            <file name="plone/kupu_plone_layer/kupusearch.xml.pt"/>
+            <file name="plone/kupu_plone_layer/referencebrowser.js"/>
+            <file name="plone/kupu_plone_layer/referencebrowser.pt"/>
+            <file name="plone/kupu_plone_layer/resolveuid.py"/>
+            <file
+                name="plone/kupu_plone_layer/sample-kupu-customisation-policy.py"/>
+            <file name="plone/kupu_plone_layer/wysiwyg_support.pt"/>
+        </folder>
+        <folder name="kupudrawers">
+            <file name="common/kupudrawers/allimages.xml"/>
+            <file name="common/kupudrawers/drawer.xsl"/>
+            <file name="common/kupudrawers/drawer.xsl.metadata"/>
+            <file name="common/kupudrawers/imagelibrary.xml"/>
+            <file name="common/kupudrawers/kupubuttons.xml"/>
+            <file name="common/kupudrawers/libraries.rng"/>
+            <file name="common/kupudrawers/linklibrary.xml"/>
+            <file name="common/kupudrawers/logos.xml"/>
+            <file name="common/kupudrawers/test-drawer.xsl"/>
+        </folder>
+    </projectTree>
+</project>

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/Makefile
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/Makefile	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,47 @@
+# $Id: Makefile,v 1.8 2005/09/08 08:30:31 michiel Exp $
+
+
+KUPU_HOME=..
+XSLTPROC = /usr/bin/env xsltproc
+
+XSL_DEBUG = --param debug true\(\)
+XSLTPROC_PARAMS = --nonet --novalid --xinclude
+XSL_FILE=$(KUPU_HOME)/make.xsl
+XSLJSPX_FILE=$(KUPU_HOME)/make-jspx.xsl
+I18N=$(KUPU_HOME)/kupu-i18n.jar
+
+LANGS=nl de fr it eo
+#type in i18n: msginit -l <locale> -i messages.po
+
+
+all: index.jspx
+
+
+index.jspx: mmbase-kupu-i18n.jar *.kupu 
+	$(XSLTPROC) $(XSLTPROC_PARAMS) -o $@  $(XSLJSPX_FILE) dist-mmbase.kupu
+
+$(I18N):
+	@$(MAKE) -C $(KUPU_HOME) kupu-i18n.jar	
+
+.PHONY:
+messages: *.js clean
+	rm -f phony.js
+	grep -r "fmt:message" *.jspx *.kupu | sed 's/.*key="\(.*\)".*/_("\1");/g' | uniq > phony.js
+	mkdir -p i18n
+	xgettext --from-code=UTF-8 -L java -k_ -p i18n -j *.js -o en.po
+	for LOCALE in $(LANGS) ; do \
+	   msgmerge --update --backup=off i18n/$${LOCALE}.po i18n/en.po; \
+	done
+
+mmbase-kupu-i18n.jar: i18n/*.po
+	mkdir -p resourcebundle
+	for LOCALE in $(LANGS) en ; do \
+	    msgfmt --java2  -D . -d resourcebundle -r org.mmbase.kupu.Messages -l $${LOCALE} i18n/$${LOCALE}.po; \
+	done
+	jar cf $@ -C resourcebundle org
+
+clean:
+	rm -f index.jspx
+	rm -f mmbase-kupu-i18n.jar
+	rm -rf resourcebundle
+	@$(MAKE) -C $(KUPU_HOME) clean

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/body.kupu
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/body.kupu	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,97 @@
+<?xml version="1.0" ?>
+<kupu:feature
+    name="body"
+    implementation="mmbase"
+    xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:kupu="http://kupu.oscom.org/namespaces/dist"
+    xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+    xmlns:jsp="http://java.sun.com/JSP/Page"
+    xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0"
+    xmlns:fn="http://java.sun.com/jsp/jstl/functions"
+    i18n:domain="kupu"
+    >
+  <kupu:id>$Id: body.kupu,v 1.10 2005/09/27 18:26:52 michiel Exp $</kupu:id>
+
+
+  <kupu:part name="body">
+    <mm:import externid="objectnumber"  />
+    <mm:import externid="tools"  />
+    <mm:import externid="origin"  />
+    <mm:import id="back" externid="kupu_back">${header.referer}</mm:import>
+    <mm:compare referid="objectnumber" value="new">
+      <mm:import externid="referrer">${header.referer}</mm:import>
+      <mm:import id="wizardxml">${mm:directory(referrer)}/${param.wizard}.xml</mm:import>
+      <mm:haspage page="$wizardxml">
+        <mm:formatter id="type" write="false">
+          <mm:include cite="true" page="${wizardxml}"/>
+          <mm:xslt>
+            <xsl:template xmlns:xsl="http://www.w3.org/1999/XSL/Transform" match="/">
+              <xsl:value-of select="/wizard-schema/action[@type='create']/object/@type"/>
+            </xsl:template>
+          </mm:xslt>
+        </mm:formatter>
+        <mm:formatter id="role" write="false">
+          <mm:include cite="true" page="${wizardxml}"/>
+          <mm:xslt>
+            <xsl:template xmlns:xsl="http://www.w3.org/1999/XSL/Transform" match="/">
+              <xsl:value-of select="/wizard-schema/action[@type='create']/object/relation/@role"/>
+            </xsl:template>
+          </mm:xslt>
+        </mm:formatter>
+        <mm:isempty referid="role">
+          <mm:import reset="true" id="role">related</mm:import>
+        </mm:isempty>
+      </mm:haspage>
+      <mm:haspage page="${wizardxml}" inverse="true">
+        <mm:import externid="wizard" vartype="list" listdelimiter="/" />
+        <mm:import id="type">${wizard[fn:length(wizard) - 1]}</mm:import>
+        <mm:import id="role">related</mm:import>
+      </mm:haspage>
+      <mm:createnode type="$type" id="node">
+
+      </mm:createnode>
+      <mm:present referid="origin">
+        <mm:hasnode number="$origin">
+          <mm:log>Creating relation between ${origin} and ${node} with role ${role}</mm:log>
+          <mm:node id="origin" referid="origin" />
+          <mm:createrelation role="${role}" source="origin" destination="node" />
+        </mm:hasnode>
+      </mm:present>
+      <mm:import externid="link_nodetypes" />
+      <mm:import externid="related_types" />
+      <mm:redirect referids="node at objectnumber,tools?,language?,origin?,nodetypes?,back at kupu_back,link_nodetypes?,related_types?" /> 
+    </mm:compare>
+    <mm:compare referid="objectnumber" value="new" inverse="true">
+      <mm:node id="node" referid="objectnumber" />
+    </mm:compare>
+    <mm:url absolute="true" page="." id="abs" write="false" />
+    <body onload="kupu = startKupu('${lang}'); mmbaseInit('${node}', '${abs}');">
+      <kupu:define-slot name="body" />
+    </body>
+  </kupu:part>
+
+  <kupu:part name="fulleditor">
+    <div class="kupu-fulleditor">
+      <kupu:define-slot name="fulleditor" />
+    </div>
+  </kupu:part>
+
+  <kupu:part name="editorframe">
+    <div class="kupu-editorframe">
+      <form>					
+        <iframe id="kupu-editor"
+                class="kupu-editor-iframe"
+                frameborder="0"
+                src="start.jspx"
+                scrolling="auto">
+          <jsp:text>
+          </jsp:text>
+        </iframe>
+        <textarea
+         class="kupu-editor-textarea" 
+         id="kupu-editor-textarea"><jsp:text> </jsp:text></textarea>
+      </form>
+    </div>
+  </kupu:part>
+
+</kupu:feature>

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/contextmenu.kupu
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/contextmenu.kupu	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,17 @@
+<?xml version="1.0" ?>
+<kupu:feature
+    name="contextmenu"
+    implementation="mmbase"
+    xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:jsp="http://java.sun.com/JSP/Page"
+    xmlns:kupu="http://kupu.oscom.org/namespaces/dist"
+    xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+    i18n:domain="kupu"
+    >
+  <kupu:id>$Id: contextmenu.kupu,v 1.2 2005/04/19 21:23:58 michiel Exp $</kupu:id>
+
+  <kupu:part name="jsincludes">
+    <script type="text/javascript" src="${kupu_common}/kupucontextmenu.js"><jsp:text> </jsp:text></script>
+  </kupu:part>
+
+</kupu:feature>

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/cross-browser.js
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/cross-browser.js	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,179 @@
+// Mostly based on cross-browser scripts with copyright notices:
+// Copyright 2001-2005 Michael Foster (Cross-Browser.com)
+// Part of X, a Cross-Browser Javascript Library, Distributed under the terms of the GNU LGPL
+
+function xGetElementsByClassName(c, p, t, f) {
+  var found = new Array();
+  var re = new RegExp('\\b'+c+'\\b', 'i');
+  var list = document.getElementsByTagName(t);
+  for (var i = 0; i < list.length; ++i) {
+    if (list[i].className && list[i].className.search(re) != -1) {
+      found[found.length] = list[i];
+      if (f) f(list[i]);
+    }
+  }
+  return found;
+}
+
+function xDef() {
+  for(var i=0; i<arguments.length; ++i){if(typeof(arguments[i])=='undefined') return false;}
+  return true;
+}
+function xGetComputedStyle(oEle, sProp, bInt) {
+  var s, p = 'undefined';
+  var dv = document.defaultView;
+  if(dv && dv.getComputedStyle){
+    s = dv.getComputedStyle(oEle,'');
+    if (s) p = s.getPropertyValue(sProp);
+  }
+  else if(oEle.currentStyle) {
+    // convert css property name to object property name for IE
+    var a = sProp.split('-');
+    sProp = a[0];
+    for (var i=1; i<a.length; ++i) {
+      c = a[i].charAt(0);
+      sProp += a[i].replace(c, c.toUpperCase());
+    }   
+    p = oEle.currentStyle[sProp];
+  }
+  else return null;
+  return bInt ? (parseInt(p) || 0) : p;
+}
+
+
+
+
+function xClientHeight() {
+  var h=0;
+  if(document.compatMode == 'CSS1Compat' && !window.opera && document.documentElement && document.documentElement.clientHeight)
+    h=document.documentElement.clientHeight;
+  else if(document.body && document.body.clientHeight)
+    h=document.body.clientHeight;
+  else if(xDef(window.innerWidth,window.innerHeight,document.width)) {
+    h=window.innerHeight;
+    if(document.width>window.innerWidth) h-=16;
+  }
+  return h;
+}
+
+function xClientWidth() {
+  var w=0;
+  if(document.compatMode == 'CSS1Compat' && !window.opera && document.documentElement && document.documentElement.clientWidth)
+    w=document.documentElement.clientWidth;
+  else if(document.body && document.body.clientWidth)
+    w=document.body.clientWidth;
+  else if(xDef(window.innerWidth,window.innerHeight,document.height)) {
+    w=window.innerWidth;
+    if(document.height>window.innerHeight) w-=16;
+  }
+  return w;
+}
+
+function xWidth(e, w) {
+  if(typeof(e) == 'string' && !(e=document.getElementById(e))) {
+      return 0;
+  }
+  if (typeof(w) == "number") {
+      if (w<0) w = 0;
+      else w=Math.round(w);
+  }
+  else w=-1;
+  var css= typeof(e.style) != 'undefined';
+  if (e == document || e.tagName.toLowerCase() == 'html' || e.tagName.toLowerCase() == 'body') {
+    w = xClientWidth();
+  }
+  else if(css && xDef(e.offsetWidth) && typeof(e.style.width) == "string") {
+    if(w>=0) {
+      var pl=0,pr=0,bl=0,br=0;
+      if (document.compatMode=='CSS1Compat') {
+        var gcs = xGetComputedStyle;
+        pl=gcs(e,'padding-left',1);
+        if (pl !== null) {
+          pr=gcs(e,'padding-right',1);
+          bl=gcs(e,'border-left-width',1);
+          br=gcs(e,'border-right-width',1);
+        }
+        // Should we try this as a last resort?
+        // At this point getComputedStyle and currentStyle do not exist.
+        else if(xDef(e.offsetWidth,e.style.width)){
+          e.style.width=w+'px';
+          pl=e.offsetWidth-w;
+        }
+      }
+      w-=(pl+pr+bl+br);
+      if(isNaN(w)||w<0) {
+          return;
+      } else {
+          e.style.width=w+'px';
+      }
+    }
+    w=e.offsetWidth;
+  }
+  else if(css && xDef(e.style.pixelWidth)) {
+    if(w>=0) e.style.pixelWidth=w;
+    w=e.style.pixelWidth;
+  }
+  return w;
+}
+
+function xHeight(e, h) {
+  if(typeof(e) == 'string' && !(e=document.getElementById(e))) {
+      return 0;
+  }
+  if (typeof(h) == "number") {
+    if (h<0) h = 0;
+    else h=Math.round(h);
+  }
+  else h=-1;
+  var css=xDef(e.style);
+  if (e == document || e.tagName.toLowerCase() == 'html' || e.tagName.toLowerCase() == 'body') {
+    h = xClientHeight();
+  }
+  else if(css && xDef(e.offsetHeight) && typeof(e.style.height) == "string") {
+    if(h>=0) {
+      var pt=0,pb=0,bt=0,bb=0;
+      if (document.compatMode=='CSS1Compat') {
+        var gcs = xGetComputedStyle;
+        pt=gcs(e,'padding-top',1);
+        if (pt !== null) {
+          pb=gcs(e,'padding-bottom',1);
+          bt=gcs(e,'border-top-width',1);
+          bb=gcs(e,'border-bottom-width',1);
+        }
+        // Should we try this as a last resort?
+        // At this point getComputedStyle and currentStyle do not exist.
+        else if(xDef(e.offsetHeight,e.style.height)){
+          e.style.height=h+'px';
+          pt=e.offsetHeight-h;
+        }
+      }
+      h-=(pt+pb+bt+bb);
+      if(isNaN(h)||h<0) return;
+      else e.style.height=h+'px';
+    }
+    h=e.offsetHeight;
+  }
+  else if(css && xDef(e.style.pixelHeight)) {
+    if(h>=0) e.style.pixelHeight=h;
+    h=e.style.pixelHeight;
+  } else {
+  }
+  return h;
+}
+
+function xTop(e, iY) {
+  if(!(e=document.getElementById(e))) return 0;
+  var css=xDef(e.style);
+  if(css && typeof(e.style.top) == "string" ) {
+    if(typeof(iY) == 'number') e.style.top= iY + 'px';
+    else {
+      iY=parseInt(e.style.top);
+      if(isNaN(iY)) iY=0;
+    }
+  }
+  else if(css && xDef(e.style.pixelTop)) {
+    if(xNum(iY)) e.style.pixelTop=iY;
+    else iY=e.style.pixelTop;
+  }
+  return iY;
+}

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/dist-mmbase.kupu
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/dist-mmbase.kupu	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,24 @@
+<kupu:dist
+  xmlns:kupu="http://kupu.oscom.org/namespaces/dist"
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  >
+
+  <!-- Include implementations -->
+  <xi:include href="../include.kupu" />
+  <xi:include href="include.kupu" />
+
+  <!-- Define the default slot to start with -->
+  <kupu:expand>
+    <kupu:define-slot name="start" />
+  </kupu:expand>
+
+  <!-- Define an implementation order -->
+  <kupu:implementation-order>
+    <kupu:implementation name="mmbase" />
+    <kupu:implementation name="default" />
+  </kupu:implementation-order>
+
+  <!-- MMBase does not want to use certain features -->
+  <kupu:disable-feature name="colorchooser" />
+
+</kupu:dist>

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers.kupu
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers.kupu	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,97 @@
+<?xml version="1.0" ?>
+<kupu:feature
+    name="drawers"
+    implementation="mmbase"
+    xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0"
+    xmlns:kupu="http://kupu.oscom.org/namespaces/dist"
+    xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+    xmlns:jsp="http://java.sun.com/JSP/Page"
+    i18n:domain="kupu"
+    >
+  <kupu:id>$Id: drawers.kupu,v 1.15 2005/10/19 14:18:50 michiel Exp $</kupu:id>
+
+
+  <kupu:part name="styles">
+    <link href="${kupu_common}/kupudrawerstyles.css" rel="stylesheet" type="text/css" />
+  </kupu:part>
+  <kupu:part name="jsincludes">
+    <script type="text/javascript" src="${kupu_common}/kupudrawers.js"><jsp:text> </jsp:text></script>
+    <script type="text/javascript" src="mmbasedrawers.js"><jsp:text> </jsp:text></script>
+  </kupu:part>
+
+
+  <kupu:part name="buttons">
+    <span class="kupu-tb-buttongroup">
+      <button type="button" class="kupu-image"        id="kupu-imagelibdrawer-button"  title="image" i18n:attributes="title">&#160;</button>
+      <button type="button" class="kupu-inthyperlink" id="kupu-linklibdrawer-button"   title="link"  i18n:attributes="title">&#160;</button>
+      <button type="button" class="kupu-exthyperlink" id="kupu-linkdrawer-button" title="external link" i18n:attributes="title">&#160;</button>
+      <!--
+      <button type="button" class="kupu-table"        id="kupu-tabledrawer-button"     title="table" i18n:attributes="title">&#160;</button>
+      -->
+    </span>
+  </kupu:part>
+
+  <kupu:part name="xmlconfig">
+    <mm:import externid="link_nodetypes">urls,segments,attachments</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>
+
+    <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>
+  </kupu:part>
+
+
+
+  <!-- Overridden just for the jsp:text, because otherwise the iframe collapes, and browsers get very confused -->
+  <kupu:part name="librarydrawer">
+    <div style="display:block;" class="kupu-librarydrawer-parent">
+      <iframe style="display:none" class="kupu-anchorframe" src="javascript:''"
+        onload="if(window.drawertool) window.drawertool.current_drawer.anchorframe_loaded();"><jsp:text>
+      </jsp:text>
+      </iframe>
+    </div>
+  </kupu:part>
+
+  <kupu:part name="linkdrawer">
+    <div id="kupu-linkdrawer" class="kupu-drawer kupu-linkdrawer">
+      <h1 i18n:translate="">External Link</h1>
+      <div id="kupu-linkdrawer-addlink" class="kupu-panels kupu-linkdrawer-addlink">
+        <table>
+        <tr><td><div class="kupu-toolbox-label">
+
+          <span i18n:translate="">Link the highlighted text to this URL:</span>
+        </div>
+
+        <input class="kupu-toolbox-st kupu-linkdrawer-input" type="text" />
+        </td><td class="kupu-preview-button">
+        <button type="button" onclick="drawertool.current_drawer.preview()" i18n:translate="">Preview</button>
+        </td></tr>
+        <tr class="kupu-linkdrawer-anchors" style="display:none">
+          <td colspan="2">
+            <label>Bookmark<select><option i18n:translate="" value="">(none)</option></select></label> 
+          </td>
+        </tr>
+        <tr><td colspan="2" align="center">
+        <iframe frameborder="1" scrolling="auto" width="440" height="198"
+                class="kupu-linkdrawer-preview" src="${abs}/../../common/kupublank.html"><jsp:text>
+        </jsp:text>
+        </iframe>
+        </td></tr>
+        </table>
+        <div class="kupu-dialogbuttons">
+          <button type="button" onclick="drawertool.current_drawer.save()" i18n:translate="">Ok</button>
+          <button type="button" onclick="drawertool.closeDrawer()" i18n:translate="">Cancel</button>
+        </div>
+
+      </div>
+    </div>
+  </kupu:part>
+
+
+
+
+</kupu:feature>

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/attachments.items.jspx
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/attachments.items.jspx	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,32 @@
+<!--
+    Produces: 'items' for attachments
+    Needs: a request context 'drawer', containing a listcontainer 'query'.
+-->
+<mm:context
+    xmlns:jsp="http://java.sun.com/JSP/Page" 
+    xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0" 
+    id="drawer" scope="request">
+  <jsp:output omit-xml-declaration="yes" />
+  <mm:import externid="surpressupload" />
+  <mm:content type="text/xml">
+    <mm:listnodescontainer referid="query">
+      <items>
+        <mm:context>
+          <mm:notpresent referid="surpressupload">
+            <uploadbutton>yes</uploadbutton>
+          </mm:notpresent>
+          <mm:listnodes id="attachment">
+            <resource id="${attachment.number}">          
+              <uri>mmbase://attachments/${attachment.number}</uri>
+              <title>[<mm:field name="mimetype" />: <mm:field name="title" />]</title>
+              <size><mm:field name="size" />b</size>
+              <icon>
+                <mm:function name="iconurl"/>
+              </icon>
+            </resource>
+          </mm:listnodes>
+        </mm:context>
+      </items>
+    </mm:listnodescontainer>
+  </mm:content>
+</mm:context>

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/collection.jspx
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/collection.jspx	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,39 @@
+<?xml version="1.0" ?>
+<mm:content 
+    xmlns:jsp="http://java.sun.com/JSP/Page" 
+    xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0" 
+    type="text/xml" 
+    expires="-1">
+  <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="kupubasedir" />
+  <collection>
+    <uri>drawers/collection.jspx?search=${search}</uri>
+    <icon>${kupubasedir}/mmbase/icons/map.gif</icon>
+    <title>MMBase</title>
+    <mm:cloud method="asis">
+      <mm:import externid="nodetype">images</mm:import>
+      <mm:import externid="source" />
+
+      <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>
+          <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:haspage>
+          <mm:haspage page="${nodetype}.items.jspx" inverse="true">
+            <mm:include referids="kupubasedir" page="texts.items.jspx" />
+          </mm:haspage>         
+        </mm:listnodescontainer>
+      </mm:context>
+    </mm:cloud>
+  </collection>
+</mm:content>

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/drawer.jspx
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/drawer.jspx	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,13 @@
+<mm:content
+    xmlns:jsp="http://java.sun.com/JSP/Page"
+    xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0"
+    type="text/html"
+    expires="-1">
+  <jsp:output omit-xml-declaration="true" />
+  <mm:cloud method="asis">
+    <mm:import id="nodetypes">images</mm:import>
+    <mm:formatter xslt="drawer.xsl" escape="none">
+      <mm:include referids="nodetypes" page="libraries.jspx" escape="none" />
+    </mm:formatter>
+  </mm:cloud>
+</mm:content>

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/drawer.xsl.jspx
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/drawer.xsl.jspx	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+##############################################################################
+#
+# Copyright (c) 2003-2005 Kupu Contributors. All rights reserved.
+#
+# This software is distributed under the terms of the Kupu
+# License. See LICENSE.txt for license text. For a list of Kupu
+# Contributors see CREDITS.txt.
+#
+##############################################################################
+
+XSL transformation from Kupu Library XML to HTML for the image library
+drawer.
+
+$Id: drawer.xsl,v 1.12 2005/09/16 19:47:56 michiel Exp $
+-->
+<xsl:stylesheet
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
+  xmlns="http://www.w3.org/1999/xhtml"
+  xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0"
+  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+  >
+  <mm:link absolute="true" page="../../common/kupudrawers/drawer.xsl">
+    <!-- Must be absolute, or otherwise IE chokes -->
+    <xsl:import href="${_}" />
+  </mm:link>    
+  
+
+  <!-- 
+       Overridden to use the 'showupload' parameter always, if an 'uploadbutton' tab is present 
+  -->
+  <xsl:template match="*" mode="panel">
+    <xsl:choose>
+      <xsl:when test="$drawertype='image'">
+        <xsl:if test="//resource[@selected]">
+          <xsl:apply-templates
+              select="/libraries/*[@selected]//resource[@selected]"
+              mode="image-properties"/>
+        </xsl:if>
+      </xsl:when>
+      <xsl:when test="$drawertype='link'">
+        <xsl:apply-templates
+            select="/libraries/*[@selected]//resource[@selected]"
+            mode="link-properties"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:apply-templates
+            select="//resource[@selected]"
+            mode="properties"/>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:if test="$showupload='yes'">
+      <xsl:apply-templates
+          select="/libraries/*[@selected]/uploadbutton"
+          mode="upload"/>
+    </xsl:if>
+  </xsl:template>
+
+  <!--
+      Just overridden to rename it, because we use upload also for attachments, not only for images 
+      (Called in 'panel' mode)
+  -->
+  <xsl:template match="uploadbutton" mode="upload">
+    <xsl:apply-templates select="." mode="image-upload" />
+  </xsl:template>
+
+
+  <!--
+      Overridden to remove 'target', we're not interested in that.
+  -->
+  <xsl:template match="resource|collection" mode="link-properties">
+    <xsl:apply-templates select="." mode="base-properties"/>
+  </xsl:template>
+
+  <!-- 
+       We know height and width beforehand, so we don't use the 'kupuFixImage' function.         
+       That works faster and more reliable.
+       They are added as attributes on all tags (icon, preview and uri).
+  -->
+  <xsl:template match="icon">
+    <img src="{.}" alt="{../title}">
+      <xsl:if test="@height">
+        <xsl:attribute name="height"><xsl:value-of select="@height" /></xsl:attribute>
+      </xsl:if>
+      <xsl:if test="@width">
+        <xsl:attribute name="width"><xsl:value-of select="@width" /></xsl:attribute>
+      </xsl:if>
+    </img>
+  </xsl:template>
+  
+  <xsl:template match="resource|collection" mode="image-view">
+    <xsl:choose>
+      <xsl:when test="preview">
+        <img src="{preview}" title="{title}"  width="{preview/@width}" height="{preview/@height}"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <img width="{uri/@width}" height="{uri/@height}" src="{uri}" title="{title}"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+  
+  <xsl:template name="mystyle">
+    <link type="text/css" rel="stylesheet" media="all">
+      <xsl:attribute name="href">mydrawerstyle.css</xsl:attribute>
+    </link>
+  </xsl:template>
+
+</xsl:stylesheet>

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/images.items.jspx
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/images.items.jspx	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,50 @@
+<!--
+    Produces: 'items' for images
+    Needs: a request context 'drawer', containing a listcontainer 'query'.
+-->
+<mm:context
+    xmlns:jsp="http://java.sun.com/JSP/Page" 
+    xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0" 
+    id="drawer" scope="request">
+  <jsp:output omit-xml-declaration="yes" />
+  <mm:import externid="surpressupload" />
+  <mm:content type="text/xml">
+    <mm:notpresent referid="query">
+      <mm:cloud method="asis">
+        <mm:listnodescontainer id="query" type="images" />
+      </mm:cloud>
+    </mm:notpresent>
+    <mm:listnodescontainer referid="query">
+      <mm:maxnumber value="100" />
+      <mm:sortorder field="number" direction="down" />
+      <items>
+        <mm:context>
+          <mm:notpresent referid="surpressupload">
+            <uploadbutton>yes</uploadbutton>
+          </mm:notpresent>
+          <mm:listnodes id="image">
+            <resource id="${image.number}">          
+              <mm:image template="s(100x100&gt;)">
+                <uri height="${dimension.height}" width="${dimension.width}">${mm:escape('text/xml', _)}</uri>
+              </mm:image>
+              <title><mm:field name="title" /></title>
+              <size><mm:field name="filesize" />b</size>
+              <mm:hasfield name="height">
+                <mm:image>
+                  <height>${dimension.height}</height>
+                  <width>${dimension.width}</width>
+                </mm:image>
+              </mm:hasfield>
+              <mm:image template="s(200x200&gt;)">
+                <preview height="${dimension.height}" width="${dimension.width}">${mm:escape('text/xml', _)}</preview>
+              </mm:image>
+              <mm:image template="s(40x40&gt;)">
+                <icon height="${dimension.height}" width="${dimension.width}">${mm:escape('text/xml', _)}</icon>
+              </mm:image>
+            </resource>
+          </mm:listnodes>
+        </mm:context>
+      </items>
+    </mm:listnodescontainer>
+  </mm:content>
+</mm:context>

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/kupudrawerstyles.css
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/kupudrawerstyles.css	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,189 @@
+/*****************************************************************************
+ *
+ * Kupu drawer styles
+ *
+ * Copyright (c) 2003-2005 Kupu Contributors. See CREDITS.txt
+ *
+ * Instead of customizing this file, it is recommended to add your own
+ * CSS file.  Feel free to use whole or parts of this for your own
+ * designs, but give credit where credit is due.
+ *
+ *****************************************************************************/
+
+/* $Id: kupudrawerstyles.css,v 1.1 2005/04/21 21:40:27 michiel Exp $ */
+
+.kupu-drawer {
+  position: absolute;
+  display: none;
+  border: solid 1px gray;
+  border-top: solid 10px #c0c0c0;
+  background-color: ButtonFace;
+  padding: 0 8px 8px 8px;
+  height: auto;
+  width: 520px;
+  z-index: 2;
+}
+
+.kupu-drawer h1 {
+   height: auto; width: auto;
+}
+
+div#kupu-drawerheader, div#kupu-dialogbuttons { 
+  font-family: sans-serif;
+}
+
+input#kupu-searchbox-input {
+  width: 8em;
+  margin-bottom: 6px;
+  margin-top: 12px;
+  padding: 2px;
+}
+
+input#kupu-linkdrawer-input {
+  width: 400px;
+}
+
+div#kupu-librarydrawer h1, div.kupu-drawer h1 {
+  margin-top: 12px;
+}
+
+div.kupu-dialogbuttons {
+  text-align: right;
+  margin-top: 6px;
+  margin-bottom: 6px;
+}
+
+div.kupu-dialogbuttons button {
+  margin-left: 0.3em;
+}
+
+div.kupu-panels {
+  width: 100%;
+  background-color: ButtonFace;
+  clear:both;
+}
+
+div.kupu-panels td {
+  font-family: sans-serif;
+  font-size: 12px;
+  background-color: white;
+  vertical-align: top;
+  padding: 6px;
+}
+
+div.kupu-panels td.kupu-preview-button {
+  vertical-align: bottom;
+}
+
+div.kupu-panels table {
+ width: 100%; 
+ margin: 0; 
+ padding: 0; 
+ border: 0;
+}
+
+td.panel {
+  height: 260px;
+}
+
+td#kupu-librariespanel {
+  width: 22%;
+}
+
+td#kupu-resourcespanel {
+  width: 33%;
+}
+
+td#kupu-propertiespanel {
+  width: 45%;
+}
+
+div#kupu-resourceitems {
+  height: 100%;
+}
+
+.overflow {
+  overflow: auto;
+  height: 100%;
+}
+
+div.kupu-libsource, div.kupu-libsource-selected {
+  text-align: center;
+  padding-top: 0.2em;
+  padding-bottom: 0.6em;
+}
+
+div.response, div.collection {
+  background-repeat: no-repeat;
+  padding-left: 20px;
+  height: 15px;
+  margin-top: 0.1em;
+  overflow: hidden;
+  padding-top: 4px;
+}
+
+div.kupu-libsource, div.kupu-libsource-selected, 
+div.kupu-resource, div.kupu-collection, div.kupu-upload {
+  cursor: pointer;
+  margin-bottom: 2px;
+  vertical-align: text-bottom;
+}
+div.kupu-upload {
+   text-align: right; font-style: italic;
+}
+
+div.kupu-libsource-selected {
+  background-repeat: no-repeat;
+}
+
+div.kupu-libsource-selected span,
+ div.kupu-libsource span{
+  margin-top: 3px;
+  display: block;
+}
+
+div.kupu-libsource-selected span {
+  background-color: ButtonFace;  
+}
+
+#kupu-tabledrawer-edittable {
+  display: none;
+}
+
+img.library-icon-collection, img.library-icon-resource {
+  margin-right: 5px;
+  height: 16px;
+  width: 16px;
+}
+
+span.drawer-item-title {
+  padding-left: 2px;
+  padding-right: 2px;
+  padding-top: 2px;
+}
+
+/* Local image upload form */
+
+#kupu-upload-to {
+  margin-top: 10px;
+  margin-bottom: 10px;
+  clear:both;
+}
+
+#kupu-upload-file {
+  margin-top: 10px;
+  margin-bottom: 10px;
+  clear:both;
+}
+
+#kupu-upload-title {
+  margin-top: 10px;
+  margin-bottom: 10px;
+  clear:both;
+}
+
+#kupu-upload-instructions {
+  margin-top:10px;
+  margin-bottom: 20px;
+  clear:both;
+}

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/kupuimages/kupublank.html
==============================================================================

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/kupuimages/kupulibrary.png
==============================================================================
Binary file. No diff available.

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/libraries.jspx
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/libraries.jspx	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,29 @@
+<?xml version="1.0" ?>
+<mm:content
+    xmlns:jsp="http://java.sun.com/JSP/Page"
+    xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0"
+    type="text/xml"
+    expires="-1">
+  <mm:cloud method="asis">
+    <mm:import externid="nodetypes" vartype="list">images,attachments,segments,urls</mm:import>
+    <mm:import id="s" externid="source" />
+    <mm:present referid="s">
+      <mm:node referid="s" id="s" />
+    </mm:present>
+    <libraries>
+      <param name="showupload">yes</param>
+      <param name="drawertype">image</param>
+      <mm:url absolute="server" id="kupubasedir" page="../.." write="false" />
+      <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:context>
+          </mm:hasrelationmanager>
+        </mm:hasnodemanager>
+      </mm:stringlist>
+    </libraries>
+  </mm:cloud>
+</mm:content>

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/library.jspx
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/library.jspx	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,37 @@
+<mm:content
+    xmlns:jsp="http://java.sun.com/JSP/Page"
+    xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0"
+    type="text/xml"
+    expires="-1">
+  <!--
+       $Id: library.jspx,v 1.13 2005/10/19 14:18:50 michiel Exp $
+  -->
+  <jsp:output omit-xml-declaration="yes" />
+
+  <mm:cloud method="asis">
+    <mm:import externid="nodetype">images</mm:import>
+    <mm:import externid="source" />
+    <mm:import externid="kupubasedir" />
+    <mm:context scope="request" id="drawer">
+      <library id="${nodetype}">
+        <title>
+          <mm:nodeinfo nodetype="$nodetype" type="plural_guinodemanager" />
+        </title>
+        <icon height="12" width="16">${kupubasedir}mmbase/icons/map.gif</icon>
+        <mm:remove referid="query" />
+        <mm:listnodescontainer id="query" type="$nodetype">
+          <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>
+        </mm:listnodescontainer>
+        <mm:compare referid="nodetype" valueset="images,attachments">
+          <uploadbutton type="${nodetype}">
+            <uri>drawers/upload.jspx?nodetype=${nodetype}</uri>
+          </uploadbutton>
+        </mm:compare>
+      </library>
+    </mm:context>
+  </mm:cloud>
+</mm:content>
\ No newline at end of file

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/search.constraints.jspx
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/search.constraints.jspx	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,21 @@
+<!-- 
+     This xml can be jsp:directive.include-d inside a node-container.
+     It need two variables to exist:
+     search:    string to search on
+     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>
+      </mm:fieldinfo>
+    </mm:fieldlist>
+  </mm:composite>
+</mm:isnotempty>

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/search.library.jspx
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/search.library.jspx	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,56 @@
+<mm:content
+    xmlns:jsp="http://java.sun.com/JSP/Page"
+    xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0"
+    type="text/xml"
+    expires="-1">
+  <jsp:directive.page  errorPage="../error.jspx" />
+  <!--
+       $Id: search.library.jspx,v 1.3 2005/10/19 14:18:50 michiel Exp $
+  -->
+  <jsp:output omit-xml-declaration="yes" />
+
+  <mm:cloud method="asis">
+    <mm:import id="search" externid="SearchableText" required="true" />
+
+    <mm:import externid="librarysize">50</mm:import>
+    <mm:import externid="page">0</mm:import>
+    <mm:import vartype="list" externid="link_nodetypes">images</mm:import>
+    <mm:import externid="source" />
+
+    <mm:log>${nodetypes}</mm:log>
+    <library id="${nodetypes}_${search}">
+      <uri><mm:url referids="search,librarysize at max,link_nodetypes at nodetypes" page="drawers/collection.jspx" /></uri>
+      <title>"<mm:write referid="search" />"</title>
+      <icon>icons/map.gif</icon>
+
+      <mm:stringlist referid="link_nodetypes">
+        <mm:hasnodemanager name="$_">
+          <mm:context id="drawer" scope="request">
+            <mm:import externid="kupubasedir" reset="true" />
+            <mm:remove referid="nodetype" />
+            <mm:write id="nodetype" write="false" />
+            <mm:remove referid="query" />
+            <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>
+              <mm:sortorder field="number" direction="down" />
+              <mm:maxnumber value="$librarysize" />
+              <mm:offset    value="${librarysize * page}" />
+              <mm:haspage page="${nodetype}.items.jspx">
+                <mm:include debug="xml" page="${nodetype}.items.jspx">
+                  <mm:param name="surpressupload" />
+                </mm:include>
+              </mm:haspage>
+              <mm:haspage page="${nodetype}.items.jspx" inverse="true">
+                <mm:include debug="xml" page="texts.items.jspx" />
+              </mm:haspage>
+            </mm:listnodescontainer>
+          </mm:context>
+        </mm:hasnodemanager>
+      </mm:stringlist>
+
+    </library>
+  </mm:cloud>
+</mm:content>
\ No newline at end of file

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/segments.items.jspx
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/segments.items.jspx	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,36 @@
+<!--
+    Produces: 'items' for images
+    Needs: a request context 'drawer', containing a listcontainer 'query'.
+-->
+<mm:context
+    xmlns:jsp="http://java.sun.com/JSP/Page" 
+    xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0" 
+    id="drawer" scope="request">
+  <jsp:output omit-xml-declaration="yes" />
+  <mm:import externid="kupubasedir" reset="true" />
+  <mm:content type="text/xml">
+    <mm:listnodescontainer referid="query">
+      <items>
+        <mm:context>
+          <mm:listnodes id="segment">
+            <resource id="${segment.number}">          
+              <uri>mmbase://segments/${segment.number}</uri>
+              <title>
+                <mm:hasfunction name="index">
+                  <mm:function name="index">
+                    <mm:isempty>
+                      <mm:field name="title" />
+                    </mm:isempty>
+                    <mm:write />
+                  </mm:function>
+                </mm:hasfunction>
+              </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>
+            </resource>
+          </mm:listnodes>
+        </mm:context>
+      </items>
+    </mm:listnodescontainer>
+  </mm:content>
+</mm:context>

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/test.post.jspx
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/test.post.jspx	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,20 @@
+<?xml version="1.0" ?>
+<mm:content 
+    xmlns:jsp="http://java.sun.com/JSP/Page" 
+    xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0" 
+    type="text/html" 
+    expires="-1">
+  <jsp:directive.page session="true" errorPage="../error.jspx" />
+  <html>
+    <head>
+    </head>
+    <body>
+      <form  enctype="multipart/form-data" method="post" action="upload.jspx">
+        <input type="file" name="node_prop_image" />
+        <input type="submit" />
+        <input type="hidden" name="upload" value="/kupuUploadImage" />
+        <input type="hidden" name="nodetype" value="attachments" />
+      </form>
+    </body>
+  </html>
+</mm:content>

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/texts.items.jspx
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/texts.items.jspx	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,33 @@
+<!--
+    Produces: 'items' for images
+    Needs: a request context 'drawer', containing a listcontainer 'query'.
+-->
+<mm:context
+    xmlns:jsp="http://java.sun.com/JSP/Page" 
+    xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0" 
+    id="drawer" scope="request">
+  <jsp:output omit-xml-declaration="yes" />
+  <mm:import externid="kupubasedir" reset="true" />
+  <mm:content type="text/xml">
+    <mm:listnodescontainer referid="query">
+      <items>
+        <mm:context>
+          <mm:listnodes id="text">
+            <mm:nodeinfo type="nodemanager" id="nm" write="false" />
+            <resource id="${text.number}">          
+              <uri>mmbase://${nm}/${text.number}</uri>
+              <title><mm:hasfunction name="icon" inverse="true"><mm:nodeinfo type="guinodemanager" />: </mm:hasfunction><mm:function name="gui" write="true"><mm:isempty><mm:field name="number" /></mm:isempty></mm:function></title>
+              <description><mm:nodeinfo type="guitype" />: <mm:function name="gui" /></description>
+              <mm:hasfunction name="icon">
+                <icon><mm:function name="icon" /></icon>
+              </mm:hasfunction>
+              <mm:hasfunction name="icon" inverse="true">
+                <icon>${kupubasedir}/common/kupuimages/document.png</icon>
+              </mm:hasfunction>
+            </resource>
+          </mm:listnodes>
+        </mm:context>
+      </items>
+    </mm:listnodescontainer>
+  </mm:content>
+</mm:context>

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/upload.jspx
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/upload.jspx	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,53 @@
+<?xml version="1.0" ?>
+<html>
+<mm:content 
+    xmlns:jsp="http://java.sun.com/JSP/Page" 
+    xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0" 
+    type="text/html" 
+    expires="-1">
+  <jsp:directive.page session="true" errorPage="../error.jspx" />
+  <head>
+  </head>
+
+    
+  <mm:cloud rank="basic user">
+    <mm:import externid="nodetype">images</mm:import>    
+    <mm:log>Uploading</mm:log>
+    <mm:import id="title" externid="node_prop_title" from="multipart"/>
+    <mm:import id="description" externid="node_prop_desc" from="multipart"/>
+    <mm:import id="file" externid="node_prop_image" from="multipart" vartype="fileitem"  />
+    <mm:createnode type="$nodetype" id="node">
+      <mm:hasfield name="title">
+        <mm:setfield name="title" valueid="title" />
+      </mm:hasfield>
+      <mm:hasfield name="name">
+        <mm:setfield name="name" valueid="title" />
+      </mm:hasfield>
+      <mm:hasfield name="subtitle">
+        <mm:setfield name="subtitle" valueid="description" />
+      </mm:hasfield>
+      <mm:hasfield name="description">
+        <mm:setfield name="description" valueid="description" />
+      </mm:hasfield>
+      <mm:hasfield name="filename">
+        <mm:setfield name="filename">${file.name}</mm:setfield>
+      </mm:hasfield>
+      <mm:setfield name="handle" valueid="file" />
+    </mm:createnode>
+    <mm:node referid="node">
+      <mm:function name="mimetype" id="mimetype" write="false" />
+      <mm:hasfunction name="cache">
+        <mm:image template="s(100x100&gt;)">
+          <body onLoad="window.parent.kupu.getTool('drawertool').current_drawer.finishUpload('${_}', '${mimetype}');">
+          </body>
+        </mm:image>
+      </mm:hasfunction>
+      <mm:hasfunction name="cache" inverse="true">
+        <mm:field name="number" write="false" id="number" />
+        <body onLoad="window.parent.kupu.getTool('drawertool').current_drawer.finishUpload('mmbase://${nodetype}/${number}', '${mimetype}');">
+        </body>
+      </mm:hasfunction>
+    </mm:node>
+  </mm:cloud>
+</mm:content>
+</html>
\ No newline at end of file

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/urls.items.jspx
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/drawers/urls.items.jspx	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,39 @@
+<!--
+    Produces: 'items' for urls
+    Needs: a request context 'drawer', containing a listcontainer 'query'.
+-->
+<mm:context
+    xmlns:jsp="http://java.sun.com/JSP/Page" 
+    xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0" 
+    id="drawer" scope="request">
+  <jsp:output omit-xml-declaration="yes" />
+  <mm:content type="text/xml">
+    <mm:import externid="kupubasedir" reset="true" />
+    <mm:listnodescontainer referid="query">
+      <items>
+        <mm:context>
+          <mm:listnodes id="url">
+            <resource id="${url.number}">   
+              <uri><mm:field name="url" /></uri>
+              <title>
+                <mm:hasfield name="title">
+                  <mm:field id="title" name="title"><mm:write /><mm:isempty><mm:field name="url"><mm:write /><mm:isempty>No title</mm:isempty></mm:field></mm:isempty></mm:field>
+                </mm:hasfield>
+                <mm:hasfield name="name">
+                  <mm:field id="name"  name="name"><mm:write /><mm:isempty><mm:field name="url"><mm:write /><mm:isempty>No title</mm:isempty></mm:field></mm:isempty></mm:field>
+                </mm:hasfield>
+                <mm:notpresent referid="title">
+                  <mm:notpresent referid="name">
+                    <mm:field name="url" />
+                  </mm:notpresent>
+                </mm:notpresent>
+              </title>
+              <description><mm:field name="url" /></description>
+              <icon>${kupubasedir}/common/kupuimages/link.png</icon>
+            </resource>
+          </mm:listnodes>
+        </mm:context>
+      </items>
+    </mm:listnodescontainer>
+  </mm:content>
+</mm:context>

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/error.jspx
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/error.jspx	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,43 @@
+<html
+    xmlns:jsp="http://java.sun.com/JSP/Page"
+    xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0"
+    xml:lang="nl" lang="nl">
+  <jsp:output omit-xml-declaration="true" />
+  <jsp:directive.page session="false" isErrorPage="true" />
+  <mm:content language="nl" type="text/html" postprocessor="reducespace" expires="0">
+    
+    <head>
+      <title><mm:import id="title">500 <jsp:expression>exception != null ? exception.getMessage() : " fout "</jsp:expression></mm:import><mm:write referid="title" /></title>
+      <mm:link  page="/mmbase/style/favicon.ico">
+        <link rel="icon" href="${_}" type="image/x-icon" />
+        <link rel="shortcut icon" href="${_}" type="image/x-icon" />
+      </mm:link>
+      <mm:link page="/mmbase/style/css/mmbase.css">
+        <link rel="stylesheet" href="${_}" />
+      </mm:link>
+    </head>
+    <body>
+      <div id="frame" >           
+             
+        <div id="content">        
+          <h1><mm:write referid="title" /></h1>
+          <p>
+            Deze pagina bevat een fout.
+          </p>
+          <mm:log jspvar="log"><jsp:scriptlet>log.warn(exception, exception);</jsp:scriptlet></mm:log>
+          <pre>
+            STACK
+            <mm:import id="trace">
+              <jsp:scriptlet>
+                if (exception != null) { 
+                exception.printStackTrace(new java.io.PrintWriter(out));
+                } 
+              </jsp:scriptlet>
+            </mm:import>
+            <mm:write referid="trace" />
+          </pre>          
+        </div>
+      </div>
+    </body>
+  </mm:content>
+</html>
\ No newline at end of file

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/head.kupu
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/head.kupu	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,56 @@
+<?xml version="1.0" ?>
+<kupu:feature
+    name="head"
+    implementation="mmbase"
+    xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:kupu="http://kupu.oscom.org/namespaces/dist"
+    xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
+    xmlns:jsp="http://java.sun.com/JSP/Page"
+    xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0">
+  <kupu:id>$Id: head.kupu,v 1.15 2005/09/14 17:24:31 michiel Exp $</kupu:id>
+  
+  <kupu:part name="meta">
+    <fmt:bundle basename="org.mmbase.kupu.Messages">
+      <title>
+        <fmt:message key="Richtext editor" />
+        <jsp:text>: ${param.objectnumber}</jsp:text>
+      </title>
+    </fmt:bundle>
+    <mm:link page="/mmbase/style/images/edit.ico">
+      <link rel="icon"          href="${_}" type="image/x-icon" />
+      <link rel="shortcut icon" href="${_}" type="image/x-icon" />
+    </mm:link>
+    <mm:import id="kupu_common">../common</mm:import>
+  </kupu:part>
+
+  <kupu:part name="jsincludes">
+    <script type="text/javascript" src="${kupu_common}/sarissa.js"><jsp:text> </jsp:text></script>
+    <script type="text/javascript" src="${kupu_common}/sarissa_ieemu_xpath.js"><jsp:text> </jsp:text></script>
+    <script type="text/javascript" src="${kupu_common}/kupuhelpers.js"><jsp:text> </jsp:text></script>
+    <script type="text/javascript" src="${kupu_common}/kupueditor.js"><jsp:text> </jsp:text></script>
+    <script type="text/javascript" src="${kupu_common}/kupubasetools.js"><jsp:text> </jsp:text></script>
+    <script type="text/javascript" src="${kupu_common}/kupuloggers.js"><jsp:text> </jsp:text></script>
+    <script type="text/javascript" src="${kupu_common}/kupuspellchecker.js"><jsp:text> </jsp:text></script>
+    <script type="text/javascript" src="${kupu_common}/kupunoi18n.js"><jsp:text> </jsp:text></script>
+    <script type="text/javascript" src="../i18n.js"><jsp:text> </jsp:text></script>
+    <script type="text/javascript" src="${kupu_common}/kupucleanupexpressions.js"><jsp:text> </jsp:text></script>
+    <script type="text/javascript" src="${kupu_common}/kupucontentfilters.js"><jsp:text> </jsp:text></script>
+    <script type="text/javascript" src="${kupu_common}/kuputoolcollapser.js"><jsp:text> </jsp:text></script>
+    <script type="text/javascript" src="cross-browser.js"><jsp:text> </jsp:text></script>
+    <script type="text/javascript" src="layout.js"><jsp:text> </jsp:text></script>
+    <script type="text/javascript" src="mmbasetools.js"><jsp:text> </jsp:text></script>
+    <script type="text/javascript" src="mmbase.js"><jsp:text> </jsp:text></script>
+  </kupu:part>
+
+  <kupu:part name="styles">
+    <link href="${kupu_common}/kupustyles.css" rel="stylesheet" type="text/css"><jsp:text> </jsp:text></link> 
+    <!-- fills image buttons and so on -->
+    <link href="mmbase.css" rel="stylesheet" type="text/css" />    
+  </kupu:part>
+
+
+  <kupu:part name="bootstrap-editor">
+    <script type="text/javascript" src="kupuinit.js"><jsp:text> </jsp:text></script>
+  </kupu:part>
+
+</kupu:feature>

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/html.kupu
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/html.kupu	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,40 @@
+<?xml version="1.0" ?>
+<kupu:feature
+    name="html"
+    implementation="mmbase"
+    xmlns:kupu="http://kupu.oscom.org/namespaces/dist"
+    >
+  <kupu:id>$Id: html.kupu,v 1.14 2005/09/27 18:26:52 michiel Exp $</kupu:id>
+  <kupu:part name="html">
+    <html xmlns="http://www.w3.org/1999/xhtml"
+          xmlns:jsp="http://java.sun.com/JSP/Page" 
+          xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
+          xmlns:fn="http://java.sun.com/jsp/jstl/functions"
+          xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0">
+      &lt;!-- This file is automaticly generated, don't edit!! --&gt; <!-- That is, not _this_ file, but index.jspx ..-->
+      <jsp:output doctype-root-element="html"
+                  doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
+                  doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"/>
+
+      <mm:url absolute="server" id="kupubasedir" page=".." write="false" />
+      <mm:cloud rank="basic user">
+        <!--
+        <mm:import id="org.mmbase.index-root" externid="root" />
+        <mm:import externid="org.mmbase.index-root" from="this,session" />
+        <mm:param referid="org.mmbase.index-root" />
+        <mm:write session="org.mmbase.index-root" referid="org.mmbase.index-root" />
+        -->
+        <mm:import id="rich_language" externid="language" />
+        <mm:import externid="rich_language" from="this,session">client</mm:import>
+        <mm:write session="rich_language" referid="rich_language" />
+        <mm:write cookie="rich_language" referid="rich_language"/>
+        <mm:content type="text/html"  language="${rich_language}" expires="0" jspvar="locale" postprocessor="none">
+          <mm:import id="lang"><jsp:expression>((java.util.Locale)locale).getLanguage()</jsp:expression></mm:import>
+          <fmt:bundle basename="org.oscom.kupu.Messages">
+            <kupu:define-slot name="html" />
+          </fmt:bundle>
+        </mm:content>
+      </mm:cloud>
+    </html>
+  </kupu:part>
+</kupu:feature>

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/i18n/de.po
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/i18n/de.po	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,113 @@
+# German translations for mmbase package.
+# Copyright (C) 2005 THE mmbase'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the mmbase package.
+# Michiel Meeuwissen <EMAIL at ADDRESS>, 2005.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: mmbase 18\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-11-28 18:04+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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: mmbase.js:141
+msgid "Saving body (kupu)"
+msgstr ""
+
+#: mmbase.js:144
+msgid "Saving fields (form)"
+msgstr ""
+
+#: mmbase.js:173
+msgid "saved"
+msgstr ""
+
+#: mmbase.js:202
+msgid "RELOAD"
+msgstr ""
+
+#: mmbase.js:223
+msgid "Getting node fields for "
+msgstr ""
+
+#: mmbase.js:231
+msgid "Loading node fields for "
+msgstr ""
+
+#: mmbase.js:243
+msgid "Getting node body "
+msgstr ""
+
+#: mmbase.js:250
+msgid "Loading node body "
+msgstr ""
+
+#: mmbasetools.js:13
+msgid "Div tool initialized"
+msgstr ""
+
+#: mmbasetools.js:39
+msgid "Found paragraph"
+msgstr ""
+
+#: mmbasetools.js:43
+msgid "Didn't find paragraph"
+msgstr ""
+
+#: mmbasetools.js:48
+msgid "Div inserted"
+msgstr ""
+
+#: phony.js:1
+msgid "No node"
+msgstr ""
+
+#: phony.js:2
+msgid "Normal"
+msgstr ""
+
+#: phony.js:3 phony.js:5
+msgid "Richtext editor"
+msgstr ""
+
+#: phony.js:4
+msgid "Heading 1"
+msgstr ""
+
+#: phony.js:6
+msgid "default"
+msgstr ""
+
+#: phony.js:7
+msgid "Block"
+msgstr ""
+
+#: phony.js:8
+msgid "Block class"
+msgstr ""
+
+#: phony.js:9
+msgid "Note left"
+msgstr ""
+
+#: phony.js:10
+msgid "Note right"
+msgstr ""
+
+#: phony.js:11
+msgid "Insert block"
+msgstr ""
+
+#: override.js:2
+msgid "strong: alt-b"
+msgstr ""
+
+#: override.js:3
+msgid "emphasis: alt-i"
+msgstr ""

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/i18n/en.po
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/i18n/en.po	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,113 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-11-28 18:04+0100\n"
+"PO-Revision-Date: 2005-11-28 18:05+0100\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: mmbase.js:141
+msgid "Saving body (kupu)"
+msgstr "Saving body (kupu)"
+
+#: mmbase.js:144
+msgid "Saving fields (form)"
+msgstr "Saving fields (form)"
+
+#: mmbase.js:173
+msgid "saved"
+msgstr "saved"
+
+#: mmbase.js:202
+msgid "RELOAD"
+msgstr "RELOAD"
+
+#: mmbase.js:223
+msgid "Getting node fields for "
+msgstr "Getting node fields for "
+
+#: mmbase.js:231
+msgid "Loading node fields for "
+msgstr "Loading node fields for "
+
+#: mmbase.js:243
+msgid "Getting node body "
+msgstr "Getting node body "
+
+#: mmbase.js:250
+msgid "Loading node body "
+msgstr "Loading node body "
+
+#: mmbasetools.js:13
+msgid "Div tool initialized"
+msgstr "Div tool initialized"
+
+#: mmbasetools.js:39
+msgid "Found paragraph"
+msgstr "Found paragraph"
+
+#: mmbasetools.js:43
+msgid "Didn't find paragraph"
+msgstr "Didn't find paragraph"
+
+#: mmbasetools.js:48
+msgid "Div inserted"
+msgstr "Div inserted"
+
+#: phony.js:1
+msgid "No node"
+msgstr "No node"
+
+#: phony.js:2
+msgid "Normal"
+msgstr "Normal"
+
+#: phony.js:3 phony.js:5
+msgid "Richtext editor"
+msgstr "Richtext editor"
+
+#: phony.js:4
+msgid "Heading 1"
+msgstr "Heading 1"
+
+#: phony.js:6
+msgid "default"
+msgstr "default"
+
+#: phony.js:7
+msgid "Block"
+msgstr "Block"
+
+#: phony.js:8
+msgid "Block class"
+msgstr "Block class"
+
+#: phony.js:9
+msgid "Note left"
+msgstr "Note left"
+
+#: phony.js:10
+msgid "Note right"
+msgstr "Note right"
+
+#: phony.js:11
+msgid "Insert block"
+msgstr "Insert block"
+
+#: override.js:2
+msgid "strong: alt-b"
+msgstr "strong: alt-b"
+
+#: override.js:3
+msgid "emphasis: alt-i"
+msgstr "emphasis: alt-i"

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/i18n/eo.po
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/i18n/eo.po	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,113 @@
+# Esperanto translations for mmbase package.
+# Copyright (C) 2005 THE mmbase'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the mmbase package.
+# Michiel Meeuwissen <EMAIL at ADDRESS>, 2005.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: mmbase 18\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-11-28 18:04+0100\n"
+"PO-Revision-Date: 2005-11-28 18: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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: mmbase.js:141
+msgid "Saving body (kupu)"
+msgstr "Savante tekston (kupan)"
+
+#: mmbase.js:144
+msgid "Saving fields (form)"
+msgstr "Savante kampojn (formularajn)"
+
+#: mmbase.js:173
+msgid "saved"
+msgstr "Savita"
+
+#: mmbase.js:202
+msgid "RELOAD"
+msgstr "RETIRAS"
+
+#: mmbase.js:223
+msgid "Getting node fields for "
+msgstr "Tirante kampojn"
+
+#: mmbase.js:231
+msgid "Loading node fields for "
+msgstr "En?utante kampojn por "
+
+#: mmbase.js:243
+msgid "Getting node body "
+msgstr "Tirante nodan korpon "
+
+#: mmbase.js:250
+msgid "Loading node body "
+msgstr "En?utante objekton"
+
+#: mmbasetools.js:13
+msgid "Div tool initialized"
+msgstr ""
+
+#: mmbasetools.js:39
+msgid "Found paragraph"
+msgstr ""
+
+#: mmbasetools.js:43
+msgid "Didn't find paragraph"
+msgstr ""
+
+#: mmbasetools.js:48
+msgid "Div inserted"
+msgstr ""
+
+#: phony.js:1
+msgid "No node"
+msgstr "Nenio nodo"
+
+#: phony.js:2
+msgid "Normal"
+msgstr ""
+
+#: phony.js:3 phony.js:5
+msgid "Richtext editor"
+msgstr "Ri?a redaktilo"
+
+#: phony.js:4
+msgid "Heading 1"
+msgstr ""
+
+#: phony.js:6
+msgid "default"
+msgstr "defa?lto"
+
+#: phony.js:7
+msgid "Block"
+msgstr ""
+
+#: phony.js:8
+msgid "Block class"
+msgstr ""
+
+#: phony.js:9
+msgid "Note left"
+msgstr ""
+
+#: phony.js:10
+msgid "Note right"
+msgstr ""
+
+#: phony.js:11
+msgid "Insert block"
+msgstr ""
+
+#: override.js:2
+msgid "strong: alt-b"
+msgstr "forte: alt-b"
+
+#: override.js:3
+msgid "emphasis: alt-i"
+msgstr "emfaze: alt-e"

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/i18n/fr.po
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/i18n/fr.po	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,113 @@
+# French translations for mmbase package.
+# Copyright (C) 2005 THE mmbase'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the mmbase package.
+# Michiel Meeuwissen <EMAIL at ADDRESS>, 2005.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: mmbase 18\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-11-28 18:04+0100\n"
+"PO-Revision-Date: 2005-06-09 00:42+0200\n"
+"Last-Translator: Michiel Meeuwissen <EMAIL at ADDRESS>\n"
+"Language-Team: French <traduc at traduc.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: mmbase.js:141
+msgid "Saving body (kupu)"
+msgstr ""
+
+#: mmbase.js:144
+msgid "Saving fields (form)"
+msgstr ""
+
+#: mmbase.js:173
+msgid "saved"
+msgstr ""
+
+#: mmbase.js:202
+msgid "RELOAD"
+msgstr ""
+
+#: mmbase.js:223
+msgid "Getting node fields for "
+msgstr ""
+
+#: mmbase.js:231
+msgid "Loading node fields for "
+msgstr ""
+
+#: mmbase.js:243
+msgid "Getting node body "
+msgstr ""
+
+#: mmbase.js:250
+msgid "Loading node body "
+msgstr ""
+
+#: mmbasetools.js:13
+msgid "Div tool initialized"
+msgstr ""
+
+#: mmbasetools.js:39
+msgid "Found paragraph"
+msgstr ""
+
+#: mmbasetools.js:43
+msgid "Didn't find paragraph"
+msgstr ""
+
+#: mmbasetools.js:48
+msgid "Div inserted"
+msgstr ""
+
+#: phony.js:1
+msgid "No node"
+msgstr ""
+
+#: phony.js:2
+msgid "Normal"
+msgstr ""
+
+#: phony.js:3 phony.js:5
+msgid "Richtext editor"
+msgstr ""
+
+#: phony.js:4
+msgid "Heading 1"
+msgstr ""
+
+#: phony.js:6
+msgid "default"
+msgstr ""
+
+#: phony.js:7
+msgid "Block"
+msgstr ""
+
+#: phony.js:8
+msgid "Block class"
+msgstr ""
+
+#: phony.js:9
+msgid "Note left"
+msgstr ""
+
+#: phony.js:10
+msgid "Note right"
+msgstr ""
+
+#: phony.js:11
+msgid "Insert block"
+msgstr ""
+
+#: override.js:2
+msgid "strong: alt-b"
+msgstr ""
+
+#: override.js:3
+msgid "emphasis: alt-i"
+msgstr ""

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/i18n/it.po
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/i18n/it.po	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,113 @@
+# Italian translations for mmbase package.
+# Copyright (C) 2005 THE mmbase'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the mmbase package.
+# Michiel Meeuwissen <EMAIL at ADDRESS>, 2005.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: mmbase 18\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-11-28 18:04+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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: mmbase.js:141
+msgid "Saving body (kupu)"
+msgstr ""
+
+#: mmbase.js:144
+msgid "Saving fields (form)"
+msgstr ""
+
+#: mmbase.js:173
+msgid "saved"
+msgstr ""
+
+#: mmbase.js:202
+msgid "RELOAD"
+msgstr ""
+
+#: mmbase.js:223
+msgid "Getting node fields for "
+msgstr ""
+
+#: mmbase.js:231
+msgid "Loading node fields for "
+msgstr ""
+
+#: mmbase.js:243
+msgid "Getting node body "
+msgstr ""
+
+#: mmbase.js:250
+msgid "Loading node body "
+msgstr ""
+
+#: mmbasetools.js:13
+msgid "Div tool initialized"
+msgstr ""
+
+#: mmbasetools.js:39
+msgid "Found paragraph"
+msgstr ""
+
+#: mmbasetools.js:43
+msgid "Didn't find paragraph"
+msgstr ""
+
+#: mmbasetools.js:48
+msgid "Div inserted"
+msgstr ""
+
+#: phony.js:1
+msgid "No node"
+msgstr ""
+
+#: phony.js:2
+msgid "Normal"
+msgstr ""
+
+#: phony.js:3 phony.js:5
+msgid "Richtext editor"
+msgstr ""
+
+#: phony.js:4
+msgid "Heading 1"
+msgstr ""
+
+#: phony.js:6
+msgid "default"
+msgstr ""
+
+#: phony.js:7
+msgid "Block"
+msgstr ""
+
+#: phony.js:8
+msgid "Block class"
+msgstr ""
+
+#: phony.js:9
+msgid "Note left"
+msgstr ""
+
+#: phony.js:10
+msgid "Note right"
+msgstr ""
+
+#: phony.js:11
+msgid "Insert block"
+msgstr ""
+
+#: override.js:2
+msgid "strong: alt-b"
+msgstr ""
+
+#: override.js:3
+msgid "emphasis: alt-i"
+msgstr ""

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/i18n/nl.po
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/i18n/nl.po	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,113 @@
+# Dutch translations for mmbase package.
+# Copyright (C) 2005 THE mmbase'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the mmbase package.
+# Michiel Meeuwissen <EMAIL at ADDRESS>, 2005.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: mmbase 18\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-11-28 18:04+0100\n"
+"PO-Revision-Date: 2005-11-28 18:05+0100\n"
+"Last-Translator: Michiel Meeuwissen <mihxil at xs4all.nl>\n"
+"Language-Team: Dutch <vertaling at vrijschrift.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: mmbase.js:141
+msgid "Saving body (kupu)"
+msgstr "Schrijft tekst weg (kupu)"
+
+#: mmbase.js:144
+msgid "Saving fields (form)"
+msgstr "Schrijft velden weg (formulier)"
+
+#: mmbase.js:173
+msgid "saved"
+msgstr "opgeslagen"
+
+#: mmbase.js:202
+msgid "RELOAD"
+msgstr ""
+
+#: mmbase.js:223
+msgid "Getting node fields for "
+msgstr "Haalt velden (formulier) voor"
+
+#: mmbase.js:231
+msgid "Loading node fields for "
+msgstr "Schrijft velden weg (formulier)"
+
+#: mmbase.js:243
+msgid "Getting node body "
+msgstr "Haalt node text"
+
+#: mmbase.js:250
+msgid "Loading node body "
+msgstr "Haalt node op"
+
+#: mmbasetools.js:13
+msgid "Div tool initialized"
+msgstr ""
+
+#: mmbasetools.js:39
+msgid "Found paragraph"
+msgstr ""
+
+#: mmbasetools.js:43
+msgid "Didn't find paragraph"
+msgstr ""
+
+#: mmbasetools.js:48
+msgid "Div inserted"
+msgstr ""
+
+#: phony.js:1
+msgid "No node"
+msgstr "Geen node"
+
+#: phony.js:2
+msgid "Normal"
+msgstr ""
+
+#: phony.js:3 phony.js:5
+msgid "Richtext editor"
+msgstr "Richtext editor"
+
+#: phony.js:4
+msgid "Heading 1"
+msgstr ""
+
+#: phony.js:6
+msgid "default"
+msgstr "default"
+
+#: phony.js:7
+msgid "Block"
+msgstr "Blok"
+
+#: phony.js:8
+msgid "Block class"
+msgstr "Blok-soort"
+
+#: phony.js:9
+msgid "Note left"
+msgstr "Noot (links)"
+
+#: phony.js:10
+msgid "Note right"
+msgstr "Noot (rechts)"
+
+#: phony.js:11
+msgid "Insert block"
+msgstr "Voeg blok in"
+
+#: override.js:2
+msgid "strong: alt-b"
+msgstr "sterker: alt-b"
+
+#: override.js:3
+msgid "emphasis: alt-i"
+msgstr "benadrukt: alt-i"

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/icons/map-open.gif
==============================================================================
Binary file. No diff available.

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/icons/map.gif
==============================================================================
Binary file. No diff available.

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/include.kupu
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/include.kupu	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,20 @@
+<kupu:include
+  xmlns:kupu="http://kupu.oscom.org/namespaces/dist"
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  >
+
+  <!-- Include features -->
+  <xi:include href="wire.kupu" />
+  <xi:include href="head.kupu" />
+  <xi:include href="body.kupu" />
+  <xi:include href="html.kupu" />
+  <xi:include href="xmlconfig.kupu" />
+  <xi:include href="drawers.kupu" />
+  <xi:include href="toolbar.kupu" />
+  <xi:include href="toolboxes.kupu" />
+  <xi:include href="saveonpart.kupu" />
+  <xi:include href="contextmenu.kupu" />
+  <xi:include href="mmbase.kupu" />
+
+
+</kupu:include>

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/index.kupu
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/index.kupu	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,24 @@
+<kupu:dist
+  xmlns:kupu="http://kupu.oscom.org/namespaces/dist"
+  xmlns:xi="http://www.w3.org/2003/XInclude"
+  >
+
+  <!-- Include implementations -->
+  <xi:include href="../kupu/default/include.kupu" />
+  <xi:include href="include.kupu" />
+
+  <!-- Define the default slot to start with -->
+  <kupu:expand>
+    <kupu:define-slot name="html" />
+  </kupu:expand>
+
+  <!-- Define an implementation order -->
+  <kupu:implementation-order>
+    <kupu:implementation name="mmbase" />
+    <kupu:implementation name="default" />
+  </kupu:implementation-order>
+
+  <!-- MMBase does not want to use certain features -->
+  <kupu:disable-feature name="colorchooser" />
+
+</kupu:dist>

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/kupuinit.js
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/kupuinit.js	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,292 @@
+/*
+ * Copyright (c) 2003-2005 Kupu Contributors. All rights reserved.
+ *
+ * This software is distributed under the terms of the Kupu
+ * License. See LICENSE.txt for license text. For a list of Kupu
+ * Contributors see CREDITS.txt.
+ *
+ *****************************************************************************/
+
+// $Id: kupuinit.js,v 1.21 2005/09/27 18:26:52 michiel Exp $
+
+//----------------------------------------------------------------------------
+// MMBase initialization for it's kupu
+//----------------------------------------------------------------------------
+
+// somewhy, IE needs this:
+var kupu;
+
+
+
+function initKupu(iframe) {
+    // first we create a logger
+    var l = new PlainLogger('kupu-toolbox-debuglog', 5);
+
+    // 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 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');
+
+    // 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?
+
+    // add the buttons to the toolbar
+    var savebuttonfunc = function(button, editor) {saveNode(button, editor);};
+    var savebutton = new KupuButton('kupu-save-button', savebuttonfunc);
+    kupu.registerTool('savebutton', savebutton);
+
+    // function that returns a function to execute a button command
+    var execCommand = function(cmd) {
+        return function(button, editor) {
+            editor.execCommand(cmd);
+        };
+    };
+
+    var boldchecker = ParentWithStyleChecker(new Array('b', 'strong'), null, null, "bold");
+    var boldbutton = new KupuStateButton('kupu-bold-button', execCommand('bold'), boldchecker, 'kupu-bold', 'kupu-bold-pressed');
+    kupu.registerTool('boldbutton', boldbutton);
+
+    var italicschecker = ParentWithStyleChecker(new Array('i', 'em'), null, null, 'italic');
+    var italicsbutton = new KupuStateButton('kupu-italic-button', execCommand('italic'), italicschecker, 'kupu-italic', 'kupu-italic-pressed');
+    kupu.registerTool('italicsbutton', italicsbutton);
+
+
+    var subscriptchecker = ParentWithStyleChecker(new Array('sub'), null, null, 'subscript');
+    var subscriptbutton = new KupuStateButton('kupu-subscript-button', execCommand('subscript'), subscriptchecker, 'kupu-subscript', 'kupu-subscript-pressed');
+    kupu.registerTool('subscriptbutton', subscriptbutton);
+
+    var superscriptchecker = ParentWithStyleChecker(new Array('super', 'sup'), null, null, 'superscript');
+    var superscriptbutton = new KupuStateButton('kupu-superscript-button', execCommand('superscript'), superscriptchecker, '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'));
+    kupu.registerTool('redobutton', redobutton);
+
+    var removeimagebutton = new KupuRemoveElementButton('kupu-removeimage-button', 'img', 'kupu-removeimage');
+    kupu.registerTool('removeimagebutton', removeimagebutton);
+
+    var removelinkbutton = new KupuRemoveElementButton('kupu-removelink-button', 'a', 'kupu-removelink');
+    kupu.registerTool('removelinkbutton', removelinkbutton);
+
+    var removedivbutton = new KupuRemoveElementButton('kupu-removediv-button', 'div', 'kupu-removediv');
+    kupu.registerTool('removedivbutton', removedivbutton);
+
+    var listtool = new ListTool('kupu-list-ul-addbutton', 'kupu-list-ol-addbutton', 'kupu-ulstyles', 'kupu-olstyles');
+    kupu.registerTool('listtool', listtool);
+
+
+    var linktool = new LinkTool();
+    // remove 'create link' from context menu, it doesn't work, and there are 2 wokring methods.
+    linktool.createContextMenuElements = function(selNode, event) {
+        var ret = new Array();
+        var link = linktool.editor.getNearestParentOfType(selNode, 'a');
+        if (link) {
+            ret.push(new ContextMenuElement(_('Delete link'), linktool.deleteLink, linktool));
+        };
+        return ret;
+    };
+    kupu.registerTool('linktool', linktool);
+    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) {
+        return new Array();
+    };
+    kupu.registerTool('imagetool', imagetool);
+    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);
+
+
+    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-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);
+
+    var divstool = new DivsTool();
+    kupu.registerTool('divstool', divstool);
+
+    var divstoolbox = new DivsToolBox('kupu-div-addbutton',
+                                       'kupu-divs-float-select', 'kupu-toolbox-divs',  'kupu-toolbox', 'kupu-toolbox-active');
+    divstool.registerToolBox('divstoolbox', divstoolbox);
+
+
+
+    var spellchecker = new KupuSpellChecker('kupu-spellchecker-button',
+                                            'spellcheck.jspx');
+    kupu.registerTool('spellchecker', spellchecker);
+
+    // like the zoom tool, but it doens' realy work.
+
+    var zoom = new KupuZoomTool('kupu-zoom-button');
+    kupu.registerTool('zoomtool', zoom);
+
+    // 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 sourceedittool = new SourceEditTool('kupu-source-button', 'kupu-editor-textarea');
+   kupu.registerTool('sourceedittool', sourceedittool);
+   */
+
+   // Drawers...
+
+   // Function that returns function to open a drawer
+   var opendrawer = function(drawerid) {
+       return function(button, editor) {
+           drawertool.openDrawer(drawerid);
+       };
+   };
+
+   var imagelibdrawerbutton = new KupuButton('kupu-imagelibdrawer-button', opendrawer('imagelibdrawer'));
+   kupu.registerTool('imagelibdrawerbutton', imagelibdrawerbutton);
+
+   var linklibdrawerbutton = new KupuButton('kupu-linklibdrawer-button',
+                                            opendrawer('linklibdrawer'));
+   kupu.registerTool('linklibdrawerbutton', linklibdrawerbutton);
+
+   var linkdrawerbutton = new KupuButton('kupu-linkdrawer-button',
+                                         opendrawer('linkdrawer'));
+   kupu.registerTool('linkdrawerbutton', linkdrawerbutton);
+
+
+   // 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);
+
+   drawertool.search = function() {
+       alert('haaai');
+   }
+
+   try {
+       var linklibdrawer = new ResourceLibraryDrawer(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'],
+                                                   conf['image_libraries_uri'],
+                                                   conf['search_images_uri']);
+       drawertool.registerDrawer('imagelibdrawer', imagelibdrawer);
+
+       /*
+       var imagelibdrawer2 = new ImageLibraryDrawer(null,
+                                                    conf['image_xsl_uri'],
+                                                    conf['image_libraries_uri'],
+                                                    conf['search_images_uri']);
+       drawertool.registerDrawer('nodeimagedrawer', imagelibdrawer2);
+       */
+   } catch(e) {
+       var msg = _('There was a problem initializing the drawers. Most ' +
+               'likely the XSLT or XML files aren\'t available. If this ' +
+               'is not the Kupu demo version, check your files or the ' +
+               'service that provide them (error: ${error}).',
+               {'error': (e.message || e.toString())});
+       alert(msg);
+   };
+   var linkdrawer = new LinkDrawer('kupu-linkdrawer', linktool);
+   drawertool.registerDrawer('linkdrawer', linkdrawer);
+
+    /*
+   var tabledrawerbutton = new KupuButton('kupu-tabledrawer-button',
+                                           opendrawer('tabledrawer'));
+   kupu.registerTool('tabledrawerbutton', tabledrawerbutton);
+    */
+   //var tabledrawer = new TableDrawer('kupu-tabledrawer', tabletool);
+   // drawertool.registerDrawer('tabledrawer', tabledrawer);
+
+    // register some cleanup filter
+    // remove tags that aren't in the XHTML DTD
+   var nonxhtmltagfilter = new NonXHTMLTagFilter(
+   {'html': 1,
+        'body': 1,
+        'head': 1,
+        'title': 1,
+        'a': 1,
+        'abbr': 0,
+        'acronym': 0,
+        'address': 0,
+        'b': 1,
+        'base': 0,
+        'blockquote': 0,
+        'br': 1,
+        'caption': 1,
+        'cite': 0,
+        'code': 0,
+        'col': 0,
+        'colgroup': 0,
+        'dd': 0,
+        'dfn': 0,
+        'div': 1,
+        'dl': 0,
+        'dt': 0,
+        'em': 1,
+        'h1': 1,
+        'h2': 1,
+        'h3': 1,
+        'h4': 1,
+        'h5': 1,
+        'h6': 1,
+        'h7': 1,
+        'i': 1,
+        'img': 1,
+        'kbd': 1,
+        'li': 1,
+        'link': 0,
+        'meta': 1,
+        'ol': 1,
+        'p': 1,
+        'pre': 0,
+        'q': 0,
+        'samp': 0,
+        'script': 0,
+        'span': 0,
+        'strong': 1,
+        'style': 0,
+        'sub': 1,
+        'sup': 1,
+        'table': 1,
+        'tbody': 1,
+        'td': 1,
+        'tfoot': 0,
+        'th': 1,
+        'thead': 0,
+        'tr': 1,
+        'ul': 1,
+        'u': 0,
+        'var': 0,
+        'font': 0,
+        'center': 0
+        });
+    kupu.registerFilter(nonxhtmltagfilter);
+
+    return kupu;
+};

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/kupustyle.css
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/kupustyle.css	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,161 @@
+ at import url("../../style/css/mmxf.css");
+body { 
+  background-color: white;
+  font-size: 12pt;
+}
+h1,h2,h3,h4,h5,h6,h7,h8,th { 
+  font-weight: bold;
+  color: #006;
+}
+h1 { 
+  font-size: 15pt;
+}
+h2 { 
+  padding-left: 1em;
+  font-size: 14pt;
+}
+h3 { 
+  padding-left: 2em;
+  font-size: 13pt;
+}
+h4 { 
+  padding-left: 3em;
+  font-size: 12pt;
+  margin-top: 0px;
+  margin-bottom: 0px;
+  padding-top: 0px;
+  padding-bottom: 0px;
+}
+
+h5, h6, h7, h8 { 
+  font-style: italic;
+  font-size: 12pt;
+  margin-top: 0px;
+  margin-bottom: 0px;
+  padding-top: 0px;
+  padding-bottom: 0px;
+}
+h5 { 
+  padding-left: 4em;
+}
+h6 { 
+  padding-left: 5em;
+}
+h7 { 
+  padding-left: 6em;
+}
+h8 { 
+  padding-left: 7em;
+}
+
+h1:first-child, h2:first-child, h3:first-child, h4:first-child, h5:first-child, h6:first-child, h7:first-child, h8:first-child { 
+  margin-top: 0px;
+}
+
+p {
+}
+
+table { 
+  border: 1px black solid;
+  border-spacing: 0px;
+  empty-cells: show;
+  border-collapse: collapse;
+  background-color: #fafafa;
+}
+
+td { 
+  border: 1px black solid;
+}
+th { 
+  border: 1px black solid;
+}
+
+img.image-right { 
+  float: right;
+  margin-right: 0px;
+  margin-left: 1ex;
+}
+
+img.image-left { 
+  float: left;
+  margin-left: 0px;
+  margin-right: 1ex;
+}
+img.section-inline { 
+}
+
+img.node { 
+  float: left;
+  border: solid 5px green;
+}
+img.paragraph { 
+  border: solid 1px green;
+}
+img.section { 
+  float: left;
+  border: solid 1px green;
+}
+
+strong, b  { 
+  color: green;
+  font-weight: bold;
+}
+
+em, i { 
+  font-style: italic;
+}
+
+
+div.float { 
+  display: block;
+  float: left;
+  width: 200px;
+  padding: 5px;
+  margin: 1ex;
+  border: solid black 1px;
+}
+
+div.note { 
+  background-color: #ffc;
+  font-style: italic;
+}
+div.note i { 
+  font-style: normal;
+}
+div.note em { 
+  font-style: normal;
+}
+
+div.right { 
+  margin-right: 0px;
+  float: right;
+
+}
+div.left { 
+  margin-left: 0px;
+  float: left;
+} 
+
+div.intermezzo  { 
+  float: left;
+  margin-left: 0px;
+  margin-right: 2ex;
+  width: 90%;
+  background-color: #cfc;
+  font-style: normal;
+}
+div.quote { 
+  background-color: #fcc;
+  font-style: italic;
+}
+
+div.caption { 
+  background-color: #ddd;
+}
+ul, ol { 
+  list-style-position: outside;
+}
+
+li { 
+  margin-left: 20px;
+}
\ No newline at end of file

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/layout.css
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/layout.css	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,139 @@
+body { 
+  overflow: hidden;
+}
+
+body, #footer, #header, #centerColumn, #leftColumn, #kupu-editor, #kupu div.kupu-editorframe,  #kupu, #kupu div.kupu-toolboxes, div.kupu-fulleditor, div.kupu-fulleditor-zoomed, #toolbar, form, input, textarea, iframe#kupu-editor, iframe,
+div.kupu-toolbox, div.kupu-toolbox-active { 
+  padding-right: 0px;
+  padding-left: 0px;
+  padding-bottom: 0px;
+  padding-top: 0px;
+  margin-right: 0px;
+  margin-left: 0px;
+  margin-bottom: 0px;
+  margin-top: 0px;
+  border-right: 0px;
+  border-left: 0px;
+  border-top: 0px;
+  border-bottom: 0px;
+
+}
+body.kupu-fulleditor-zoomed  { 
+  position: absolute;
+  background-color: white;
+}
+
+form { 
+
+}
+
+/* Height and width of these are reset in layout.js */
+iframe.kupu-editor-iframe { 
+  height: 100px;
+  width: 100px;
+}
+iframe#kupu-editor { 
+  width: 100px;
+  height: 100px;
+}
+
+#header, #footer {
+  text-align: center;
+  white-space: nowrap;
+}
+#header {
+  height: 20px;
+}
+
+#centerColumn {
+  padding: 0;
+  margin: 0;
+  margin-left: 270px;
+  margin-right: 0px;
+}
+#leftColumn {
+  position: absolute;
+  width: 270px;
+  margin: 0;
+  padding: 0;
+  font-size: small;
+  overflow: hidden;
+}
+#leftColumn {
+  left: 0;
+}
+#nodefields {  
+  padding-right: 0px;
+  padding-left: 0px;
+  padding-bottom: 0px;
+  padding-top: 0px;
+  margin-right: 0px;
+  margin-left: 0px;
+  margin-bottom: 0px;
+  overflow: auto;
+} 
+
+
+#nodefields td {
+  vertical-align: top;
+}
+#nodefields p { 
+  margin: 0px;
+}
+
+#footer {
+  display: none;          
+  height: 40px;
+  padding: 16px 0 0 0;
+}
+
+#toolbar { 
+  height: 30px;
+}
+
+div.kupu .toolbar { 
+  background-color: green;
+ }
+div.kupu-toolboxes {
+  float: none;
+  width: auto;
+}
+
+
+textarea.kupu-editor-textarea {
+  height: auto;
+  margin:0;
+  padding:0;
+}
+
+
+#leftColumn form { 
+  display: block;
+  margin-right: 2px;
+  margin-left: 2px;
+}
+
+#languageSelector { 
+  position: absolute;
+  top: 0px;
+  right: 0px;
+  display: inline;
+  height: 18px;
+  overflow: hidden;
+   
+}
+
+#back { 
+  position: absolute;
+  top: 0px;
+  left: 0px;
+  display: inline;
+  height: 18px;
+  overflow: hidden;
+  background-color: white;
+   
+}
+
+.tree { 
+  white-space: nowrap;
+}
\ No newline at end of file

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/layout.js
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/layout.js	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,98 @@
+
+
+if (document.getElementById || document.all) { // minimum dhtml support required
+  document.write("<"+"style type='text/css'>#footer{visibility:hidden;}<"+"/style>");
+  window.onload = winOnLoad;
+}
+function winOnLoad() {
+  var ele = document.getElementById('leftColumn');
+  if (ele && xDef(ele.style, ele.offsetHeight)) { // another compatibility check
+      //adjustLayout();
+    addEventHandler(window, 'resize', winOnResize, window);
+  }
+}
+function winOnResize() {
+  adjustLayout();
+}
+
+function rePosition(id) {
+    // This seems to be only necessary in Mozilla.
+    var el = document.getElementById(id);
+    el.style.position = "absolute";
+    el.style.left = (xClientWidth() - 202) + "px";
+}
+
+function adjustToolBoxesLayout() {
+    var toolbox = 40;
+    var spacing = 5;
+    var toolboxRight = 2;
+    xTop("kupu-toolbox-links", toolbox);
+    rePosition("kupu-toolbox-links");
+    toolbox += xHeight("kupu-toolbox-links") + spacing;
+    xTop("kupu-toolbox-images", toolbox);
+    rePosition("kupu-toolbox-images");
+    toolbox += xHeight("kupu-toolbox-images") + spacing;
+    xTop("kupu-toolbox-tables", toolbox);
+    rePosition("kupu-toolbox-tables");
+    toolbox += xHeight("kupu-toolbox-tables") + spacing;
+    xTop("kupu-toolbox-divs", toolbox);
+    rePosition("kupu-toolbox-divs");
+    toolbox += xHeight("kupu-toolbox-divs") + spacing;
+    xTop("kupu-toolbox-debug", toolbox);
+    rePosition("kupu-toolbox-debug");
+
+}
+function adjustLayout() {
+    var zoomTool = kupu.getTool("zoomtool");
+    if (zoomTool && zoomTool.zoomed) return;
+
+    var leftColumnWidth = 270;
+    var maxHeight = xClientHeight() - 20;
+    var maxWidth  = xClientWidth() - leftColumnWidth - 4;
+  
+    // Assign maximum height to all columns
+    xHeight('leftColumn', maxHeight - 3);
+    xHeight('centerColumn', maxHeight);
+    xWidth('centerColumn', maxWidth);
+    var pattern = new RegExp("\\bmm_validate\\b");
+    var a = document.getElementById('leftColumn').getElementsByTagName('input');    
+    for (i = 0; i < a.length; i++) {
+        if (pattern.test(a[i].className)) {
+            xWidth(a[i], leftColumnWidth - 6);
+        }
+    }
+
+    a = document.getElementById('leftColumn').getElementsByTagName('textarea');
+    for (i=0; i < a.length; i++) {
+        if (pattern.test(a[i].className)) {
+            xWidth(a[i], leftColumnWidth - 6);
+        }
+    }
+
+    var maxHeightArea = maxHeight - 27;
+
+    a = xGetElementsByClassName('kupu-editorframe');
+    for (i=0; i < a.length; i++) {
+        xHeight(a[i], maxHeightArea);
+        xWidth(a[i], maxWidth);
+    }
+
+
+    xHeight("toolboxes", maxHeight);
+    xHeight("kupu-editor", maxHeightArea - 3);
+    xWidth("kupu-editor", maxWidth - 201);
+
+    var nodeHeight = xHeight('nodefields');
+    var toolsHeight =  maxHeight - nodeHeight - 1;
+    if (toolsHeight < 100) {
+        toolsHeight = 100;
+        xHeight("nodefields", maxHeight - 100 - 1);
+    }
+
+    adjustToolBoxesLayout();
+
+    xHeight("mmbase-tools", toolsHeight);
+
+    
+}
+

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/make.jspx
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/make.jspx	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,22 @@
+<!-- Trying to build the editor dynamicaly,
+     but kupu's make.xsl is not really compatible with Xalan, it seems.
+     Anyhow, you'd start with enabling XInclude:
+     - Place (a very) new xercesImpl in WEB-INF/lib
+     - Place: /WEB-INF/classes/META-INF/services/org.apache.xerces.xni.parser.XMLParserConfiguration  containing:
+     org.apache.xerces.parsers.XIncludeParserConfiguration
+
+    TODO: hack make.xsl to work with Xalan too.
+  -->
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      xmlns:jsp="http://java.sun.com/JSP/Page"
+      xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0">
+  <jsp:output doctype-root-element="html"
+              doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
+              doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"/>
+  <jsp:output omit-xml-declaration="true" />
+  <mm:content type="text/html" expires="-1" escaper="text/xml">
+    <mm:formatter xslt="../kupu/make.xsl">
+      <mm:include page="../kupu/dist-mmbase.kupu" />
+    </mm:formatter>
+  </mm:content>
+</html>
\ No newline at end of file

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/mmbase.css
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/mmbase.css	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,180 @@
+ at import url("layout.css");
+
+body { 
+}
+
+a { 
+  color: #ffa;
+  text-decoration: none;
+}
+
+ul, ol { 
+  padding-left: 18px;
+  margin-left: 0px;
+}
+li { 
+  margin-left: 0px;
+ }
+#leftColumnContent a:hover { 
+  background-color: #76a2b6;
+}
+
+img { 
+  border: 0;
+}
+
+#header, #leftColumn { 
+  background-color: #527d94;
+  color: #fff;
+}
+
+
+#nodefields a:hover { 
+   background-color: #527d94;
+}
+
+
+#nodefields {   
+  background-color: #76a2b6;
+  overflow: auto;
+}
+
+#nodefields input {
+/*  user-input: enabled; */
+}
+
+#nodefields input.mm_year { 
+  width: 5ex;
+}
+
+
+
+#mmbase-tools { 
+  overflow: auto;
+  overflow-x: auto;
+  overflow-y: auto;
+ 
+}
+#mmbase-tools ul { 
+  list-style-type: none;          
+
+ }
+
+iframe { 
+  background-color: #ffc;
+}
+
+a.current  { 
+  background-color:  #76a2b6;
+}
+
+
+#mmbase-tools a.create {
+  text-decoration: none;
+}
+
+#mmbase-tools .mmbase-tool { 
+  min-height: 100px;
+}
+		
+#preview { 
+  background-color: blue;
+  margin: 0px;
+}
+
+#kupu { 
+  z-index: 1;
+}
+#kupu-tb-buttons {
+}
+
+textarea#kupu-editor-textarea {
+  display: none;
+  background-color: white;
+}
+#kupu div.kupu-drawer textarea, #kupu div.kupu-drawer input { 
+  border: 1px solid;
+  background-color: #eee;
+}
+#kupu div.kupu-drawer textarea { 
+  width: 95%;
+}
+#kupu div#image_alt_div { 
+  display: none;
+}
+#kupu div.kupu-drawer input#kupu-upload-file { 
+  width: 60%;
+}
+#kupu div.kupu-drawer div.overflow { 
+  overflow-x: auto;
+  overflow-y: auto;
+}
+
+#kupu div.kupu-editorframe {
+  background-color: #ccc;
+}
+#kupu div.kupu-toolboxes {
+  background-color: green;
+  float: none;
+  width: auto;
+  overflow-y: auto;
+}
+
+div.kupu-fulleditor-zoomed div.kupu-toolboxes {
+  display: block;
+}
+div.kupu-fulleditor-zoomed div.kupu-toolbox {
+  display: none;
+}
+div.kupu-fulleditor-zoomed div.kupu-toolbox-active {
+  display: none;
+}
+
+#kupu-editor { 
+  background-color: white;
+}
+
+#kupu-editor h1,h2,h3,h4,h5,h6,h7 { 
+  color: red;
+}
+
+div.kupu-toolbox, div.kupu-toolbox-active { 
+  position: absolute;
+  width: 200px;
+  right: 2px;
+  display: block;
+  background-color: #527d94;
+}
+div.kupu-toolbox-active { 
+  background-color: #76a2b6;
+}
+div.kupu-toolbox-active #kupu-div-addbutton  { 
+  display: none;
+                                              
+}
+div#kupu-toolbox-links { 
+}
+div#kupu-toolbox-images { 
+  top: 250px;
+
+}
+div#kupu-toolbox-tables { 
+  top: 500px;
+
+}
+div#kupu-toolbox-debug { 
+  display: none;
+  top: 750px;
+}
+
+div#kupu-toolbox-addtable{ 
+
+} 
+img.icon { 
+  margin-right: 0.5ex;
+  border: 0px;
+}
+
+button.mmbase-logo {background-image: url("mmbase.png");}
+
+.kupu-removediv {background-image: url("../common/kupuimages/remove.png");}
\ No newline at end of file

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/mmbase.js
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/mmbase.js	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,392 @@
+/**
+ * The node currently being edited
+ */
+var currentNode;
+var trunkNode;
+var absoluteUrl;
+
+// any object can be used as map in javascript, but make it look a bit nicer.
+function Map() {
+    this.add = function(key, value) {
+        var prevValue = this[key];
+        this[key] = value;
+        return prevValue;
+    };
+    this.get = function(key) {
+        return this[key];
+    };
+    this.remove = function(key) {
+        this[key] = undefined;
+    }
+}
+
+
+/**
+ * Caches of loaded nodes (represented in HTML)
+ */
+
+var loadedNodes      = new Map();
+var loadedTrees      = new Map();
+var unloadedTrees    = new Map();
+var uncollapsedNodes = new Array();
+var loadedNodeBodies = new Map();
+
+function startKupu(language) {
+    // first let's load the message catalog
+    // if there's no global 'i18n_message_catalog' variable available, don't
+    // try to load any translations
+
+    if (window.i18n_message_catalog) {
+        var request = getRequest();
+        // sync request, scary...
+        request.open('GET', '../common/kupu.pox.jspx?mymessages=../mmbase/mymessages.jspx&language=' + language, false);
+        request.send('');
+        if (request.status != '200') {
+            alert('Error loading translation (status ' + status + '), falling back to english');
+        } else {
+            // load successful, continue
+            var dom = request.responseXML;
+            window.i18n_message_catalog.initialize(dom);
+        };
+    }
+    // initialize the editor, initKupu groks 1 arg, a reference to the iframe
+    var frame = getFromSelector('kupu-editor');
+    var kupu = initKupu(frame);
+    // this makes the editor's content_changed attribute set according to changes
+    // in a textarea or input (registering onchange, see saveOnPart() for more
+    // details)
+    kupu.registerContentChanger(getFromSelector('kupu-editor-textarea'));
+
+    // let's register saveOnPart(), to ask the user if he wants to save when
+    // leaving after editing
+    if (kupu.getBrowserName() == 'IE') {
+        // IE supports onbeforeunload, so let's use that
+        addEventHandler(window, 'beforeunload', saveOnPart);
+    } else {
+        // some versions of Mozilla support onbeforeunload (starting with 1.7)
+        // so let's try to register and if it fails fall back on onunload
+        var re = /rv:([0-9\.]+)/
+        var match = re.exec(navigator.userAgent)
+        if (match[1] && parseFloat(match[1]) > 1.6) {
+            addEventHandler(window, 'beforeunload', saveOnPart);
+        } else {
+            addEventHandler(window, 'unload', saveOnPart);
+        };
+    };
+
+    // and now we can initialize...
+    kupu.initialize();
+    if (window.kuputoolcollapser) {
+        var collapser = new window.kuputoolcollapser.Collapser('kupu-toolboxes');
+        if (kupu.getBrowserName() != 'IE') {        
+            collapser.initialize();	
+        }
+        var toolboxes =  document.getElementById('kupu-toolboxes');
+        for (var i=0; i < toolboxes.childNodes.length; i++) {
+            var child = toolboxes.childNodes[i];
+            if (child.className == 'kupu-toolbox') {
+                var heading = child.getElementsByTagName('h1')[0];
+                addEventHandler(heading, 'click', adjustToolBoxesLayout);
+            };
+        };
+        if (kupu.getBrowserName() == 'IE') {        
+            collapser.initialize();	
+        }
+    };
+
+    return kupu;
+};
+
+
+function mmbaseInit(node, abs) {
+    KupuZoomTool.prototype.origcommandfunc  = KupuZoomTool.prototype.commandfunc;
+    KupuZoomTool.prototype.commandfunc = function(button, editor) {
+        this.origcommandfunc(button, editor);
+        if (this.zoomed == true) {
+            document.getElementById("leftColumn").style.display = "none";
+            //document.getElementById("header").style.display = "none";
+        } else {
+            document.getElementById("leftColumn").style.display = "block";
+            adjustLayout();
+        }
+    }
+    winOnLoad();
+    trunkNumber = node;
+    loadNode(node);
+
+    absoluteUrl = abs;
+
+}
+
+/*
+function openPopup(url, width, height) {
+    var sw = screen.width;
+    var sh = screen.height;
+    var left = sw / 2 - width / 2;
+    var top = sh / 2 - height / 2;
+    var win = window.open(absoluteUrl + "../common/" + url, 'someWindow', 
+                'width=' + width + ',height=' + height + ',left=' + left + ',top=' + top);
+    return win;
+};
+*/
+
+function getRequest() {
+    return new XMLHttpRequest();
+}
+
+function serialize(request) {
+    //return request.responseXML.xml;
+    // new sarissa:
+    return Sarissa.serialize(request.responseXML);
+}
+
+var boundary = "----------mmbase-kupu-node-fields----1234567890";
+var newline  = "\x0D\x0A";
+
+function addMultiPart(content, a) {
+    content += "--" + boundary + newline;
+    content += "Content-Disposition: form-data; name=\"" + a.name + "\"" + newline + newline;
+    content += a.value + newline;
+    return content;
+}
+
+/**
+ * Called by the save button.
+ */
+function saveNode(button, editor) {
+    // hmm, i think editor == kupu
+    kupu.logMessage(_("Saving body (kupu)") + " " + currentNode);
+    editor.saveDocument(undefined, true); // kupu-part of save
+    var content = "";
+    kupu.logMessage(_("Saving fields (form)") + " " + currentNode);
+
+    
+    var a = document.getElementsByTagName('input', document.getElementById('nodefields'));
+    for (i=0; i < a.length; i++) {
+        content = addMultiPart(content, a[i]);
+    }
+    a = document.getElementsByTagName('select', document.getElementById('nodefields'));
+    for (i=0; i < a.length; i++) {
+        content = addMultiPart(content, a[i]);
+    }
+
+    a = document.getElementsByTagName('textarea', document.getElementById('nodefields'));
+    for (i=0; i < a.length; i++) {
+        content = addMultiPart(content, a[i]);
+    }
+    content += "--" + boundary + "\x2D\x2D";
+
+    var request = getRequest();
+
+    request.open("POST", "receive.jspx?fields=true", true);
+    request.setRequestHeader("Content-Type", "multipart/form-data; boundary=" + boundary);
+    request.send(content);
+    request.onreadystatechange = function() {
+        if (request.readyState == 4) {
+            kupu.handleSaveResponse(request);
+            var node = currentNode;
+            currentNode = undefined;
+            //alert("Posted \n" + content);
+            alert(_("saved") + " " + node);
+            kupu.logMessage("Reloading " + node);
+            loadedNodes.remove(node);
+            loadedNodeBodies.remove(node);
+            loadNode(node);
+        }
+    }
+
+}
+
+
+/**
+ * If title is edited, tree must be updated (used in onKeyUp)
+ */
+function updateTree(nodeNumber, title) {
+    var nodeA = document.getElementById('a_' + nodeNumber);
+    if (nodeA != null) {
+        nodeA.innerHTML = title;
+    }}
+
+/**
+ * Load one node from server into the 'node' div. Unless that already happened, in which case this
+ * result is taken from cache.
+ */
+function loadNode(nodeNumber) {
+
+    var nodeDiv = document.getElementById('nodefields');
+
+    if (nodeNumber == currentNode) {
+        kupu.logMessage(_("RELOAD"));
+        loadedNodes.remove(nodeNumber);
+        loadedNodeBodies.remove(nodeNumber);
+        currentNode = undefined;
+    }
+    var currentA;
+
+    if (currentNode != undefined) {
+        // store current values in loaded-values maps.
+        loadedNodes.add(currentNode, nodeDiv.innerHTML);
+        //alert("Storing for later user " + nodeDiv.innerHTML);
+        loadedNodeBodies.add(currentNode, kupu.getHTMLBody());
+        currentA = document.getElementById('a_' + currentNode);
+        if (currentA != undefined) {
+            currentA.className = "";
+        }
+
+    }
+
+    var nodeXml = loadedNodes.get(nodeNumber);
+    if (nodeXml == null) {
+        kupu.logMessage(_("Getting node fields for ") + nodeNumber);
+        var dom = Sarissa.getDomDocument();
+        dom.async = false;
+        dom.load('node.jspx?objectnumber=' + nodeNumber);
+        nodeXml = Sarissa.serialize(dom);
+        //alert("received " + nodeXml);
+        loadedNodes.add(nodeNumber, nodeXml);
+    } else {
+        kupu.logMessage(_("Loading node fields for ") + nodeNumber);
+        var request = getRequest();
+        request.open('GET', 'node.jspx?loadonly=true&objectnumber=' + nodeNumber, false);
+        request.send('');
+    }
+
+    // request to node.jspx, should have put the node in the session
+
+    nodeDiv.innerHTML = nodeXml;
+
+    var nodeBodyXml = loadedNodeBodies.get(nodeNumber);
+    if (nodeBodyXml == null) {
+        kupu.logMessage(_("Getting node body ") + " " + nodeNumber);
+        var dom = Sarissa.getDomDocument();
+        dom.async = false;
+        dom.load('node.body.jspx');
+        nodeBodyXml = Sarissa.serialize(dom);
+        loadedNodeBodies.add(nodeNumber, nodeBodyXml);
+    } else {
+        kupu.logMessage(_("Loading node body ") + " " + nodeNumber);
+    }
+
+    kupu.setHTMLBody(nodeBodyXml);
+    currentNode = nodeNumber;
+    currentA = document.getElementById('a_' + currentNode);
+    if (currentA != undefined) currentA.className = "current";
+    adjustLayout();
+
+}
+
+/**
+ * ================================================================================
+ * TREE tool
+ * ================================================================================
+ */
+
+/**
+ * Load a part from the 'tree' of nodes. A request is done, and the div with the correct id is filled.
+ */
+function loadRelated(nodeNumber) {
+    var treeXml = loadedTrees.get(nodeNumber);
+    if (treeXml == null) {
+        var request = getRequest();
+        request.open('GET', 'tools/tree.jspx?objectnumber=' + nodeNumber, false);
+        request.send('');
+        treeXml = serialize(request);
+        loadedTrees.add(nodeNumber, treeXml);
+    }
+    var related = document.getElementById('node_' + nodeNumber);
+    unloadedTrees.add(nodeNumber, related.innerHTML);
+
+    related.innerHTML = treeXml;
+    uncollapsedNodes['node' + nodeNumber] = nodeNumber;
+}
+
+/**
+ * Unload a part from the 'tree' of nodes. The div with the correct id is made empty.
+ */
+function unloadRelated(nodeNumber) {
+    var related = document.getElementById('node_' + nodeNumber);
+    var html = unloadedTrees.get(nodeNumber);
+    if (html == null) {
+        // just fall-back
+        var request = getRequest();
+        request.open('GET', 'tools/tree.jspx?objectnumber=' + nodeNumber, false);
+        request.send('');
+        html = serialize(request);
+    }
+    related.innerHTML = html;
+    uncollapsedNodes['node' + nodeNumber] = null;
+}
+
+function reloadTree() {
+    var request = getRequest();
+    request.open('GET', 'tools/tree.jspx?objectnumber=' + trunkNumber, false);
+    request.send('');
+    var tree = serialize(request);
+    document.getElementById('tree').innerHTML = tree;
+    for (var i in uncollapsedNodes) {
+        if (i.indexOf("node") == 0) {
+            loadRelated(uncollapsedNodes[i]);
+        }
+    }
+    // trick to make current node active again
+    var node = currentNode;
+    currentNode = undefined; // otherwise it will be relaoded from the server
+
+    loadNode(node);
+
+}
+
+/**
+ * Load a part from the 'tree' of nodes. A request is done, and the div with the correct id is filled.
+ */
+function createSubNode(nodeNumber) {
+    var request = getRequest();
+    request.open('GET', 'tools/create-subnode.jspx?objectnumber=' + nodeNumber, false);
+    request.send('');
+    var result = serialize(request);
+    alert(result);
+    loadedTrees = new Map();
+    reloadTree();
+}
+
+/**
+ * ================================================================================
+ * Related tool
+ * ================================================================================
+ */
+
+
+function deleteRelation(type, nodeNumber, relationNode) {
+    var relatedRequest = getRequest();
+    relatedRequest.open('GET', absoluteUrl + 'tools/related-type.jspx?objectnumber=' + nodeNumber + "&delete_relation=" + relationNode + "&type=" + type, false);
+    relatedRequest.send('');
+    var result = serialize(relatedRequest);
+    document.getElementById("related_" + type).innerHTML = result;
+
+
+}
+
+function createRelation(type, nodeNumber, relatedNode) {
+    var relatedRequest = getRequest();
+    relatedRequest.open('GET',  absoluteUrl + 'tools/related-type.jspx?objectnumber=' + nodeNumber + "&relate_node=" + relatedNode + "&type=" + type, false);
+    relatedRequest.send('');
+    var result = serialize(relatedRequest);
+    document.getElementById("related_" + type).innerHTML = result;
+}
+
+
+
+
+// ================================================================================
+
+/**
+ * our own version to also save the other fields 
+ */
+function saveOnPart() {
+    /* ask the user if (s)he wants to save the document before leaving */
+    if (kupu.content_changed && 
+        confirm(_('You have unsaved changes. Do you want to save before leaving the page?'))) {
+        kupu.config.reload_src = 0;
+        saveNode(null, kupu);
+    };
+};

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/mmbase.kupu
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/mmbase.kupu	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,97 @@
+<kupu:feature name="mmbase" implementation="mmbase"
+              xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0"
+              xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
+              xmlns:jsp="http://java.sun.com/JSP/Page"
+              xmlns:kupu="http://kupu.oscom.org/namespaces/dist" >
+
+  <kupu:part name="tools-div">
+    <div id="mmbase-tools">
+      <mm:import externid="tools" from="this,parameters" vartype="list">empty</mm:import>
+      <mm:stringlist referid="tools">
+        <mm:isnotempty>
+          <mm:include page="tools/${_}.jspx" />
+        </mm:isnotempty>
+      </mm:stringlist>
+    </div>
+  </kupu:part>
+
+  <kupu:part name="node-div">
+    <div id="nodefields">
+      <mm:include page="node.jspx" />
+    </div>
+  </kupu:part>
+
+  <kupu:part name="preview-div">
+    <div id="node-preview">
+      <mm:include page="preview.jspx" />
+    </div>
+  </kupu:part>
+
+  <kupu:part name="kupu-div">
+    <div id="kupu">
+      <kupu:insert-part feature="body" part="fulleditor" />
+    </div>
+  </kupu:part>
+  <kupu:part name="header">
+    <div id="header">
+      <fmt:bundle basename="org.mmbase.kupu.Messages">
+        <div id="back">
+          <a href="${back}">
+            <mm:link page="/mmbase/style/images/previous.png">
+              <img src="${_}" alt="&amp;lt;" />
+            </mm:link>
+          </a>
+        </div>
+        <fmt:message key="Richtext editor" />
+        <mm:node number="${node}" notfound="skip">
+          <jsp:text> (<mm:nodeinfo type="guitype" />)</jsp:text>
+        </mm:node>
+        <div id="languageSelector">
+          <form name="languageform" method="get" action=".">
+            <input type="hidden" name="objectnumber" value="${node}" />
+            <input type="hidden" name="tools" value="${tools}" />
+            <input type="hidden" name="kupu_back" value="${back}" />
+            <select onChange="document.forms['languageform'].submit();" name="language">
+              <mm:compare referid="rich_language" value="client">
+                <option value="client" selected="selected"><fmt:message key="default" /></option>
+              </mm:compare>
+              <mm:compare referid="rich_language" value="client" inverse="true">
+                <option value="client"><fmt:message key="default" /></option>
+              </mm:compare>
+              <mm:import id="languages" vartype="list">en,zh,ja,de,fr,pt,nl,da,cs,fi,el,sr,eo</mm:import>
+              <mm:stringlist referid="languages">
+                <mm:locale language="${_}" jspvar="locale">
+                  <mm:compare referid2="rich_language">
+                    <option value="${_}" selected="selected"><jsp:expression>locale.getDisplayName(locale)</jsp:expression></option>
+                  </mm:compare>
+                  <mm:compare referid2="rich_language" inverse="true">
+                    <option value="${_}"><jsp:expression>locale.getDisplayName(locale)</jsp:expression></option>
+                  </mm:compare>
+                </mm:locale>
+              </mm:stringlist>
+            </select>
+          </form>
+        </div>
+      </fmt:bundle>
+    </div>
+  </kupu:part>
+
+  <kupu:part name="navigate">
+    <div id="leftColumn">
+      <div id="leftColumnContent">
+        <kupu:insert-part feature="mmbase"     part="tools-div" />
+        <kupu:insert-part feature="mmbase"     part="node-div" />
+        <kupu:insert-part feature="mmbase"     part="preview-div" />
+      </div>
+    </div>
+  </kupu:part>
+
+  <kupu:part name="kupu-edit">
+    <div id="centerColumn">
+      <div id="centerColumnContent">
+        <kupu:insert-part feature="mmbase"     part="kupu-div" />
+      </div>
+    </div>
+  </kupu:part>
+
+</kupu:feature>

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/mmbase.png
==============================================================================
Binary file. No diff available.

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/mmbasedrawers.js
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/mmbasedrawers.js	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,89 @@
+/**
+ * Specialized drawer for mmbase-resources.
+ * Like LinkLibraryDrawer, but with upload-functionality.
+ * $Id: $
+ */
+
+function ResourceLibraryDrawer(tool, xsluri, libsuri, searchuri, baseelement) {
+    /* a specific LibraryDrawer for links */
+
+    this.drawertitle = "Insert Link";
+    this.drawertype = "link";
+    this.showupload = '';
+    if (tool) {
+        this.init(tool, xsluri, libsuri, searchuri, baseelement);
+    }
+
+    this.save = function() {
+        this.editor.resumeEditing();
+        /* create a link in the iframe according to collected data
+           from the drawer */
+        var selxpath = '//resource[@selected]';
+        var selnode = this.xmldata.selectSingleNode(selxpath);
+        if (!selnode) {
+            var uploadbutton = this.xmldata.selectSingleNode("/libraries/*[@selected]/uploadbutton");
+            if (uploadbutton) {
+                this.uploadResource();
+            }
+            return;
+        }
+
+        var uri = selnode.selectSingleNode('uri/text()').nodeValue;
+        uri = uri.strip();  // needs kupuhelpers.js
+        var title = '';
+        title = selnode.selectSingleNode('title/text()').nodeValue;
+        title = title.strip();
+
+        // XXX requiring the user to know what link type to enter is a
+        // little too much I think. (philiKON)
+        var type = null;
+        var elm = getFromSelector('link_name');
+        var name = elm ? elm.value : '';
+        var target = null;
+        if (getFromSelector('link_target') && getFromSelector('link_target').value != '')
+            target = getFromSelector('link_target').value;
+        
+        this.tool.createLink(uri, type, name, target, title);
+        this.drawertool.closeDrawer();
+    };
+    // upload, on submit/insert press
+    this.uploadResource = function() {
+        var form = document.getElementById('kupu_upload_form');
+        if (!form || form.node_prop_image.value == '') {
+            alert("" + form + " " + form.node_prop_image.value);
+            return;
+        }
+
+        if (form.node_prop_title.value == "") {
+            alert("Please enter a title for the image you are uploading");
+            return;        
+        };
+        
+        form.submit();
+    };
+    
+    // called for example when no permission to upload for some reason
+    this.cancelUpload = function(msg) {
+        var s = this.xmldata.selectSingleNode('/libraries/*[@selected]');     
+        s.removeAttribute("selected");
+        this.updateDisplay();
+        if (msg != '') {
+            alert(msg);
+        };
+    };
+    
+    // called by onLoad within document sent by server
+    this.finishUpload = function(url, mimetype) {
+        this.editor.resumeEditing();
+        var form = document.getElementById('kupu_upload_form');
+        var title = "[" + mimetype + ":" + form.node_prop_title.value + "]";        
+        this.tool.createLink(url, null, null, null, title);
+        this.shared.newimages = 1;
+        this.drawertool.closeDrawer();
+    };
+
+
+};
+
+ResourceLibraryDrawer.prototype = new LibraryDrawer;
+ResourceLibraryDrawer.prototype.shared = {}; // Shared data

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/mmbasetools.js
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/mmbasetools.js	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,143 @@
+var divids = 0;
+
+/**
+ * This tool is to create 'blocks'
+ * $Id: $
+ */
+
+function DivsTool() {
+    /* tool to add 'divs' */
+
+    this.initialize = function(editor) {
+        /* attach the event handlers */
+        this.editor = editor;
+        this.editor.logMessage(_("Div tool initialized"));
+    };
+
+
+    this.createDiv = function(divclass) {
+        /* create a div */
+        var currnode = this.editor.getSelectedNode();
+
+        var doc = this.editor.getInnerDocument();
+        var div = doc.createElement('div');
+        div.id = "createddiv_" + (divids++);
+        if (divclass) {
+            div.className = divclass;
+        };
+        var text = this.editor.getSelection();
+        var child;
+        if (! text || text == '') {
+            child = doc.createElement("p");
+            child.appendChild(doc.createTextNode(".")); // should not be empty, otherwise doesn't work well in firefox
+        } else {
+            child = doc.createTextNode(text);
+        }
+        var marker = doc.createTextNode("");
+        div.appendChild(child);
+        var currp = this.editor.getNearestParentOfType(currnode, 'p');
+        if (currp) {
+            this.editor.logMessage(_("Found paragraph"));
+            currp.parentNode.insertBefore(div, currp);
+            this.editor.insertNodeAtSelection(doc.createTextNode(""), 1);
+        } else {
+            this.editor.logMessage(_("Didn't find paragraph"));
+            //alert("Inserting " + div);
+            div = this.editor.insertNodeAtSelection(div, 1);
+        }
+        this.editor.insertNodeAtSelection(marker, 1);
+
+        this.editor.logMessage(_("Div inserted"));
+        this.editor.updateState();
+        return div;
+    };
+
+    this.setDivClass = function(divclass) {
+        /* set the class of the selected image */
+        var currnode = this.editor.getSelectedNode();
+        var currdiv = this.editor.getNearestParentOfType(currnode, 'div');
+        if (currdiv) {
+            currdiv.className = divclass;
+        };
+    };
+
+    this.deleteDiv = function() {
+        /* delete the current link */
+        var currnode = this.editor.getSelectedNode();
+        var linkel = this.editor.getNearestParentOfType(currnode, 'div');
+        if (!linkel) {
+            this.editor.logMessage(_('Not inside block'));
+            return;
+        };
+        while (linkel.childNodes.length) {
+            linkel.parentNode.insertBefore(linkel.childNodes[0], linkel);
+        };
+        linkel.parentNode.removeChild(linkel);
+
+        this.editor.logMessage(_('Block removed'));
+        this.editor.updateState();
+    };
+
+    this.createContextMenuElements = function(selNode, event) {
+        /* create the 'Create link' or 'Remove link' menu elements */
+        var ret = new Array();
+        var link = this.editor.getNearestParentOfType(selNode, 'div');
+        if (link) {
+            ret.push(new ContextMenuElement(_('Delete block'), this.deleteDiv, this));
+        }
+        return ret;
+    };
+
+}
+
+DivsTool.prototype = new KupuTool;
+
+function DivsToolBox(insertbuttonid, classselectid, toolboxid, plainclass, activeclass) {
+
+    this.insertbutton = getFromSelector(insertbuttonid);
+    this.classselect  = getFromSelector(classselectid);
+    this.toolboxel    = getFromSelector(toolboxid);
+    this.plainclass   = plainclass;
+    this.activeclass  = activeclass;
+
+    this.initialize = function(tool, editor) {
+        this.tool = tool;
+        this.editor = editor;
+        addEventHandler(this.classselect, "change", this.setDivClass, this);
+        addEventHandler(this.insertbutton, "click", this.addDiv, this);
+    };
+
+    this.updateState = function(selNode, event) {
+        /* update the state of the toolbox element */
+        var divel = this.editor.getNearestParentOfType(selNode, 'div');
+        if (divel) {
+            // check first before setting a class for backward compatibility
+            if (this.toolboxel) {
+                this.toolboxel.className = this.activeclass;
+                var divclass = divel.className ? divel.className : 'note';
+                selectSelectItem(this.classselect, divclass);
+            };
+        } else {
+            if (this.toolboxel) {
+                this.toolboxel.className = this.plainclass;
+            };
+        };
+    };
+
+    this.addDiv = function() {
+        /* add an div */
+        var sel_class = this.classselect.options[this.classselect.selectedIndex].value;
+        this.tool.createDiv(sel_class);
+        this.editor.focusDocument();
+    };
+
+    this.setDivClass = function() {
+        /* set the class for the current image */
+        var sel_class = this.classselect.options[this.classselect.selectedIndex].value;
+        this.tool.setDivClass(sel_class);
+        this.editor.focusDocument();
+    };
+};
+
+ImageToolBox.prototype = new KupuToolBox;
+

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/mymessages.jspx
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/mymessages.jspx	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,23 @@
+<!-- sadly no way of iterating bundle in jstl, falling back to java -->
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
+  <jsp:directive.page import="java.util.*" contentType="text/xml"  errorPage="error.jspx" />
+  <messages>
+    <jsp:scriptlet>
+      try {
+      String language = request.getParameter("language");
+      ResourceBundle bundle = ResourceBundle.getBundle("org.mmbase.kupu.Messages", language == null ? request.getLocale() : new Locale(language));
+      Enumeration keys = bundle.getKeys();
+      while(keys.hasMoreElements()) {
+      String key = (String)keys.nextElement();
+      if (key.equals("")) continue;
+    </jsp:scriptlet>
+    <message>
+      <msgid><jsp:expression>key</jsp:expression></msgid>
+      <msgstr><jsp:expression>bundle.getString(key)</jsp:expression></msgstr>
+    </message>
+    <jsp:scriptlet>
+      }
+      } catch (Exception e) {}
+    </jsp:scriptlet>
+  </messages>
+</jsp:root>

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/node.body.jspx
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/node.body.jspx	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,45 @@
+<mm:content type="text/xml"
+            expires="-1"
+            xmlns="http://www.w3.org/1999/xhtml" 
+            xmlns:jsp="http://java.sun.com/JSP/Page" 
+            xmlns:fn="http://java.sun.com/jsp/jstl/functions"
+            xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0">
+  <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:cloud method="asis">
+    <mm:notpresent referid="node">      
+      <mm:remove referid="node" />
+      <mm:node number="${param.objectnumber}" id="node" notfound="skip" />
+    </mm:notpresent>
+
+    <mm:present referid="node">
+      <mm:node  number="$node">
+        <mm:formatter xslt="xslt/mmxf2kupu.xslt" id="sent" escape="none">
+          <mm:param name="client" value="${fn:contains(header['user-agent'], 'MSIE')  ? 'msie' : 'gecko'}" />
+          <mm:field name="body" />
+          <mm:listrelations type="object" role="idrel" searchdir="destination" >
+            <mm:relatednode>
+              <mm:nodeinfo type="nodemanager">
+                <mm:compare value="blocks">
+                  <mm:listrelations type="object" role="idrel" searchdir="destination" >
+                    <mm:relatednode />
+                  </mm:listrelations>
+                </mm:compare>
+              </mm:nodeinfo>
+            </mm:relatednode>
+          </mm:listrelations>
+        </mm:formatter>
+        <!--
+        <mm:log>Sending <mm:write referid="sent" escape="none" /></mm:log>
+        -->
+      </mm:node>
+    </mm:present>
+
+    <mm:notpresent referid="node">
+      <p>NODE NOT FOUND</p>
+    </mm:notpresent>
+
+  </mm:cloud>  
+</mm:content>

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/node.jspx
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/node.jspx	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,63 @@
+<mm:content type="text/xml"
+	    expires="-1"
+      xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:jsp="http://java.sun.com/JSP/Page"
+      xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
+      xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0"
+      >
+  <jsp:directive.page session="true" errorPage="error.jspx" />
+  <jsp:output omit-xml-declaration="true" />
+  <mm:import externid="rich_language" from="session">client</mm:import>
+  <mm:locale language="$rich_language">
+    <mm:cloud rank="basic user" >
+      <fmt:bundle basename="org.mmbase.kupu.Messages">
+        <mm:import id="node" externid="objectnumber" />
+        <mm:import externid="loadonly" />
+        <mm:notpresent  referid="node">
+          <div class="node" title="No Node">
+            <p><fmt:message key="No node" /></p>
+          </div>
+        </mm:notpresent>
+        <mm:present referid="node">
+
+          <mm:param name="org.mmbase.xml-mode" value="kupu" />
+          <mm:node id="node" referid="node">
+            <div class="node" title="${node.number} ${node.title}">
+              <mm:notpresent referid="loadonly">
+                <table>
+                  <tr>
+                    <th><jsp:text>#<mm:field name="number" /> (<mm:nodeinfo type="guitype" />)</jsp:text></th>
+                    <mm:hasfunction name="index">
+                      <th><mm:function name="index" /></th>
+                    </mm:hasfunction>
+                  </tr>
+                </table>
+                <form>
+                  <mm:fieldlist id="field" type="edit">
+                    <mm:fieldinfo type="name">
+                      <mm:compare value="body" inverse="true">
+                        <p>
+                          <mm:fieldinfo type="guiname" /><jsp:text> </jsp:text>
+                          <mm:fieldinfo type="name">
+                            <mm:compare value="title">
+                              <!-- noempty, because HTML sucks -->
+                              <mm:fieldinfo  options="noempty,extra:onKeyUp='updateTree(${node.number}, this.value); kupu.content_changed=true;'" type="input" />
+                            </mm:compare>
+                            <mm:compare value="title" inverse="true">
+                              <mm:fieldinfo  options="noempty,extra:onChange='kupu.content_changed=true;'" type="input" />
+                            </mm:compare>
+                          </mm:fieldinfo>
+                        </p>
+                      </mm:compare>
+                    </mm:fieldinfo>
+                  </mm:fieldlist>
+                </form>
+              </mm:notpresent>
+            </div>
+          </mm:node>
+          <mm:write session="kupu_node" referid="node" />
+        </mm:present>
+      </fmt:bundle>
+    </mm:cloud>
+  </mm:locale>
+</mm:content>
\ No newline at end of file

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/override.js
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/override.js	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,3 @@
+; Override few message from kupu, this makes them appear in mymessages.jspx, and hence work.
+_("strong: alt-b")
+_("emphasis: alt-i")

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/preview.jspx
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/preview.jspx	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<div xmlns="http://www.w3.org/1999/xhtml"
+     xmlns:jsp="http://java.sun.com/JSP/Page" 
+     xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
+     xmlns:fn="http://java.sun.com/jsp/jstl/functions" 
+     xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0">
+  <jsp:output omit-xml-declaration="true" />
+  <mm:content type="text/html" expires="0">
+    <mm:import externid="objectnumber" />
+    <mm:cloud method="asis">
+      <mm:node referid="objectnumber">
+        <mm:formatter format="xhtml"> 
+          <mm:field name="body" />
+          <mm:listrelations type="object" role="idrel" searchdir="destination">
+            <mm:relatednode>
+              <mm:nodeinfo type="nodemanager">
+                <mm:compare value="blocks">
+                <mm:listrelations type="object" role="idrel" searchdir="destination" >
+                  <mm:relatednode />
+                </mm:listrelations>
+                </mm:compare>
+              </mm:nodeinfo>
+            </mm:relatednode>
+          </mm:listrelations>
+        </mm:formatter>
+      </mm:node>    
+    </mm:cloud>
+  </mm:content>
+</div>
\ No newline at end of file

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/receive.jspx
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/receive.jspx	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,47 @@
+<mm:content type="application/xml"
+            language="en" expires="-1"
+            xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0"
+            xmlns:jsp="http://java.sun.com/JSP/Page">
+  <jsp:directive.page import="java.io.*,java.util.*,org.apache.commons.fileupload.*" session="true" errorPage="error.jspx" />
+  <jsp:output omit-xml-declaration="true" />
+
+  <html>
+    <head>
+      <title>KUPU-receiver</title>
+    </head>
+    <body >
+      <mm:cloud jspvar="cloud" rank="basic user">
+        <mm:log jspvar="log">
+          <mm:import externid="kupu_node" from="session" />
+          <mm:node number="${kupu_node.number}" jspvar="node">
+            <mm:import externid="fields">false</mm:import>
+            <mm:compare referid="fields" value="false">
+              <mm:param name="org.mmbase.xml-mode" value="kupu" />
+              <jsp:scriptlet>
+                log.service("Saving body of " + node.getNumber());
+                StringBuffer received = new StringBuffer();
+                BufferedReader r  =  new BufferedReader(new InputStreamReader(request.getInputStream(), "UTF-8"));
+                String line = r.readLine();
+                while (line != null) {
+                  received.append(line).append("\n");
+                  line = r.readLine();
+                }
+                node.setStringValue("body", received.toString());
+                log.debug("Saved " + received.toString());
+              </jsp:scriptlet>
+            </mm:compare>
+
+            <mm:compare referid="fields" value="true">
+              <mm:fieldlist id="field" type="edit" >
+                <mm:fieldinfo type="useinput" options="trim" />
+              </mm:fieldlist>
+            </mm:compare>
+          </mm:node>
+          <jsp:scriptlet>
+            log.service("Saved body");
+          </jsp:scriptlet>
+        </mm:log>
+      </mm:cloud>
+    </body>
+  </html>
+</mm:content>

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/saveonpart.kupu
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/saveonpart.kupu	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,15 @@
+<?xml version="1.0" ?>
+<kupu:feature
+    name="saveonpart"
+    implementation="mmbase"
+    xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:jsp="http://java.sun.com/JSP/Page"
+    xmlns:kupu="http://kupu.oscom.org/namespaces/dist"
+    >
+  <kupu:id>$Id: saveonpart.kupu,v 1.3 2005/09/14 17:24:31 michiel Exp $</kupu:id>
+
+  <kupu:part name="jsincludes">
+    <!-- saveonpart function is in mmbase.js -->
+  </kupu:part>
+
+</kupu:feature>

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/spellcheck.jspx
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/spellcheck.jspx	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,46 @@
+<!-- 
+     Server side spell checking based on aspell.
+     Used by kupu. This is an implementation in JSPX
+     TODO: Perhaps MMBase depenency can be removed, and this can be a more general tool, for JSP/Kupu combo's.
+
+     @author Michiel Meeuwissen
+     @version $Id: spellcheck.jspx,v 1.4 2005/09/27 18:26:52 michiel Exp $
+-->
+<mm:content type="text/xml" expires="-1"
+            xmlns:jsp="http://java.sun.com/JSP/Page" 
+            xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
+            xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0"            
+            >
+  <jsp:output omit-xml-declaration="true" />
+  <jsp:directive.page import="java.io.*,org.mmbase.util.externalprocess.CommandLauncher" session="true" errorPage="error.jspx" />
+
+  <mm:import externid="text" jspvar="text" vartype="string" />
+  <spellcheck_result>
+    <jsp:scriptlet>      
+      CommandLauncher launcher = new CommandLauncher("SpellChecker");
+      ByteArrayOutputStream errorStream = new ByteArrayOutputStream();
+      InputStream inputStream = new ByteArrayInputStream(text.getBytes("UTF-8"));
+
+      ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); // XXXX TODO should use piping here, and perhaps even pooling
+      launcher.execute(new String[]{"aspell", "-a", "-H", "--lang=nl", "--encoding=utf-8"});
+      launcher.waitAndWrite(inputStream, outputStream, errorStream);
+
+      BufferedReader output = new BufferedReader(new InputStreamReader(new ByteArrayInputStream(outputStream.toByteArray()), "UTF-8"));
+      String line = output.readLine();
+      while (line != null) {
+        if (line.startsWith("&amp; ")) {
+          int colon = line.indexOf(":");
+          int wordEnd = line.substring(2).indexOf(" ");
+    </jsp:scriptlet>
+    <incorrect>
+      <word><jsp:expression>line.substring(2, wordEnd + 2)</jsp:expression></word>
+      <replacements><jsp:expression>line.substring(colon + 1)</jsp:expression></replacements>
+    </incorrect>    
+    <jsp:scriptlet>
+        }
+        line = output.readLine();
+      }
+    </jsp:scriptlet>
+    <error><jsp:expression>new String(errorStream.toByteArray(), "UTF-8")</jsp:expression></error>
+  </spellcheck_result> 
+</mm:content>
\ No newline at end of file

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/start.jspx
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/start.jspx	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,27 @@
+<mm:content type="text/html"
+            expires="0"
+            xmlns="http://www.w3.org/1999/xhtml" 
+            xmlns:jsp="http://java.sun.com/JSP/Page" 
+            xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
+            xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0">
+  <jsp:output omit-xml-declaration="true"
+              doctype-root-element="html"
+              doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN"
+              doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
+              />
+  <mm:import externid="rich_language" from="parameters,session">client</mm:import>
+  <mm:locale language="$rich_language">
+    <fmt:bundle basename="org.mmbase.kupu.Messages">
+      <html>       
+        <head>
+          <title>Kupu text area</title>
+          <link href="kupustyle.css" rel="stylesheet" type="text/css" />
+        </head>
+        <body class="mmxf">
+          <p><fmt:message key="No node" /></p>
+        </body>
+      </html>
+    </fmt:bundle>
+  </mm:locale>
+</mm:content>
+  
\ No newline at end of file

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/test.kupu
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/test.kupu	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,11 @@
+<kupu:feature
+    name="test"
+    implementation="mmbase"
+    xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:kupu="http://kupu.oscom.org/namespaces/dist"
+    >
+  <kupu:part name="comments">
+    <script type="text/javascript" src="kupudrawers.js"> </script>
+  </kupu:part>
+</kupu:feature>
+

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/toolbar.kupu
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/toolbar.kupu	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,70 @@
+<?xml version="1.0" ?>
+<kupu:feature
+    name="toolbar"
+    implementation="mmbase"
+    xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:kupu="http://kupu.oscom.org/namespaces/dist"
+    xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+    xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
+    i18n:domain="kupu"
+    >
+  <kupu:id>$Id: toolbar.kupu,v 1.12 2005/06/30 17:11:44 michiel Exp $</kupu:id>
+
+  <!-- lets limit ourselves to 2 ways of emphasis (in stead of 3) -->
+  <kupu:part name="buttongroup-basicmarkup">
+    <fmt:bundle basename="org.mmbase.kupu.Messages">
+      <span class="kupu-tb-buttongroup" id="kupu-bg-basicmarkup">
+        <button type="button" class="kupu-bold"   id="kupu-bold-button"   title="strong: alt-b"   i18n:attributes="title" accesskey="b">&#160;</button>
+        <button type="button" class="kupu-italic" id="kupu-italic-button" title="emphasis: alt-i" i18n:attributes="title" accesskey="i">&#160;</button>
+      </span>
+    </fmt:bundle>
+  </kupu:part>
+
+
+  <kupu:part name="select-styles">
+    <select id="kupu-tb-styles">
+      <option value="P" i18n:translate="">Normal</option>
+      <option value="H1"><span i18n:translate="">Heading 1</span></option>
+      <option value="H2"><span i18n:translate="">Heading 2</span></option>
+      <option value="H3"><span i18n:translate="">Heading 3</span></option>
+      <option value="H4"><span i18n:translate="">Heading 4</span></option>
+      <option value="H5"><span i18n:translate="">Heading 5</span></option>
+      <option value="H6"><span i18n:translate="">Heading 6</span></option>
+    </select>
+  </kupu:part>
+
+  <kupu:part name="logo">
+    <span class="kupu-tb-buttongroup kupu-logo" style="float: right">
+      <button type="button" class="kupu-logo" title="Kupu SVN/unreleased" 
+              id="kupu-logo-button" i18n:attributes="title"
+              onclick="window.open('http://kupu.oscom.org');"
+              >&#160;</button>
+      <button type="button" class="mmbase-logo" title="MMBase 1.8"  id="mmbase-logo-button"
+              onclick="window.open('http://www.mmbase.org');"
+              >&#160;</button>
+    </span>
+  </kupu:part>
+
+  <kupu:part name="buttongroup-remove">
+    <span class="kupu-tb-buttongroup" id="kupu-bg-remove">
+      <button type="button" class="kupu-removeimage invisible"
+              id="kupu-removeimage-button" title="Remove image"
+              i18n:attributes="title">&#160;</button>
+      <button type="button" class="kupu-removelink invisible"
+              id="kupu-removelink-button" title="Remove link"
+              i18n:attributes="title">&#160;</button>
+      <button type="button" class="kupu-removediv invisible"
+              id="kupu-removediv-button" title="Remove block"
+              i18n:attributes="title">&#160;</button>
+    </span>
+  </kupu:part>
+
+  <kupu:part name="zoom">
+    <span class="kupu-tb-buttongroup" style="float: none;"  id="kupu-zoom">
+      <button type="button" class="kupu-zoom" id="kupu-zoom-button"
+                title="zoom: alt-x" accesskey="x">&#160;</button>
+    </span>
+  </kupu:part>
+
+
+</kupu:feature>

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/toolboxes.kupu
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/toolboxes.kupu	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,86 @@
+<?xml version="1.0" ?>
+<kupu:feature
+    name="toolboxes"
+    implementation="mmbase"
+    xmlns:kupu="http://kupu.oscom.org/namespaces/dist"
+    xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+    xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
+    xmlns:jsp="http://java.sun.com/JSP/Page"
+    xmlns="http://www.w3.org/1999/xhtml"
+    i18n:domain="kupu"
+    >
+  <kupu:id>$Id: toolboxes.kupu,v 1.9 2005/09/08 08:30:31 michiel Exp $</kupu:id>
+
+
+  <kupu:part name="images">
+    <div class="kupu-toolbox" id="kupu-toolbox-images">
+      <h1  class="kupu-toolbox-heading" i18n:translate="">Images</h1>
+      <div>
+        <div class="kupu-toolbox-label">
+          <span i18n:translate="">Image class:</span>
+        </div>
+        <select class="wide" id="kupu-image-float-select">
+          <option value="image-inline" i18n:translate="">Inline</option>
+          <option value="image-left"   i18n:translate="">Left</option>
+          <option value="image-right"  i18n:translate="">Right</option>
+          <!--
+          <option value="paragraph" i18n:translate="">Paragraph</option>
+          <option value="section"   i18n:translate="">Section</option>
+          -->
+        </select>
+        <div style="display: none;">
+          <div class="kupu-toolbox-label">
+            <span i18n:translate="">Insert image at the following URL:</span>
+          </div>
+          <input id="kupu-image-input"
+                 value="kupuimages/kupu_icon.gif"
+                 class="wide"
+                 type="text" />
+          
+          <div class="kupu-toolbox-buttons">
+            <button type="button" id="kupu-image-addbutton"
+                    class="kupu-toolbox-action" i18n:translate="">Insert Image</button>
+          </div>
+        </div>
+      </div>
+    </div>
+  </kupu:part>
+
+  <kupu:part name="divs">
+    <div class="kupu-toolbox" id="kupu-toolbox-divs">
+      <fmt:bundle basename="org.mmbase.kupu.Messages">
+        <h1  class="kupu-toolbox-heading"><fmt:message key="Block" /></h1>        
+        <div>
+          <div class="kupu-toolbox-label">
+            <span><fmt:message key="Block class" /></span>
+          </div>
+          <select  id="kupu-divs-float-select">
+            <option value="float note left"><fmt:message key="Note left" /></option>
+            <option value="float note right"><fmt:message key="Note right" /></option>
+            <option value="float intermezzo">Intermezzo</option>
+            <option value="float caption left">captioned left</option>
+            <option value="float caption right">captioned right</option>
+            <option value="float quote right">quote right</option>
+            <option value="float quote left">quote left</option>
+          </select>
+          <div class="kupu-toolbox-buttons">
+            <button type="button" id="kupu-div-addbutton"
+                    class="kupu-toolbox-action"><fmt:message key="Insert block" /></button>
+          </div>
+        </div>
+      </fmt:bundle>
+    </div>
+  </kupu:part>
+
+  <!-- Overridden just for the jsp:text (to avoid that it collaps, which doesn't work in browers -->
+  <kupu:part name="debug">
+    <div class="kupu-toolbox" id="kupu-toolbox-debug">
+      <h1 class="kupu-toolbox-heading" i18n:translate="">Debug Log</h1>
+      <div id="kupu-toolbox-debuglog"
+           class="kupu-toolbox-label">
+        <jsp:text> </jsp:text>
+      </div>
+    </div>
+  </kupu:part>
+  
+</kupu:feature>

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/tools/create-subnode.jspx
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/tools/create-subnode.jspx	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,30 @@
+<mm:content type="text/xml" expires="0"
+     xmlns="http://www.w3.org/1999/xhtml"
+     xmlns:jsp="http://java.sun.com/JSP/Page" 
+     xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0"
+     >
+  <jsp:output omit-xml-declaration="true" />
+  <mm:cloud rank="basic user">
+    <mm:param name="org.mmbase.xml-mode" value="kupu" />
+
+    <mm:import externid="objectnumber" required="true" />
+    <mm:node id="node" referid="objectnumber">
+      <mm:listrelationscontainer type="segments" role="index" searchdir="destination">
+        <mm:maxnumber value="1" />
+        <mm:sortorder field="pos" direction="down" />
+        <mm:listrelations>
+          <mm:field name="pos" id="pos" write="false"/>
+        </mm:listrelations>
+      </mm:listrelationscontainer>
+    </mm:node>
+    
+    <mm:createnode id="segment" type="segments">
+      <mm:setfield name="title">Nieuwe titel</mm:setfield>
+    </mm:createnode>
+
+    <mm:createrelation source="node" destination="segment" role="index">
+      <mm:setfield name="pos">${pos + 1}</mm:setfield>
+    </mm:createrelation>
+    <info>Created ${node} -${pos +1}- ${segment}</info>
+  </mm:cloud>
+</mm:content>
\ No newline at end of file

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/tools/empty.jspx
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/tools/empty.jspx	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,15 @@
+<div xmlns="http://www.w3.org/1999/xhtml" 
+     xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:j18n="http://jakarta.apache.org/taglibs/i18n-1.0" xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0">
+  <jsp:text> </jsp:text>
+</div>
+
+
+
+
+  
+  
+
+  
+  
+
+

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/tools/related-type.jspx
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/tools/related-type.jspx	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,85 @@
+<!-- 
+     Used for for related.jspx 
+     Presents related nodes for one type, plus the functionality to delete and add those. (reloading itself through xmlhttprequest)
+-->
+<mm:content
+    type="text/xml"
+    expires="-1"
+    xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:jsp="http://java.sun.com/JSP/Page" 
+    xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0"
+    >
+  <jsp:output omit-xml-declaration="true" />
+  <mm:import externid="type">images</mm:import>
+  <mm:import externid="rich_language" from="session">client</mm:import>
+  <mm:locale language="$rich_language">    
+    <div>      
+      <mm:cloud rank="basic user">
+        <mm:import id="node" externid="objectnumber" required="true" />
+        <mm:node referid="node">
+          
+          <!-- delete a relation if requested -->
+          <mm:import  externid="delete_relation"  />
+          <mm:present referid="delete_relation">
+            <mm:deletenode referid="delete_relation">
+            </mm:deletenode>
+          </mm:present>
+
+          <!-- create a relation if requested -->
+          <mm:import externid="relate_node" />
+          <mm:present referid="relate_node">
+            <mm:listrelations type="${type}" role="posrel" orderby="posrel.pos" max="1">
+              <mm:field name="pos" id="pos" write="false" />
+            </mm:listrelations>
+            <mm:node referid="relate_node" id="relate_node" />
+            <mm:createrelation source="node" destination="relate_node" role="posrel">
+              <mm:present referid="pos">
+                <mm:setfield name="pos">${pos - 1}</mm:setfield>
+              </mm:present>
+              <mm:notpresent referid="pos">
+                <mm:setfield name="pos">0</mm:setfield>
+              </mm:notpresent>
+            </mm:createrelation>
+          </mm:present>
+
+          <!-- now list the relations -->
+          <mm:listrelationscontainer role="posrel"  type="$type">
+            <mm:sortorder field="posrel.pos" />
+            <p>
+              <mm:link page="../common/kupuimages/${type == 'images' ? 'image' : 'inthyperlink'}.png">
+                <img alt="+" 
+                     src="${_}" 
+                     onclick="window.open(absoluteUrl + 'tools/search-node.jspx?objectnumber=${node}&amp;amp;type=${type}', '_blank', 'scrollbars=yes');"
+                     />
+              </mm:link>
+              <mm:nodeinfo nodetype="$type" type="guitype" />
+            </p>
+            <mm:size>
+              <mm:isgreaterthan value="0">              
+                <mm:nodeinfo nodetype="$type" type="plural_guitype" id="plural" write="false" />
+                <p title="${plural}">
+                  <mm:listrelations id="relation">
+                    <mm:relatednode>
+                      <nobr>
+                        <mm:function name="gui" escape="none" />
+                        <mm:maydelete node="relation">
+                          <mm:link page="../common/kupuimages/remove.png">
+                            <img alt="-"
+                                 src="${_}" 
+                                 onclick="deleteRelation('${type}', ${node}, ${relation});"
+                                 />
+                          </mm:link>
+                        </mm:maydelete>
+                        <mm:last inverse="true">, </mm:last>
+                      </nobr>
+                    </mm:relatednode>
+                  </mm:listrelations>
+                </p>
+              </mm:isgreaterthan>
+            </mm:size>
+          </mm:listrelationscontainer>
+        </mm:node>
+      </mm:cloud>
+    </div>
+  </mm:locale>
+</mm:content>

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/tools/related.jspx
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/tools/related.jspx	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,31 @@
+<!--
+    The related tool is to related some object to the node directly
+    argument: related_types: list of types, defaults to images, urls, mediafragments
+ -->
+<div id="mmbase_related mmbase-tool">
+ <mm:content
+     type="text/html"
+     expires="-1"
+     xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:jsp="http://java.sun.com/JSP/Page" 
+    xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0"
+    >
+  <mm:import externid="rich_language" from="session">client</mm:import>
+  <jsp:directive.page session="true" errorPage="../error.jspx" />
+  <mm:locale language="$rich_language">
+    <mm:cloud rank="basic user">
+      <mm:import id="node" externid="objectnumber" required="true" />
+      <mm:node referid="node">
+        <mm:import externid="related_types" vartype="list">images,urls</mm:import>
+        <mm:stringlist referid="related_types" id="type">
+          <mm:hasnodemanager name="$type">
+            <div id="related_${type}">
+              <mm:include page="related-type.jspx" referids="type" />
+            </div>
+          </mm:hasnodemanager>
+        </mm:stringlist>
+      </mm:node>
+    </mm:cloud>
+  </mm:locale>
+</mm:content>
+</div>
\ No newline at end of file

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/tools/search-node.jspx
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/tools/search-node.jspx	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,130 @@
+<!--
+     Used for for related.jspx
+     Presents related nodes for one type, plus the functionality to delete and add those.
+
+-->
+<mm:content
+    type="text/html"
+    expires="-1"
+    xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:jsp="http://java.sun.com/JSP/Page"
+    xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0"
+    >
+  <jsp:directive.page session="true" errorPage="../error.jspx" />
+  <mm:import externid="type">images</mm:import>
+  <mm:import externid="new" />
+  <mm:import externid="commit" />
+  <mm:import externid="objectnumber" required="true" />
+  <mm:import externid="rich_language" from="session">client</mm:import>
+  <mm:locale language="$rich_language">
+    <html>
+      <head>
+        <mm:link page="/mmbase/style/css/mmbase.css">
+          <link href="${_}" rel="stylesheet" type="text/css"/>
+        </mm:link>
+      </head>
+      <body>
+        <div>
+          <mm:import externid="offset">0</mm:import>
+          <mm:import externid="search"></mm:import>
+          <mm:cloud rank="basic user">
+            <mm:present referid="new">
+              <!-- new node form -->
+              <mm:link>
+                <form id="create" action="${_}" method="post" enctype="multipart/form-data">
+                  <input type="hidden" name="objectnumber" value="${objectnumber}" />
+                  <input type="hidden" name="type"         value="${type}" />
+                  <mm:fieldlist nodetype="${type}" type="edit">
+                    <p>
+                      <mm:fieldinfo type="guiname" />: <mm:fieldinfo type="input" />
+                    </p>
+                  </mm:fieldlist>
+                  <input type="submit" value="commit" name="commit" />
+                </form>
+              </mm:link>
+            </mm:present>
+
+            <mm:notpresent referid="new">
+              <mm:present referid="commit">
+                <!-- create the new node commited with the new node form -->
+                <mm:createnode type="${type}">
+                  <mm:fieldlist type="edit">
+                    <mm:fieldinfo type="useinput" />
+                  </mm:fieldlist>
+                </mm:createnode>
+              </mm:present>
+
+              <!-- search tool -->
+              <mm:link>
+                <form id="search" action="${_}" method="post">
+                  <input type="hidden" name="objectnumber" value="${objectnumber}" />
+                  <input type="hidden" name="type"         value="${type}" />
+                  <input type="hidden" name="offset"       value="0" />
+                  <input name="search" value="${search}" />
+                  <input type="submit" value="search" name="ssearch" />
+                  <input type="submit" value="new" name="new" />
+                </form>
+              </mm:link>
+              <mm:listnodescontainer type="${type}">
+
+                <mm:isnotempty referid="search">
+                  <!-- search action -->
+                  <mm:composite operator="OR">
+                    <mm:fieldlist nodetype="${type}" fields="title,subtitle,intro,body">
+                      <mm:fieldinfo type="name">
+                        <mm:constraint field="$_"  operator="LIKE" value="%${search}%" />
+                      </mm:fieldinfo>
+                    </mm:fieldlist>
+                  </mm:composite>
+                </mm:isnotempty>
+
+                <mm:sortorder field="number" direction="down" />
+
+                <mm:maxnumber value="20" />
+                <mm:offset value="$offset" />
+
+                <!-- paging -->
+                <mm:previousbatches indexoffset="1">
+                  <mm:link referids="_ at offset,objectnumber,search?,type">
+                    <a href="${_}"><mm:index /></a>
+                  </mm:link> ,
+                </mm:previousbatches>
+                <mm:index offset="1" />
+                <mm:nextbatches indexoffset="1">
+                  ,
+                  <mm:link referids="_ at offset,objectnumber,search?,type">
+                    <a href="${_}"><mm:index /></a>
+                  </mm:link>
+                </mm:nextbatches>
+
+                <!-- result -->
+                <table>
+                  <tr>
+                    <th><jsp:text> </jsp:text></th>
+                    <mm:fieldlist nodetype="${type}" type="list">
+                      <th><mm:fieldinfo type="guiname" /></th>
+                    </mm:fieldlist>
+                  </tr>
+                  <mm:listnodes id="related" >
+                    <tr>
+                      <td>
+                        <p onclick="window.opener.createRelation('${type}', ${objectnumber}, ${related}); window.close(); window.opener.focus();">
+                          <mm:link page="/mmbase/style/images/create.gif">
+                            <img src="${_}" alt="+" />
+                          </mm:link>
+                        </p>
+                      </td>
+                      <mm:fieldlist nodetype="${type}" type="list">
+                        <td><mm:fieldinfo type="guivalue" /></td>
+                      </mm:fieldlist>
+                    </tr>
+                  </mm:listnodes>
+                </table>
+              </mm:listnodescontainer>
+            </mm:notpresent>
+          </mm:cloud>
+        </div>
+      </body>
+    </html>
+  </mm:locale>
+</mm:content>

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/tools/test.jspx
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/tools/test.jspx	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,15 @@
+<div xmlns="http://www.w3.org/1999/xhtml" 
+      xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:j18n="http://jakarta.apache.org/taglibs/i18n-1.0" xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0">
+  hoi
+</div>
+
+
+
+
+  
+  
+
+  
+  
+
+

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/tools/tree.jspx
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/tools/tree.jspx	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,79 @@
+<div id="tree" class="mmbase-tool">
+<mm:content
+    type="text/xml"
+    expires="-1"
+    xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:jsp="http://java.sun.com/JSP/Page" 
+    xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0"
+    >
+  <jsp:directive.page session="true" errorPage="../error.jspx" />
+<mm:cloud rank="basic user">
+<!-- 
+     This tool is to show a kind of table of contents in which this node is.
+     Can be used to navigate.
+
+     Parts of this tree can be added with xmlhttprequest. So this jspx is kind of 'manually recursive'.
+ 
+  Shows:
+  <div class="tree" id="node_[]">
+     [folder] <a id="a_[]">link to node</a>
+     <ul>
+       <li> 
+         <div class="tree" id="node_[1]">
+           [folder] <a id="a_[1]">index First subchapter</a>
+         </div>
+       </li>
+       <li> 
+         <div class="tree" id="node_[2]" class="off">
+           [folder] <a id="a_[2]">index Second subchapter</a>
+         </div>
+       </li>
+        .....
+     </ul>
+  </div>                                                            -->        
+  <jsp:output omit-xml-declaration="true" />
+  <mm:param name="org.mmbase.xml-mode" value="kupu" />
+  <mm:import id="node" externid="objectnumber">pol_default</mm:import>
+  <mm:import externid="root">${node}</mm:import>
+  <mm:node referid="root" id="root" notfound="skip">
+    <mm:param name="org.mmbase.index-root" referid="root" />
+  </mm:node>
+  <mm:node id="n" referid="node">
+    <div class="tree" id="node_${n}">
+      <mm:listrelationscontainer type="segments" role="index" searchdir="destination">
+        <mm:sortorder field="pos" />       
+        <a href="javascript: unloadRelated(${n});">
+          <img class="icon" src="icons/map-open.gif" />
+        </a>
+        <a href="javascript: loadNode(${n});" id="a_${n}"> ${n.title}</a>
+        <ul>          
+        <mm:listrelations id="rel">
+          <li> 
+            <mm:relatednode id="segment">
+              <div id="node_${segment}" class="tree">
+                <mm:listrelationscontainer type="segments" role="index" searchdir="destination">                     
+                  <mm:sortorder field="pos" />
+                  <a  href="javascript: loadRelated(${segment});">                    
+                    <img class="icon" src="icons/map.gif" />
+                  </a>
+                  <mm:hasfunction name="index">
+                    <mm:function name="index" id="index" write="false" />
+                  </mm:hasfunction>
+                  <a href="javascript: loadNode(${segment});" id="a_${segment}" title="${index}"> ${segment.title}</a>
+                </mm:listrelationscontainer>
+              </div>
+            </mm:relatednode>
+          </li>
+        </mm:listrelations>
+        </ul>
+      </mm:listrelationscontainer>
+      <a class="create" title="New" href="javascript: createSubNode(${node});">
+        <mm:link page="/mmbase/style/images/create.gif">
+          <img src="${_}" alt="+" title="Cre?er subhoofstuk" />
+        </mm:link>
+      </a>
+    </div>
+  </mm:node>
+</mm:cloud>
+</mm:content>
+</div>
\ No newline at end of file

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/wire.kupu
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/wire.kupu	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,84 @@
+<!--
+
+   @version $Id: wire.kupu,v 1.12 2005/07/11 16:33:48 michiel Exp $
+   @author Michiel Meeuwissen <michiel.meeuwissen at gmail.com>
+-->
+<kupu:wire
+    implementation="mmbase"
+    xmlns:kupu="http://kupu.oscom.org/namespaces/dist"
+    >
+
+  <kupu:fill-slot name="head">
+    <kupu:insert-part feature="head"        part="meta" />
+    <kupu:insert-part feature="head"        part="styles" />
+    <kupu:insert-part feature="drawers"     part="styles" />
+    <kupu:insert-part feature="head"        part="jsincludes" />
+    <kupu:insert-part feature="contextmenu" part="jsincludes" />
+    <kupu:insert-part feature="head"        part="bootstrap-editor" />
+    <kupu:insert-part feature="saveonpart"  part="jsincludes" />
+    <!-- kupu:insert-part feature="sourceedit"  part="jsincludes" /-->
+    <!-- kupu:insert-part feature="spellchecker" part="jsincludes" /-->
+    <kupu:insert-part feature="drawers"     part="jsincludes" />
+  </kupu:fill-slot>
+
+  <kupu:fill-slot name="body">
+    <kupu:insert-part feature="xmlconfig"  part="xmlconfig" />
+
+    <kupu:insert-part feature="mmbase"  part="header" />
+    <kupu:insert-part feature="mmbase"  part="navigate" />
+    <kupu:insert-part feature="mmbase"  part="kupu-edit" />
+
+    <!--
+    <kupu:insert-part feature="body"       part="fulleditor" />
+    -->
+  </kupu:fill-slot>
+
+  <kupu:fill-slot name="fulleditor">
+    <kupu:insert-part feature="toolbar"   part="toolbar" />
+    <kupu:insert-part feature="toolboxes" part="toolboxes" />
+    <kupu:insert-part feature="body"      part="editorframe" />
+  </kupu:fill-slot>
+
+
+
+  <kupu:fill-slot name="toolboxes">
+    <kupu:insert-part feature="toolboxes" part="links" />
+    <kupu:insert-part feature="toolboxes" part="images" />
+    <kupu:insert-part feature="toolboxes" part="tables" />
+    <kupu:insert-part feature="toolboxes" part="divs" />
+    <kupu:insert-part feature="toolboxes" part="debug" />
+  </kupu:fill-slot>
+
+  <kupu:fill-slot name="toolbar-buttons">
+    <kupu:insert-part feature="toolbar" part="logo" />
+    <kupu:insert-part feature="toolbar" part="select-styles" />
+    <kupu:insert-part feature="save" part="buttons" />
+    <kupu:insert-part feature="toolbar" part="buttongroup-basicmarkup" />
+
+    <!-- let's not do subsuper for the moment, though this is actually sensible -->
+    <kupu:insert-part feature="toolbar" part="buttongroup-subsuper" />
+
+    <!--
+	kupu:insert-part feature="colorchooser" part="buttons"
+	<kupu:insert-part feature="toolbar" part="buttongroup-justify" />
+    -->
+    <kupu:insert-part feature="toolbar" part="buttongroup-list" />
+
+    <!--
+    <kupu:insert-part feature="toolbar" part="buttongroup-definitionlist" />
+    <kupu:insert-part feature="toolbar" part="buttongroup-indent" />
+    -->
+    <kupu:insert-part feature="drawers" part="buttons" />
+    <kupu:insert-part feature="toolbar" part="buttongroup-remove" />
+    <kupu:insert-part feature="toolbar" part="buttongroup-undo" />
+    <!-- kupu:insert-part feature="sourceedit" part="buttons" /-->
+
+    <kupu:insert-part feature="spellchecker" part="buttons" />
+
+    <kupu:insert-part feature="toolbar" part="zoom" />
+
+  </kupu:fill-slot>
+
+
+
+</kupu:wire>

Added: kupu/branch/kupu-1.3-silva-1.5/mmbase/xmlconfig.kupu
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/mmbase/xmlconfig.kupu	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,40 @@
+<?xml version="1.0" ?>
+<kupu:feature
+    name="xmlconfig"
+    implementation="mmbase"
+    xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:kupu="http://kupu.oscom.org/namespaces/dist"
+    >
+
+
+  <kupu:part name="xmlconfig">
+    <div style="display: none;">
+      <xml id="kupuconfig" class="kupuconfig"><!-- xmlns="http://kupu.oscom.org/namespaces/dist"-->
+	<kupuconfig>
+	  <kupu:define-slot name="kupuconfig" />
+	</kupuconfig>
+      </xml>
+    </div>
+  </kupu:part>
+  
+  
+  <kupu:part name="defaultconfig">
+    <dst>receive.jspx</dst>
+    <use_css>0</use_css>
+    <reload_after_save>0</reload_after_save>
+    <strict_output>1</strict_output>
+    <content_type>application/xhtml+xml</content_type>
+    <compatible_singletons>1</compatible_singletons>
+    <table_classes>
+      <class>plain</class>
+      <class>listing</class>
+      <class>grid</class>
+      <class>data</class>
+      <class>plain wide</class>
+      <class>listing wide</class>
+      <class>grid wide</class>
+      <class>data wide</class>
+    </table_classes>
+  </kupu:part>
+ 
+</kupu:feature>

Added: kupu/branch/kupu-1.3-silva-1.5/plone/kupu_plone_layer/kupulocate.xml.pt
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/plone/kupu_plone_layer/kupulocate.xml.pt	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,12 @@
+<tal:block define="charset here/portal_properties/site_properties/default_charset|here/portal_properties/default_charset|string:utf-8;
+        content_type python:request.RESPONSE.setHeader('Content-Type', 'text/xml;;charset=%s' % charset);"
+ replace='structure string:&lt;?xml version="1.0" encoding="${charset}" ?&gt;'>
+<?xml version="1.0"?>
+</tal:block>
+<library tal:define="kupu nocall:context/kupu_library_tool;
+        fldr kupu/getCurrentParent;
+        response request/response;
+        target string:${fldr/absolute_url}/kupucollection.xml;
+        target python:kupu.kupuUrl(target);
+        dummy python:response.redirect(target, status=301);"
+    />

Added: kupu/branch/kupu-1.3-silva-1.5/plone/kupu_plone_layer/kupuselection.xml.pt
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/plone/kupu_plone_layer/kupuselection.xml.pt	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,34 @@
+<tal:block define="charset here/portal_properties/site_properties/default_charset|here/portal_properties/default_charset|string:utf-8;
+        content_type python:request.RESPONSE.setHeader('Content-Type', 'text/xml;;charset=%s' % charset);"
+ replace='structure string:&lt;?xml version="1.0" encoding="${charset}" ?&gt;'>
+<?xml version="1.0"?>
+</tal:block>
+<!-- This library returns information about the currently selected item(s)
+e.g. Call: kupuselection.xml?src=someurl
+ -->
+<library
+    xmlns:tal="http://xml.zope.org/namespaces/tal"
+    xmlns:metal="http://xml.zope.org/namespaces/metal"
+    xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+    i18n_domain="plone"
+    >
+  <uri tal:content="template/absolute_url">URI</uri>
+  <icon tal:content="string:${here/portal_url}/kupuimages/kupusearch_icon.gif">icon</icon>
+  <title i18n_translate="box_selected">Selected</title>
+  <description>Current selection.</description>
+  <src tal:content="string:${request/URL0}?${context/kupu_library_tool/query_string}">Source</src>
+
+  <breadcrumbs class="kupu-locate">
+    <crumb
+      tal:define="url context/portal_url;
+        resource_type request/resource_type | string:mediaobject;"
+      tal:attributes="href string:${context/portal_url}/kupulocate.xml?resource_type=${resource_type}&amp;src=$$src$$">
+      Breadcrumbs
+    </crumb>
+  </breadcrumbs>
+  <items metal:use-macro="here/kupucollection.xml/macros/collectionItems">
+    <metal:slot fill-slot="defineItems">
+       <tal:var define="global items context/kupu_library_tool/getCurrentSelection"/>
+    </metal:slot>
+  </items>
+</library>

Added: kupu/branch/kupu-1.3-silva-1.5/plone/kupu_plone_layer/plonekupuimages/fullscreencollapse_icon.gif
==============================================================================
Binary file. No diff available.

Added: kupu/branch/kupu-1.3-silva-1.5/plone/kupu_plone_layer/plonekupuimages/fullscreencollapse_icon.gif.metadata
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/plone/kupu_plone_layer/plonekupuimages/fullscreencollapse_icon.gif.metadata	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,3 @@
+[default]
+title=Folder
+cache=HTTPCache

Added: kupu/branch/kupu-1.3-silva-1.5/plone/kupu_plone_layer/plonekupuimages/fullscreenexpand_icon.gif
==============================================================================
Binary file. No diff available.

Added: kupu/branch/kupu-1.3-silva-1.5/plone/kupu_plone_layer/plonekupuimages/fullscreenexpand_icon.gif.metadata
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/plone/kupu_plone_layer/plonekupuimages/fullscreenexpand_icon.gif.metadata	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,3 @@
+[default]
+title=Folder
+cache=HTTPCache

Added: kupu/branch/kupu-1.3-silva-1.5/plone/kupu_references/referencebrowser.js
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/plone/kupu_references/referencebrowser.js	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,253 @@
+// Replace referencebrowser with Kupu drawers.
+function KupuRefDrawer(tool, xsluri, libsuri, searchuri, selecturi) {
+    /* a specific LibraryDrawer for selection of references */
+    this.init(tool, xsluri, libsuri, searchuri, 'krb_drawer_base', selecturi);
+
+    this.drawertitle = "Add reference";
+    this.drawertype = "reference";
+    this.xmldata = null;
+
+    this.createContent = function(e, fieldName, label, multiple, resourcetype) {
+        this.libsuri = libsuri + resourcetype;
+        this.searchuri = searchuri + resourcetype;
+        this.selecturi = selecturi + resourcetype;
+        this.fieldName = fieldName;
+
+        this.setTitle(label);
+        this.loadSelection(fieldName, multiple);
+        this.setPosition(e);
+        KupuRefDrawer.prototype.createContent.call(this);
+    };
+
+    this.loadSelection = function(fieldName, multiple) {
+        this.multiple = multiple;
+        this.field = document.getElementById(fieldName);
+        this.preview = document.getElementById(fieldName+'_preview');
+        this.currentSelection = [];
+
+        ids = this.field.value.split(/\n/);
+        for (var i = 0; i < ids.length; i++) {
+            var id = ids[i].strip();
+            if (!id) continue;
+            this.currentSelection.push(id);
+        }
+        this.selectedSrc = this.currentSelection.join(' ');
+    };
+
+    this.save = function() {
+        var sel = this.currentSelection;
+        var titles = [];
+        var el = newElement;
+        var xml = this.xmldata;
+
+        var preview = this.preview;
+        for (var i = sel.length; i > 0;) {
+            if (sel[--i]) break;
+            delete sel[i];
+            sel.length = i;
+        }
+        var emptymsg = preview.getElementsByTagName('em')[0];
+        emptymsg.style.display = (sel.length==0)?'':'none';
+
+        for (var node = preview.firstChild; node; node = nxt) {
+            var nxt = node.nextSibling;
+            if (node.nodeName.toLowerCase()=='div') {
+                preview.removeChild(node);
+            };
+        };
+        for (var i = 0; i < sel.length; i++) {
+            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);
+            div.appendChild(link);
+            preview.appendChild(div);
+        }
+        this.field.value = this.currentSelection.join('\n');
+        referencebrowse_showRemove(this.fieldName, this.currentSelection.length);
+
+        drawertool.closeDrawer();
+    };
+
+    this.setPosition = function(e){
+        // this function adapted from code in pdlib.js in CompositePage
+        var drawernode = this.element;
+
+        if (!e)
+            e = event;
+        var page_w = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;
+        var page_h = window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight;
+          // have to check documentElement in some IE6 releases
+        var page_x = window.pageXOffset || document.documentElement.scrollLeft || document.body.scrollLeft;
+        var page_y = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop;
+
+          // Choose a location for the menu based on where the user clicked
+        var node_top, node_left;
+        var drawer_w = drawernode.offsetWidth + 20;
+        var drawer_h = drawernode.offsetHeight + 20;
+        if (drawer_h < 400) {
+            drawer_h = 400;
+        }          
+        var drawer_half_w = Math.floor(drawer_w / 2);
+        var drawer_half_h = Math.floor(drawer_h / 2);
+        if (page_w - e.clientX < drawer_half_w) {
+            // Close to the right edge
+            node_left = page_x + page_w - drawer_w; 
+        }
+        else {
+            node_left = page_x + e.clientX - drawer_half_w;
+        }
+        if (node_left < page_x) {
+            node_left = page_x;
+        }
+        if (page_h - e.clientY < drawer_half_h) {
+            // Close to the bottom
+            node_top = page_y + page_h - drawer_h;
+        }
+        else {
+            node_top = page_y + e.clientY - drawer_half_h;
+        }
+        if (node_top < page_y) {
+            node_top = page_y;
+        }
+        drawernode.style.left = '' + node_left + 'px';
+        drawernode.style.top = '' + node_top + 'px';
+    };    
+};
+
+function fakeEditor() {
+    this.getBrowserName = function() {
+        if (_SARISSA_IS_MOZ) {
+            return "Mozilla";
+        } else if (_SARISSA_IS_IE) {
+            return "IE";
+        } else {
+            throw "Browser not supported!";
+        }
+    };    
+
+    this.resumeEditing = function() {};
+    this.suspendEditing = function() {};
+    this.config = {};
+    this._saveSelection = function() {};
+};
+
+var drawertool;
+
+function krb_initdrawer(link_xsl_uri, link_libraries_uri, search_links_uri, selecturi) {
+    // Delay init until the drawer is actually opened.
+    if (!KupuRefDrawer.init) {
+        KupuRefDrawer.prototype = new LibraryDrawer;
+        // drawertool must be set, but must not change if already set.
+        drawertool = window.drawertool || new DrawerTool;
+    }
+
+    var klass = KupuRefDrawer;
+    klass.linktool = new LinkTool();
+    klass.link_xsl_uri = link_xsl_uri;
+    klass.link_libraries_uri = link_libraries_uri;
+    klass.search_links_uri = search_links_uri;
+    klass.selecturi = selecturi;
+
+    editor = new fakeEditor();
+    drawertool.initialize(editor);
+};
+
+function referencebrowser_draweropen(e, fieldName, label, multival, resource_type) {
+    var name = 'krbdrawer-'+fieldName;
+    var drawer = drawertool.drawers[name];
+    if (!drawer) {
+        var klass=KupuRefDrawer;
+        drawer = new klass(klass.linktool, klass.link_xsl_uri,
+            klass.link_libraries_uri, klass.search_links_uri, klass.selecturi);
+        drawertool.registerDrawer(name, drawer);
+    }
+    drawertool.openDrawer(name, [e, fieldName, label, multival,resource_type]);
+};
+
+function referencebrowse_showRemove(fieldName, items)
+{
+    var btnRemove = document.getElementById(fieldName+'_remove');
+    if (btnRemove) btnRemove.style.display = items?'':'none';
+}
+
+// function to clear the reference field or remove items
+// from the multivalued reference list.
+function referencebrowser_removeReference(fieldName)
+{
+    var field = document.getElementById(fieldName);
+    var preview = document.getElementById(fieldName + '_preview');
+
+    var emptymsg = preview.getElementsByTagName('em')[0];
+    emptymsg.style.display = '';
+    for (var node = preview.firstChild; node; node = nxt) {
+        var nxt = node.nextSibling;
+        if (node.nodeName.toLowerCase()=='div') {
+            preview.removeChild(node);
+        };
+    };
+    field.value = '';
+    referencebrowse_showRemove(fieldName, false);
+};
+
+/*------------------- Fallback code for non-kupu versions --------------*/
+// function to open the popup window
+function fallback_openBrowser(path, fieldName, at_url, fieldRealName)
+{
+    atrefpopup = window.open(path + '/referencebrowser_popup?fieldName=' + fieldName + '&fieldRealName=' + fieldRealName +'&at_url=' + at_url,'referencebrowser_popup','toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=500,height=550');
+}
+
+// function to return a reference from the popup window back into the widget
+function referencebrowser_setReference(widget_id, uid, label, multi)
+{
+    // differentiate between the single and mulitselect widget
+    // since the single widget has an extra label field.
+    if (multi==0) {
+        element=document.getElementById(widget_id)
+            label_element=document.getElementById(widget_id + '_label')
+            element.value=uid
+            label_element.value=label
+    }  else {
+        list=document.getElementById(widget_id)
+         // check if the item isn't already in the list
+            for (var x=0; x < list.length; x++) {
+            if (list[x].value == uid) {
+                return false;
+            }
+        }         
+          // now add the new item
+        theLength=list.length;
+        list[theLength] = new Option(label);
+        list[theLength].selected='selected';
+        list[theLength].value=uid
+    }
+}
+
+// function to clear the reference field or remove items
+// from the multivalued reference list.
+function fallback_removeReference(widget_id, multi)
+{
+    if (multi) {
+        list=document.getElementById(widget_id)
+            for (var x=list.length-1; x >= 0; x--) {
+            if (list[x].selected) {
+                list[x]=null;
+            }
+        }
+        for (var x=0; x < list.length; x++) {
+            list[x].selected='selected';
+        }        
+    } else {
+        element=document.getElementById(widget_id);
+        label_element=document.getElementById(widget_id + '_label');
+        label_element.value = "";
+        element.value="";
+    }
+}
+

Added: kupu/branch/kupu-1.3-silva-1.5/plone/kupu_references/referencebrowser.pt
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/plone/kupu_references/referencebrowser.pt	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,255 @@
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      i18n:domain="atreferencebrowserwidget">
+
+  <head><title></title></head>
+
+  <body>
+<div metal:define-macro="kupudrawer">
+   <tal:if condition="not:krb_drawer_loaded|nothing">
+     <tal:var define="global krb_drawer_loaded string:yes" />
+     <tal:if condition="not:exists:portal/portal_css">
+        <link href="#" tal:attributes="href string:${portal_url}/kupudrawerstyles.css"
+              rel="stylesheet" type="text/css" />
+
+        <link href="#" tal:attributes="href string:${portal_url}/kupuplone.css"
+              rel="stylesheet" type="text/css" />
+     </tal:if>
+<!-- reference browser javascript -->
+      <tal:if condition="not:exists:portal/portal_javascripts"
+        metal:use-macro="context/kupu_wysiwyg_support/macros/kupu_js_include">
+      </tal:if>
+      <div id="krb_drawer_base">
+        <div class="kupu-librarydrawer-parent"></div>
+     </div>
+
+        <script type="text/javascript"
+                tal:define="kupu here/kupu_library_tool;
+                            base python:kupu.getBaseUrl(here);
+                            lib_prefix    string:${base}/kupulibraries.xml?instance=${here/UID}&resource_type=;
+                            search_prefix string:${portal_url}/kupusearch.xml?instance=${here/UID}&resource_type=;
+                            select_prefix string:${portal_url}/kupuselection.xml?instance=${here/UID}&resource_type=;
+                            xsl_uri string:${portal_url}/kupudrawers/drawer.xsl;"
+                tal:content="string:krb_initdrawer('$xsl_uri','$lib_prefix','$search_prefix','$select_prefix');">
+        </script>
+    </tal:if>
+</div>
+
+    <metal:view_macro define-macro="view">
+      <tal:define define="refs python:here.getReferenceImpl(field.relationship)"
+                  condition="refs">
+
+        <tal:block tal:condition="not:field/multiValued"
+               tal:define="ref python:refs[0];
+                           obj ref/getTargetObject">
+
+            <a href="#"
+               tal:attributes="href obj/absolute_url;
+                               class python:obj.portal_type.replace(' ', '_')"
+               tal:content="python:obj.Title() or obj.absolute_url(relative=1)">
+              Sole target object's title
+            </a>
+
+            <a href="#"
+               tal:condition="python:portal.portal_interface.objectImplements(ref,'Products.Archetypes.interfaces.referenceengine.IContentReference')"
+               tal:attributes="href python:ref.getContentObject().absolute_url();
+                               class python:obj.portal_type.replace(' ', '_')"
+               tal:content="field/relationship">
+              reference object link
+            </a>
+
+        </tal:block>
+
+        <ul tal:condition="field/multiValued">
+          <li tal:repeat="ref refs">
+             <tal:block tal:define="obj ref/getTargetObject">
+                <a href="#"
+                   tal:attributes="href obj/absolute_url;
+                                   class python:obj.portal_type.replace(' ', '_')"
+                   tal:content="python:obj.Title() or obj.absolute_url(relative=1)">
+                  Target Title
+                </a>
+
+                <a href="#"
+                   tal:condition="python:portal.portal_interface.objectImplements(ref,'Products.Archetypes.interfaces.referenceengine.IContentReference')"
+                   tal:attributes="href python:ref.getContentObject().absolute_url();
+                                   class python:obj.portal_type.replace(' ', '_')"
+                   tal:content="field/relationship">
+                  reference object link
+                </a>
+             </tal:block>
+          </li>
+        </ul>
+
+      </tal:define>
+    </metal:view_macro>
+
+    <metal:edit_macro define-macro="edit">
+      <metal:use use-macro="field_macro | here/widgets/field/macros/edit">
+
+        <div metal:fill-slot="widget_body"
+             tal:define="multiVal python:test(field.multiValued, 1, 0);
+                         fieldName fieldName;
+                         rFieldName python:`fieldName`;
+                         fieldRealName field/getName;
+                         portal_type context/portal_type;
+                         kupu here/kupu_library_tool;
+                         lookupObject nocall:here/reference_catalog/lookupObject;
+                         resource_type string:$portal_type.$fieldName;
+                         rt python:kupu.getResourceType(resource_type);
+                         label widget/label;
+                         rLabel python:`label`;
+                         uids python:same_type(value, []) and value or [value];
+                         uids python:[u for u in uids if u];
+                         types_param python:','.join(field.allowed_types);
+                         referenced python:here.getReferences(field.relationship);
+                         info python:kupu.infoForBrains(referenced,rt);
+                         useKupu python:kupu.isKupuEnabled(REQUEST=request) and not request.form.get('kupu.suppress','')==fieldName;
+                         ">
+<tal:kupu condition="useKupu">
+          <metal:call use-macro="here/referencebrowser/macros/kupudrawer" />
+          <input type="hidden"
+                             value=""
+                             tal:condition="python:not field.required and multiVal"
+                             tal:attributes="name string:$fieldName:default:list"
+                 />
+
+<div class="kupu-reference" tal:attributes="id string:${fieldName}_preview">
+  <em class="empty-ref" i18n:translate="label_no_reference_set"
+        tal:condition="not:info">
+    No reference set. Click the browse button to select.
+  </em>
+  <em class="empty-ref" i18n:translate="label_no_reference_set"
+        tal:condition="info" style="display:none">
+    No reference set. Click the browse button to select.
+  </em>
+  <tal:loop repeat="i info">
+     <div tal:define="odd repeat/i/odd" tal:attributes="class python:test(odd,'odd','even');">
+       <a href="#" tal:attributes="href string:${i/url}/view;">
+         <div class="kupu-preview-row" tal:condition="i/preview">
+           <img tal:attributes="src i/preview; title i/title;"
+                        onload="kupuFixImage(this);" width="1" height="1"/>
+         </div>
+         <h1 class="kupu-title-row" tal:content="i/title">Item heading</h1>
+         <div class="kupu-description-row" tal:content="structure i/description" tal:condition="i/description"></div>
+         <div style="clear:both;line-height:1px;">&nbsp;</div>
+       </a>
+    </div>
+ </tal:loop>
+</div>
+
+     <textarea style="display:none"
+               tal:attributes="name string:${fieldName}:lines;
+                                    id string:${fieldName};"
+               tal:content="python:'\n'.join(uids)"></textarea>
+      <div>
+
+              <input type="button" 
+                        class="searchButton"
+                        value="Browse..." 
+                        onClick=""
+                        i18n:attributes="value label_browse;"
+                        tal:attributes="onClick string:referencebrowser_draweropen(event,$rFieldName,$rLabel,$multiVal,'$resource_type');;;" />
+
+              <input type="button" 
+                        class="destructive" 
+                        value="Remove reference" 
+                        onClick=""
+                        i18n:attributes="value label_remove_reference;"
+                        tal:condition="not: multiVal"
+                        tal:define="display python:test(uids,'','display:none');"
+                        tal:attributes="onClick string:referencebrowser_removeReference($rFieldName, $multiVal);;;
+                                style display;id string:${fieldName}_remove;" />
+          </div>          
+</tal:kupu>
+<tal:nokupu condition="not:useKupu">
+          <input type="hidden"
+                             value=""
+                             tal:condition="python:not field.required and multiVal"
+                             tal:attributes="name string:$fieldName:default:list"
+                 />
+
+          <tal:single tal:condition="not: multiVal" >
+              <tal:value tal:condition="value">
+                  <tal:block tal:define="obj python:here.reference_catalog.lookupObject(value)">
+                      <input size="" 
+                                type="text" 
+                                value="" 
+                                id="" 
+                                tal:attributes="value obj/title_or_id;
+                                                      tabindex tabindex/next;
+                                                      size python:test(widget.size=='', 30, widget.size);
+                                                      id string:${fieldName}_label" readonly="readonly" />
+                  </tal:block>
+              </tal:value>
+              <input id=""
+                        size="50"
+                        type="text"
+                        value="No reference set. Click the browse button to select."
+                        readonly="readonly"
+                        i18n:attributes="value label_no_reference_set;"
+                        tal:condition="not:  value"
+                        tal:attributes="id string:${fieldName}_label"/>
+              <input type="hidden"
+                        value=""
+                        name=""
+                        tal:attributes="name fieldName;
+                                              value value;
+                                              id string:${fieldName}" />
+          </tal:single>
+          <tal:multi tal:condition="multiVal" 
+                     tal:define="targets python:[(here.reference_catalog.lookupObject(u),u) for u in uids if u]">
+                <select
+                  multiple="multiple"
+                  tabindex=""
+                  tal:attributes="name string:${fieldName}:list;
+                                        id string:${fieldName};
+                                        size python:test(widget.size=='', 8, widget.size);
+                                        tabindex tabindex/next;">
+                    <tal:block tal:repeat="set targets">
+                        <option value=""
+                                     selected="selected"
+                                    tal:attributes="value python:set[1];"
+                                    tal:content="python:set[0].title_or_id()">
+                            option
+                        </option>
+                  </tal:block>
+                </select>
+          </tal:multi>
+          <div tal:define="startup_directory python:kupu.getBaseUrl(here, rt);
+                           at_url python:'/'.join(here.getPhysicalPath())">
+              <input type="button" 
+                        class="searchButton"
+                        value="Browse..." 
+                        onClick=""
+                        i18n:attributes="value label_browse;"
+                        tal:attributes="onClick string:javascript:fallback_openBrowser('${startup_directory}','${fieldName}', '${at_url}', '${fieldRealName}')" />
+              <input type="button" 
+                        class="destructive" 
+                        value="Remove reference" 
+                        onClick=""
+                        i18n:attributes="value label_remove_reference;"
+                        tal:condition="not: multiVal"
+                        tal:attributes="onClick string:javascript:fallback_removeReference('${fieldName}', ${multiVal})" />
+              <input type="button" 
+                        class="destructive" 
+                        value="Remove selected items" 
+                        onClick=""
+                        i18n:attributes="value label_remove_selected_items;"
+                        tal:condition="multiVal"
+                        tal:attributes="onClick string:javascript:fallback_removeReference('${fieldName}', ${multiVal})" />                        
+          </div>          
+</tal:nokupu>
+          <!-- Todo? -->
+          <metal:addable metal:use-macro="here/widgets/addable_support/macros/addable"/>
+        </div>
+      </metal:use>
+    </metal:edit_macro>
+
+    <metal:search_macro define-macro="search">
+      <div metal:use-macro="here/widgets/reference/macros/edit"></div>
+    </metal:search_macro>
+  </body>
+</html>

Added: kupu/branch/kupu-1.3-silva-1.5/plone/plonedrawers.py
==============================================================================
--- (empty file)
+++ kupu/branch/kupu-1.3-silva-1.5/plone/plonedrawers.py	Fri Jun  6 14:52:00 2008
@@ -0,0 +1,777 @@
+##############################################################################
+#
+# Copyright (c) 2003-2005 Kupu Contributors. All rights reserved.
+#
+# This software is distributed under the terms of the Kupu
+# License. See LICENSE.txt for license text. For a list of Kupu
+# Contributors see CREDITS.txt.
+#
+##############################################################################
+"""Plone Kupu library tool
+
+This module defines a mixin class for the kupu tool which contains
+support code for drawers. Much of this code was formerly in separate
+Python scripts, but has been moved here to make it easier to maintain.
+
+"""
+import re
+from thread import get_ident
+from Products.CMFCore.utils import getToolByName
+from AccessControl import Unauthorized, ClassSecurityInfo, getSecurityManager
+from Globals import InitializeClass
+from Products.Archetypes.public import *
+from Products.Archetypes.interfaces.referenceable import IReferenceable
+from Products.PythonScripts.standard import html_quote, newline_to_br
+from Products.kupu.plone.librarytool import KupuError
+
+try:
+    from PIL import Image
+except ImportError:
+    HAS_PIL = False
+else:
+    HAS_PIL = True
+
+UIDURL = re.compile(".*\\bresolveuid/([^/?#]+)")
+
+# mapping (thread-id, portal-physicalPath, portal_type) ->
+# imagefield-getAvailableSizes (as tuple sorted by dimension) (width, height, key)
+IMAGE_SIZES_CACHE = {}
+
+class ResourceType:
+    '''Resource types are wrapped into a class so we can easily
+    access attributes which may, or may not be present.
+    '''
+    def __init__(self, tool, name):
+        self.name = name
+        self._tool = tool
+        parts = name.split('.', 1)
+
+        if len(parts)==1:
+            self._portal_types = tool.queryPortalTypesForResourceType(name, ())
+            self._field = self._widget = None
+        else:
+            # Must be portal_type.fieldname
+            typename, fieldname = parts
+            # Topic criteria have typename and fieldname embedded in
+            # the criteria name.
+            if fieldname.startswith('crit__'):
+                typename, fieldname = fieldname.split('_')[-2:]
+
+            __traceback_info__ = (parts, typename, fieldname)
+            archetype_tool = getToolByName(tool, 'archetype_tool', None)
+            types = archetype_tool.listRegisteredTypes()
+            typeinfo = [t for t in types if t['portal_type']==typename]
+
+            if len(typeinfo)==0:
+                raise KupuError("Unrecognised portal type for resource %s" % name)
+
+            schema = typeinfo[0]['schema']
+            self.klass = typeinfo[0]['klass']
+            try:
+                self._field = schema[fieldname]
+            except KeyError:
+                raise KupuError("Unrecognised fieldname for resource %s" % name)
+                
+            self._widget = self._field.widget
+
+    def __repr__(self):
+        return "<ResourceType %s %s %s %s %s" % (
+            self.name,
+            self.portal_types, self.getQuery(), self.allow_browse, self.startup_directory
+            )
+
+    def get_portal_types(self):
+        if not hasattr(self, '_portal_types'):
+            field = self._field
+            allowed_types = getattr(field, 'allowed_types', ())
+
+            if allowed_types == ():
+                dr = self._tool.getDefaultResource()
+                allowed_types = self._tool.getResourceType(dr).portal_types
+
+            allow_method = getattr(field, 'allowed_types_method', None)
+            if allow_method is not None:
+                instance = self._instanceFromRequest()
+                if instance:
+                    meth = getattr(instance, allow_method)
+                    allowed_types = meth()
+            self._portal_types = allowed_types
+
+        return self._portal_types
+    portal_types = property(get_portal_types)
+
+    def getQuery(self):
+        query = {'portal_type': self.portal_types }
+        
+        if self._field is not None:
+            field = self._field
+            widget = field.widget
+            base_query = getattr(widget, 'base_query', None)
+            if base_query and isinstance(base_query, basestring):
+                # We need the actual object containing the field to be
+                # able to call a dynamic base_query
+                instance = self._instanceFromRequest()
+                if instance:
+                    base_query = getattr(instance, base_query, None)
+                    if base_query:
+                       base_query = base_query()
+                       
+            if base_query:
+                query.update(base_query)
+
+        return query
+
+    def _instanceFromRequest(self):
+        """Get instance object from UID in request.
+        Throws an error if there isn