From sylvain at codespeak.net  Thu Oct  2 11:06:50 2008
From: sylvain at codespeak.net (sylvain at codespeak.net)
Date: Thu,  2 Oct 2008 11:06:50 +0200 (CEST)
Subject: [kupu-checkins] r58553 - in kupu/branch/kupu-1.4-silva: . doc
Message-ID: <20081002090650.3DAF3169FD1@codespeak.net>

Author: sylvain
Date: Thu Oct  2 11:06:49 2008
New Revision: 58553

Modified:
   kupu/branch/kupu-1.4-silva/doc/CHANGES.txt
   kupu/branch/kupu-1.4-silva/version.txt
Log:
Fix CHANGES.txt and version.txt

Modified: kupu/branch/kupu-1.4-silva/doc/CHANGES.txt
==============================================================================
--- kupu/branch/kupu-1.4-silva/doc/CHANGES.txt	(original)
+++ kupu/branch/kupu-1.4-silva/doc/CHANGES.txt	Thu Oct  2 11:06:49 2008
@@ -2,6 +2,14 @@
 Kupu changes
 ============
 
+- 1.4 Beta 3
+
+  - Make documentation as ReST to release as egg.
+
+- 1.4 Beta 2
+
+  - Fix FireFox 3 issues.
+
 - 1.4 Beta 1
 
   - Fixed some problems with handling of multi-valued form fields in the

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	Thu Oct  2 11:06:49 2008
@@ -1 +1 @@
-kupu 1.4.1-silva (unreleased)
+kupu 1.4b3-silva

From sylvain at codespeak.net  Thu Oct  2 11:08:55 2008
From: sylvain at codespeak.net (sylvain at codespeak.net)
Date: Thu,  2 Oct 2008 11:08:55 +0200 (CEST)
Subject: [kupu-checkins] r58555 - kupu/tag/kupu-1.4b3-silva
Message-ID: <20081002090855.D5C3016A0B8@codespeak.net>

Author: sylvain
Date: Thu Oct  2 11:08:55 2008
New Revision: 58555

Added:
   kupu/tag/kupu-1.4b3-silva/
      - copied from r58554, kupu/branch/kupu-1.4-silva/
Log:
- Make tag release 1.4b3-silva


From sylvain at codespeak.net  Thu Oct  2 11:12:03 2008
From: sylvain at codespeak.net (sylvain at codespeak.net)
Date: Thu,  2 Oct 2008 11:12:03 +0200 (CEST)
Subject: [kupu-checkins] r58556 - in kupu/branch/kupu-1.4-silva: . doc
Message-ID: <20081002091203.AFBBE16A0B8@codespeak.net>

Author: sylvain
Date: Thu Oct  2 11:12:03 2008
New Revision: 58556

Modified:
   kupu/branch/kupu-1.4-silva/doc/CHANGES.txt
   kupu/branch/kupu-1.4-silva/version.txt
Log:
bump version and CHANGES.txt

Modified: kupu/branch/kupu-1.4-silva/doc/CHANGES.txt
==============================================================================
--- kupu/branch/kupu-1.4-silva/doc/CHANGES.txt	(original)
+++ kupu/branch/kupu-1.4-silva/doc/CHANGES.txt	Thu Oct  2 11:12:03 2008
@@ -2,6 +2,10 @@
 Kupu changes
 ============
 
+- 1.4 Final
+
+  - ...
+
 - 1.4 Beta 3
 
   - Make documentation as ReST to release as egg.

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	Thu Oct  2 11:12:03 2008
@@ -1 +1 @@
-kupu 1.4b3-silva
+kupu 1.4-final-silva (unreleased)

From mihxil at codespeak.net  Fri Oct  3 11:07:35 2008
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Fri,  3 Oct 2008 11:07:35 +0200 (CEST)
Subject: [kupu-checkins] r58582 - kupu/trunk/kupu/mmbase
Message-ID: <20081003090735.89157169ECA@codespeak.net>

Author: mihxil
Date: Fri Oct  3 11:07:34 2008
New Revision: 58582

Modified:
   kupu/trunk/kupu/mmbase/Makefile
Log:
builder i18n takes a ******* eternity, do I prefer to not let it happen implicitely

Modified: kupu/trunk/kupu/mmbase/Makefile
==============================================================================
--- kupu/trunk/kupu/mmbase/Makefile	(original)
+++ kupu/trunk/kupu/mmbase/Makefile	Fri Oct  3 11:07:34 2008
@@ -14,16 +14,16 @@
 #type in i18n: msginit -l <locale> -i messages.po
 
 
-all: index.jspx body.jspx head.jspx
+all: index.jspx body.jspx head.jspx mmbase-kupu-i18n.jar
 
 
-index.jspx: mmbase-kupu-i18n.jar *.kupu  Makefile $(XSLJSPX_FILE)
+index.jspx: *.kupu  Makefile $(XSLJSPX_FILE)
 	$(XSLTPROC) $(XSLTPROC_PARAMS) -o $@  $(XSLJSPX_FILE) dist-mmbase.kupu
 
-body.jspx: mmbase-kupu-i18n.jar *.kupu  Makefile $(XSLJSPX_FILE)
+body.jspx: *.kupu  Makefile $(XSLJSPX_FILE)
 	$(XSLTPROC) $(XSLTPROC_PARAMS) -o $@  $(XSLJSPX_FILE) body-mmbase.kupu
 
-head.jspx: mmbase-kupu-i18n.jar *.kupu  Makefile $(XSLJSPX_FILE)
+head.jspx: *.kupu  Makefile $(XSLJSPX_FILE)
 	$(XSLTPROC) $(XSLTPROC_PARAMS) -o $@  $(XSLJSPX_FILE) head-mmbase.kupu
 
 $(I18N):

From mihxil at codespeak.net  Fri Oct  3 11:18:35 2008
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Fri,  3 Oct 2008 11:18:35 +0200 (CEST)
Subject: [kupu-checkins] r58583 - kupu/trunk/kupu/mmbase
Message-ID: <20081003091835.74A73169E84@codespeak.net>

Author: mihxil
Date: Fri Oct  3 11:18:35 2008
New Revision: 58583

Modified:
   kupu/trunk/kupu/mmbase/mmbasedrawers.js
Log:
accidentely checkin in this proto-code

Modified: kupu/trunk/kupu/mmbase/mmbasedrawers.js
==============================================================================
--- kupu/trunk/kupu/mmbase/mmbasedrawers.js	(original)
+++ kupu/trunk/kupu/mmbase/mmbasedrawers.js	Fri Oct  3 11:18:35 2008
@@ -89,7 +89,3 @@
 ResourceLibraryDrawer.prototype.shared = {}; // Shared data
 
 
-ImageLibraryDrawer.prototype.originalCreateContent = ImageLibraryDrawer.prototype.createContent;
-
-ImageLibraryDrawer.prototype.createContent = function() {
-}

From mihxil at codespeak.net  Fri Oct  3 11:38:00 2008
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Fri,  3 Oct 2008 11:38:00 +0200 (CEST)
Subject: [kupu-checkins] r58584 - kupu/trunk/kupu/mmbase
Message-ID: <20081003093800.1F54916A059@codespeak.net>

Author: mihxil
Date: Fri Oct  3 11:37:59 2008
New Revision: 58584

Modified:
   kupu/trunk/kupu/mmbase/drawers.kupu
   kupu/trunk/kupu/mmbase/kupuinit.js
   kupu/trunk/kupu/mmbase/layout.js
   kupu/trunk/kupu/mmbase/toolboxes.kupu
Log:
Avoiding to show tools which are actually unused, because the corresponding relation type does not exists or is not switched on

Modified: kupu/trunk/kupu/mmbase/drawers.kupu
==============================================================================
--- kupu/trunk/kupu/mmbase/drawers.kupu	(original)
+++ kupu/trunk/kupu/mmbase/drawers.kupu	Fri Oct  3 11:37:59 2008
@@ -65,7 +65,7 @@
     <image_libraries_uri>drawers/libraries.jspx?nodetypes=${inline_nodetypes}&amp;amp;source=${objectnumber}&amp;amp;librarysize=${librarysize}</image_libraries_uri>
     <link_libraries_uri>drawers/libraries.jspx?nodetypes=${attachment_nodetypes}&amp;amp;source=${objectnumber}&amp;amp;librarysize=${librarysize}</link_libraries_uri>
 
-    <search_images_uri>drawers/search.library.jspx?kupubasedir=${kupubasedir}&amp;amp;link_nodetypes=images&amp;amp;source=${objectnumber}&amp;amp;librarysize=${librarysize}</search_images_uri>
+    <search_images_uri>drawers/search.library.jspx?kupubasedir=${kupubasedir}&amp;amp;link_nodetypes=${inline_nodetypes}&amp;amp;source=${objectnumber}&amp;amp;librarysize=${librarysize}</search_images_uri>
     <search_links_uri> drawers/search.library.jspx?kupubasedir=${kupubasedir}&amp;amp;link_nodetypes=${link_nodetypes}&amp;amp;source=${objectnumber}&amp;amp;librarysize=${librarysize}</search_links_uri>
   </kupu:part>
 

Modified: kupu/trunk/kupu/mmbase/kupuinit.js
==============================================================================
--- kupu/trunk/kupu/mmbase/kupuinit.js	(original)
+++ kupu/trunk/kupu/mmbase/kupuinit.js	Fri Oct  3 11:37:59 2008
@@ -138,11 +138,13 @@
         'kupu-divs-float-select', 'kupu-toolbox-divs',  'kupu-toolbox', 'kupu-toolbox-active');
     divstool.registerToolBox('divstoolbox', divstoolbox);
 
-    var flashtool = new FlashTool();
-    kupu.registerTool('flashtool', flashtool);
+    if (document.getElementById('kupu-toolbox-flash')) {
+        var flashtool = new FlashTool();
+        kupu.registerTool('flashtool', flashtool);
 
-    var flashtoolbox = new FlashToolBox('kupu-flash-float-select', 'kupu-toolbox-flash',  'kupu-toolbox', 'kupu-toolbox-active');
-    flashtool.registerToolBox('flashtoolbox', flashtoolbox);
+        var flashtoolbox = new FlashToolBox('kupu-flash-float-select', 'kupu-toolbox-flash',  'kupu-toolbox', 'kupu-toolbox-active');
+        flashtool.registerToolBox('flashtoolbox', flashtoolbox);
+    }
 
 
 
@@ -169,9 +171,9 @@
 
     // Function that returns function to open a drawer
     var opendrawer = function(drawerid) {
-	return function(button, editor) {
+        return function(button, editor) {
             drawertool.openDrawer(drawerid);
-	};
+        };
     };
 
     var imagelibdrawerbutton = new KupuButton('kupu-imagelibdrawer-button', opendrawer('imagelibdrawer'));
