From wiggy at codespeak.net  Tue Aug  5 01:45:35 2008
From: wiggy at codespeak.net (wiggy at codespeak.net)
Date: Tue,  5 Aug 2008 01:45:35 +0200 (CEST)
Subject: [kupu-checkins] r56989 - kupu/trunk/Products.kupu
Message-ID: <20080804234535.8AFB1169F60@codespeak.net>

Author: wiggy
Date: Tue Aug  5 01:45:33 2008
New Revision: 56989

Modified:
   kupu/trunk/Products.kupu/setup.py
Log:
Update metadata

Modified: kupu/trunk/Products.kupu/setup.py
==============================================================================
--- kupu/trunk/Products.kupu/setup.py	(original)
+++ kupu/trunk/Products.kupu/setup.py	Tue Aug  5 01:45:33 2008
@@ -2,7 +2,7 @@
 import os
 
 version = open(os.path.join("Products", "kupu", "version.txt")).read()
-version = version.replace('kupu', '').strip()
+version = version.replace('kupu', '').strip() + 'dev'
 
 setup(name='Products.kupu',
       version=version,
@@ -27,7 +27,19 @@
       zip_safe=False,
       install_requires=[
           'setuptools',
-          # -*- Extra requirements: -*-
+          'zope.interface',
+          'zope.schema',
+          'zope.i18n',
+          'zope.i18nmessageid',
+          'Products.Archetypes',
+          'Products.GenericSetup',
+          'Products.CMFCore',
+          'Products.CMFPlone',
+          'Products.MimetypesRegistry',
+          'Products.PortalTransforms',
+          'Products.ATContentTypes',
+          'Products.i18ntestcase',
+          'plone.app.controlpanel',
       ],
       entry_points="""
       # -*- Entry points: -*-

From mihxil at codespeak.net  Thu Aug  7 21:14:20 2008
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Thu,  7 Aug 2008 21:14:20 +0200 (CEST)
Subject: [kupu-checkins] r57085 - kupu/trunk/kupu/mmbase
Message-ID: <20080807191420.526F52A013F@codespeak.net>

Author: mihxil
Date: Thu Aug  7 21:14:14 2008
New Revision: 57085

Modified:
   kupu/trunk/kupu/mmbase/   (props changed)
Log:
added a svn:ignore property

From mihxil at codespeak.net  Thu Aug  7 21:27:31 2008
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Thu,  7 Aug 2008 21:27:31 +0200 (CEST)
Subject: [kupu-checkins] r57086 - in kupu/trunk/kupu: . mmbase
Message-ID: <20080807192731.0D556169E3F@codespeak.net>

Author: mihxil
Date: Thu Aug  7 21:27:26 2008
New Revision: 57086

Modified:
   kupu/trunk/kupu/   (props changed)
   kupu/trunk/kupu/mmbase/   (props changed)
Log:
added some more svn:ignore

From wiggy at codespeak.net  Fri Aug  8 13:04:48 2008
From: wiggy at codespeak.net (wiggy at codespeak.net)
Date: Fri,  8 Aug 2008 13:04:48 +0200 (CEST)
Subject: [kupu-checkins] r57096 - kupu/trunk/kupu/doc
Message-ID: <20080808110448.04ED0169FAE@codespeak.net>

Author: wiggy
Date: Fri Aug  8 13:04:48 2008
New Revision: 57096

Modified:
   kupu/trunk/kupu/doc/INSTALL.txt
Log:
At least explain how to run the xslt transforms

Modified: kupu/trunk/kupu/doc/INSTALL.txt
==============================================================================
--- kupu/trunk/kupu/doc/INSTALL.txt	(original)
+++ kupu/trunk/kupu/doc/INSTALL.txt	Fri Aug  8 13:04:48 2008
@@ -42,7 +42,11 @@
 
 Basic install on a 'plain' webserver (Apache, IIS, etc.):
 
-Unpack the kupu tarball. XXX xsl transformation, copy default dir XXX
+o Unpack the kupu tarball. 
+
+o Run all xsl transformation by running ``make``
+
+o copy default dir XXX
 
 
 Configuration and customization
@@ -106,3 +110,4 @@
 If you have installation problems, see http://kupu.oscom.org for a
 list of possible places to ask questions (mailinglist, IRC channel) or
 send an email to kupu-dev at codespeak.net.
+

From mihxil at codespeak.net  Wed Aug 13 11:32:50 2008
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Wed, 13 Aug 2008 11:32:50 +0200 (CEST)
Subject: [kupu-checkins] r57222 - kupu/trunk/kupu/mmbase
Message-ID: <20080813093250.10B9A169E7E@codespeak.net>

Author: mihxil
Date: Wed Aug 13 11:32:50 2008
New Revision: 57222

Modified:
   kupu/trunk/kupu/mmbase/layout.css
   kupu/trunk/kupu/mmbase/mmbase.css
   kupu/trunk/kupu/mmbase/mmbase.js
   kupu/trunk/kupu/mmbase/mmbase.kupu
   kupu/trunk/kupu/mmbase/mmbasedrawers.js
Log:
using some javascript animation to give same user feedback, but without the annoying alert

Modified: kupu/trunk/kupu/mmbase/layout.css
==============================================================================
--- kupu/trunk/kupu/mmbase/layout.css	(original)
+++ kupu/trunk/kupu/mmbase/layout.css	Wed Aug 13 11:32:50 2008
@@ -1,9 +1,9 @@
-body { 
+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 { 
+div.kupu-toolbox, div.kupu-toolbox-active {
   padding-right: 0px;
   padding-left: 0px;
   padding-bottom: 0px;
@@ -18,21 +18,21 @@
   border-bottom: 0px;
 
 }
-body.kupu-fulleditor-zoomed  { 
+body.kupu-fulleditor-zoomed  {
   position: absolute;
   background-color: white;
 }
 
-form { 
+form {
 
 }
 
 /* Height and width of these are reset in layout.js */
-iframe.kupu-editor-iframe { 
+iframe.kupu-editor-iframe {
   height: 100px;
   width: 100px;
 }
-iframe#kupu-editor { 
+iframe#kupu-editor {
   width: 100px;
   height: 100px;
 }
@@ -62,7 +62,7 @@
 #leftColumn {
   left: 0;
 }
-#nodefields {  
+#nodefields {
   padding-right: 0px;
   padding-left: 0px;
   padding-bottom: 0px;
@@ -71,27 +71,27 @@
   margin-left: 0px;
   margin-bottom: 0px;
   overflow: auto;
-} 
+}
 
 
 #nodefields td {
   vertical-align: top;
 }
-#nodefields p { 
+#nodefields p {
   margin: 0px;
 }
 
 #footer {
-  display: none;          
+  display: none;
   height: 40px;
   padding: 16px 0 0 0;
 }
 
-#toolbar { 
+#toolbar {
   height: 30px;
 }
 
-div.kupu .toolbar { 
+div.kupu .toolbar {
   background-color: green;
  }
 div.kupu-toolboxes {
@@ -107,23 +107,23 @@
 }
 
 
-#leftColumn form { 
+#leftColumn form {
   display: block;
   margin-right: 2px;
   margin-left: 2px;
 }
 
-#languageSelector { 
+#languageSelector {
   position: absolute;
   top: 0px;
   right: 0px;
   display: inline;
   height: 18px;
   overflow: hidden;
-   
+
 }
 
-#back { 
+#back {
   position: absolute;
   top: 0px;
   left: 0px;
@@ -131,9 +131,17 @@
   height: 18px;
   overflow: hidden;
   background-color: white;
-   
+
+}
+
+#save-message {
+  display: inline;
+  height: 18px;
+  position: absolute;
+  left: 18px;
+  top: 0px;
 }
 
-.tree { 
+.tree {
   white-space: nowrap;
-}
\ No newline at end of file
+}

Modified: kupu/trunk/kupu/mmbase/mmbase.css
==============================================================================
--- kupu/trunk/kupu/mmbase/mmbase.css	(original)
+++ kupu/trunk/kupu/mmbase/mmbase.css	Wed Aug 13 11:32:50 2008
@@ -254,3 +254,11 @@
 .mm_related table.create input[type='file'].mm_validate {
   width: 50px;
 }
+
+#save-message {
+  color: white;
+  font-weight: bold;
+}
+#save-message img {
+  background-color: white;
+}

Modified: kupu/trunk/kupu/mmbase/mmbase.js
==============================================================================
--- kupu/trunk/kupu/mmbase/mmbase.js	(original)
+++ kupu/trunk/kupu/mmbase/mmbase.js	Wed Aug 13 11:32:50 2008
@@ -156,6 +156,7 @@
  */
 function saveNode(button, editor) {
     // hmm, i think editor == kupu
+    $("#ajax-loader").css("display", "inline");
     kupu.logMessage(_("Saving body (kupu)") + " " + currentNode);
     editor.saveDocument(undefined, true); // kupu-part of save
     var content = "";
@@ -189,16 +190,27 @@
             //alert("Posted \n" + content);
             if (request.status == 200) {
                 currentNode = undefined;
-                alert(_("saved") + " " + node);
+		$("#save-message span").each(function() {
+		    $(this).empty();
+		    $(this).append(_("saved") + " " + node);
+		    $(this).fadeIn(400);
+		    var p = this;
+		    $(this).fadeOut(4000, function() {$(p).empty()} );
+		});
                 kupu.logMessage("Reloading " + node);
                 loadedNodes.remove(node);
                 loadedNodeBodies.remove(node);
                 loadNode(node);
-		$("#kupu-save-button").trigger("kupu-saved");
+		try {
+		    $("#kupu-save-button").trigger("kupu-saved");
+		} catch (ex) {
+                    kupu.logMessage(ex);
+		}
             } else {
                 alert(_("Not saved") + " " + node);
                 reloadAfterError();
             }
+	    $("#ajax-loader").css("display", "none");
         }
     }
 

Modified: kupu/trunk/kupu/mmbase/mmbase.kupu
==============================================================================
--- kupu/trunk/kupu/mmbase/mmbase.kupu	(original)
+++ kupu/trunk/kupu/mmbase/mmbase.kupu	Wed Aug 13 11:32:50 2008
@@ -47,6 +47,12 @@
             </mm:link>
           </a>
         </div>
+        <div id="save-message">
+          <mm:link page="/mmbase/style/ajax-loader.gif">
+            <img id="ajax-loader" style="display: none;" height="20" src="${_}" alt="&amp;lt;" />
+          </mm:link>
+          <span> </span>
+        </div>
         <fmt:message key="Richtext editor" />
         <mm:node number="${node}" notfound="skip">
           <jsp:text> (<mm:nodeinfo type="guitype" />)</jsp:text>

Modified: kupu/trunk/kupu/mmbase/mmbasedrawers.js
==============================================================================
--- kupu/trunk/kupu/mmbase/mmbasedrawers.js	(original)
+++ kupu/trunk/kupu/mmbase/mmbasedrawers.js	Wed Aug 13 11:32:50 2008
@@ -1,7 +1,7 @@
 /**
  * Specialized drawer for mmbase-resources.
  * Like LinkLibraryDrawer, but with upload-functionality.
- * $Id: $
+ * $Id $
  */
 
 function ResourceLibraryDrawer(tool, xsluri, libsuri, searchuri, baseelement) {
@@ -42,7 +42,7 @@
         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();
     };
@@ -56,27 +56,27 @@
 
         if (form.node_prop_title.value == "") {
             alert("Please enter a title for the image you are uploading");
-            return;        
+            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]');     
+        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 + "]";        
+        var title = "[" + mimetype + ":" + form.node_prop_title.value + "]";
         this.tool.createLink(url, null, null, null, title);
         this.shared.newimages = 1;
         this.drawertool.closeDrawer();

From mihxil at codespeak.net  Wed Aug 13 17:18:54 2008
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Wed, 13 Aug 2008 17:18:54 +0200 (CEST)
Subject: [kupu-checkins] r57225 - kupu/trunk/kupu/mmbase
Message-ID: <20080813151854.6705B16A00E@codespeak.net>

Author: mihxil
Date: Wed Aug 13 17:18:52 2008
New Revision: 57225

Modified:
   kupu/trunk/kupu/mmbase/mmbasetools.js
Log:
this was implemented a bit clumsy, and because of that a bit broken. Now it's better.

Modified: kupu/trunk/kupu/mmbase/mmbasetools.js
==============================================================================
--- kupu/trunk/kupu/mmbase/mmbasetools.js	(original)
+++ kupu/trunk/kupu/mmbase/mmbasetools.js	Wed Aug 13 17:18:52 2008
@@ -8,143 +8,143 @@
 function DivsTool() {
     /* tool to add 'divs' */
 
-    this.initialize = function(editor) {
-        /* attach the event handlers */
-        this.editor = editor;
-        this.editor.logMessage(_("Div tool initialized"));
-    };
+}
+DivsTool.prototype = new KupuTool;
 
+DivsTool.prototype.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 currp = this.editor.getNearestParentOfType(currnode, 'p');
-
-        var doc = this.editor.getInnerDocument();
-        var div = doc.createElement('div');
-        div.id = "createddiv_" + (divids++);
-        if (divclass) {
-            div.className = divclass;
-        };
-        var selection  = this.editor.getSelection();
-        var fragment   = selection ? selection.cloneContents() : undefined;
-        if(fragment == undefined || fragment.firstChild == undefined || fragment.firstChild.nodeType == Node.TEXT_NODE) {
-            var child = doc.createElement("p");
-            if (fragment != undefined) {
-                child.appendChild(selection.cloneContents());
-            }
-            div.appendChild(child);
-            if (child.childNodes.length == 0 || (child.childNodes.length == 1 && (child.firstChild.nodeValue == "" || child.firstChild.nodeValue == undefined))) {
-                child.appendChild(doc.createTextNode("."));
-            }
-        } else {
-            div.appendChild(fragment);
+DivsTool.prototype.createDiv = function(divclass) {
+    /* create a div */
+    var currnode = this.editor.getSelectedNode();
+    var currp = this.editor.getNearestParentOfType(currnode, 'p');
+
+    var doc = this.editor.getInnerDocument();
+    var div = doc.createElement('div');
+    div.id = "createddiv_" + (divids++);
+    if (divclass) {
+        div.className = divclass;
+    };
+    var selection  = this.editor.getSelection();
+    var fragment   = selection ? selection.cloneContents() : undefined;
+    if(fragment == undefined || fragment.firstChild == undefined || fragment.firstChild.nodeType == Node.TEXT_NODE) {
+        var child = doc.createElement("p");
+        if (fragment != undefined) {
+            child.appendChild(selection.cloneContents());
         }
-
-        //var ser = new XMLSerializer();
-        //alert("inserting " + ser.serializeToString(div));
-
-        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);
+        div.appendChild(child);
+        if (child.childNodes.length == 0 || (child.childNodes.length == 1 && (child.firstChild.nodeValue == "" || child.firstChild.nodeValue == undefined))) {
+            child.appendChild(doc.createTextNode("."));
         }
+    } else {
+        div.appendChild(fragment);
+    }
+
+    //var ser = new XMLSerializer();
+    //alert("inserting " + ser.serializeToString(div));
+
+    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.logMessage(_("Div inserted"));
+    this.editor.updateState();
+    return div;
+};
 
-        this.editor.logMessage(_("Div inserted"));
-        this.editor.updateState();
-        return div;
+DivsTool.prototype.setDivClass = function(divclass) {
+    var currnode = this.editor.getSelectedNode();
+    var currdiv = this.editor.getNearestParentOfType(currnode, 'div');
+    if (currdiv) {
+        currdiv.className = divclass;
     };
+};
 
-    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;
-        };
+DivsTool.prototype.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;
     };
-
-    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();
+    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, 'div');
-        if (link) {
-            ret.push(new ContextMenuElement(_('Delete block'), this.deleteDiv, this));
-        }
-        return ret;
-    };
+    this.editor.logMessage(_('Block removed'));
+    this.editor.updateState();
+};
 
-}
+DivsTool.prototype.createContextMenuElements = function(selNode, event) {
+    /* create the 'Create link' or 'Remove link' menu elements */
+    var ret = [];
+    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.classRe = new RegExp('\\bfloat\\b', 'i');
-    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);
-    };
+}
+
+
+DivsToolBox.prototype.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 && this.classRe.test(divel.className)) {
-            // 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;
-            };
+DivsToolBox.prototype.updateState = function(selNode, event) {
+    /* update the state of the toolbox element */
+    var divel = this.editor.getNearestParentOfType(selNode, 'div');
+    if (divel && this.classRe.test(divel.className)) {
+        // 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();
-    };
+DivsToolBox.prototype.addDiv = function() {
+    /* add an div */
+    var sel_class = this.classselect.options[this.classselect.selectedIndex].value;
+    this.tool.createDiv(sel_class);
+    this.editor.focusDocument();
 };
 
-ImageToolBox.prototype = new KupuToolBox;
+DivsToolBox.prototype.setDivClass = function() {
+    var sel_class = this.classselect.options[this.classselect.selectedIndex].value;
+    this.tool.setDivClass(sel_class);
+    this.editor.focusDocument();
+};
+
+
+
 

From hannosch at codespeak.net  Sat Aug 16 21:02:02 2008
From: hannosch at codespeak.net (hannosch at codespeak.net)
Date: Sat, 16 Aug 2008 21:02:02 +0200 (CEST)
Subject: [kupu-checkins] r57334 - kupu/trunk/Products.kupu
Message-ID: <20080816190202.C0F3F16856C@codespeak.net>

Author: hannosch
Date: Sat Aug 16 21:02:00 2008
New Revision: 57334

Modified:
   kupu/trunk/Products.kupu/   (props changed)
Log:
Added some ignores


From mihxil at codespeak.net  Thu Aug 21 14:01:39 2008
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Thu, 21 Aug 2008 14:01:39 +0200 (CEST)
Subject: [kupu-checkins] r57545 - kupu/trunk/kupu/mmbase
Message-ID: <20080821120139.DCA8216A17C@codespeak.net>

Author: mihxil
Date: Thu Aug 21 14:01:37 2008
New Revision: 57545

Modified:
   kupu/trunk/kupu/mmbase/body.kupu
   kupu/trunk/kupu/mmbase/layout.css
   kupu/trunk/kupu/mmbase/layout.js
   kupu/trunk/kupu/mmbase/mmbase.css
   kupu/trunk/kupu/mmbase/mmbase.js
   kupu/trunk/kupu/mmbase/mmbase.kupu
   kupu/trunk/kupu/mmbase/wire.kupu
Log:
Cleaned up a bit. Made custom style possible. 

Modified: kupu/trunk/kupu/mmbase/body.kupu
==============================================================================
--- kupu/trunk/kupu/mmbase/body.kupu	(original)
+++ kupu/trunk/kupu/mmbase/body.kupu	Thu Aug 21 14:01:37 2008
@@ -14,20 +14,6 @@
 
 
   <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:import externid="templates">${mm:directory(header.referer)}</mm:import>
-    <mm:import externid="javascript">${mm:directory(header.referer)}</mm:import>
-
-    <mm:haspage page="${javascript}/kupu.js">
-      <mm:link page="${javascript}/kupu.js">
-        <script type="text/javascript" src="${_}">
-          <jsp:text> </jsp:text>
-        </script>
-      </mm:link>
-    </mm:haspage>
 
     <mm:compare referid="objectnumber" value="new">
       <mm:import externid="referrer">${header.referer}</mm:import>

Modified: kupu/trunk/kupu/mmbase/layout.css
==============================================================================
--- kupu/trunk/kupu/mmbase/layout.css	(original)
+++ kupu/trunk/kupu/mmbase/layout.css	Thu Aug 21 14:01:37 2008
@@ -2,7 +2,12 @@
   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,
+body, #footer, #header, #centerColumn, #mmbase-extra,
+#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;
@@ -51,15 +56,13 @@
   margin-left: 270px;
   margin-right: 0px;
 }
-#leftColumn {
+#mmbase-extra {
   position: absolute;
   width: 270px;
   margin: 0;
   padding: 0;
   font-size: small;
   overflow: hidden;
-}
-#leftColumn {
   left: 0;
 }
 #nodefields {
@@ -107,7 +110,7 @@
 }
 
 
-#leftColumn form {
+#mmbase-tools form {
   display: block;
   margin-right: 2px;
   margin-left: 2px;
@@ -123,25 +126,32 @@
 
 }
 
-#back {
+#back, #ajax-loader {
   position: absolute;
+  display: block;
   top: 0px;
   left: 0px;
-  display: inline;
   height: 18px;
   overflow: hidden;
   background-color: white;
-
+  z-index: 0;
 }
 
 #save-message {
-  display: inline;
-  height: 18px;
   position: absolute;
+  display: block;
+  height: 18px;
   left: 18px;
   top: 0px;
 }
 
+#ajax-loader {
+  z-index: 100;
+}
+#ajax-loader img {
+  height: 18px;
+}
+
 .tree {
   white-space: nowrap;
 }

Modified: kupu/trunk/kupu/mmbase/layout.js
==============================================================================
--- kupu/trunk/kupu/mmbase/layout.js	(original)
+++ kupu/trunk/kupu/mmbase/layout.js	Thu Aug 21 14:01:37 2008
@@ -5,7 +5,7 @@
   window.onload = winOnLoad;
 }
 function winOnLoad() {
-  var ele = document.getElementById('leftColumn');
+  var ele = document.getElementById('mmbase-extra');
   if (ele && xDef(ele.style, ele.offsetHeight)) { // another compatibility check
     adjustLayout();
     addEventHandler(window, 'resize', winOnResize, window);
@@ -49,20 +49,20 @@
     var leftColumnWidth = 270;
     var maxHeight = xClientHeight() - 20;
     var maxWidth  = xClientWidth() - leftColumnWidth - 4;
-  
+
     // Assign maximum height to all columns
-    xHeight('leftColumn', maxHeight - 3);
+    xHeight('mmbase-extra', maxHeight - 3);
     xHeight('centerColumn', maxHeight);
     xWidth('centerColumn', maxWidth);
     var pattern = new RegExp("\\bmm_validate\\b");
-    var a = document.getElementById('leftColumn').getElementsByTagName('input');    
+    var a = document.getElementById('mmbase-extra').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');
+    a = document.getElementById('mmbase-extra').getElementsByTagName('textarea');
     for (i=0; i < a.length; i++) {
         if (pattern.test(a[i].className)) {
             xWidth(a[i], leftColumnWidth - 6);
@@ -93,6 +93,6 @@
 
     xHeight("mmbase-tools", toolsHeight);
 
-    
+
 }
 

Modified: kupu/trunk/kupu/mmbase/mmbase.css
==============================================================================
--- kupu/trunk/kupu/mmbase/mmbase.css	(original)
+++ kupu/trunk/kupu/mmbase/mmbase.css	Thu Aug 21 14:01:37 2008
@@ -15,7 +15,7 @@
 li {
   margin-left: 0px;
  }
-#leftColumnContent a:hover {
+#mmbase-extra div a:hover {
   background-color: #76a2b6;
 }
 
@@ -23,7 +23,7 @@
   border: 0;
 }
 
-#header, #leftColumn {
+#header, #mmbase-extra {
   background-color: #527d94;
   color: #fff;
 }

Modified: kupu/trunk/kupu/mmbase/mmbase.js
==============================================================================
--- kupu/trunk/kupu/mmbase/mmbase.js	(original)
+++ kupu/trunk/kupu/mmbase/mmbase.js	Thu Aug 21 14:01:37 2008
@@ -103,10 +103,10 @@
     KupuZoomTool.prototype.commandfunc = function(button, editor) {
         this.origcommandfunc(button, editor);
         if (this.zoomed == true) {
-            document.getElementById("leftColumn").style.display = "none";
+            document.getElementById("mmbase-extra").style.display = "none";
             //document.getElementById("header").style.display = "none";
         } else {
-            document.getElementById("leftColumn").style.display = "block";
+            document.getElementById("mmbase-extra").style.display = "block";
             adjustLayout();
         }
     }
@@ -151,12 +151,13 @@
     return content;
 }
 
+
 /**
  * Called by the save button.
  */
 function saveNode(button, editor) {
     // hmm, i think editor == kupu
-    $("#ajax-loader").css("display", "inline");
+    $("#ajax-loader").css("display", "block");
     kupu.logMessage(_("Saving body (kupu)") + " " + currentNode);
     editor.saveDocument(undefined, true); // kupu-part of save
     var content = "";

Modified: kupu/trunk/kupu/mmbase/mmbase.kupu
==============================================================================
--- kupu/trunk/kupu/mmbase/mmbase.kupu	(original)
+++ kupu/trunk/kupu/mmbase/mmbase.kupu	Thu Aug 21 14:01:37 2008
@@ -1,8 +1,9 @@
-<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: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">
@@ -33,10 +34,37 @@
     </div>
   </kupu:part>
 
+  <kupu:part name="import-variables">
+    <mm:import externid="objectnumber"  />
+    <mm:import externid="tools"  />
+    <mm:import externid="origin"  />
+    <mm:import id="back" externid="kupu_back">${header.referer}</mm:import>
+    <mm:import externid="templates">${mm:directory(header.referer)}</mm:import>
+    <mm:import externid="javascript">${mm:directory(header.referer)}</mm:import>
+  </kupu:part>
+
   <kupu:part name="styles">
     <link href="mmbase.css" rel="stylesheet" type="text/css" />
+    <!-- custom style -->
+    <mm:haspage page="${templates}/kupu.css">
+      <mm:link page="${templates}/kupu.cc">
+        <link href="${_}" rel="stylesheet" type="text/css" />
+      </mm:link>
+    </mm:haspage>
+  </kupu:part>
+
+  <kupu:part name="jsincludes">
+    <!-- custom java script -->
+    <mm:haspage page="${javascript}/kupu.js">
+      <mm:link page="${javascript}/kupu.js">
+        <script type="text/javascript" src="${_}">
+          <jsp:text> </jsp:text>
+        </script>
+      </mm:link>
+    </mm:haspage>
   </kupu:part>
 
+
   <kupu:part name="header">
     <div id="header">
       <fmt:bundle basename="org.mmbase.kupu.Messages">
@@ -47,10 +75,12 @@
             </mm:link>
           </a>
         </div>
-        <div id="save-message">
+        <div id="ajax-loader" style="display: none;">
           <mm:link page="/mmbase/style/ajax-loader.gif">
-            <img id="ajax-loader" style="display: none;" height="20" src="${_}" alt="&amp;lt;" />
+            <img  src="${_}" alt="*" />
           </mm:link>
+        </div>
+        <div id="save-message">
           <span> </span>
         </div>
         <fmt:message key="Richtext editor" />
@@ -82,8 +112,8 @@
   </kupu:part>
 
   <kupu:part name="navigate">
-    <div id="leftColumn">
-      <div id="leftColumnContent">
+    <div id="mmbase-extra">
+      <div>
         <kupu:insert-part feature="mmbase"     part="tools-div" />
         <kupu:insert-part feature="mmbase"     part="node-div" />
         <kupu:insert-part feature="mmbase"     part="preview-div" />

Modified: kupu/trunk/kupu/mmbase/wire.kupu
==============================================================================
--- kupu/trunk/kupu/mmbase/wire.kupu	(original)
+++ kupu/trunk/kupu/mmbase/wire.kupu	Thu Aug 21 14:01:37 2008
@@ -10,15 +10,21 @@
 
   <kupu:fill-slot name="head">
     <kupu:insert-part feature="head"        part="meta" />
+    <kupu:insert-part feature="mmbase"      part="import-variables" />
+
     <kupu:insert-part feature="head"        part="styles" />
     <kupu:insert-part feature="drawers"     part="styles" />
     <kupu:insert-part feature="mmbase"      part="styles" />
+
     <kupu:insert-part feature="head"        part="jsincludes" />
     <kupu:insert-part feature="contextmenu" part="jsincludes" />
+    <kupu:insert-part feature="mmbase"      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="spellchecker" part="jsincludes" /-->
     <kupu:insert-part feature="drawers"     part="jsincludes" />
   </kupu:fill-slot>
 

From mihxil at codespeak.net  Thu Aug 21 14:55:04 2008
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Thu, 21 Aug 2008 14:55:04 +0200 (CEST)
Subject: [kupu-checkins] r57549 - kupu/trunk/kupu/mmbase
Message-ID: <20080821125504.DD13216A08E@codespeak.net>

Author: mihxil
Date: Thu Aug 21 14:55:01 2008
New Revision: 57549

Modified:
   kupu/trunk/kupu/mmbase/layout.js
   kupu/trunk/kupu/mmbase/mmbase.js
   kupu/trunk/kupu/mmbase/mmbase.kupu
Log:
implemented all this layout javascript a bit more OO, so it can easier be modified by certain implementations

Modified: kupu/trunk/kupu/mmbase/layout.js
==============================================================================
--- kupu/trunk/kupu/mmbase/layout.js	(original)
+++ kupu/trunk/kupu/mmbase/layout.js	Thu Aug 21 14:55:01 2008
@@ -1,98 +1,115 @@
 
+function Layouter() {
+}
+
+Layouter.prototype.winOnLoad = function() {
+    var ele = document.getElementById('mmbase-extra');
+    if (ele && xDef(ele.style, ele.offsetHeight)) { // another compatibility check
+	this.adjust();
+	addEventHandler(window, 'resize', this.winOnResize, window);
+    }
+}
+Layouter.prototype.winOnResize = function() {
+    this.adjust();
+}
 
-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('mmbase-extra');
-  if (ele && xDef(ele.style, ele.offsetHeight)) { // another compatibility check
-    adjustLayout();
-    addEventHandler(window, 'resize', winOnResize, window);
-  }
+Layouter.prototype.maxHeight = function() {
+    return xClientHeight() - 20;
 }
-function winOnResize() {
-  adjustLayout();
+Layouter.prototype.leftWidth = function () {
+    return 270;
 }
 
-function rePosition(id) {
+Layouter.prototype.maxWidth = function () {
+    return xClientWidth() - this.leftWidth() - 4;
+}
+
+Layouter.prototype.rePosition = function(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() {
+Layouter.prototype.adjustToolBoxes = function() {
     var toolbox = 40;
     var spacing = 5;
     var toolboxRight = 2;
     xTop("kupu-toolbox-links", toolbox);
-    rePosition("kupu-toolbox-links");
+    this.rePosition("kupu-toolbox-links");
     toolbox += xHeight("kupu-toolbox-links") + spacing;
     xTop("kupu-toolbox-images", toolbox);
-    rePosition("kupu-toolbox-images");
+    this.rePosition("kupu-toolbox-images");
     toolbox += xHeight("kupu-toolbox-images") + spacing;
     xTop("kupu-toolbox-tables", toolbox);
-    rePosition("kupu-toolbox-tables");
+    this.rePosition("kupu-toolbox-tables");
     toolbox += xHeight("kupu-toolbox-tables") + spacing;
     xTop("kupu-toolbox-divs", toolbox);
-    rePosition("kupu-toolbox-divs");
+    this.rePosition("kupu-toolbox-divs");
     toolbox += xHeight("kupu-toolbox-divs") + spacing;
     xTop("kupu-toolbox-debug", toolbox);
-    rePosition("kupu-toolbox-debug");
+    this.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
+Layouter.prototype.adjustMMBaseExtra = function() {
+    var maxHeight = this.maxHeight();
+    var leftWidth = this.leftWidth();
     xHeight('mmbase-extra', maxHeight - 3);
-    xHeight('centerColumn', maxHeight);
-    xWidth('centerColumn', maxWidth);
     var pattern = new RegExp("\\bmm_validate\\b");
     var a = document.getElementById('mmbase-extra').getElementsByTagName('input');
     for (i = 0; i < a.length; i++) {
         if (pattern.test(a[i].className)) {
-            xWidth(a[i], leftColumnWidth - 6);
+            xWidth(a[i], leftWidth - 6);
         }
     }
-
     a = document.getElementById('mmbase-extra').getElementsByTagName('textarea');
     for (i=0; i < a.length; i++) {
         if (pattern.test(a[i].className)) {
-            xWidth(a[i], leftColumnWidth - 6);
+            xWidth(a[i], leftWidth - 6);
         }
     }
+}
+Layouter.prototype.adjustMMBaseTools = function() {
+    var maxHeight = this.maxHeight();
+    var nodeHeight = xHeight('nodefields');
+    var toolsHeight =  maxHeight - nodeHeight - 1;
+    if (toolsHeight < 100) {
+        toolsHeight = 100;
+        xHeight("nodefields", maxHeight - 100 - 1);
+    }
+    xHeight("mmbase-tools", toolsHeight);
 
+}
+Layouter.prototype.adjustKupu = function () {
+    var maxHeight     = this.maxHeight();
     var maxHeightArea = maxHeight - 27;
+    var maxWidth      = this.maxWidth();
 
     a = xGetElementsByClassName('kupu-editorframe');
-    for (i=0; i < a.length; i++) {
+    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);
-    }
+Layouter.prototype.adjust = function() {
+    var zoomTool = kupu.getTool("zoomtool");
+    if (zoomTool && zoomTool.zoomed) return;
 
-    adjustToolBoxesLayout();
+    var maxHeight = this.maxHeight();
+    var maxWidth  = this.maxWidth();
 
-    xHeight("mmbase-tools", toolsHeight);
+    // Assign maximum height to all columns
+    xHeight('centerColumn', maxHeight);
+    xWidth('centerColumn',   maxWidth);
 
+    this.adjustMMBaseExtra();
+    this.adjustKupu();
 
+    this.adjustMMBaseTools();
+    this.adjustToolBoxes();
 }
 

Modified: kupu/trunk/kupu/mmbase/mmbase.js
==============================================================================
--- kupu/trunk/kupu/mmbase/mmbase.js	(original)
+++ kupu/trunk/kupu/mmbase/mmbase.js	Thu Aug 21 14:55:01 2008
@@ -31,6 +31,8 @@
 var uncollapsedNodes = [];
 var loadedNodeBodies = new Map();
 
+var layout = new Layouter();
+
 function startKupu(language) {
     // first let's load the message catalog
     // if there's no global 'i18n_message_catalog' variable available, don't
@@ -86,7 +88,9 @@
             var child = toolboxes.childNodes[i];
             if (child.className == 'kupu-toolbox') {
                 var heading = child.getElementsByTagName('h1')[0];
-                addEventHandler(heading, 'click', adjustToolBoxesLayout);
+		if (typeof(layout.adjustToolBoxesLayout) != "undefined") {
+                    addEventHandler(heading, 'click', layout.adjustToolBoxesLayout);
+		}
             };
         };
         if (kupu.getBrowserName() == 'IE') {
@@ -102,15 +106,18 @@
     KupuZoomTool.prototype.origcommandfunc  = KupuZoomTool.prototype.commandfunc;
     KupuZoomTool.prototype.commandfunc = function(button, editor) {
         this.origcommandfunc(button, editor);
+	var mmb = document.getElementById("mmbase-extra");
+	if (mmb.originalDisplay == null) mmb.originalDisplay = mmb.style.display;
         if (this.zoomed == true) {
-            document.getElementById("mmbase-extra").style.display = "none";
+            mmb.style.display = "none";
             //document.getElementById("header").style.display = "none";
         } else {
-            document.getElementById("mmbase-extra").style.display = "block";
-            adjustLayout();
+            mmb.style.display = mmb.originalDisplay;
+            layout.adjust();
         }
     }
-    winOnLoad();
+    layout.winOnLoad();
+
     trunkNumber = node;
     loadNode(node);
 
@@ -325,7 +332,9 @@
 
     currentA = document.getElementById('a_' + currentNode);
     if (currentA != undefined) currentA.className = "current";
-    adjustLayout();
+    if (typeof(adjustLayout) != "undefined") {
+	adjustLayout();
+    }
 
 }
 

Modified: kupu/trunk/kupu/mmbase/mmbase.kupu
==============================================================================
--- kupu/trunk/kupu/mmbase/mmbase.kupu	(original)
+++ kupu/trunk/kupu/mmbase/mmbase.kupu	Thu Aug 21 14:55:01 2008
@@ -1,6 +1,7 @@
 <kupu:feature
     name="mmbase" implementation="mmbase"
     xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0"
+    xmlns:c="http://java.sun.com/jsp/jstl/core"
     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" >
@@ -40,14 +41,14 @@
     <mm:import externid="origin"  />
     <mm:import id="back" externid="kupu_back">${header.referer}</mm:import>
     <mm:import externid="templates">${mm:directory(header.referer)}</mm:import>
-    <mm:import externid="javascript">${mm:directory(header.referer)}</mm:import>
+    <mm:import externid="javascript">${templates}</mm:import>
   </kupu:part>
 
   <kupu:part name="styles">
     <link href="mmbase.css" rel="stylesheet" type="text/css" />
     <!-- custom style -->
     <mm:haspage page="${templates}/kupu.css">
-      <mm:link page="${templates}/kupu.cc">
+      <mm:link page="${templates}/kupu.css">
         <link href="${_}" rel="stylesheet" type="text/css" />
       </mm:link>
     </mm:haspage>
@@ -92,6 +93,8 @@
             <input type="hidden" name="objectnumber" value="${node}" />
             <input type="hidden" name="tools" value="${tools}" />
             <input type="hidden" name="kupu_back" value="${back}" />
+            <input type="hidden" name="templates" value="${templates}" />
+            <input type="hidden" name="javascript" value="${javascript}" />
             <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>
@@ -100,8 +103,8 @@
                 <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,hi</mm:import>
-              <mm:stringlist referid="languages">
-                <mm:import id="gui"><mm:locale language="${_}" jspvar="locale"><jsp:expression>locale.getDisplayName(locale)</jsp:expression></mm:locale></mm:import>
+              <mm:stringlist referid="languages" jspvar="l">
+                <c:set var="gui"><jsp:expression>new java.util.Locale(l).getDisplayName(new java.util.Locale(l))</jsp:expression></c:set>
                 <mm:option value="${_}" compare="${rich_language}">${gui}</mm:option>
               </mm:stringlist>
             </select>

From mihxil at codespeak.net  Thu Aug 21 15:45:45 2008
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Thu, 21 Aug 2008 15:45:45 +0200 (CEST)
Subject: [kupu-checkins] r57555 - kupu/trunk/kupu/mmbase
Message-ID: <20080821134545.E5D7F169FDB@codespeak.net>

Author: mihxil
Date: Thu Aug 21 15:45:45 2008
New Revision: 57555

Modified:
   kupu/trunk/kupu/mmbase/layout.js
   kupu/trunk/kupu/mmbase/mmbase.js
Log:
various details and bugfixes

Modified: kupu/trunk/kupu/mmbase/layout.js
==============================================================================
--- kupu/trunk/kupu/mmbase/layout.js	(original)
+++ kupu/trunk/kupu/mmbase/layout.js	Thu Aug 21 15:45:45 2008
@@ -6,7 +6,8 @@
     var ele = document.getElementById('mmbase-extra');
     if (ele && xDef(ele.style, ele.offsetHeight)) { // another compatibility check
 	this.adjust();
-	addEventHandler(window, 'resize', this.winOnResize, window);
+	var self = this;
+	addEventHandler(window, 'resize', function() {self.winOnResize()}, window);
     }
 }
 Layouter.prototype.winOnResize = function() {
@@ -19,9 +20,12 @@
 Layouter.prototype.leftWidth = function () {
     return 270;
 }
+Layouter.prototype.rightWidth = function () {
+    return 201;
+}
 
 Layouter.prototype.maxWidth = function () {
-    return xClientWidth() - this.leftWidth() - 4;
+    return xClientWidth() - this.leftWidth() -  this.rightWidth() - 4;
 }
 
 Layouter.prototype.rePosition = function(id) {
@@ -53,22 +57,30 @@
 }
 Layouter.prototype.adjustMMBaseExtra = function() {
     var maxHeight = this.maxHeight();
-    var leftWidth = this.leftWidth();
     xHeight('mmbase-extra', maxHeight - 3);
+    this.adjustMMBaseExtraElements();
+}
+
+Layouter.prototype.mmbaseExtraWidth = function() {
+    return this.leftWidth() - 6;
+}
+Layouter.prototype.adjustMMBaseExtraElements = function() {
+    var width = this.mmbaseExtraWidth();
     var pattern = new RegExp("\\bmm_validate\\b");
     var a = document.getElementById('mmbase-extra').getElementsByTagName('input');
     for (i = 0; i < a.length; i++) {
         if (pattern.test(a[i].className)) {
-            xWidth(a[i], leftWidth - 6);
+            xWidth(a[i], width);
         }
     }
     a = document.getElementById('mmbase-extra').getElementsByTagName('textarea');
     for (i=0; i < a.length; i++) {
         if (pattern.test(a[i].className)) {
-            xWidth(a[i], leftWidth - 6);
+            xWidth(a[i], width);
         }
     }
 }
+
 Layouter.prototype.adjustMMBaseTools = function() {
     var maxHeight = this.maxHeight();
     var nodeHeight = xHeight('nodefields');
@@ -92,7 +104,7 @@
     }
     xHeight("toolboxes", maxHeight);
     xHeight("kupu-editor", maxHeightArea - 3);
-    xWidth("kupu-editor", maxWidth - 201);
+    xWidth("kupu-editor", maxWidth);
 }
 
 Layouter.prototype.adjust = function() {

Modified: kupu/trunk/kupu/mmbase/mmbase.js
==============================================================================
--- kupu/trunk/kupu/mmbase/mmbase.js	(original)
+++ kupu/trunk/kupu/mmbase/mmbase.js	Thu Aug 21 15:45:45 2008
@@ -88,9 +88,7 @@
             var child = toolboxes.childNodes[i];
             if (child.className == 'kupu-toolbox') {
                 var heading = child.getElementsByTagName('h1')[0];
-		if (typeof(layout.adjustToolBoxesLayout) != "undefined") {
-                    addEventHandler(heading, 'click', layout.adjustToolBoxesLayout);
-		}
+                addEventHandler(heading, 'click', function() { layout.adjustToolBoxes() });
             };
         };
         if (kupu.getBrowserName() == 'IE') {
@@ -332,9 +330,7 @@
 
     currentA = document.getElementById('a_' + currentNode);
     if (currentA != undefined) currentA.className = "current";
-    if (typeof(adjustLayout) != "undefined") {
-	adjustLayout();
-    }
+    layout.adjust();
 
 }
 

From mihxil at codespeak.net  Thu Aug 21 16:48:19 2008
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Thu, 21 Aug 2008 16:48:19 +0200 (CEST)
Subject: [kupu-checkins] r57559 - kupu/trunk/kupu/mmbase
Message-ID: <20080821144819.F0D1D16A131@codespeak.net>

Author: mihxil
Date: Thu Aug 21 16:48:18 2008
New Revision: 57559

Modified:
   kupu/trunk/kupu/mmbase/body.kupu
   kupu/trunk/kupu/mmbase/mmbase.kupu
Log:
more details

Modified: kupu/trunk/kupu/mmbase/body.kupu
==============================================================================
--- kupu/trunk/kupu/mmbase/body.kupu	(original)
+++ kupu/trunk/kupu/mmbase/body.kupu	Thu Aug 21 16:48:18 2008
@@ -59,7 +59,7 @@
       </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:redirect referids="node at objectnumber,tools?,language?,origin?,nodetypes?,back at kupu_back,link_nodetypes?,related_types?,javascript?,style?,templates?" />
     </mm:compare>
     <mm:compare referid="objectnumber" value="new" inverse="true">
       <mm:node id="node" referid="objectnumber" />

Modified: kupu/trunk/kupu/mmbase/mmbase.kupu
==============================================================================
--- kupu/trunk/kupu/mmbase/mmbase.kupu	(original)
+++ kupu/trunk/kupu/mmbase/mmbase.kupu	Thu Aug 21 16:48:18 2008
@@ -41,14 +41,15 @@
     <mm:import externid="origin"  />
     <mm:import id="back" externid="kupu_back">${header.referer}</mm:import>
     <mm:import externid="templates">${mm:directory(header.referer)}</mm:import>
-    <mm:import externid="javascript">${templates}</mm:import>
+    <mm:import externid="style">${templates}</mm:import>
+    <mm:import externid="javascript">${style}</mm:import>
   </kupu:part>
 
   <kupu:part name="styles">
     <link href="mmbase.css" rel="stylesheet" type="text/css" />
     <!-- custom style -->
-    <mm:haspage page="${templates}/kupu.css">
-      <mm:link page="${templates}/kupu.css">
+    <mm:haspage page="${style}/kupu.css">
+      <mm:link page="${style}/kupu.css">
         <link href="${_}" rel="stylesheet" type="text/css" />
       </mm:link>
     </mm:haspage>

From mihxil at codespeak.net  Thu Aug 21 16:54:55 2008
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Thu, 21 Aug 2008 16:54:55 +0200 (CEST)
Subject: [kupu-checkins] r57560 - kupu/trunk/kupu/mmbase
Message-ID: <20080821145455.14C1516A164@codespeak.net>

Author: mihxil
Date: Thu Aug 21 16:54:54 2008
New Revision: 57560

Modified:
   kupu/trunk/kupu/mmbase/mmbase.js
Log:
it's better to do the saveOnPart synchronously

Modified: kupu/trunk/kupu/mmbase/mmbase.js
==============================================================================
--- kupu/trunk/kupu/mmbase/mmbase.js	(original)
+++ kupu/trunk/kupu/mmbase/mmbase.js	Thu Aug 21 16:54:54 2008
@@ -160,7 +160,7 @@
 /**
  * Called by the save button.
  */
-function saveNode(button, editor) {
+function saveNode(button, editor, async) {
     // hmm, i think editor == kupu
     $("#ajax-loader").css("display", "block");
     kupu.logMessage(_("Saving body (kupu)") + " " + currentNode);
@@ -185,8 +185,7 @@
     content += "--" + boundary + "\x2D\x2D";
 
     var request = getRequest();
-
-    request.open("POST", "receive.jspx?fields=true", true);
+    request.open("POST", "receive.jspx?fields=true", async || async == null);
     request.setRequestHeader("Content-Type", "multipart/form-data; boundary=" + boundary);
     request.send(content);
     request.onreadystatechange = function() {
@@ -446,6 +445,6 @@
     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);
+        saveNode(null, kupu, false);
     };
 };

From mihxil at codespeak.net  Thu Aug 21 17:20:33 2008
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Thu, 21 Aug 2008 17:20:33 +0200 (CEST)
Subject: [kupu-checkins] r57561 - kupu/trunk/kupu/mmbase
Message-ID: <20080821152033.D6A0016A112@codespeak.net>

Author: mihxil
Date: Thu Aug 21 17:20:32 2008
New Revision: 57561

Modified:
   kupu/trunk/kupu/mmbase/layout.js
   kupu/trunk/kupu/mmbase/mmbase.js
Log:
made it possible to do adjust layout for zoomed version

Modified: kupu/trunk/kupu/mmbase/layout.js
==============================================================================
--- kupu/trunk/kupu/mmbase/layout.js	(original)
+++ kupu/trunk/kupu/mmbase/layout.js	Thu Aug 21 17:20:32 2008
@@ -107,10 +107,18 @@
     xWidth("kupu-editor", maxWidth);
 }
 
-Layouter.prototype.adjust = function() {
-    var zoomTool = kupu.getTool("zoomtool");
-    if (zoomTool && zoomTool.zoomed) return;
+Layouter.prototype.adjustZoomed = function() {
+}
+Layouter.prototype.adjustUnzoomed = function() {
+}
+
+Layouter.prototype.adjust = function(zoom) {
+    if (zoom) {
+	Layouter.prototype.adjustZoomed();
+	return;
+    }
 
+    Layouter.prototype.adjustUnzoomed();
     var maxHeight = this.maxHeight();
     var maxWidth  = this.maxWidth();
 

Modified: kupu/trunk/kupu/mmbase/mmbase.js
==============================================================================
--- kupu/trunk/kupu/mmbase/mmbase.js	(original)
+++ kupu/trunk/kupu/mmbase/mmbase.js	Thu Aug 21 17:20:32 2008
@@ -108,6 +108,7 @@
 	if (mmb.originalDisplay == null) mmb.originalDisplay = mmb.style.display;
         if (this.zoomed == true) {
             mmb.style.display = "none";
+	    layout.adjust(true);
             //document.getElementById("header").style.display = "none";
         } else {
             mmb.style.display = mmb.originalDisplay;

From mihxil at codespeak.net  Thu Aug 21 17:26:57 2008
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Thu, 21 Aug 2008 17:26:57 +0200 (CEST)
Subject: [kupu-checkins] r57562 - kupu/trunk/kupu/mmbase
Message-ID: <20080821152657.BAA1D16A0C7@codespeak.net>

Author: mihxil
Date: Thu Aug 21 17:26:50 2008
New Revision: 57562

Modified:
   kupu/trunk/kupu/mmbase/toolbar.kupu
Log:
reported mmbase version was not actually correct

Modified: kupu/trunk/kupu/mmbase/toolbar.kupu
==============================================================================
--- kupu/trunk/kupu/mmbase/toolbar.kupu	(original)
+++ kupu/trunk/kupu/mmbase/toolbar.kupu	Thu Aug 21 17:26:50 2008
@@ -3,6 +3,7 @@
     name="toolbar"
     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:fmt="http://java.sun.com/jsp/jstl/fmt"
@@ -39,13 +40,16 @@
 
   <kupu:part name="logo">
     <span class="kupu-tb-buttongroup kupu-logo" style="float: right">
-      <button type="button" class="kupu-logo" title="Kupu SVN/unreleased" 
+      <button type="button" class="kupu-logo" title="Kupu SVN/unreleased"
               id="kupu-logo-button" i18n:attributes="title title_logo;"
               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>
+      <mm:cloudinfo type="mmbaseversion">
+
+        <button type="button" class="mmbase-logo" title="${_}"  id="mmbase-logo-button"
+                onclick="window.open('http://www.mmbase.org');"
+                >&#160;</button>
+      </mm:cloudinfo>
     </span>
   </kupu:part>
 

From mihxil at codespeak.net  Fri Aug 22 11:24:22 2008
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Fri, 22 Aug 2008 11:24:22 +0200 (CEST)
Subject: [kupu-checkins] r57576 - in kupu/trunk/kupu/mmbase: . tools
Message-ID: <20080822092422.40E9116A189@codespeak.net>

Author: mihxil
Date: Fri Aug 22 11:24:20 2008
New Revision: 57576

Modified:
   kupu/trunk/kupu/mmbase/mmbase.css
   kupu/trunk/kupu/mmbase/tools/searchrelate.jspx
Log:
left-box is not very semantic

Modified: kupu/trunk/kupu/mmbase/mmbase.css
==============================================================================
--- kupu/trunk/kupu/mmbase/mmbase.css	(original)
+++ kupu/trunk/kupu/mmbase/mmbase.css	Fri Aug 22 11:24:20 2008
@@ -211,12 +211,12 @@
 }
 
 
-div.kupu-toolbox.left-box {
+div.kupu-toolbox.extra-box {
   width: 260px;
   left: 0px;
 }
 
-div.kupu-toolbox.left-box h1 {
+div.kupu-toolbox.extra-box h1 {
   color: black;
 }
 

Modified: kupu/trunk/kupu/mmbase/tools/searchrelate.jspx
==============================================================================
--- kupu/trunk/kupu/mmbase/tools/searchrelate.jspx	(original)
+++ kupu/trunk/kupu/mmbase/tools/searchrelate.jspx	Fri Aug 22 11:24:20 2008
@@ -25,7 +25,7 @@
         <mm:import id="repository" from="session" externid="${prefix}repository"  required="true"/>
         <mm:import id="current"    from="session" externid="${prefix}current"    required="true"/>
 
-        <div class="kupu-toolbox left-box" >
+        <div class="kupu-toolbox extra-box" >
           <h1 class="kupu-toolbox-heading-closed" title="click to fold">${currentTitle}</h1>
           <div>
             <mm-sr:relate repository="${repository}"

From mihxil at codespeak.net  Fri Aug 22 13:33:08 2008
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Fri, 22 Aug 2008 13:33:08 +0200 (CEST)
Subject: [kupu-checkins] r57584 - kupu/trunk/kupu/mmbase
Message-ID: <20080822113308.9006B16A1AD@codespeak.net>

Author: mihxil
Date: Fri Aug 22 13:33:07 2008
New Revision: 57584

Modified:
   kupu/trunk/kupu/mmbase/node.jspx
Log:
added some css classes so that you can easier style it

Modified: kupu/trunk/kupu/mmbase/node.jspx
==============================================================================
--- kupu/trunk/kupu/mmbase/node.jspx	(original)
+++ kupu/trunk/kupu/mmbase/node.jspx	Fri Aug 22 13:33:07 2008
@@ -23,7 +23,9 @@
           <mm:param name="org.mmbase.xml-mode" value="kupu" />
           <mm:node id="node" referid="node">
             <mm:import id="gui" escape="tagstripper(NONE)"><mm:nodeinfo type="gui" /></mm:import>
-            <div class="node" title="${node.number} ${gui}">
+            <mm:nodeinfo type="nodemanager" id="nodetype" write="false" />
+            <div class="node mm_nm_${nodetype}"
+                 title="${node.number} ${gui}">
               <mm:notpresent referid="loadonly">
                 <table>
                   <tr>
@@ -34,20 +36,23 @@
                   </tr>
                 </table>
                 <form>
-                  <mm:fieldlist id="field" type="edit">
+                  <mm:fieldlist id="field" type="edit" varStatus="status">
                     <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 class="${status.current.name}">
+                          <span class="name"><mm:fieldinfo type="guiname" /></span>
+                          <jsp:text> </jsp:text>
+                          <span class="value">
+                            <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>
+                          </span>
                         </p>
                       </mm:compare>
                     </mm:fieldinfo>

From mihxil at codespeak.net  Fri Aug 22 13:42:19 2008
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Fri, 22 Aug 2008 13:42:19 +0200 (CEST)
Subject: [kupu-checkins] r57586 - kupu/trunk/kupu/mmbase
Message-ID: <20080822114219.87EEA169FDB@codespeak.net>

Author: mihxil
Date: Fri Aug 22 13:42:17 2008
New Revision: 57586

Modified:
   kupu/trunk/kupu/mmbase/node.jspx
Log:
and even more classes

Modified: kupu/trunk/kupu/mmbase/node.jspx
==============================================================================
--- kupu/trunk/kupu/mmbase/node.jspx	(original)
+++ kupu/trunk/kupu/mmbase/node.jspx	Fri Aug 22 13:42:17 2008
@@ -39,7 +39,7 @@
                   <mm:fieldlist id="field" type="edit" varStatus="status">
                     <mm:fieldinfo type="name">
                       <mm:compare value="body" inverse="true">
-                        <p class="${status.current.name}">
+                        <p class="mm_f_${status.current.name} ${status.current.readOnly ? 'readonly' : ''} mm_state_${status.current.state} ${status.current.virtual ? 'virtual' : ''} ${status.current.required ? 'required' : ''}">
                           <span class="name"><mm:fieldinfo type="guiname" /></span>
                           <jsp:text> </jsp:text>
                           <span class="value">

From mihxil at codespeak.net  Sat Aug 23 16:15:43 2008
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Sat, 23 Aug 2008 16:15:43 +0200 (CEST)
Subject: [kupu-checkins] r57603 - kupu/trunk/kupu/mmbase
Message-ID: <20080823141543.824E016A28C@codespeak.net>

Author: mihxil
Date: Sat Aug 23 16:15:42 2008
New Revision: 57603

Modified:
   kupu/trunk/kupu/mmbase/mmbasetools.js
Log:
accidentely removed the handlers

Modified: kupu/trunk/kupu/mmbase/mmbasetools.js
==============================================================================
--- kupu/trunk/kupu/mmbase/mmbasetools.js	(original)
+++ kupu/trunk/kupu/mmbase/mmbasetools.js	Sat Aug 23 16:15:42 2008
@@ -110,8 +110,8 @@
 DivsToolBox.prototype.initialize = function(tool, editor) {
     this.tool = tool;
     this.editor = editor;
-    //addEventHandler(this.classselect, "change", this.setDivClass, this);
-    //addEventHandler(this.insertbutton, "click", this.addDiv, this);
+    addEventHandler(this.classselect, "change", this.setDivClass, this);
+    addEventHandler(this.insertbutton, "click", this.addDiv, this);
 };
 
 DivsToolBox.prototype.updateState = function(selNode, event) {

From eric at codespeak.net  Wed Aug 27 12:45:00 2008
From: eric at codespeak.net (eric at codespeak.net)
Date: Wed, 27 Aug 2008 12:45:00 +0200 (CEST)
Subject: [kupu-checkins] r57639 - in kupu/branch/kupu-1.4-silva: .
	Extensions doc plone plone/tests zope2 zope3
Message-ID: <20080827104500.CEF7A16A0C1@codespeak.net>

Author: eric
Date: Wed Aug 27 12:44:59 2008
New Revision: 57639

Modified:
   kupu/branch/kupu-1.4-silva/Extensions/Install.py
   kupu/branch/kupu-1.4-silva/__init__.py
   kupu/branch/kupu-1.4-silva/doc/LICENSE.txt
   kupu/branch/kupu-1.4-silva/plone/interfaces.py
   kupu/branch/kupu-1.4-silva/plone/librarytool.py
   kupu/branch/kupu-1.4-silva/plone/permissions.py
   kupu/branch/kupu-1.4-silva/plone/plonedrawers.py
   kupu/branch/kupu-1.4-silva/plone/plonelibrarytool.py
   kupu/branch/kupu-1.4-silva/plone/tests/test_browserSupportsKupu.py
   kupu/branch/kupu-1.4-silva/plone/tests/test_librarymanager.py
   kupu/branch/kupu-1.4-silva/plone/tests/test_plonedrawer.py
   kupu/branch/kupu-1.4-silva/plone/tests/test_resourcetypemapper.py
   kupu/branch/kupu-1.4-silva/version.txt
   kupu/branch/kupu-1.4-silva/zope2/__init__.py
   kupu/branch/kupu-1.4-silva/zope3/field.py
   kupu/branch/kupu-1.4-silva/zope3/interfaces.py
Log:
version and copyrights


Modified: kupu/branch/kupu-1.4-silva/Extensions/Install.py
==============================================================================
--- kupu/branch/kupu-1.4-silva/Extensions/Install.py	(original)
+++ kupu/branch/kupu-1.4-silva/Extensions/Install.py	Wed Aug 27 12:44:59 2008
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2003-2005 Kupu Contributors. All rights reserved.
+# Copyright (c) 2003-2008 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

Modified: kupu/branch/kupu-1.4-silva/__init__.py
==============================================================================
--- kupu/branch/kupu-1.4-silva/__init__.py	(original)
+++ kupu/branch/kupu-1.4-silva/__init__.py	Wed Aug 27 12:44:59 2008
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2003-2005 Kupu Contributors. All rights reserved.
+# Copyright (c) 2003-2008 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

Modified: kupu/branch/kupu-1.4-silva/doc/LICENSE.txt
==============================================================================
--- kupu/branch/kupu-1.4-silva/doc/LICENSE.txt	(original)
+++ kupu/branch/kupu-1.4-silva/doc/LICENSE.txt	Wed Aug 27 12:44:59 2008
@@ -1,4 +1,4 @@
-Copyright (c) 2003-2005, Kupu Contributors
+Copyright (c) 2003-2008 Kupu Contributors
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

Modified: kupu/branch/kupu-1.4-silva/plone/interfaces.py
==============================================================================
--- kupu/branch/kupu-1.4-silva/plone/interfaces.py	(original)
+++ kupu/branch/kupu-1.4-silva/plone/interfaces.py	Wed Aug 27 12:44:59 2008
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2003-2005 Kupu Contributors. All rights reserved.
+# Copyright (c) 2003-2008 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

Modified: kupu/branch/kupu-1.4-silva/plone/librarytool.py
==============================================================================
--- kupu/branch/kupu-1.4-silva/plone/librarytool.py	(original)
+++ kupu/branch/kupu-1.4-silva/plone/librarytool.py	Wed Aug 27 12:44:59 2008
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2003-2005 Kupu Contributors. All rights reserved.
+# Copyright (c) 2003-2008 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

Modified: kupu/branch/kupu-1.4-silva/plone/permissions.py
==============================================================================
--- kupu/branch/kupu-1.4-silva/plone/permissions.py	(original)
+++ kupu/branch/kupu-1.4-silva/plone/permissions.py	Wed Aug 27 12:44:59 2008
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2003-2005 Kupu Contributors. All rights reserved.
+# Copyright (c) 2003-2008 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

Modified: kupu/branch/kupu-1.4-silva/plone/plonedrawers.py
==============================================================================
--- kupu/branch/kupu-1.4-silva/plone/plonedrawers.py	(original)
+++ kupu/branch/kupu-1.4-silva/plone/plonedrawers.py	Wed Aug 27 12:44:59 2008
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2003-2005 Kupu Contributors. All rights reserved.
+# Copyright (c) 2003-2008 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

Modified: kupu/branch/kupu-1.4-silva/plone/plonelibrarytool.py
==============================================================================
--- kupu/branch/kupu-1.4-silva/plone/plonelibrarytool.py	(original)
+++ kupu/branch/kupu-1.4-silva/plone/plonelibrarytool.py	Wed Aug 27 12:44:59 2008
@@ -1,7 +1,7 @@
 # -*- coding: latin-1 -*-
 ##############################################################################
 #
-# Copyright (c) 2003-2005 Kupu Contributors. All rights reserved.
+# Copyright (c) 2003-2008 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

Modified: kupu/branch/kupu-1.4-silva/plone/tests/test_browserSupportsKupu.py
==============================================================================
--- kupu/branch/kupu-1.4-silva/plone/tests/test_browserSupportsKupu.py	(original)
+++ kupu/branch/kupu-1.4-silva/plone/tests/test_browserSupportsKupu.py	Wed Aug 27 12:44:59 2008
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2003-2005 Kupu Contributors. All rights reserved.
+# Copyright (c) 2003-2008 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

Modified: kupu/branch/kupu-1.4-silva/plone/tests/test_librarymanager.py
==============================================================================
--- kupu/branch/kupu-1.4-silva/plone/tests/test_librarymanager.py	(original)
+++ kupu/branch/kupu-1.4-silva/plone/tests/test_librarymanager.py	Wed Aug 27 12:44:59 2008
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2003-2005 Kupu Contributors. All rights reserved.
+# Copyright (c) 2003-2008 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

Modified: kupu/branch/kupu-1.4-silva/plone/tests/test_plonedrawer.py
==============================================================================
--- kupu/branch/kupu-1.4-silva/plone/tests/test_plonedrawer.py	(original)
+++ kupu/branch/kupu-1.4-silva/plone/tests/test_plonedrawer.py	Wed Aug 27 12:44:59 2008
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2003-2005 Kupu Contributors. All rights reserved.
+# Copyright (c) 2003-2008 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

Modified: kupu/branch/kupu-1.4-silva/plone/tests/test_resourcetypemapper.py
==============================================================================
--- kupu/branch/kupu-1.4-silva/plone/tests/test_resourcetypemapper.py	(original)
+++ kupu/branch/kupu-1.4-silva/plone/tests/test_resourcetypemapper.py	Wed Aug 27 12:44:59 2008
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2003-2005 Kupu Contributors. All rights reserved.
+# Copyright (c) 2003-2008 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

Modified: kupu/branch/kupu-1.4-silva/version.txt
==============================================================================
--- kupu/branch/kupu-1.4-silva/version.txt	(original)
+++ kupu/branch/kupu-1.4-silva/version.txt	Wed Aug 27 12:44:59 2008
@@ -1 +1 @@
-kupu 1.4b2-silva
+kupu 1.4-silva

Modified: kupu/branch/kupu-1.4-silva/zope2/__init__.py
==============================================================================
--- kupu/branch/kupu-1.4-silva/zope2/__init__.py	(original)
+++ kupu/branch/kupu-1.4-silva/zope2/__init__.py	Wed Aug 27 12:44:59 2008
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2003-2005 Kupu Contributors. All rights reserved.
+# Copyright (c) 2003-2008 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

Modified: kupu/branch/kupu-1.4-silva/zope3/field.py
==============================================================================
--- kupu/branch/kupu-1.4-silva/zope3/field.py	(original)
+++ kupu/branch/kupu-1.4-silva/zope3/field.py	Wed Aug 27 12:44:59 2008
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2003-2005 Kupu Contributors. All rights reserved.
+# Copyright (c) 2003-2008 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

Modified: kupu/branch/kupu-1.4-silva/zope3/interfaces.py
==============================================================================
--- kupu/branch/kupu-1.4-silva/zope3/interfaces.py	(original)
+++ kupu/branch/kupu-1.4-silva/zope3/interfaces.py	Wed Aug 27 12:44:59 2008
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2003-2005 Kupu Contributors. All rights reserved.
+# Copyright (c) 2003-2008 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

From eric at codespeak.net  Wed Aug 27 12:45:38 2008
From: eric at codespeak.net (eric at codespeak.net)
Date: Wed, 27 Aug 2008 12:45:38 +0200 (CEST)
Subject: [kupu-checkins] r57640 - kupu/tag/kupu-1.4-silva
Message-ID: <20080827104538.4F8D216A0C1@codespeak.net>

Author: eric
Date: Wed Aug 27 12:45:36 2008
New Revision: 57640

Added:
   kupu/tag/kupu-1.4-silva/
      - copied from r57639, kupu/branch/kupu-1.4-silva/
Log:
tag for release

From eric at codespeak.net  Wed Aug 27 12:46:19 2008
From: eric at codespeak.net (eric at codespeak.net)
Date: Wed, 27 Aug 2008 12:46:19 +0200 (CEST)
Subject: [kupu-checkins] r57641 - kupu/branch/kupu-1.4-silva
Message-ID: <20080827104619.F041E16A0C1@codespeak.net>

Author: eric
Date: Wed Aug 27 12:46:19 2008
New Revision: 57641

Modified:
   kupu/branch/kupu-1.4-silva/version.txt
Log:
reset version


Modified: kupu/branch/kupu-1.4-silva/version.txt
==============================================================================
--- kupu/branch/kupu-1.4-silva/version.txt	(original)
+++ kupu/branch/kupu-1.4-silva/version.txt	Wed Aug 27 12:46:19 2008
@@ -1 +1 @@
-kupu 1.4-silva
+kupu 1.4.1-silva (unreleased)

From mihxil at codespeak.net  Fri Aug 29 12:14:11 2008
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Fri, 29 Aug 2008 12:14:11 +0200 (CEST)
Subject: [kupu-checkins] r57675 - kupu/trunk/kupu/mmbase
Message-ID: <20080829101411.42B8216A100@codespeak.net>

Author: mihxil
Date: Fri Aug 29 12:14:10 2008
New Revision: 57675

Modified:
   kupu/trunk/kupu/mmbase/drawers.kupu
Log:
some missing divs gave errors

Modified: kupu/trunk/kupu/mmbase/drawers.kupu
==============================================================================
--- kupu/trunk/kupu/mmbase/drawers.kupu	(original)
+++ kupu/trunk/kupu/mmbase/drawers.kupu	Fri Aug 29 12:14:10 2008
@@ -40,7 +40,7 @@
     <mm:import externid="librarysize">50</mm:import>
     <image_xsl_uri>drawers/drawer.xsl.jspx</image_xsl_uri>
     <link_xsl_uri>drawers/drawer.xsl.jspx</link_xsl_uri>
-    
+
     <image_libraries_uri>drawers/libraries.jspx?nodetypes=images&amp;amp;source=${objectnumber}&amp;amp;librarysize=${librarysize}</image_libraries_uri>
     <link_libraries_uri>drawers/libraries.jspx?nodetypes=${link_nodetypes}&amp;amp;source=${objectnumber}&amp;amp;librarysize=${librarysize}</link_libraries_uri>
 
@@ -64,31 +64,58 @@
     <div id="kupu-linkdrawer" class="kupu-drawer kupu-linkdrawer">
       <h1 i18n:translate="title_ext_link">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="label_link_text">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="button_preview">Preview</button>
-        </td></tr>
-        <tr class="kupu-linkdrawer-anchors" style="display:none">
-          <td colspan="2">
-            <label
-                  i18n:translate="label_anchor">Anchor<select><option
-                  i18n:translate="opt_top_of_page" value="">top of page (default)</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 class="kupu-tabbed">
+          <tbody class="kupu-addlink">
+            <tr><td><div class="kupu-toolbox-label">
+
+              <span i18n:translate="label_link_text">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="button_preview">Preview</button>
+            </td></tr>
+            <tr class="kupu-linkdrawer-anchors" style="display:none">
+              <td colspan="2">
+                <label
+                    i18n:translate="label_anchor">Anchor<select><option
+                    i18n:translate="opt_top_of_page" value="">top of page (default)</option></select></label>
+              </td>
+            </tr>
+            <tr><td colspan="2" align="center">
+              <div class="watermark"><span i18n:translate="">Preview</span></div>
+              <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>
+          </tbody>
+          <tbody class="kupu-embed">
+            <tr>
+              <td>
+                <div class="kupu-toolbox-label">
+                  <!-- Link to items matching the keyword  -->
+                  <span i18n:translate="help_paste_here">
+                    Paste &lt;object&gt; or &lt;embed&gt; tag here:
+                  </span>
+                </div>
+                <textarea
+                    class="kupu-toolbox-st kupu-embed-input"
+                    i18n:translate="placeholder_html_code">[insert arbitrary HTML code here]</textarea>
+              </td>
+            </tr>
+            <tr>
+              <td i18n:translate="custom_html_help">
+                You may use this box to insert custom snippets of
+                HTML code. There is no guarantee that any code
+                inserted in this way will be preserved when you save
+                your edits. To select an existing object from IE click on
+                the border, from Firefox double click it.
+              </td>
+            </tr>
+          </tbody>
         </table>
         <div class="kupu-dialogbuttons">
           <button type="button"

From mihxil at codespeak.net  Fri Aug 29 13:22:15 2008
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Fri, 29 Aug 2008 13:22:15 +0200 (CEST)
Subject: [kupu-checkins] r57677 - kupu/trunk/kupu/mmbase
Message-ID: <20080829112215.5F76916A0F7@codespeak.net>

Author: mihxil
Date: Fri Aug 29 13:22:12 2008
New Revision: 57677

Modified:
   kupu/trunk/kupu/mmbase/body-mmbase.kupu
   kupu/trunk/kupu/mmbase/mmbase.kupu
   kupu/trunk/kupu/mmbase/wire.kupu
Log:
made wiring a bit more componentized

Modified: kupu/trunk/kupu/mmbase/body-mmbase.kupu
==============================================================================
--- kupu/trunk/kupu/mmbase/body-mmbase.kupu	(original)
+++ kupu/trunk/kupu/mmbase/body-mmbase.kupu	Fri Aug 29 13:22:12 2008
@@ -9,7 +9,7 @@
 
   <!-- Define the default slot to start with -->
   <kupu:expand>
-    <kupu:define-slot name="start" />
+    <kupu:define-slot name="blockdiv" />
   </kupu:expand>
 
   <!-- Define an implementation order -->

Modified: kupu/trunk/kupu/mmbase/mmbase.kupu
==============================================================================
--- kupu/trunk/kupu/mmbase/mmbase.kupu	(original)
+++ kupu/trunk/kupu/mmbase/mmbase.kupu	Fri Aug 29 13:22:12 2008
@@ -66,6 +66,48 @@
     </mm:haspage>
   </kupu:part>
 
+  <kupu:part name="language-selector">
+    <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}" />
+        <input type="hidden" name="templates" value="${templates}" />
+        <input type="hidden" name="javascript" value="${javascript}" />
+        <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,hi</mm:import>
+          <mm:stringlist referid="languages" jspvar="l">
+            <c:set var="gui"><jsp:expression>new java.util.Locale(l).getDisplayName(new java.util.Locale(l))</jsp:expression></c:set>
+            <mm:option value="${_}" compare="${rich_language}">${gui}</mm:option>
+          </mm:stringlist>
+        </select>
+      </form>
+    </div>
+  </kupu:part>
+
+  <kupu:part name="save-feedback">
+    <div id="ajax-loader" style="display: none;">
+      <mm:link page="/mmbase/style/ajax-loader.gif">
+        <img  src="${_}" alt="*" />
+      </mm:link>
+    </div>
+    <div id="save-message">
+      <span> </span>
+    </div>
+  </kupu:part>
+
+  <kupu:part name="current-node">
+    <mm:node number="${node}" notfound="skip">
+      <jsp:text> (<mm:nodeinfo type="guitype" />)</jsp:text>
+    </mm:node>
+  </kupu:part>
+
 
   <kupu:part name="header">
     <div id="header">
@@ -77,40 +119,12 @@
             </mm:link>
           </a>
         </div>
-        <div id="ajax-loader" style="display: none;">
-          <mm:link page="/mmbase/style/ajax-loader.gif">
-            <img  src="${_}" alt="*" />
-          </mm:link>
-        </div>
-        <div id="save-message">
-          <span> </span>
-        </div>
+        <kupu:insert-part feature="mmbase"     part="save-feedback" />
+
         <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}" />
-            <input type="hidden" name="templates" value="${templates}" />
-            <input type="hidden" name="javascript" value="${javascript}" />
-            <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,hi</mm:import>
-              <mm:stringlist referid="languages" jspvar="l">
-                <c:set var="gui"><jsp:expression>new java.util.Locale(l).getDisplayName(new java.util.Locale(l))</jsp:expression></c:set>
-                <mm:option value="${_}" compare="${rich_language}">${gui}</mm:option>
-              </mm:stringlist>
-            </select>
-          </form>
-        </div>
+        <kupu:insert-part feature="mmbase"     part="language-selector" />
+        <kupu:insert-part feature="mmbase"     part="curent-node" />
+
       </fmt:bundle>
     </div>
   </kupu:part>
@@ -133,4 +147,14 @@
     </div>
   </kupu:part>
 
+  <kupu:part name="blockdiv">
+    <div class="mm_c c_kupu b_edit"
+         xmlns="http://www.w3.org/1999/xhtml"
+         xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+         i18n:domain="kupu" >
+      <kupu:define-slot name="block" />
+    </div>
+  </kupu:part>
+
+
 </kupu:feature>

Modified: kupu/trunk/kupu/mmbase/wire.kupu
==============================================================================
--- kupu/trunk/kupu/mmbase/wire.kupu	(original)
+++ kupu/trunk/kupu/mmbase/wire.kupu	Fri Aug 29 13:22:12 2008
@@ -8,6 +8,7 @@
     xmlns:kupu="http://kupu.oscom.org/namespaces/dist"
     >
 
+
   <kupu:fill-slot name="head">
     <kupu:insert-part feature="head"        part="meta" />
     <kupu:insert-part feature="mmbase"      part="import-variables" />
@@ -40,6 +41,11 @@
     -->
   </kupu:fill-slot>
 
+  <kupu:fill-slot name="blockdiv">
+    <kupu:insert-part feature="head" part="head" />
+    <kupu:insert-part feature="body" part="body" />
+  </kupu:fill-slot>
+
   <kupu:fill-slot name="fulleditor">
     <kupu:insert-part feature="toolbar"   part="toolbar" />
     <kupu:insert-part feature="toolboxes" part="toolboxes" />

From mihxil at codespeak.net  Fri Aug 29 13:23:29 2008
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Fri, 29 Aug 2008 13:23:29 +0200 (CEST)
Subject: [kupu-checkins] r57678 - kupu/trunk/kupu/common
Message-ID: <20080829112329.9778716A0F7@codespeak.net>

Author: mihxil
Date: Fri Aug 29 13:23:28 2008
New Revision: 57678

Modified:
   kupu/trunk/kupu/common/kupudrawers.js
Log:
I suppose this cannot harm. It helps me, I for some reason get exceptios there.

Modified: kupu/trunk/kupu/common/kupudrawers.js
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers.js	(original)
+++ kupu/trunk/kupu/common/kupudrawers.js	Fri Aug 29 13:23:28 2008
@@ -276,6 +276,7 @@
 
 proto.showAnchors = function(selected) {
     var select = this.anchorSelect();
+    if (select == undefined) return;
     var opts = select.options;
 
     while (opts.length > 1) opts[1] = null;

From mihxil at codespeak.net  Fri Aug 29 13:41:58 2008
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Fri, 29 Aug 2008 13:41:58 +0200 (CEST)
Subject: [kupu-checkins] r57679 - kupu/trunk/kupu/mmbase
Message-ID: <20080829114158.41D5A169F32@codespeak.net>

Author: mihxil
Date: Fri Aug 29 13:41:55 2008
New Revision: 57679

Modified:
   kupu/trunk/kupu/mmbase/mmbase.js
Log:
logging the class of the obtained html can be quite informative (the _type_ of the node can be read from it)

Modified: kupu/trunk/kupu/mmbase/mmbase.js
==============================================================================
--- kupu/trunk/kupu/mmbase/mmbase.js	(original)
+++ kupu/trunk/kupu/mmbase/mmbase.js	Fri Aug 29 13:41:55 2008
@@ -300,6 +300,7 @@
     // request to node.jspx, should have put the node in the session
     if (success) {
         nodeDiv.innerHTML = nodeXml;
+	kupu.logMessage($(nodeDiv).find("div").attr("class"));
     }