@@ -192,23 +194,23 @@
     kupu.registerTool('drawertool', drawertool);
 
     drawertool.search = function() {
-	alert('haaai');
+        alert('haaai');
     }
 
     try {
-	var linklibdrawer = new ResourceLibraryDrawer(linktool,
+        var linklibdrawer = new ResourceLibraryDrawer(linktool,
             conf['link_xsl_uri'],
             conf['link_libraries_uri'],
             conf['search_links_uri']);
-	drawertool.registerDrawer('linklibdrawer', linklibdrawer);
+        drawertool.registerDrawer('linklibdrawer', linklibdrawer);
 
-	var imagelibdrawer = new ImageLibraryDrawer(imagetool,
+        var imagelibdrawer = new ImageLibraryDrawer(imagetool,
             conf['image_xsl_uri'],
             conf['image_libraries_uri'],
             conf['search_images_uri']);
-	drawertool.registerDrawer('imagelibdrawer', imagelibdrawer);
+        drawertool.registerDrawer('imagelibdrawer', imagelibdrawer);
 
-	/*
+        /*
        var imagelibdrawer2 = new ImageLibraryDrawer(null,
                                                     conf['image_xsl_uri'],
                                                     conf['image_libraries_uri'],
@@ -216,12 +218,12 @@
        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 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);
@@ -237,7 +239,7 @@
     // register some cleanup filter
     // remove tags that aren't in the XHTML DTD
     var nonxhtmltagfilter = new NonXHTMLTagFilter(
-	{'html': 1,
+        {'html': 1,
          'body': 1,
          'head': 1,
          'title': 1,
@@ -273,7 +275,7 @@
          'li': 1,
          'link': 0,
          'meta': 1,
-	 'object': 1,
+         'object': 1,
          'ol': 1,
          'p': 1,
          'pre': 0,

Modified: kupu/trunk/kupu/mmbase/layout.js
==============================================================================
--- kupu/trunk/kupu/mmbase/layout.js	(original)
+++ kupu/trunk/kupu/mmbase/layout.js	Fri Oct  3 11:37:59 2008
@@ -39,28 +39,40 @@
     var toolbox = 40;
     var spacing = 5;
     var toolboxRight = 2;
-    xTop("kupu-toolbox-links", toolbox);
-    this.rePosition("kupu-toolbox-links");
-    toolbox += xHeight("kupu-toolbox-links") + spacing;
-
-    xTop("kupu-toolbox-images", toolbox);
-    this.rePosition("kupu-toolbox-images");
-    toolbox += xHeight("kupu-toolbox-images") + spacing;
-
-    xTop("kupu-toolbox-tables", toolbox);
-    this.rePosition("kupu-toolbox-tables");
-    toolbox += xHeight("kupu-toolbox-tables") + spacing;
-
-    xTop("kupu-toolbox-divs", toolbox);
-    this.rePosition("kupu-toolbox-divs");
-    toolbox += xHeight("kupu-toolbox-divs") + spacing;
-
-    xTop("kupu-toolbox-flash", toolbox);
-    this.rePosition("kupu-toolbox-flash");
-    toolbox += xHeight("kupu-toolbox-flash") + spacing;
+    if (document.getElementById('kupu-toolbox-links')) {
+        xTop("kupu-toolbox-links", toolbox);
+        this.rePosition("kupu-toolbox-links");
+        toolbox += xHeight("kupu-toolbox-links") + spacing;
+    }
+
+    if (document.getElementById('kupu-toolbox-images')) {
+        xTop("kupu-toolbox-images", toolbox);
+        this.rePosition("kupu-toolbox-images");
+        toolbox += xHeight("kupu-toolbox-images") + spacing;
+    }
+
+    if (document.getElementById('kupu-toolbox-tables')) {
+        xTop("kupu-toolbox-tables", toolbox);
+        this.rePosition("kupu-toolbox-tables");
+        toolbox += xHeight("kupu-toolbox-tables") + spacing;
+    }
 
-    xTop("kupu-toolbox-debug", toolbox);
-    this.rePosition("kupu-toolbox-debug");
+    if (document.getElementById('kupu-toolbox-divs')) {
+        xTop("kupu-toolbox-divs", toolbox);
+        this.rePosition("kupu-toolbox-divs");
+        toolbox += xHeight("kupu-toolbox-divs") + spacing;
+    }
+
+    if (document.getElementById('kupu-toolbox-flash')) {
+        xTop("kupu-toolbox-flash", toolbox);
+        this.rePosition("kupu-toolbox-flash");
+        toolbox += xHeight("kupu-toolbox-flash") + spacing;
+    }
+
+    if (document.getElementById('kupu-toolbox-debug')) {
+        xTop("kupu-toolbox-debug", toolbox);
+        this.rePosition("kupu-toolbox-debug");
+    }
 
 }
 Layouter.prototype.adjustMMBaseExtra = function() {

Modified: kupu/trunk/kupu/mmbase/toolboxes.kupu
==============================================================================
--- kupu/trunk/kupu/mmbase/toolboxes.kupu	(original)
+++ kupu/trunk/kupu/mmbase/toolboxes.kupu	Fri Oct  3 11:37:59 2008
@@ -5,7 +5,9 @@
     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:c="http://java.sun.com/jsp/jstl/core"
     xmlns:jsp="http://java.sun.com/JSP/Page"
+    xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0"
     xmlns="http://www.w3.org/1999/xhtml"
     i18n:domain="kupu"
     >
@@ -13,89 +15,105 @@
 
 
   <kupu:part name="images">
-    <div class="kupu-toolbox" id="kupu-toolbox-images">
-      <h1 class="kupu-toolbox-heading" i18n:translate="title_images">Images</h1>
-      <div>
-        <div class="kupu-toolbox-label">
-          <span i18n:translate="label_image_class">Image class:</span>
-        </div>
-        <select class="wide" id="kupu-image-float-select">
-          <option value="image image-inline" i18n:translate="opt_inline">Inline</option>
-          <option value="image image-left" i18n:translate="opt_left">Left</option>
-          <option value="image image-right" i18n:translate="opt_right">Right</option>
-          <fmt:bundle basename="org.mmbase.kupu.Messages">
-            <option value="image image-left big" ><fmt:message key="Left (Big)" /></option>
-            <option value="image image-right big"><fmt:message key="Right (Big)" /></option>
-            <option value="image image-center big"><fmt:message key="Big" /></option>
-          </fmt:bundle>
-          <!--
-          <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>
+    <c:if test="${mm:contains(inline_nodetype, 'flashobjects')}">
+      <mm:node referid="objectnumber">
+        <mm:hasrelationmanager sourcemanager="$_node" destinationmanager="images" role="idrel">
+          <div class="kupu-toolbox" id="kupu-toolbox-images">
+            <h1 class="kupu-toolbox-heading" i18n:translate="title_images">Images</h1>
+            <div>
+              <div class="kupu-toolbox-label">
+                <span i18n:translate="label_image_class">Image class:</span>
+              </div>
+              <select class="wide" id="kupu-image-float-select">
+                <option value="image image-inline" i18n:translate="opt_inline">Inline</option>
+                <option value="image image-left" i18n:translate="opt_left">Left</option>
+                <option value="image image-right" i18n:translate="opt_right">Right</option>
+                <fmt:bundle basename="org.mmbase.kupu.Messages">
+                  <option value="image image-left big" ><fmt:message key="Left (Big)" /></option>
+                  <option value="image image-right big"><fmt:message key="Right (Big)" /></option>
+                  <option value="image image-center big"><fmt:message key="Big" /></option>
+                </fmt:bundle>
+                <!--
+                    <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>
+        </mm:hasrelationmanager>
+      </mm:node>
+    </c:if>
   </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>
+    <mm:node referid="objectnumber">
+      <mm:hasrelationmanager sourcemanager="$_node" destinationmanager="blocks" role="idrel">
+        <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>
-      </fmt:bundle>
-    </div>
+      </mm:hasrelationmanager>
+    </mm:node>
   </kupu:part>
 
   <kupu:part name="flash">
-    <div class="kupu-toolbox" id="kupu-toolbox-flash">
-      <fmt:bundle basename="org.mmbase.kupu.Messages">
-        <h1  class="kupu-toolbox-heading"><fmt:message key="Flash" /></h1>
-        <div>
-          <div class="kupu-toolbox-label">
-            <span><fmt:message key="Flash class" /></span>
-          </div>
-          <select class="wide" id="kupu-flash-float-select">
-            <option value="flash image-inline"><fmt:message key="Flash inline" /></option>
-            <option value="flash image-left"><fmt:message key="Flash left" /></option>
-            <option value="flash image-right"><fmt:message key="Flash right" /></option>
-          </select>
-          <div class="flashobject">
-            <jsp:text> </jsp:text>
+    <c:if test="${mm:contains(inline_nodetype, 'flashobjects')}">
+      <mm:node referid="objectnumber">
+        <mm:hasrelationmanager sourcemanager="$_node" destinationmanager="flashobjects" role="idrel">
+          <div class="kupu-toolbox" id="kupu-toolbox-flash">
+            <fmt:bundle basename="org.mmbase.kupu.Messages">
+              <h1  class="kupu-toolbox-heading"><fmt:message key="Flash" /></h1>
+              <div>
+                <div class="kupu-toolbox-label">
+                  <span><fmt:message key="Flash class" /></span>
+                </div>
+                <select class="wide" id="kupu-flash-float-select">
+                  <option value="flash image-inline"><fmt:message key="Flash inline" /></option>
+                <option value="flash image-left"><fmt:message key="Flash left" /></option>
+                <option value="flash image-right"><fmt:message key="Flash right" /></option>
+                </select>
+                <div class="flashobject">
+                  <jsp:text> </jsp:text>
+                </div>
+              </div>
+          </fmt:bundle>
           </div>
-        </div>
-      </fmt:bundle>
-    </div>
+        </mm:hasrelationmanager>
+      </mm:node>
+    </c:if>
   </kupu:part>
 
   <!-- Overridden just for the jsp:text (to avoid that it collapses, which doesn't work in browers -->

From mihxil at codespeak.net  Fri Oct  3 11:51:23 2008
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Fri,  3 Oct 2008 11:51:23 +0200 (CEST)
Subject: [kupu-checkins] r58585 - kupu/trunk/kupu/mmbase
Message-ID: <20081003095123.2C70B16A086@codespeak.net>

Author: mihxil
Date: Fri Oct  3 11:51:22 2008
New Revision: 58585

Modified:
   kupu/trunk/kupu/mmbase/toolboxes.kupu
Log:


Modified: kupu/trunk/kupu/mmbase/toolboxes.kupu
==============================================================================
--- kupu/trunk/kupu/mmbase/toolboxes.kupu	(original)
+++ kupu/trunk/kupu/mmbase/toolboxes.kupu	Fri Oct  3 11:51:22 2008
@@ -15,7 +15,7 @@
 
 
   <kupu:part name="images">
-    <c:if test="${mm:contains(inline_nodetype, 'flashobjects')}">
+    <c:if test="${mm:contains(inline_nodetypes, 'images')}">
       <mm:node referid="objectnumber">
         <mm:hasrelationmanager sourcemanager="$_node" destinationmanager="images" role="idrel">
           <div class="kupu-toolbox" id="kupu-toolbox-images">
@@ -90,7 +90,7 @@
   </kupu:part>
 
   <kupu:part name="flash">
-    <c:if test="${mm:contains(inline_nodetype, 'flashobjects')}">
+    <c:if test="${mm:contains(inline_nodetypes, 'flashobjects')}">
       <mm:node referid="objectnumber">
         <mm:hasrelationmanager sourcemanager="$_node" destinationmanager="flashobjects" role="idrel">
           <div class="kupu-toolbox" id="kupu-toolbox-flash">

From duncan at codespeak.net  Mon Oct  6 11:30:39 2008
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Mon,  6 Oct 2008 11:30:39 +0200 (CEST)
Subject: [kupu-checkins] r58619 - in kupu/trunk/kupu: doc plone
Message-ID: <20081006093039.7792F16A018@codespeak.net>

Author: duncan
Date: Mon Oct  6 11:30:38 2008
New Revision: 58619

Modified:
   kupu/trunk/kupu/doc/CHANGES.txt
   kupu/trunk/kupu/plone/html2captioned.py
Log:
Fix Plone issue 8287

Modified: kupu/trunk/kupu/doc/CHANGES.txt
==============================================================================
--- kupu/trunk/kupu/doc/CHANGES.txt	(original)
+++ kupu/trunk/kupu/doc/CHANGES.txt	Mon Oct  6 11:30:38 2008
@@ -2,6 +2,12 @@
 Kupu changes
 ============
 
+- 1.4.12
+
+  - Plone tickets
+
+    * 8280 HTML source preview bug with Kupu 1.4.10 and Firefox 3
+
 - 1.4.11
 
   - French translations broke drawers

Modified: kupu/trunk/kupu/plone/html2captioned.py
==============================================================================
--- kupu/trunk/kupu/plone/html2captioned.py	(original)
+++ kupu/trunk/kupu/plone/html2captioned.py	Mon Oct  6 11:30:38 2008
@@ -203,9 +203,9 @@
                 uid = match.group('uid')
                 target = self.resolveuid(context, rc, uid)
                 if target is not None:
-                    try:
+                    if getattr(aq_base(target), 'getRemoteUrl', None) is not None:
                         url = target.getRemoteUrl()
-                    except AttributeError:
+                    else:
                         url = target.absolute_url_path()
                     return tag + url
                 return match.group(0)

From duncan at codespeak.net  Mon Oct  6 11:46:29 2008
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Mon,  6 Oct 2008 11:46:29 +0200 (CEST)
Subject: [kupu-checkins] r58620 - in kupu/trunk/kupu: doc plone
Message-ID: <20081006094629.04A5116A0C1@codespeak.net>

Author: duncan
Date: Mon Oct  6 11:46:29 2008
New Revision: 58620

Modified:
   kupu/trunk/kupu/doc/CHANGES.txt
   kupu/trunk/kupu/plone/plonelibrarytool.py
Log:
Fix Plone tickets 8287,8546

Modified: kupu/trunk/kupu/doc/CHANGES.txt
==============================================================================
--- kupu/trunk/kupu/doc/CHANGES.txt	(original)
+++ kupu/trunk/kupu/doc/CHANGES.txt	Mon Oct  6 11:46:29 2008
@@ -7,6 +7,8 @@
   - Plone tickets
 
     * 8280 HTML source preview bug with Kupu 1.4.10 and Firefox 3
+    * 8287 html2caption is vulnerable to being fooled by acquisitions
+    * 8546 kupu AttributeError captioning
 
 - 1.4.11
 

Modified: kupu/trunk/kupu/plone/plonelibrarytool.py
==============================================================================
--- kupu/trunk/kupu/plone/plonelibrarytool.py	(original)
+++ kupu/trunk/kupu/plone/plonelibrarytool.py	Mon Oct  6 11:46:29 2008
@@ -856,7 +856,7 @@
         if captioning is not None:
             self.captioning = bool(captioning)
 
-        if self.linkbyuid or self.captioning:
+        if self.linkbyuid or self.getCaptioning():
             util.install_transform(self)
         else:
             util.remove_transform(self)

From duncan at codespeak.net  Mon Oct  6 14:07:15 2008
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Mon,  6 Oct 2008 14:07:15 +0200 (CEST)
Subject: [kupu-checkins] r58631 - in kupu/trunk/kupu: .
	plone/kupu_plone_layer plone/profiles/default
Message-ID: <20081006120715.0998B16A00E@codespeak.net>

Author: duncan
Date: Mon Oct  6 14:07:15 2008
New Revision: 58631

Modified:
   kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
   kupu/trunk/kupu/plone/profiles/default/metadata.xml
   kupu/trunk/kupu/version.txt
Log:
Bump version number for release

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html	Mon Oct  6 14:07:15 2008
@@ -1,8 +1,8 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:i18n="http://xml.zope.org/namespaces/i18n" i18n:domain="kupu">
 
-  <!--$Id: include.kupu 11657 2005-04-30 17:19:15Z guido $-->
-    <!--$Id: wire.kupu 20919 2005-12-09 10:14:44Z duncan $-->
+  <!--$Id: include.kupu 56534 2008-07-14 10:11:10Z guido $-->
+    <!--$Id: wire.kupu 56534 2008-07-14 10:11:10Z guido $-->
     <!--$Id: html.kupu 13336 2005-06-13 11:03:58Z gotcha $-->
     <!--$Id: head.kupu 20919 2005-12-09 10:14:44Z duncan $-->
     <!-- saved from url=(0013)about:internet -->
@@ -17,11 +17,12 @@
     <!--$Id: colorchooser.kupu 45650 2007-08-14 10:04:42Z guido $-->
     <!--$Id: save.kupu 44538 2007-06-26 10:46:28Z duncan $-->
     <!--$Id: drawers.kupu 48419 2007-11-08 15:14:05Z duncan $-->
+    <!--$Id: sourceedit.kupu 25717 2006-04-12 10:33:01Z fschulze $-->
     <!--$Id: include.kupu 39202 2007-02-19 12:06:45Z duncan $-->
     <!--$Id: wire.kupu 45669 2007-08-15 10:47:27Z duncan $-->
     <!--$Id: head.kupu 44831 2007-07-07 19:01:27Z duncan $-->
     <!--$Id: xmlconfig.kupu 35367 2006-12-06 09:06:21Z duncan $-->
-    <!--$Id: body.kupu 52772 2008-03-20 13:52:12Z duncan $-->
+    <!--$Id: body.kupu 52814 2008-03-21 16:37:00Z duncan $-->
     <!--$Id: toolbar.kupu 45621 2007-08-13 12:26:50Z duncan $-->
     <!--$Id save.kupu (not yet in svn) $-->
     <!--$Id: drawers.kupu 44538 2007-06-26 10:46:28Z duncan $-->

Modified: kupu/trunk/kupu/plone/profiles/default/metadata.xml
==============================================================================
--- kupu/trunk/kupu/plone/profiles/default/metadata.xml	(original)
+++ kupu/trunk/kupu/plone/profiles/default/metadata.xml	Mon Oct  6 14:07:15 2008
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
 <metadata>
-  <version>1.4.11</version>
+  <version>1.4.12</version>
 </metadata>

Modified: kupu/trunk/kupu/version.txt
==============================================================================
--- kupu/trunk/kupu/version.txt	(original)
+++ kupu/trunk/kupu/version.txt	Mon Oct  6 14:07:15 2008
@@ -1 +1 @@
-kupu 1.4.11
+kupu 1.4.12

From duncan at codespeak.net  Mon Oct  6 14:13:55 2008
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Mon,  6 Oct 2008 14:13:55 +0200 (CEST)
Subject: [kupu-checkins] r58633 - kupu/trunk/kupu/plone
Message-ID: <20081006121355.AD9011684D5@codespeak.net>

Author: duncan
Date: Mon Oct  6 14:13:54 2008
New Revision: 58633

Modified:
   kupu/trunk/kupu/plone/html2captioned.py
Log:
html2captioned transform should avoid erroring if at all possible (end users would prefer to see question marks rather than a Plone error page), so encoding errors should be ignored.

Modified: kupu/trunk/kupu/plone/html2captioned.py
==============================================================================
--- kupu/trunk/kupu/plone/html2captioned.py	(original)
+++ kupu/trunk/kupu/plone/html2captioned.py	Mon Oct  6 14:13:54 2008
@@ -179,7 +179,7 @@
                         # strings that may contain non-ascii characters need to be decoded to unicode
                         for key in ('caption', 'tag'):
                             if isinstance(d[key], str):
-                                d[key] = d[key].decode('utf8')
+                                d[key] = d[key].decode('utf8', 'replace')
 
                         if atag is not None: # Must preserve original link, don't overwrite with a link to the image
                             d['isfullsize'] = True
@@ -194,7 +194,9 @@
                 return match.group(0) # No change
 
             if isinstance(data, str):
-                data = data.decode('utf8')
+                # Transform for end user output should avoid erroring
+                # if it can, so use 'replace' on decode.
+                data = data.decode('utf8', 'replace')
             html = IMAGE_PATTERN.sub(replaceImage, data)
 
             # Replace urls that use UIDs with human friendly urls.

From duncan at codespeak.net  Mon Oct  6 14:14:25 2008
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Mon,  6 Oct 2008 14:14:25 +0200 (CEST)
Subject: [kupu-checkins] r58634 - kupu/tag/kupu-1.4.12
Message-ID: <20081006121425.38149169F35@codespeak.net>

Author: duncan
Date: Mon Oct  6 14:14:24 2008
New Revision: 58634

Added:
   kupu/tag/kupu-1.4.12/
      - copied from r58633, kupu/trunk/kupu/
Log:
Create tag for release

From duncan at codespeak.net  Mon Oct  6 14:39:56 2008
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Mon,  6 Oct 2008 14:39:56 +0200 (CEST)
Subject: [kupu-checkins] r58641 - in kupu/tag/Products.kupu-1.4.12: .
	Products
Message-ID: <20081006123956.4AFD616A078@codespeak.net>

Author: duncan
Date: Mon Oct  6 14:39:55 2008
New Revision: 58641

Added:
   kupu/tag/Products.kupu-1.4.12/
      - copied from r58640, kupu/trunk/Products.kupu/
Modified:
   kupu/tag/Products.kupu-1.4.12/Products/   (props changed)
   kupu/tag/Products.kupu-1.4.12/Products/EXTERNALS.txt
Log:
Tag the kupu egg (N.B. the tagged egg has its svn:external fixed to point at the kupu tag).

Modified: kupu/tag/Products.kupu-1.4.12/Products/EXTERNALS.txt
==============================================================================
--- kupu/trunk/Products.kupu/Products/EXTERNALS.txt	(original)
+++ kupu/tag/Products.kupu-1.4.12/Products/EXTERNALS.txt	Mon Oct  6 14:39:55 2008
@@ -1 +1,2 @@
-kupu https://codespeak.net/svn/kupu/trunk/kupu 
+kupu https://codespeak.net/svn/kupu/tag/kupu-1.4.12
+

From duncan at codespeak.net  Mon Oct  6 15:04:42 2008
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Mon,  6 Oct 2008 15:04:42 +0200 (CEST)
Subject: [kupu-checkins] r58648 - kupu/tag/Products.kupu-1.4.12
Message-ID: <20081006130442.5AC2E169E0E@codespeak.net>

Author: duncan
Date: Mon Oct  6 15:04:40 2008
New Revision: 58648

Modified:
   kupu/tag/Products.kupu-1.4.12/setup.py
Log:
Getting UnicodeDecodeError when uploading the egg: force CHANGES.txt to ascii for now

Modified: kupu/tag/Products.kupu-1.4.12/setup.py
==============================================================================
--- kupu/tag/Products.kupu-1.4.12/setup.py	(original)
+++ kupu/tag/Products.kupu-1.4.12/setup.py	Mon Oct  6 15:04:40 2008
@@ -7,8 +7,8 @@
 setup(name='Products.kupu',
       version=version,
       description="",
-      long_description=open(os.path.join("Products", "kupu", "doc", "README.txt")).read() + "\n" +
-                       open(os.path.join("Products", "kupu", "doc", "CHANGES.txt")).read(),
+      long_description=(open(os.path.join("Products", "kupu", "doc", "README.txt")).read() + "\n" +
+                       open(os.path.join("Products", "kupu", "doc", "CHANGES.txt")).read()).decode('utf-8').encode('ascii','replace'),
       # Get more strings from http://www.python.org/pypi?%3Aaction=list_classifiers
       classifiers=[
         "Framework :: Plone",

From duncan at codespeak.net  Mon Oct  6 18:07:41 2008
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Mon,  6 Oct 2008 18:07:41 +0200 (CEST)
Subject: [kupu-checkins] r58678 - kupu/tag/Products.kupu-1.4.12
Message-ID: <20081006160741.EDB07169F2A@codespeak.net>

Author: duncan
Date: Mon Oct  6 18:07:39 2008
New Revision: 58678

Modified:
   kupu/tag/Products.kupu-1.4.12/setup.py
Log:
Version number shouldnt end in dev

Modified: kupu/tag/Products.kupu-1.4.12/setup.py
==============================================================================
--- kupu/tag/Products.kupu-1.4.12/setup.py	(original)
+++ kupu/tag/Products.kupu-1.4.12/setup.py	Mon Oct  6 18:07:39 2008
@@ -2,7 +2,7 @@
 import os
 
 version = open(os.path.join("Products", "kupu", "version.txt")).read()
-version = version.replace('kupu', '').strip() + 'dev'
+version = version.replace('kupu', '').strip()
 
 setup(name='Products.kupu',
       version=version,

From wiggy at codespeak.net  Wed Oct  8 23:21:55 2008
From: wiggy at codespeak.net (wiggy at codespeak.net)
Date: Wed,  8 Oct 2008 23:21:55 +0200 (CEST)
Subject: [kupu-checkins] r58851 - kupu/trunk/Products.kupu
Message-ID: <20081008212155.40D47169F15@codespeak.net>

Author: wiggy
Date: Wed Oct  8 23:21:52 2008
New Revision: 58851

Modified:
   kupu/trunk/Products.kupu/setup.py
Log:
Correct the name of the Plone egg

Modified: kupu/trunk/Products.kupu/setup.py
==============================================================================
--- kupu/trunk/Products.kupu/setup.py	(original)
+++ kupu/trunk/Products.kupu/setup.py	Wed Oct  8 23:21:52 2008
@@ -34,7 +34,7 @@
           'Products.Archetypes',
           'Products.GenericSetup',
           'Products.CMFCore',
-          'Products.CMFPlone',
+          'Plone',
           'Products.MimetypesRegistry',
           'Products.PortalTransforms',
           'Products.ATContentTypes',

From wiggy at codespeak.net  Wed Oct  8 23:22:00 2008
From: wiggy at codespeak.net (wiggy at codespeak.net)
Date: Wed,  8 Oct 2008 23:22:00 +0200 (CEST)
Subject: [kupu-checkins] r58852 - kupu/trunk/kupu/doc
Message-ID: <20081008212200.9D9A8169F3A@codespeak.net>

Author: wiggy
Date: Wed Oct  8 23:21:59 2008
New Revision: 58852

Modified:
   kupu/trunk/kupu/doc/CHANGES.txt
Log:
Correct the name of the Plone egg

Modified: kupu/trunk/kupu/doc/CHANGES.txt
==============================================================================
--- kupu/trunk/kupu/doc/CHANGES.txt	(original)
+++ kupu/trunk/kupu/doc/CHANGES.txt	Wed Oct  8 23:21:59 2008
@@ -2,6 +2,11 @@
 Kupu changes
 ============
 
+- ?
+
+  - Correct dependency for the Plone egg.
+
+
 - 1.4.12
 
   - Plone tickets

From mihxil at codespeak.net  Thu Oct  9 12:46:08 2008
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Thu,  9 Oct 2008 12:46:08 +0200 (CEST)
Subject: [kupu-checkins] r58854 - kupu/trunk/kupu/common
Message-ID: <20081009104608.5DB78169E3D@codespeak.net>

Author: mihxil
Date: Thu Oct  9 12:46:06 2008
New Revision: 58854

Modified:
   kupu/trunk/kupu/common/kupudrawers.js
Log:
when expanding drawer in small frame, it is usefull to restore the scroll-position afterwards, because there is no real way for the user to do it, and she may end up with a piece of the editor invisible

Modified: kupu/trunk/kupu/common/kupudrawers.js
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers.js	(original)
+++ kupu/trunk/kupu/common/kupudrawers.js	Thu Oct  9 12:46:06 2008
@@ -80,6 +80,10 @@
 proto.initialize = function(editor, drawertool) {
     this.editor = editor;
     this.drawertool = drawertool;
+    // on a small screen, the appearance of the drawer could scroll the screen.
+    // Here we stored the position, so that we can restore it for the user.
+    this.scrollPosition = document.documentElement.scrollTop;
+
 };
 
 proto.createContent = function() {
@@ -96,6 +100,7 @@
     }
     this.element.style.display = 'none';
     this.focussed = false;
+    document.documentElement.scrollTop = this.scrollPosition; // see initialize
 };
 
 proto.focusElement = function() {

From mihxil at codespeak.net  Thu Oct  9 12:56:24 2008
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Thu,  9 Oct 2008 12:56:24 +0200 (CEST)
Subject: [kupu-checkins] r58855 - kupu/trunk/kupu/mmbase/drawers
Message-ID: <20081009105624.85FFF169E32@codespeak.net>

Author: mihxil
Date: Thu Oct  9 12:56:23 2008
New Revision: 58855

Modified:
   kupu/trunk/kupu/mmbase/drawers/libraries.jspx
Log:
if using dynamic include, should of course pass the var then

Modified: kupu/trunk/kupu/mmbase/drawers/libraries.jspx
==============================================================================
--- kupu/trunk/kupu/mmbase/drawers/libraries.jspx	(original)
+++ kupu/trunk/kupu/mmbase/drawers/libraries.jspx	Thu Oct  9 12:56:23 2008
@@ -18,8 +18,7 @@
         <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,librarysize" page="library.jspx" />
+              <mm:include referids="kupubasedir,librarysize,nodetype" page="library.jspx" />
             </mm:context>
           </mm:hasrelationmanager>
           <mm:hasrelationmanager sourcemanager="$s" destinationmanager="$_" role="idrel" inverse="true">

From duncan at codespeak.net  Thu Oct  9 13:50:35 2008
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Thu,  9 Oct 2008 13:50:35 +0200 (CEST)
Subject: [kupu-checkins] r58856 - in kupu/tag/kupu-1.4.12.1: .
	plone/profiles/default
Message-ID: <20081009115035.5196F169F79@codespeak.net>

Author: duncan
Date: Thu Oct  9 13:50:33 2008
New Revision: 58856

Added:
   kupu/tag/kupu-1.4.12.1/
      - copied from r58855, kupu/tag/kupu-1.4.12/
Modified:
   kupu/tag/kupu-1.4.12.1/plone/profiles/default/metadata.xml
   kupu/tag/kupu-1.4.12.1/version.txt
Log:
Identical to kupu-1.4.12 except for the version number. This is to allow a fresh egg release.

Modified: kupu/tag/kupu-1.4.12.1/plone/profiles/default/metadata.xml
==============================================================================
--- kupu/tag/kupu-1.4.12/plone/profiles/default/metadata.xml	(original)
+++ kupu/tag/kupu-1.4.12.1/plone/profiles/default/metadata.xml	Thu Oct  9 13:50:33 2008
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
 <metadata>
-  <version>1.4.12</version>
+  <version>1.4.12.1</version>
 </metadata>

Modified: kupu/tag/kupu-1.4.12.1/version.txt
==============================================================================
--- kupu/tag/kupu-1.4.12/version.txt	(original)
+++ kupu/tag/kupu-1.4.12.1/version.txt	Thu Oct  9 13:50:33 2008
@@ -1 +1 @@
-kupu 1.4.12
+kupu 1.4.12.1

From duncan at codespeak.net  Thu Oct  9 13:56:47 2008
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Thu,  9 Oct 2008 13:56:47 +0200 (CEST)
Subject: [kupu-checkins] r58857 - in kupu/tag/Products.kupu-1.4.12.1: .
	Products
Message-ID: <20081009115647.C3407169FCF@codespeak.net>

Author: duncan
Date: Thu Oct  9 13:56:47 2008
New Revision: 58857

Added:
   kupu/tag/Products.kupu-1.4.12.1/
      - copied from r58856, kupu/trunk/Products.kupu/
Modified:
   kupu/tag/Products.kupu-1.4.12.1/Products/   (props changed)
   kupu/tag/Products.kupu-1.4.12.1/Products/EXTERNALS.txt
   kupu/tag/Products.kupu-1.4.12.1/setup.py
Log:
Fresh egg with corrected dependencies

Modified: kupu/tag/Products.kupu-1.4.12.1/Products/EXTERNALS.txt
==============================================================================
--- kupu/trunk/Products.kupu/Products/EXTERNALS.txt	(original)
+++ kupu/tag/Products.kupu-1.4.12.1/Products/EXTERNALS.txt	Thu Oct  9 13:56:47 2008
@@ -1 +1,2 @@
-kupu https://codespeak.net/svn/kupu/trunk/kupu 
+kupu https://codespeak.net/svn/kupu/tag/kupu-1.4.12.1
+

Modified: kupu/tag/Products.kupu-1.4.12.1/setup.py
==============================================================================
--- kupu/trunk/Products.kupu/setup.py	(original)
+++ kupu/tag/Products.kupu-1.4.12.1/setup.py	Thu Oct  9 13:56:47 2008
@@ -2,13 +2,13 @@
 import os
 
 version = open(os.path.join("Products", "kupu", "version.txt")).read()
-version = version.replace('kupu', '').strip() + 'dev'
+version = version.replace('kupu', '').strip()
 
 setup(name='Products.kupu',
       version=version,
       description="",
-      long_description=open(os.path.join("Products", "kupu", "doc", "README.txt")).read() + "\n" +
-                       open(os.path.join("Products", "kupu", "doc", "CHANGES.txt")).read(),
+      long_description=(open(os.path.join("Products", "kupu", "doc", "README.txt")).read() + "\n" +
+                       open(os.path.join("Products", "kupu", "doc", "CHANGES.txt")).read()).decode('utf-8').encode('ascii','replace'),
       # Get more strings from http://www.python.org/pypi?%3Aaction=list_classifiers
       classifiers=[
         "Framework :: Plone",

From duncan at codespeak.net  Sat Oct 18 17:50:04 2008
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Sat, 18 Oct 2008 17:50:04 +0200 (CEST)
Subject: [kupu-checkins] r59216 - in kupu/trunk/kupu: common doc
Message-ID: <20081018155004.09A8B16A177@codespeak.net>

Author: duncan
Date: Sat Oct 18 17:50:04 2008
New Revision: 59216

Modified:
   kupu/trunk/kupu/common/kupubasetools.js
   kupu/trunk/kupu/doc/CHANGES.txt
Log:
Fix Plone ticket #8612 strangely numbered column headings (Col 01 | Col 11 | Col 21 | Col 31 etc.)

Modified: kupu/trunk/kupu/common/kupubasetools.js
==============================================================================
--- kupu/trunk/kupu/common/kupubasetools.js	(original)
+++ kupu/trunk/kupu/common/kupubasetools.js	Sat Oct 18 17:50:04 2008
@@ -1419,9 +1419,9 @@
     if (makeHeader) {
         var tr = doc.createElement("tr");
         var thead = doc.createElement("thead");
-        for (var i=0; i < cols; i++) {
+        for (var i=1; i <= cols; i++) {
             var th = doc.createElement("th");
-            th.appendChild(doc.createTextNode("Col " + i+1));
+            th.appendChild(doc.createTextNode("Col " + i));
             tr.appendChild(th);
         }
         thead.appendChild(tr);

Modified: kupu/trunk/kupu/doc/CHANGES.txt
==============================================================================
--- kupu/trunk/kupu/doc/CHANGES.txt	(original)
+++ kupu/trunk/kupu/doc/CHANGES.txt	Sat Oct 18 17:50:04 2008
@@ -6,6 +6,9 @@
 
   - Correct dependency for the Plone egg.
 
+  - Plone tickets
+
+    * 8612 strangely numbered column headings (Col 01 | Col 11 | Col 21 | Col 31 etc.)
 
 - 1.4.12
 

From mihxil at codespeak.net  Wed Oct 22 13:38:39 2008
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Wed, 22 Oct 2008 13:38:39 +0200 (CEST)
Subject: [kupu-checkins] r59310 - kupu/trunk/kupu/mmbase
Message-ID: <20081022113839.9B1CF16A0E3@codespeak.net>

Author: mihxil
Date: Wed Oct 22 13:38:39 2008
New Revision: 59310

Modified:
   kupu/trunk/kupu/mmbase/body.kupu
Log:
converve also 'currentTitle' parameters (used by searchrelate tool)

Modified: kupu/trunk/kupu/mmbase/body.kupu
==============================================================================
--- kupu/trunk/kupu/mmbase/body.kupu	(original)
+++ kupu/trunk/kupu/mmbase/body.kupu	Wed Oct 22 13:38:39 2008
@@ -59,7 +59,8 @@
       </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?,javascript?,style?,templates?,prefix?" />
+      <mm:import externid="currentTitle" />
+      <mm:redirect referids="node at objectnumber,tools?,language?,origin?,nodetypes?,back at kupu_back,link_nodetypes?,related_types?,javascript?,style?,templates?,prefix?,currentTitle?" />
     </mm:compare>
     <mm:compare referid="objectnumber" value="new" inverse="true">
       <mm:node id="node" referid="objectnumber" />

From mihxil at codespeak.net  Wed Oct 22 13:39:25 2008
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Wed, 22 Oct 2008 13:39:25 +0200 (CEST)
Subject: [kupu-checkins] r59311 - in kupu/trunk/kupu/mmbase: . drawers
Message-ID: <20081022113925.827A416A164@codespeak.net>

Author: mihxil
Date: Wed Oct 22 13:39:24 2008
New Revision: 59311

Modified:
   kupu/trunk/kupu/mmbase/drawers/libraries.jspx
   kupu/trunk/kupu/mmbase/toolboxes.kupu
Log:
details

Modified: kupu/trunk/kupu/mmbase/drawers/libraries.jspx
==============================================================================
--- kupu/trunk/kupu/mmbase/drawers/libraries.jspx	(original)
+++ kupu/trunk/kupu/mmbase/drawers/libraries.jspx	Wed Oct 22 13:39:24 2008
@@ -5,7 +5,7 @@
     type="text/xml"
     expires="-1">
   <mm:cloud method="asis">
-    <mm:import externid="nodetypes" vartype="list">images,attachments,segments,urls</mm:import>
+    <mm:import externid="nodetypes" vartype="list">images,flashobjects,attachments,segments,urls</mm:import>
     <mm:import id="s" externid="source" />
     <mm:present referid="s">
       <mm:node referid="s" id="s" />
@@ -22,7 +22,7 @@
             </mm:context>
           </mm:hasrelationmanager>
           <mm:hasrelationmanager sourcemanager="$s" destinationmanager="$_" role="idrel" inverse="true">
-            Cannot make relations beteeen ${s} and ${_}.
+            <jsp:text>Cannot make relations beteeen ${s} and ${_}.</jsp:text>
             <mm:log> Cannot make relations beteeen ${s} and ${_}.</mm:log>
           </mm:hasrelationmanager>
         </mm:hasnodemanager>

Modified: kupu/trunk/kupu/mmbase/toolboxes.kupu
==============================================================================
--- kupu/trunk/kupu/mmbase/toolboxes.kupu	(original)
+++ kupu/trunk/kupu/mmbase/toolboxes.kupu	Wed Oct 22 13:39:24 2008
@@ -102,8 +102,8 @@
                 </div>
                 <select class="wide" id="kupu-flash-float-select">
                   <option value="flash image-inline"><fmt:message key="Flash inline" /></option>
-                <option value="flash image-left"><fmt:message key="Flash left" /></option>
-                <option value="flash image-right"><fmt:message key="Flash right" /></option>
+                  <option value="flash image-left"><fmt:message key="Flash left" /></option>
+                  <option value="flash image-right"><fmt:message key="Flash right" /></option>
                 </select>
                 <div class="flashobject">
                   <jsp:text> </jsp:text>

From mihxil at codespeak.net  Wed Oct 22 13:56:57 2008
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Wed, 22 Oct 2008 13:56:57 +0200 (CEST)
Subject: [kupu-checkins] r59312 - kupu/trunk/kupu/mmbase/drawers
Message-ID: <20081022115657.C731016A136@codespeak.net>

Author: mihxil
Date: Wed Oct 22 13:56:55 2008
New Revision: 59312

Modified:
   kupu/trunk/kupu/mmbase/drawers/libraries.jspx
Log:
lowered a log

Modified: kupu/trunk/kupu/mmbase/drawers/libraries.jspx
==============================================================================
--- kupu/trunk/kupu/mmbase/drawers/libraries.jspx	(original)
+++ kupu/trunk/kupu/mmbase/drawers/libraries.jspx	Wed Oct 22 13:56:55 2008
@@ -22,8 +22,8 @@
             </mm:context>
           </mm:hasrelationmanager>
           <mm:hasrelationmanager sourcemanager="$s" destinationmanager="$_" role="idrel" inverse="true">
-            <jsp:text>Cannot make relations beteeen ${s} and ${_}.</jsp:text>
-            <mm:log> Cannot make relations beteeen ${s} and ${_}.</mm:log>
+            <jsp:text>Cannot make relations beteeen ${s} and ${_}. </jsp:text>
+            <mm:log level="debug"> Cannot make relations beteeen ${s} and ${_}.</mm:log>
           </mm:hasrelationmanager>
         </mm:hasnodemanager>
       </mm:stringlist>

From mihxil at codespeak.net  Wed Oct 22 17:41:18 2008
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Wed, 22 Oct 2008 17:41:18 +0200 (CEST)
Subject: [kupu-checkins] r59321 - kupu/trunk/kupu/mmbase
Message-ID: <20081022154118.CA51516A1CE@codespeak.net>

Author: mihxil
Date: Wed Oct 22 17:41:18 2008
New Revision: 59321

Modified:
   kupu/trunk/kupu/mmbase/mmbase.js
   kupu/trunk/kupu/mmbase/mmbase.kupu
Log:
trying to help IE a bit

Modified: kupu/trunk/kupu/mmbase/mmbase.js
==============================================================================
--- kupu/trunk/kupu/mmbase/mmbase.js	(original)
+++ kupu/trunk/kupu/mmbase/mmbase.js	Wed Oct 22 17:41:18 2008
@@ -68,7 +68,7 @@
         // 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)
+            var match = re.exec(navigator.userAgent)
         if (match[1] && parseFloat(match[1]) > 1.6) {
             addEventHandler(window, 'beforeunload', saveOnPart);
         } else {
@@ -104,11 +104,11 @@
     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;
+        var mmb = document.getElementById("mmbase-extra");
+        if (mmb.originalDisplay == null) mmb.originalDisplay = mmb.style.display;
         if (this.zoomed == true) {
             mmb.style.display = "none";
-	    layout.adjust(true);
+            layout.adjust(true);
             //document.getElementById("header").style.display = "none";
         } else {
             mmb.style.display = mmb.originalDisplay;
@@ -196,27 +196,28 @@
             //alert("Posted \n" + content);
             if (request.status == 200) {
                 currentNode = undefined;
-		$("#save-message span").each(function() {
-		    $(this).empty();
-		    $(this).append(_("saved") + " " + node);
-		    $(this).fadeIn(400);
-		    var p = this;
-		    $(this).fadeOut(4000, function() {$(p).empty()} );
-		});
+                $("#save-message span").each(function() {
+                    if (this.originalTextContext == null) this.originalTextContext = this.textContent;
+                    $(this).empty();
+                    $(this).append(_("saved") + " " + node);
+                    $(this).fadeIn(400);
+                    var p = this;
+                    $(this).fadeOut(4000, function() {$(p).empty(); $(p).append(p.originalTextContent); } );
+                });
                 kupu.logMessage("Reloading " + node);
                 loadedNodes.remove(node);
                 loadedNodeBodies.remove(node);
                 loadNode(node);
-		try {
-		    $("#kupu-save-button").trigger("kupu-saved");
-		} catch (ex) {
+                try {
+                    $("#kupu-save-button").trigger("kupu-saved");
+                } catch (ex) {
                     kupu.logMessage(ex);
-		}
+                }
             } else {
                 alert(_("Not saved") + " " + node);
                 reloadAfterError();
             }
-	    $("#ajax-loader").css("display", "none");
+            $("#ajax-loader").css("display", "none");
         }
     }
 
@@ -300,7 +301,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"));
+        kupu.logMessage($(nodeDiv).find("div").attr("class"));
     }
 
 

Modified: kupu/trunk/kupu/mmbase/mmbase.kupu
==============================================================================
--- kupu/trunk/kupu/mmbase/mmbase.kupu	(original)
+++ kupu/trunk/kupu/mmbase/mmbase.kupu	Wed Oct 22 17:41:18 2008
@@ -101,7 +101,7 @@
       </mm:link>
     </div>
     <div id="save-message">
-      <span> </span>
+      <span>...</span>
     </div>
   </kupu:part>
 

From mihxil at codespeak.net  Thu Oct 23 15:18:30 2008
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Thu, 23 Oct 2008 15:18:30 +0200 (CEST)
Subject: [kupu-checkins] r59335 - kupu/trunk/kupu/mmbase/tools
Message-ID: <20081023131830.E358416A1C9@codespeak.net>

Author: mihxil
Date: Thu Oct 23 15:18:30 2008
New Revision: 59335

Modified:
   kupu/trunk/kupu/mmbase/tools/searchrelate.jspx
Log:
collapser is not actually useable twice. So don't. redid it on the fly.

Modified: kupu/trunk/kupu/mmbase/tools/searchrelate.jspx
==============================================================================
--- kupu/trunk/kupu/mmbase/tools/searchrelate.jspx	(original)
+++ kupu/trunk/kupu/mmbase/tools/searchrelate.jspx	Thu Oct 23 15:18:30 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 extra-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}"
@@ -56,8 +56,23 @@
         </div>
         <script type="text/javascript">
           $(document).ready(function() {
-             var collapser = new window.kuputoolcollapser.Collapser('mm_searchrelate');
-             collapser.initialize();
+          $('#mm_searchrelate h1').each(function() {
+            $(this).find("+ div").css("display", "none");
+          });
+          $('#mm_searchrelate h1').click(function() {
+              var h1 = this;
+              $(this).find("+ div").each(function() {
+                 var c = $(this).css("display");
+                 $(this).css("display", c == 'none' ? 'block' : 'none');
+                 if (c == 'none') {
+                   $(h1).addClass("kupu-toolbox-heading-opened");
+                   $(h1).removeClass("kupu-toolbox-heading-closed");
+                   } else {
+                   $(h1).addClass("kupu-toolbox-heading-closed");
+                   $(h1).removeClass("kupu-toolbox-heading-opened");
+                   }
+                 });
+          });
           });
         </script>
       </mm:cloud>

From mihxil at codespeak.net  Thu Oct 23 15:29:25 2008
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Thu, 23 Oct 2008 15:29:25 +0200 (CEST)
Subject: [kupu-checkins] r59336 - kupu/trunk/kupu/mmbase/drawers
Message-ID: <20081023132925.3186A16A0F4@codespeak.net>

Author: mihxil
Date: Thu Oct 23 15:29:24 2008
New Revision: 59336

Modified:
   kupu/trunk/kupu/mmbase/drawers/collection.jspx
Log:
using request attributes

Modified: kupu/trunk/kupu/mmbase/drawers/collection.jspx
==============================================================================
--- kupu/trunk/kupu/mmbase/drawers/collection.jspx	(original)
+++ kupu/trunk/kupu/mmbase/drawers/collection.jspx	Thu Oct 23 15:29:24 2008
@@ -28,10 +28,10 @@
           <mm:maxnumber value="${max}" />
           <mm:offset    value="${page * max}" />
           <mm:haspage page="${nodetype}.items.jspx">
-            <mm:include debug="xml" referids="kupubasedir,max" page="${nodetype}.items.jspx" />
+            <mm:include debug="xml" attributes="kupubasedir,max" page="${nodetype}.items.jspx" />
           </mm:haspage>
           <mm:haspage page="${nodetype}.items.jspx" inverse="true">
-            <mm:include debug="xml" referids="kupubasedir,max" page="texts.items.jspx" />
+            <mm:include debug="xml" attributes="kupubasedir,max" page="texts.items.jspx" />
           </mm:haspage>
         </mm:listnodescontainer>
       </mm:context>

From kupu-checkins at codespeak.net  Fri Oct 24 07:22:54 2008
From: kupu-checkins at codespeak.net (kupu-checkins at codespeak.net)
Date: Fri, 24 Oct 2008 07:22:54 +0200 (CEST)
Subject: VIAGRA ® Official Site
Message-ID: <20081024182225.70808.qmail@cc35x2.sels.ru>

An HTML attachment was scrubbed...
URL: http://codespeak.net/pipermail/kupu-checkins/attachments/20081024/f349c810/attachment.htm 

From mihxil at codespeak.net  Thu Oct 30 15:05:31 2008
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Thu, 30 Oct 2008 15:05:31 +0100 (CET)
Subject: [kupu-checkins] r59563 - kupu/trunk/kupu/mmbase/drawers
Message-ID: <20081030140531.83304169FC0@codespeak.net>

Author: mihxil
Date: Thu Oct 30 15:05:30 2008
New Revision: 59563

Modified:
   kupu/trunk/kupu/mmbase/drawers/flashobjects.items.jspx
   kupu/trunk/kupu/mmbase/drawers/libraries.jspx
   kupu/trunk/kupu/mmbase/drawers/upload.jspx
   kupu/trunk/kupu/mmbase/drawers/uploadfields.jspx
Log:
pass nodetyep to upload jsp

Modified: kupu/trunk/kupu/mmbase/drawers/flashobjects.items.jspx
==============================================================================
--- kupu/trunk/kupu/mmbase/drawers/flashobjects.items.jspx	(original)
+++ kupu/trunk/kupu/mmbase/drawers/flashobjects.items.jspx	Thu Oct 30 15:05:30 2008
@@ -7,7 +7,6 @@
     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:notpresent referid="query">
       <mm:cloud method="asis">

Modified: kupu/trunk/kupu/mmbase/drawers/libraries.jspx
==============================================================================
--- kupu/trunk/kupu/mmbase/drawers/libraries.jspx	(original)
+++ kupu/trunk/kupu/mmbase/drawers/libraries.jspx	Thu Oct 30 15:05:30 2008
@@ -13,6 +13,7 @@
     <libraries>
       <param name="drawertype">image</param>
       <mm:import id="kupubasedir"><mm:url absolute="server" page="../.." /></mm:import>
+
       <mm:import externid="librarysize">50</mm:import>
       <mm:stringlist referid="nodetypes" id="nodetype">
         <mm:hasnodemanager name="$_">

Modified: kupu/trunk/kupu/mmbase/drawers/upload.jspx
==============================================================================
--- kupu/trunk/kupu/mmbase/drawers/upload.jspx	(original)
+++ kupu/trunk/kupu/mmbase/drawers/upload.jspx	Thu Oct 30 15:05:30 2008
@@ -13,7 +13,7 @@
 
     <mm:cloud rank="basic user">
       <mm:import externid="nodetype">images</mm:import>
-      <mm:log>Uploading</mm:log>
+      <mm:log>Uploading ${nodetype}</mm:log>
       <mm:createnode type="$nodetype" id="node">
         <mm:import id="file" externid="node_prop_image" from="multipart" vartype="fileitem"  />
         <c:choose>

Modified: kupu/trunk/kupu/mmbase/drawers/uploadfields.jspx
==============================================================================
--- kupu/trunk/kupu/mmbase/drawers/uploadfields.jspx	(original)
+++ kupu/trunk/kupu/mmbase/drawers/uploadfields.jspx	Thu Oct 30 15:05:30 2008
@@ -10,7 +10,7 @@
   <mm:cloud>
     <mm:notpresent referid="surpressupload">
       <uploadbutton media="${media}">
-        <uri><mm:url absolute="server" page="upload.jspx" /></uri>
+        <uri><mm:url absolute="server" referids="nodetype" page="upload.jspx" /></uri>
         <gui><mm:nodeinfo nodetype="${nodetype}" type="guinodemanager" /></gui>
       </uploadbutton>
       <mm:fieldlist nodetype="${nodetype}" type="edit" varStatus="status">

From mihxil at codespeak.net  Thu Oct 30 15:42:55 2008
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Thu, 30 Oct 2008 15:42:55 +0100 (CET)
Subject: [kupu-checkins] r59566 - kupu/trunk/kupu/mmbase
Message-ID: <20081030144255.328E9169F87@codespeak.net>

Author: mihxil
Date: Thu Oct 30 15:42:54 2008
New Revision: 59566

Modified:
   kupu/trunk/kupu/mmbase/mmbase.kupu
Log:


Modified: kupu/trunk/kupu/mmbase/mmbase.kupu
==============================================================================
--- kupu/trunk/kupu/mmbase/mmbase.kupu	(original)
+++ kupu/trunk/kupu/mmbase/mmbase.kupu	Thu Oct 30 15:42:54 2008
@@ -77,6 +77,7 @@
         <input type="hidden" name="javascript" value="${javascript}" />
         <input type="hidden" name="prefix" value="${prefix}" />
         <input type="hidden" name="style" value="${style}" />
+        <input type="hidden" name="link_nodetypes" value="${link_nodetypes}" />
         <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>

From guido at codespeak.net  Thu Oct 30 17:21:37 2008
From: guido at codespeak.net (guido at codespeak.net)
Date: Thu, 30 Oct 2008 17:21:37 +0100 (CET)
Subject: [kupu-checkins] r59576 - kupu/trunk/kupu/common
Message-ID: <20081030162137.59907169F33@codespeak.net>

Author: guido
Date: Thu Oct 30 17:21:37 2008
New Revision: 59576

Modified:
   kupu/trunk/kupu/common/kupuhelpers.js
Log:
Seems like selectAllChildren on a selection works only for element nodes, not
for text, using the original fallback code for when selectAllChildren doesn't
exist the text does get nicely selected.


Modified: kupu/trunk/kupu/common/kupuhelpers.js
==============================================================================
--- kupu/trunk/kupu/common/kupuhelpers.js	(original)
+++ kupu/trunk/kupu/common/kupuhelpers.js	Thu Oct 30 17:21:37 2008
@@ -475,7 +475,7 @@
             /* select the contents of a node */
             var sel = this.selection;
             sel.removeAllRanges();
-            if (sel.selectAllChildren) {
+            if (sel.selectAllChildren && node.nodeType == 1) {
                 sel.selectAllChildren(node);
             } else {
                 var range = this._createRange();

From mihxil at codespeak.net  Fri Oct 31 11:57:12 2008
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Fri, 31 Oct 2008 11:57:12 +0100 (CET)
Subject: [kupu-checkins] r59587 - kupu/trunk/kupu/mmbase/drawers
Message-ID: <20081031105712.24D3416A2D8@codespeak.net>

Author: mihxil
Date: Fri Oct 31 11:57:11 2008
New Revision: 59587

Modified:
   kupu/trunk/kupu/mmbase/drawers/search.constraints.jspx
Log:
works around a bug

Modified: kupu/trunk/kupu/mmbase/drawers/search.constraints.jspx
==============================================================================
--- kupu/trunk/kupu/mmbase/drawers/search.constraints.jspx	(original)
+++ kupu/trunk/kupu/mmbase/drawers/search.constraints.jspx	Fri Oct 31 11:57:11 2008
@@ -11,6 +11,7 @@
     xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0"
     >
   <mm:isnotempty  xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0" referid="search">
+
     <mm:composite operator="OR">
       <mm:fieldlist type="search" nodetype="$nodetype">
         <mm:fieldinfo type="typedescription">
@@ -24,7 +25,7 @@
     </mm:composite>
   </mm:isnotempty>
   <!-- see remark in library.jspx -->
-  <mm:hasfield nodetype="${nodetype}" name="version">
+  <mm:hasfield nodetype="$nodetype" name="version">
     <mm:constraint field="version" value="10000" />
   </mm:hasfield>
 </jsp:root>

From mihxil at codespeak.net  Fri Oct 31 14:38:26 2008
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Fri, 31 Oct 2008 14:38:26 +0100 (CET)
Subject: [kupu-checkins] r59590 - kupu/trunk/kupu/mmbase
Message-ID: <20081031133826.D12D016A1CE@codespeak.net>

Author: mihxil
Date: Fri Oct 31 14:38:24 2008
New Revision: 59590

Modified:
   kupu/trunk/kupu/mmbase/mmbase.js
Log:
single quotes are not recognized by xgettext

Modified: kupu/trunk/kupu/mmbase/mmbase.js
==============================================================================
--- kupu/trunk/kupu/mmbase/mmbase.js	(original)
+++ kupu/trunk/kupu/mmbase/mmbase.js	Fri Oct 31 14:38:24 2008
@@ -446,7 +446,7 @@
 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?'))) {
+        confirm(_("You have unsaved changes. Do you want to save before leaving the page?"))) {
         kupu.config.reload_src = 0;
         saveNode(null, kupu, false);
     };

From mihxil at codespeak.net  Fri Oct 31 14:38:36 2008
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Fri, 31 Oct 2008 14:38:36 +0100 (CET)
Subject: [kupu-checkins] r59591 - kupu/trunk/kupu/mmbase/i18n
Message-ID: <20081031133836.2B46D16A1D3@codespeak.net>

Author: mihxil
Date: Fri Oct 31 14:38:35 2008
New Revision: 59591

Modified:
   kupu/trunk/kupu/mmbase/i18n/de.po
   kupu/trunk/kupu/mmbase/i18n/en.po
   kupu/trunk/kupu/mmbase/i18n/eo.po
   kupu/trunk/kupu/mmbase/i18n/fr.po
   kupu/trunk/kupu/mmbase/i18n/it.po
   kupu/trunk/kupu/mmbase/i18n/nl.po
Log:
some translations

Modified: kupu/trunk/kupu/mmbase/i18n/de.po
==============================================================================
--- kupu/trunk/kupu/mmbase/i18n/de.po	(original)
+++ kupu/trunk/kupu/mmbase/i18n/de.po	Fri Oct 31 14:38:35 2008
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: mmbase 18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-19 17:41+0200\n"
+"POT-Creation-Date: 2008-10-31 14:25+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"
@@ -24,27 +24,27 @@
 msgid "Saving fields (form)"
 msgstr ""
 
-#: mmbase.js:173 mmbase.js:191 mmbase.js:192 mmbase.js:201
+#: mmbase.js:173 mmbase.js:191 mmbase.js:192 mmbase.js:201 mmbase.js:202
 msgid "saved"
 msgstr ""
 
-#: mmbase.js:202 mmbase.js:242 mmbase.js:243 mmbase.js:262
+#: mmbase.js:202 mmbase.js:242 mmbase.js:243 mmbase.js:262 mmbase.js:263
 msgid "RELOAD"
 msgstr ""
 
-#: mmbase.js:223 mmbase.js:264 mmbase.js:283
+#: mmbase.js:223 mmbase.js:264 mmbase.js:283 mmbase.js:284
 msgid "Getting node fields for "
 msgstr ""
 
-#: mmbase.js:231 mmbase.js:275 mmbase.js:294
+#: mmbase.js:231 mmbase.js:275 mmbase.js:294 mmbase.js:295
 msgid "Loading node fields for "
 msgstr ""
 
-#: mmbase.js:243 mmbase.js:289 mmbase.js:309
+#: mmbase.js:243 mmbase.js:289 mmbase.js:309 mmbase.js:310
 msgid "Getting node body "
 msgstr ""
 
-#: mmbase.js:250 mmbase.js:300 mmbase.js:299 mmbase.js:319
+#: mmbase.js:250 mmbase.js:300 mmbase.js:299 mmbase.js:319 mmbase.js:320
 msgid "Loading node body "
 msgstr ""
 
@@ -113,11 +113,11 @@
 msgid "emphasis: alt-i"
 msgstr ""
 
-#: mmbase.js:197 mmbase.js:198 mmbase.js:216
+#: mmbase.js:197 mmbase.js:198 mmbase.js:216 mmbase.js:217
 msgid "Not saved"
 msgstr ""
 
-#: mmbase.js:215 mmbase.js:216 mmbase.js:235
+#: mmbase.js:215 mmbase.js:216 mmbase.js:235 mmbase.js:236
 msgid "Reinited "
 msgstr ""
 
@@ -604,3 +604,7 @@
 #: phony.js:17
 msgid "Flash right"
 msgstr ""
+
+#: mmbase.js:449
+msgid "You have unsaved changes. Do you want to save before leaving the page?"
+msgstr ""

Modified: kupu/trunk/kupu/mmbase/i18n/en.po
==============================================================================
--- kupu/trunk/kupu/mmbase/i18n/en.po	(original)
+++ kupu/trunk/kupu/mmbase/i18n/en.po	Fri Oct 31 14:38:35 2008
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-19 17:41+0200\n"
-"PO-Revision-Date: 2008-09-19 17:49+0200\n"
+"POT-Creation-Date: 2008-10-31 14:25+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -24,27 +24,27 @@
 msgid "Saving fields (form)"
 msgstr "Saving fields (form)"
 
-#: mmbase.js:173 mmbase.js:191 mmbase.js:192 mmbase.js:201
+#: mmbase.js:173 mmbase.js:191 mmbase.js:192 mmbase.js:201 mmbase.js:202
 msgid "saved"
 msgstr "saved"
 
-#: mmbase.js:202 mmbase.js:242 mmbase.js:243 mmbase.js:262
+#: mmbase.js:202 mmbase.js:242 mmbase.js:243 mmbase.js:262 mmbase.js:263
 msgid "RELOAD"
 msgstr "RELOAD"
 
-#: mmbase.js:223 mmbase.js:264 mmbase.js:283
+#: mmbase.js:223 mmbase.js:264 mmbase.js:283 mmbase.js:284
 msgid "Getting node fields for "
 msgstr "Getting node fields for "
 
-#: mmbase.js:231 mmbase.js:275 mmbase.js:294
+#: mmbase.js:231 mmbase.js:275 mmbase.js:294 mmbase.js:295
 msgid "Loading node fields for "
 msgstr "Loading node fields for "
 
-#: mmbase.js:243 mmbase.js:289 mmbase.js:309
+#: mmbase.js:243 mmbase.js:289 mmbase.js:309 mmbase.js:310
 msgid "Getting node body "
 msgstr "Getting node body "
 
-#: mmbase.js:250 mmbase.js:300 mmbase.js:299 mmbase.js:319
+#: mmbase.js:250 mmbase.js:300 mmbase.js:299 mmbase.js:319 mmbase.js:320
 msgid "Loading node body "
 msgstr "Loading node body "
 
@@ -113,11 +113,11 @@
 msgid "emphasis: alt-i"
 msgstr "emphasis: alt-i"
 
-#: mmbase.js:197 mmbase.js:198 mmbase.js:216
+#: mmbase.js:197 mmbase.js:198 mmbase.js:216 mmbase.js:217
 msgid "Not saved"
 msgstr ""
 
-#: mmbase.js:215 mmbase.js:216 mmbase.js:235
+#: mmbase.js:215 mmbase.js:216 mmbase.js:235 mmbase.js:236
 msgid "Reinited "
 msgstr ""
 
@@ -604,3 +604,7 @@
 #: phony.js:17
 msgid "Flash right"
 msgstr "Right"
+
+#: mmbase.js:449
+msgid "You have unsaved changes. Do you want to save before leaving the page?"
+msgstr ""

Modified: kupu/trunk/kupu/mmbase/i18n/eo.po
==============================================================================
--- kupu/trunk/kupu/mmbase/i18n/eo.po	(original)
+++ kupu/trunk/kupu/mmbase/i18n/eo.po	Fri Oct 31 14:38:35 2008
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: mmbase 18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-19 17:41+0200\n"
+"POT-Creation-Date: 2008-10-31 14:25+0100\n"
 "PO-Revision-Date: 2008-09-19 17:50+0200\n"
 "Last-Translator: Michiel Meeuwissen <mihxil at xs4all.nl>\n"
 "Language-Team: Esperanto <translation-team-eo at lists.sourceforge.net>\n"
@@ -24,27 +24,27 @@
 msgid "Saving fields (form)"
 msgstr "Savante kampojn (formularajn)"
 
-#: mmbase.js:173 mmbase.js:191 mmbase.js:192 mmbase.js:201
+#: mmbase.js:173 mmbase.js:191 mmbase.js:192 mmbase.js:201 mmbase.js:202
 msgid "saved"
 msgstr "Savita"
 
-#: mmbase.js:202 mmbase.js:242 mmbase.js:243 mmbase.js:262
+#: mmbase.js:202 mmbase.js:242 mmbase.js:243 mmbase.js:262 mmbase.js:263
 msgid "RELOAD"
 msgstr "RETIRAS"
 
-#: mmbase.js:223 mmbase.js:264 mmbase.js:283
+#: mmbase.js:223 mmbase.js:264 mmbase.js:283 mmbase.js:284
 msgid "Getting node fields for "
 msgstr "Tirante kampojn"
 
-#: mmbase.js:231 mmbase.js:275 mmbase.js:294
+#: mmbase.js:231 mmbase.js:275 mmbase.js:294 mmbase.js:295
 msgid "Loading node fields for "
 msgstr "En?utante kampojn por "
 
-#: mmbase.js:243 mmbase.js:289 mmbase.js:309
+#: mmbase.js:243 mmbase.js:289 mmbase.js:309 mmbase.js:310
 msgid "Getting node body "
 msgstr "Tirante nodan korpon "
 
-#: mmbase.js:250 mmbase.js:300 mmbase.js:299 mmbase.js:319
+#: mmbase.js:250 mmbase.js:300 mmbase.js:299 mmbase.js:319 mmbase.js:320
 msgid "Loading node body "
 msgstr "En?utante objekton"
 
@@ -113,12 +113,12 @@
 msgid "emphasis: alt-i"
 msgstr "emfaze: alt-e"
 
-#: mmbase.js:197 mmbase.js:198 mmbase.js:216
+#: mmbase.js:197 mmbase.js:198 mmbase.js:216 mmbase.js:217
 #, fuzzy
 msgid "Not saved"
 msgstr "Savita"
 
-#: mmbase.js:215 mmbase.js:216 mmbase.js:235
+#: mmbase.js:215 mmbase.js:216 mmbase.js:235 mmbase.js:236
 msgid "Reinited "
 msgstr ""
 
@@ -605,3 +605,7 @@
 #: phony.js:17
 msgid "Flash right"
 msgstr "Dekstra"
+
+#: mmbase.js:449
+msgid "You have unsaved changes. Do you want to save before leaving the page?"
+msgstr ""

Modified: kupu/trunk/kupu/mmbase/i18n/fr.po
==============================================================================
--- kupu/trunk/kupu/mmbase/i18n/fr.po	(original)
+++ kupu/trunk/kupu/mmbase/i18n/fr.po	Fri Oct 31 14:38:35 2008
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: mmbase 18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-19 17:41+0200\n"
+"POT-Creation-Date: 2008-10-31 14:25+0100\n"
 "PO-Revision-Date: 2006-12-13 14:37+0100\n"
 "Last-Translator: Michiel Meeuwissen <EMAIL at ADDRESS>\n"
 "Language-Team: French <traduc at traduc.org>\n"
@@ -24,27 +24,27 @@
 msgid "Saving fields (form)"
 msgstr ""
 
-#: mmbase.js:173 mmbase.js:191 mmbase.js:192 mmbase.js:201
+#: mmbase.js:173 mmbase.js:191 mmbase.js:192 mmbase.js:201 mmbase.js:202
 msgid "saved"
 msgstr ""
 
-#: mmbase.js:202 mmbase.js:242 mmbase.js:243 mmbase.js:262
+#: mmbase.js:202 mmbase.js:242 mmbase.js:243 mmbase.js:262 mmbase.js:263
 msgid "RELOAD"
 msgstr ""
 
-#: mmbase.js:223 mmbase.js:264 mmbase.js:283
+#: mmbase.js:223 mmbase.js:264 mmbase.js:283 mmbase.js:284
 msgid "Getting node fields for "
 msgstr ""
 
-#: mmbase.js:231 mmbase.js:275 mmbase.js:294
+#: mmbase.js:231 mmbase.js:275 mmbase.js:294 mmbase.js:295
 msgid "Loading node fields for "
 msgstr ""
 
-#: mmbase.js:243 mmbase.js:289 mmbase.js:309
+#: mmbase.js:243 mmbase.js:289 mmbase.js:309 mmbase.js:310
 msgid "Getting node body "
 msgstr ""
 
-#: mmbase.js:250 mmbase.js:300 mmbase.js:299 mmbase.js:319
+#: mmbase.js:250 mmbase.js:300 mmbase.js:299 mmbase.js:319 mmbase.js:320
 msgid "Loading node body "
 msgstr ""
 
@@ -113,11 +113,11 @@
 msgid "emphasis: alt-i"
 msgstr ""
 
-#: mmbase.js:197 mmbase.js:198 mmbase.js:216
+#: mmbase.js:197 mmbase.js:198 mmbase.js:216 mmbase.js:217
 msgid "Not saved"
 msgstr ""
 
-#: mmbase.js:215 mmbase.js:216 mmbase.js:235
+#: mmbase.js:215 mmbase.js:216 mmbase.js:235 mmbase.js:236
 msgid "Reinited "
 msgstr ""
 
@@ -605,3 +605,7 @@
 #: phony.js:17
 msgid "Flash right"
 msgstr ""
+
+#: mmbase.js:449
+msgid "You have unsaved changes. Do you want to save before leaving the page?"
+msgstr ""

Modified: kupu/trunk/kupu/mmbase/i18n/it.po
==============================================================================
--- kupu/trunk/kupu/mmbase/i18n/it.po	(original)
+++ kupu/trunk/kupu/mmbase/i18n/it.po	Fri Oct 31 14:38:35 2008
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: mmbase 18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-19 17:41+0200\n"
+"POT-Creation-Date: 2008-10-31 14:25+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"
@@ -24,27 +24,27 @@
 msgid "Saving fields (form)"
 msgstr ""
 
-#: mmbase.js:173 mmbase.js:191 mmbase.js:192 mmbase.js:201
+#: mmbase.js:173 mmbase.js:191 mmbase.js:192 mmbase.js:201 mmbase.js:202
 msgid "saved"
 msgstr ""
 
-#: mmbase.js:202 mmbase.js:242 mmbase.js:243 mmbase.js:262
+#: mmbase.js:202 mmbase.js:242 mmbase.js:243 mmbase.js:262 mmbase.js:263
 msgid "RELOAD"
 msgstr ""
 
-#: mmbase.js:223 mmbase.js:264 mmbase.js:283
+#: mmbase.js:223 mmbase.js:264 mmbase.js:283 mmbase.js:284
 msgid "Getting node fields for "
 msgstr ""
 
-#: mmbase.js:231 mmbase.js:275 mmbase.js:294
+#: mmbase.js:231 mmbase.js:275 mmbase.js:294 mmbase.js:295
 msgid "Loading node fields for "
 msgstr ""
 
-#: mmbase.js:243 mmbase.js:289 mmbase.js:309
+#: mmbase.js:243 mmbase.js:289 mmbase.js:309 mmbase.js:310
 msgid "Getting node body "
 msgstr ""
 
-#: mmbase.js:250 mmbase.js:300 mmbase.js:299 mmbase.js:319
+#: mmbase.js:250 mmbase.js:300 mmbase.js:299 mmbase.js:319 mmbase.js:320
 msgid "Loading node body "
 msgstr ""
 
@@ -113,11 +113,11 @@
 msgid "emphasis: alt-i"
 msgstr ""
 
-#: mmbase.js:197 mmbase.js:198 mmbase.js:216
+#: mmbase.js:197 mmbase.js:198 mmbase.js:216 mmbase.js:217
 msgid "Not saved"
 msgstr ""
 
-#: mmbase.js:215 mmbase.js:216 mmbase.js:235
+#: mmbase.js:215 mmbase.js:216 mmbase.js:235 mmbase.js:236
 msgid "Reinited "
 msgstr ""
 
@@ -604,3 +604,7 @@
 #: phony.js:17
 msgid "Flash right"
 msgstr ""
+
+#: mmbase.js:449
+msgid "You have unsaved changes. Do you want to save before leaving the page?"
+msgstr ""

Modified: kupu/trunk/kupu/mmbase/i18n/nl.po
==============================================================================
--- kupu/trunk/kupu/mmbase/i18n/nl.po	(original)
+++ kupu/trunk/kupu/mmbase/i18n/nl.po	Fri Oct 31 14:38:35 2008
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: mmbase 19\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-19 17:41+0200\n"
-"PO-Revision-Date: 2008-09-19 17:49+0200\n"
+"POT-Creation-Date: 2008-10-31 14:25+0100\n"
+"PO-Revision-Date: 2008-10-31 14:26+0100\n"
 "Last-Translator: Michiel Meeuwissen <mihxil at xs4all.nl>\n"
 "Language-Team: Dutch <vertaling at vrijschrift.org>\n"
 "MIME-Version: 1.0\n"
@@ -24,27 +24,27 @@
 msgid "Saving fields (form)"
 msgstr "Schrijft velden weg (formulier)"
 
-#: mmbase.js:173 mmbase.js:191 mmbase.js:192 mmbase.js:201
+#: mmbase.js:173 mmbase.js:191 mmbase.js:192 mmbase.js:201 mmbase.js:202
 msgid "saved"
 msgstr "opgeslagen"
 
-#: mmbase.js:202 mmbase.js:242 mmbase.js:243 mmbase.js:262
+#: mmbase.js:202 mmbase.js:242 mmbase.js:243 mmbase.js:262 mmbase.js:263
 msgid "RELOAD"
 msgstr "Herladen"
 
-#: mmbase.js:223 mmbase.js:264 mmbase.js:283
+#: mmbase.js:223 mmbase.js:264 mmbase.js:283 mmbase.js:284
 msgid "Getting node fields for "
 msgstr "Haalt velden (formulier) voor"
 
-#: mmbase.js:231 mmbase.js:275 mmbase.js:294
+#: mmbase.js:231 mmbase.js:275 mmbase.js:294 mmbase.js:295
 msgid "Loading node fields for "
 msgstr "Schrijft velden weg (formulier)"
 
-#: mmbase.js:243 mmbase.js:289 mmbase.js:309
+#: mmbase.js:243 mmbase.js:289 mmbase.js:309 mmbase.js:310
 msgid "Getting node body "
 msgstr "Haalt node text"
 
-#: mmbase.js:250 mmbase.js:300 mmbase.js:299 mmbase.js:319
+#: mmbase.js:250 mmbase.js:300 mmbase.js:299 mmbase.js:319 mmbase.js:320
 msgid "Loading node body "
 msgstr "Haalt node op"
 
@@ -113,11 +113,11 @@
 msgid "emphasis: alt-i"
 msgstr "benadrukt: alt-i"
 
-#: mmbase.js:197 mmbase.js:198 mmbase.js:216
+#: mmbase.js:197 mmbase.js:198 mmbase.js:216 mmbase.js:217
 msgid "Not saved"
 msgstr "Niet opgeslagen"
 
-#: mmbase.js:215 mmbase.js:216 mmbase.js:235
+#: mmbase.js:215 mmbase.js:216 mmbase.js:235 mmbase.js:236
 msgid "Reinited "
 msgstr "Herladen "
 
@@ -587,7 +587,7 @@
 
 #: phony.js:13
 msgid "Flash"
-msgstr ""
+msgstr "Flash"
 
 #: phony.js:14
 msgid "Flash class"
@@ -604,3 +604,7 @@
 #: phony.js:17
 msgid "Flash right"
 msgstr "Rechts"
+
+#: mmbase.js:449
+msgid "You have unsaved changes. Do you want to save before leaving the page?"
+msgstr "Niet alle veranderingen zijn opgeslagen. Wilt u dat doen voordat u deze pagina verlaat?"

From mihxil at codespeak.net  Fri Oct 31 14:39:12 2008
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Fri, 31 Oct 2008 14:39:12 +0100 (CET)
Subject: [kupu-checkins] r59592 - kupu/trunk/kupu/mmbase
Message-ID: <20081031133912.46CAE16A1D3@codespeak.net>

Author: mihxil
Date: Fri Oct 31 14:39:08 2008
New Revision: 59592

Modified:
   kupu/trunk/kupu/mmbase/mmbase.css
Log:
made textareas in drawers a bit smaller

Modified: kupu/trunk/kupu/mmbase/mmbase.css
==============================================================================
--- kupu/trunk/kupu/mmbase/mmbase.css	(original)
+++ kupu/trunk/kupu/mmbase/mmbase.css	Fri Oct 31 14:39:08 2008
@@ -109,7 +109,8 @@
 #kupu div.kupu-resourceitems {
   width: 400px;
 }
-#kupu div.kupu-drawer textarea, #kupu div.kupu-drawer input {
+#kupu div.kupu-drawer textarea,
+#kupu div.kupu-drawer input {
   border: 1px solid;
   background-color: #eee;
 }
@@ -117,6 +118,9 @@
 #kupu div.kupu-drawer input.mm_validate {
   width: 300px !important;
 }
+#kupu div.kupu-drawer textarea.mm_validate {
+  height: 4em;
+}
 div.kupu-panels td.panel {
   height: 300px;
 }

From mihxil at codespeak.net  Fri Oct 31 14:42:42 2008
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Fri, 31 Oct 2008 14:42:42 +0100 (CET)
Subject: [kupu-checkins] r59593 - in kupu/trunk/kupu/mmbase: . drawers
Message-ID: <20081031134242.C5DCF16A2B3@codespeak.net>

Author: mihxil
Date: Fri Oct 31 14:42:42 2008
New Revision: 59593

Modified:
   kupu/trunk/kupu/mmbase/drawers/upload.jspx
   kupu/trunk/kupu/mmbase/mmbasedrawers.js
Log:
uploading of attachments was a bit broken

Modified: kupu/trunk/kupu/mmbase/drawers/upload.jspx
==============================================================================
--- kupu/trunk/kupu/mmbase/drawers/upload.jspx	(original)
+++ kupu/trunk/kupu/mmbase/drawers/upload.jspx	Fri Oct 31 14:42:42 2008
@@ -54,14 +54,24 @@
         <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 onLoad="window.parent.kupu.getTool('drawertool').current_drawer.finishUpload('${_}', 'image');">
             </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>
+          <c:choose>
+            <c:when test="${nodetype eq 'flashobjects'}">
+              <mm:link page="/mmbase/kupu/mmbase/icons/flash.png" referids="number at o">
+                <body onLoad="window.parent.kupu.getTool('drawertool').current_drawer.finishUpload('${_}', 'flash', ${_node.width}, ${_node.height});">
+                </body>
+              </mm:link>
+            </c:when>
+            <c:otherwise>
+              <body onLoad="window.parent.kupu.getTool('drawertool').current_drawer.finishUpload('mmbase://${nodetype}/${number}', '${mimetype}', '${_node.title}');">
+              </body>
+            </c:otherwise>
+          </c:choose>
         </mm:hasfunction>
       </mm:node>
     </mm:cloud>

Modified: kupu/trunk/kupu/mmbase/mmbasedrawers.js
==============================================================================
--- kupu/trunk/kupu/mmbase/mmbasedrawers.js	(original)
+++ kupu/trunk/kupu/mmbase/mmbasedrawers.js	Fri Oct 31 14:42:42 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) {
@@ -21,21 +21,22 @@
         var selxpath = '//resource[@selected]';
         var selnode = this.xmldata.selectSingleNode(selxpath);
         if (!selnode) {
-            var uploadbutton = this.xmldata.selectSingleNode("/libraries/*[@selected]/uploadbutton");
+            var uploadbutton = this.xmldata.selectSingleNode("/libraries/*[@selected]//uploadbutton");
             if (uploadbutton) {
                 this.uploadResource();
             }
             return;
+
         }
 
+        //Not sure if the following few lines of code make any sense.
+
         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 : '';
@@ -49,16 +50,6 @@
     // 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();
     };
 
@@ -73,11 +64,12 @@
     };
 
     // called by onLoad within document sent by server
-    this.finishUpload = function(url, mimetype) {
+    this.finishUpload = function(url, mimetype, title) {
         this.editor.resumeEditing();
+        kupu.content_changed = true;
         var form = document.getElementById('kupu_upload_form');
-        var title = "[" + mimetype + ":" + form.node_prop_title.value + "]";
-        this.tool.createLink(url, null, null, null, title);
+        var t = "[" + mimetype + ":" + title+ "]";
+        this.tool.createLink(url, null, null, null, t);
         this.shared.newimages = 1;
         this.drawertool.closeDrawer();
     };

From mihxil at codespeak.net  Fri Oct 31 15:10:32 2008
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Fri, 31 Oct 2008 15:10:32 +0100 (CET)
Subject: [kupu-checkins] r59597 - kupu/trunk/kupu/mmbase
Message-ID: <20081031141032.93896169E15@codespeak.net>

Author: mihxil
Date: Fri Oct 31 15:10:32 2008
New Revision: 59597

Modified:
   kupu/trunk/kupu/mmbase/   (props changed)
   kupu/trunk/kupu/mmbase/Makefile
   kupu/trunk/kupu/mmbase/head.kupu
   kupu/trunk/kupu/mmbase/mmbase.js
Log:
want to use i18n.js.Arranged download and useage.

Modified: kupu/trunk/kupu/mmbase/Makefile
==============================================================================
--- kupu/trunk/kupu/mmbase/Makefile	(original)
+++ kupu/trunk/kupu/mmbase/Makefile	Fri Oct 31 15:10:32 2008
@@ -14,7 +14,7 @@
 #type in i18n: msginit -l <locale> -i messages.po
 
 
-all: index.jspx body.jspx head.jspx mmbase-kupu-i18n.jar
+all: index.jspx body.jspx head.jspx mmbase-kupu-i18n.jar i18n.js/i18n.js
 
 
 index.jspx: *.kupu  Makefile $(XSLJSPX_FILE)
@@ -29,6 +29,10 @@
 $(I18N):
 	@$(MAKE) -C $(KUPU_HOME) kupu-i18n.jar
 
+i18n.js/i18n.js:
+	wget http://johnnydebris.net/javascript/.files/i18n.js-0.1.tar.gz
+	tar zxf i18n.js-0.1.tar.gz
+
 .PHONY:
 messages: *.js clean
 	rm -f phony.js

Modified: kupu/trunk/kupu/mmbase/head.kupu
==============================================================================
--- kupu/trunk/kupu/mmbase/head.kupu	(original)
+++ kupu/trunk/kupu/mmbase/head.kupu	Fri Oct 31 15:10:32 2008
@@ -32,11 +32,7 @@
     <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="i18n.js/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>

Modified: kupu/trunk/kupu/mmbase/mmbase.js
==============================================================================
--- kupu/trunk/kupu/mmbase/mmbase.js	(original)
+++ kupu/trunk/kupu/mmbase/mmbase.js	Fri Oct 31 15:10:32 2008
@@ -38,6 +38,7 @@
     // if there's no global 'i18n_message_catalog' variable available, don't
     // try to load any translations
 
+    console.log(window.i18n_message_catalog);
     if (window.i18n_message_catalog) {
         var request = getRequest();
         // sync request, scary...

From mihxil at codespeak.net  Fri Oct 31 15:56:52 2008
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Fri, 31 Oct 2008 15:56:52 +0100 (CET)
Subject: [kupu-checkins] r59598 - kupu/trunk/kupu/common
Message-ID: <20081031145652.CB0ED16A339@codespeak.net>

Author: mihxil
Date: Fri Oct 31 15:56:51 2008
New Revision: 59598

Modified:
   kupu/trunk/kupu/common/kupudrawers.js
Log:
support for create_<media> also in finishUpload

Modified: kupu/trunk/kupu/common/kupudrawers.js
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers.js	(original)
+++ kupu/trunk/kupu/common/kupudrawers.js	Fri Oct 31 15:56:51 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
@@ -1471,7 +1471,7 @@
     };
 
     // called by onLoad within document sent by server
-    this.finishUpload = function(uri) {
+    this.finishUpload = function(uri, media, width, height) {
         this.editor.resumeEditing();
         var sizeselector = document.getElementsByName('image-size-selector');
         if (sizeselector && sizeselector.length > 0) {
@@ -1500,7 +1500,12 @@
         }
         imgclass = imgclass.strip();
 
-        this.tool.createImage(uri, this.upload_title, imgclass);
+        if (media !== undefined && this.tool['create_' + media]) {
+            this.tool['create_' + media](uri, this.upload_title, imgclass, width, height);
+        } else {
+            this.tool.createImage(uri, this.upload_title, imgclass);
+        }
+
         this.shared.newimages = 1;
         this.drawertool.closeDrawer();
     };
@@ -1551,11 +1556,12 @@
         var media = document.getElementById('kupu-media').value;
         var width = document.getElementById('kupu-width').value;
         var height = document.getElementById('kupu-height').value;
-        if (this.tool['create_'+media]) {
-            this.tool['create_'+media](uri, alt, imgclass, width, height);
+        if (this.tool['create_' + media]) {
+            this.tool['create_' + media](uri, alt, imgclass, width, height);
         } else {
             this.tool.createImage(uri, alt, imgclass);
         }
+        kupu.content_changed = true;
         this.drawertool.closeDrawer();
     };
 };
@@ -1819,7 +1825,9 @@
             }
         }
         event.cancelBubble = true;
-        if (event.stopPropogation) event.stopPropogation();
+        if (event.stopPropagation) {
+            event.stopPropagation();
+        }
         event.returnValue = false;
         return false;
     }

From mihxil at codespeak.net  Fri Oct 31 15:57:56 2008
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Fri, 31 Oct 2008 15:57:56 +0100 (CET)
Subject: [kupu-checkins] r59599 - kupu/trunk/kupu/mmbase
Message-ID: <20081031145756.76D2D16A33D@codespeak.net>

Author: mihxil
Date: Fri Oct 31 15:57:56 2008
New Revision: 59599

Modified:
   kupu/trunk/kupu/mmbase/mmbase.js
Log:
accidentely left a console.log

Modified: kupu/trunk/kupu/mmbase/mmbase.js
==============================================================================
--- kupu/trunk/kupu/mmbase/mmbase.js	(original)
+++ kupu/trunk/kupu/mmbase/mmbase.js	Fri Oct 31 15:57:56 2008
@@ -38,7 +38,6 @@
     // if there's no global 'i18n_message_catalog' variable available, don't
     // try to load any translations
 
-    console.log(window.i18n_message_catalog);
     if (window.i18n_message_catalog) {
         var request = getRequest();
         // sync request, scary...