From alecm at codespeak.net  Sat Jun  3 15:54:24 2006
From: alecm at codespeak.net (alecm at codespeak.net)
Date: Sat,  3 Jun 2006 15:54:24 +0200 (CEST)
Subject: [kupu-checkins] r28165 - in kupu/branch/plone-2.1: . doc
Message-ID: <20060603135424.19FFB10070@code0.codespeak.net>

Author: alecm
Date: Sat Jun  3 15:54:13 2006
New Revision: 28165

Modified:
   kupu/branch/plone-2.1/doc/CHANGES.txt
   kupu/branch/plone-2.1/version.txt
Log:
Bump version for plone releases


Modified: kupu/branch/plone-2.1/doc/CHANGES.txt
==============================================================================
--- kupu/branch/plone-2.1/doc/CHANGES.txt	(original)
+++ kupu/branch/plone-2.1/doc/CHANGES.txt	Sat Jun  3 15:54:13 2006
@@ -2,6 +2,16 @@
 Kupu changes
 ============
 
+- 1.3.7
+
+ - General
+
+     * Robustness fix for js.
+
+     * Fix for customisation screen.
+
+     * isKupuEnabled should only return True for a field which actually allows html.
+
 - 1.3.6
 
   - Plone
@@ -25,7 +35,7 @@
 
 - 1.3.4
 
-  - Silva 
+  - Silva
 
       * Fixed some small issues in external sources support.
 
@@ -65,18 +75,18 @@
 - 1.3.2
 
   - Zope 2
-  
+
     * Updated Zope 2 distribution, it was broken in several ways.
 
   - Silva
-    
+
     * Fixed problem with ExternalSources, which made that sources could not be
       added to a page (clicking 'add' would not do anything).
 
 - 1.3.1
 
   - Silva:
-    
+
     * Fixed problem with IE that turned all src attributes (images) and hrefs
       (links) into absolute URLs, failing miserably on Zope/Silva setups.
 
@@ -162,7 +172,7 @@
   - Linking to the current folder produced an empty link. Now it links to "."
 
   - Changed how kupu in Plone handles non-HTML content e.g. STX. Now it won't
-    load for fields in Archetypes content if the content type isn't HTML (but 
+    load for fields in Archetypes content if the content type isn't HTML (but
     it does put in a link allowing you to force a conversion). See
     http://plone.org/collector/3900
 
@@ -177,13 +187,13 @@
     and tablecells to 'align'.
 
   Apache Lenya enhancements:
-  
+
   * improved handling of image assets
   * enabled roundtrip of image editing between Kupu and BXE
     (http://issues.apache.org/bugzilla/show_bug.cgi?id=29164)
   * fixed bug that inserted multiple meta charset entries per save.
   * slight wording changes here and there
-  
+
 - Kupu 1.2rc1
 
   The following issues have been resolved (see the `issue tracker`_
@@ -203,7 +213,7 @@
   - Fixed 'phantom whitespace' problem. Saved format was 'text/html'
     which non-AT content types interpret as an alias for 'stx'. Now
     sets format to 'html' for non-AT content types.
-  - Opening a drawer gave error 404 on Plone systems when Archetypes 
+  - Opening a drawer gave error 404 on Plone systems when Archetypes
     was not installed.
 
 
@@ -273,7 +283,7 @@
 
   * Added Selection object that provides a cross-browser API for working
     with the document's selection and cursor. This can be used to e.g. add
-    and manipulate arbitrary elements (it's used for instance in Silva's 
+    and manipulate arbitrary elements (it's used for instance in Silva's
     definition lists code).
 
   * Templates for different systems are now generated with an
@@ -327,7 +337,7 @@
 
   * Added POST support
 
-  * Finally added some more documentation, made some older docs less 
+  * Finally added some more documentation, made some older docs less
     Zope specific
 
   * Added toolboxes, a plugin for tools, to seperate functionality from
@@ -355,7 +365,7 @@
   * A lot of small bugfixes...
 
 - 1.0.1 (2003-12-10)
-  
+
   * Fixed bug that caused saving to fail in Mozilla 1.3.1
 
   * Fixed bug that prevented Zope from booting when Epoz and Plone were
@@ -412,7 +422,7 @@
   * Added new attributes on <iframe> to configure the Epoz instance:
 
     - dst specifices the URL to PUT to.
-  
+
     - usecss is either 0 or 1, to tell Midas whether to use CSS or
       element styles like <b>.
 
@@ -427,7 +437,7 @@
   * Added functionality for editing tables (adding and deleting
     rows and columns, setting alignment etc.)
 
-  * Fixed bug in link code, the url is now added to the link 
+  * Fixed bug in link code, the url is now added to the link
     correctly and can also be modified
 
   * Replaced some timeout code with a poll loop, which should work

Modified: kupu/branch/plone-2.1/version.txt
==============================================================================
--- kupu/branch/plone-2.1/version.txt	(original)
+++ kupu/branch/plone-2.1/version.txt	Sat Jun  3 15:54:13 2006
@@ -1 +1 @@
-kupu 1.3.6-plone
+kupu 1.3.7-plone

From alecm at codespeak.net  Sat Jun  3 15:56:11 2006
From: alecm at codespeak.net (alecm at codespeak.net)
Date: Sat,  3 Jun 2006 15:56:11 +0200 (CEST)
Subject: [kupu-checkins] r28166 - kupu/tag/kupu-1.3.7-plone
Message-ID: <20060603135611.E049910070@code0.codespeak.net>

Author: alecm
Date: Sat Jun  3 15:56:08 2006
New Revision: 28166

Added:
   kupu/tag/kupu-1.3.7-plone/
      - copied from r28165, kupu/branch/plone-2.1/
Log:
Tag new release


From mihxil at codespeak.net  Wed Jun  7 15:20:15 2006
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Wed,  7 Jun 2006 15:20:15 +0200 (CEST)
Subject: [kupu-checkins] r28450 - in kupu/trunk/kupu/mmbase: . tools
Message-ID: <20060607132015.6DF5910079@code0.codespeak.net>

Author: mihxil
Date: Wed Jun  7 15:20:14 2006
New Revision: 28450

Modified:
   kupu/trunk/kupu/mmbase/layout.js
   kupu/trunk/kupu/mmbase/mmbase.css
   kupu/trunk/kupu/mmbase/tools/related.jspx
   kupu/trunk/kupu/mmbase/tools/tree.jspx
Log:
made some adjustments to make it work better in small windows

Modified: kupu/trunk/kupu/mmbase/layout.js
==============================================================================
--- kupu/trunk/kupu/mmbase/layout.js	(original)
+++ kupu/trunk/kupu/mmbase/layout.js	Wed Jun  7 15:20:14 2006
@@ -75,18 +75,23 @@
     for (i=0; i < a.length; i++) {
         xHeight(a[i], maxHeightArea);
         xWidth(a[i], maxWidth);
-        
     }
 
+
     xHeight("toolboxes", maxHeight);
     xHeight("kupu-editor", maxHeightArea - 3);
     xWidth("kupu-editor", maxWidth - 201);
 
-    adjustToolBoxesLayout();
-
     var nodeHeight = xHeight('nodefields');
+    var toolsHeight =  maxHeight - nodeHeight - 1;
+    if (toolsHeight < 100) {
+        toolsHeight = 100;
+        xHeight("nodefields", maxHeight - 100 - 1);
+    }
+
+    adjustToolBoxesLayout();
 
-    xHeight("mmbase-tools", maxHeight - nodeHeight - 1);
+    xHeight("mmbase-tools", toolsHeight);
 
     
 }

Modified: kupu/trunk/kupu/mmbase/mmbase.css
==============================================================================
--- kupu/trunk/kupu/mmbase/mmbase.css	(original)
+++ kupu/trunk/kupu/mmbase/mmbase.css	Wed Jun  7 15:20:14 2006
@@ -68,9 +68,14 @@
   background-color:  #76a2b6;
 }
 
+
 #mmbase-tools a.create {
   text-decoration: none;
 }
+
+#mmbase-tools .mmbase-tool { 
+  min-height: 100px;
+}
 		
 #preview { 
   background-color: blue;

Modified: kupu/trunk/kupu/mmbase/tools/related.jspx
==============================================================================
--- kupu/trunk/kupu/mmbase/tools/related.jspx	(original)
+++ kupu/trunk/kupu/mmbase/tools/related.jspx	Wed Jun  7 15:20:14 2006
@@ -2,7 +2,7 @@
     The related tool is to related some object to the node directly
     argument: related_types: list of types, defaults to images, urls, mediafragments
  -->
- <div id="mmbase_related">
+<div id="mmbase_related mmbase-tool">
  <mm:content
      type="text/html"
      expires="-1"

Modified: kupu/trunk/kupu/mmbase/tools/tree.jspx
==============================================================================
--- kupu/trunk/kupu/mmbase/tools/tree.jspx	(original)
+++ kupu/trunk/kupu/mmbase/tools/tree.jspx	Wed Jun  7 15:20:14 2006
@@ -1,4 +1,4 @@
-<div id="tree">
+<div id="tree" class="mmbase-tool">
 <mm:content
     type="text/xml"
     expires="-1"

From limi at codespeak.net  Sat Jun 10 00:00:59 2006
From: limi at codespeak.net (limi at codespeak.net)
Date: Sat, 10 Jun 2006 00:00:59 +0200 (CEST)
Subject: [kupu-checkins] r28607 -
	kupu/branch/plone-2.1/plone/kupu_plone_layer
Message-ID: <20060609220059.41D0E10063@code0.codespeak.net>

Author: limi
Date: Sat Jun 10 00:00:54 2006
New Revision: 28607

Modified:
   kupu/branch/plone-2.1/plone/kupu_plone_layer/kupuplone.css.dtml
Log:
Removing spell checker button, it doesn't work properly, and locks up IE.


Modified: kupu/branch/plone-2.1/plone/kupu_plone_layer/kupuplone.css.dtml
==============================================================================
--- kupu/branch/plone-2.1/plone/kupu_plone_layer/kupuplone.css.dtml	(original)
+++ kupu/branch/plone-2.1/plone/kupu_plone_layer/kupuplone.css.dtml	Sat Jun 10 00:00:54 2006
@@ -23,7 +23,10 @@
 }
 
 
-div.kupu-toolboxes {display: none}
+div.kupu-toolboxes,
+#kupu-spellchecker {display: none}
+
+
 
 /*select.kupu-tb-styles {display: block}*/
 

From alecm at codespeak.net  Sat Jun 10 01:47:17 2006
From: alecm at codespeak.net (alecm at codespeak.net)
Date: Sat, 10 Jun 2006 01:47:17 +0200 (CEST)
Subject: [kupu-checkins] r28608 - kupu/tag/kupu-1.3.7-plone
Message-ID: <20060609234717.812A410036@code0.codespeak.net>

Author: alecm
Date: Sat Jun 10 01:47:12 2006
New Revision: 28608

Removed:
   kupu/tag/kupu-1.3.7-plone/
Log:
Delete the tag to replace it


From alecm at codespeak.net  Sat Jun 10 01:48:51 2006
From: alecm at codespeak.net (alecm at codespeak.net)
Date: Sat, 10 Jun 2006 01:48:51 +0200 (CEST)
Subject: [kupu-checkins] r28609 - kupu/branch/plone-2.1/doc
Message-ID: <20060609234851.0698F10036@code0.codespeak.net>

Author: alecm
Date: Sat Jun 10 01:48:47 2006
New Revision: 28609

Modified:
   kupu/branch/plone-2.1/doc/CHANGES.txt
Log:
Update CHANGES


Modified: kupu/branch/plone-2.1/doc/CHANGES.txt
==============================================================================
--- kupu/branch/plone-2.1/doc/CHANGES.txt	(original)
+++ kupu/branch/plone-2.1/doc/CHANGES.txt	Sat Jun 10 01:48:47 2006
@@ -4,6 +4,10 @@
 
 - 1.3.7
 
+ - Plone
+
+     * Disable spellchecker as it freezes IE
+
  - General
 
      * Robustness fix for js.

From alecm at codespeak.net  Sat Jun 10 01:51:09 2006
From: alecm at codespeak.net (alecm at codespeak.net)
Date: Sat, 10 Jun 2006 01:51:09 +0200 (CEST)
Subject: [kupu-checkins] r28610 - kupu/tag/kupu-1.3.7-plone
Message-ID: <20060609235109.18DD310036@code0.codespeak.net>

Author: alecm
Date: Sat Jun 10 01:51:03 2006
New Revision: 28610

Added:
   kupu/tag/kupu-1.3.7-plone/
      - copied from r28609, kupu/branch/plone-2.1/
Log:
Retag 1.3.7-plone because I'm lazy


From guido at codespeak.net  Tue Jun 13 12:54:29 2006
From: guido at codespeak.net (guido at codespeak.net)
Date: Tue, 13 Jun 2006 12:54:29 +0200 (CEST)
Subject: [kupu-checkins] r28739 - kupu/branch/kupu-1.3
Message-ID: <20060613105429.3877210036@code0.codespeak.net>

Author: guido
Date: Tue Jun 13 12:54:28 2006
New Revision: 28739

Modified:
   kupu/branch/kupu-1.3/version.txt
Log:
Set version for upcoming release.


Modified: kupu/branch/kupu-1.3/version.txt
==============================================================================
--- kupu/branch/kupu-1.3/version.txt	(original)
+++ kupu/branch/kupu-1.3/version.txt	Tue Jun 13 12:54:28 2006
@@ -1 +1 @@
-kupu 1.3.5 pre
+kupu 1.3.7 (SVN/Unreleased)

From guido at codespeak.net  Tue Jun 13 12:55:45 2006
From: guido at codespeak.net (guido at codespeak.net)
Date: Tue, 13 Jun 2006 12:55:45 +0200 (CEST)
Subject: [kupu-checkins] r28740 - kupu/branch/kupu-1.3/default
Message-ID: <20060613105545.537DE10036@code0.codespeak.net>

Author: guido
Date: Tue Jun 13 12:55:44 2006
New Revision: 28740

Modified:
   kupu/branch/kupu-1.3/default/toolbar.kupu
Log:
Fixing version.


Modified: kupu/branch/kupu-1.3/default/toolbar.kupu
==============================================================================
--- kupu/branch/kupu-1.3/default/toolbar.kupu	(original)
+++ kupu/branch/kupu-1.3/default/toolbar.kupu	Tue Jun 13 12:55:44 2006
@@ -52,7 +52,7 @@
 
   <kupu:part name="logo">
     <span class="kupu-tb-buttongroup kupu-logo" style="float: right" id="kupu-logo">
-      <button type="button" class="kupu-logo" title="Kupu 1.3.5" 
+      <button type="button" class="kupu-logo" title="Kupu 1.3.7 (SVN/Unreleased)" 
               i18n:attributes="title" accesskey="k"
               onclick="window.open('http://kupu.oscom.org');">&#160;</button>
     </span>

From guido at codespeak.net  Tue Jun 13 12:56:31 2006
From: guido at codespeak.net (guido at codespeak.net)
Date: Tue, 13 Jun 2006 12:56:31 +0200 (CEST)
Subject: [kupu-checkins] r28741 - kupu/branch/kupu-1.3/silva
Message-ID: <20060613105631.1DA0410036@code0.codespeak.net>

Author: guido
Date: Tue Jun 13 12:56:30 2006
New Revision: 28741

Modified:
   kupu/branch/kupu-1.3/silva/head.kupu
Log:
Removing duplicate link tag.


Modified: kupu/branch/kupu-1.3/silva/head.kupu
==============================================================================
--- kupu/branch/kupu-1.3/silva/head.kupu	(original)
+++ kupu/branch/kupu-1.3/silva/head.kupu	Tue Jun 13 12:56:30 2006
@@ -59,4 +59,7 @@
   <kupu:part name="meta">
   </kupu:part>
 
+  <kupu:part name="styles">
+  </kupu:part>
+
 </kupu:feature>

From mihxil at codespeak.net  Wed Jun 14 01:48:34 2006
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Wed, 14 Jun 2006 01:48:34 +0200 (CEST)
Subject: [kupu-checkins] r28762 - kupu/trunk/kupu/mmbase/drawers
Message-ID: <20060613234834.3F18810034@code0.codespeak.net>

Author: mihxil
Date: Wed Jun 14 01:48:30 2006
New Revision: 28762

Modified:
   kupu/trunk/kupu/mmbase/drawers/images.items.jspx
Log:
urls may contain non-valid xml characters. Escape those.

Modified: kupu/trunk/kupu/mmbase/drawers/images.items.jspx
==============================================================================
--- kupu/trunk/kupu/mmbase/drawers/images.items.jspx	(original)
+++ kupu/trunk/kupu/mmbase/drawers/images.items.jspx	Wed Jun 14 01:48:30 2006
@@ -23,7 +23,7 @@
           <mm:listnodes id="image">
             <resource id="${image.number}">          
               <mm:image template="s(100x100&gt;)">
-                <uri height="${dimension.height}" width="${dimension.width}">${_}</uri>
+                <uri height="${dimension.height}" width="${dimension.width}">${mm:escape('text/xml', _)}</uri>
               </mm:image>
               <title><mm:field name="title" /></title>
               <size><mm:field name="filesize" />b</size>
@@ -32,10 +32,10 @@
                 <width>${dimension.width}</width>
               </mm:image>
               <mm:image template="s(200x200&gt;)">
-                <preview height="${dimension.height}" width="${dimension.width}">${_}</preview>
+                <preview height="${dimension.height}" width="${dimension.width}">${mm:escape('text/xml', _)}</preview>
               </mm:image>
               <mm:image template="s(40x40&gt;)">
-                <icon height="${dimension.height}" width="${dimension.width}">${_}</icon>
+                <icon height="${dimension.height}" width="${dimension.width}">${mm:escape('text/xml', _)}</icon>
               </mm:image>
             </resource>
           </mm:listnodes>

From guido at codespeak.net  Thu Jun 22 23:37:09 2006
From: guido at codespeak.net (guido at codespeak.net)
Date: Thu, 22 Jun 2006 23:37:09 +0200 (CEST)
Subject: [kupu-checkins] r29186 - kupu/trunk/ecmaunit
Message-ID: <20060622213709.A48FA10064@code0.codespeak.net>

Author: guido
Date: Thu Jun 22 23:37:08 2006
New Revision: 29186

Modified:
   kupu/trunk/ecmaunit/runtests.js
Log:
Fixed command-line test runner (required load() calls).


Modified: kupu/trunk/ecmaunit/runtests.js
==============================================================================
--- kupu/trunk/ecmaunit/runtests.js	(original)
+++ kupu/trunk/ecmaunit/runtests.js	Thu Jun 22 23:37:08 2006
@@ -14,6 +14,9 @@
   Test runner for command-line environments, such as spidermonkey
 */
 
+load('ecmaunit.js');
+load('testecmaunit.js');
+
 function runTests() {
     reporter = new StdoutReporter;
     var testcase = new TestTestCase();

From guido at codespeak.net  Thu Jun 22 23:37:24 2006
From: guido at codespeak.net (guido at codespeak.net)
Date: Thu, 22 Jun 2006 23:37:24 +0200 (CEST)
Subject: [kupu-checkins] r29187 - kupu/trunk/ecmaunit
Message-ID: <20060622213724.5FBF910068@code0.codespeak.net>

Author: guido
Date: Thu Jun 22 23:37:23 2006
New Revision: 29187

Modified:
   kupu/trunk/ecmaunit/ecmaunit.js
Log:
Fix comparison of Date objects.


Modified: kupu/trunk/ecmaunit/ecmaunit.js
==============================================================================
--- kupu/trunk/ecmaunit/ecmaunit.js	(original)
+++ kupu/trunk/ecmaunit/ecmaunit.js	Thu Jun 22 23:37:23 2006
@@ -43,7 +43,9 @@
     }
     if (var1 != var2 &&
             (!(var1 instanceof Array && var2 instanceof Array) ||
-                !this._arrayDeepCompare(var1, var2))) {
+                !this._arrayDeepCompare(var1, var2)) &&
+            (!(var1 instanceof Date && var2 instanceof Date) ||
+                var1.getTime() != var2.getTime())) {
         this._throwException('Assertion ' + message + 'failed: ' + 
                                 var1 + ' != ' + var2);
     };
@@ -223,6 +225,8 @@
             if (!this._arrayDeepCompare(a1[i], a2[i])) {
                 return false;
             };
+        } else if (a1 instanceof Date && var2 instanceof Date) {
+            return a1.getTime() == a2.getTime();
         } else if (a1[i] != a2[i]) {
             return false;
         };

From mihxil at codespeak.net  Thu Jun 29 13:26:50 2006
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Thu, 29 Jun 2006 13:26:50 +0200 (CEST)
Subject: [kupu-checkins] r29487 - kupu/trunk/kupu/mmbase
Message-ID: <20060629112650.BEAF310079@code0.codespeak.net>

Author: mihxil
Date: Thu Jun 29 13:26:49 2006
New Revision: 29487

Modified:
   kupu/trunk/kupu/mmbase/body.kupu
Log:
bugfix, on new nodes, the 'related_types' argument was forgotten

Modified: kupu/trunk/kupu/mmbase/body.kupu
==============================================================================
--- kupu/trunk/kupu/mmbase/body.kupu	(original)
+++ kupu/trunk/kupu/mmbase/body.kupu	Thu Jun 29 13:26:49 2006
@@ -58,7 +58,8 @@
         </mm:hasnode>
       </mm:present>
       <mm:import externid="link_nodetypes" />
-      <mm:redirect referids="node at objectnumber,tools?,language?,origin?,nodetypes?,back at kupu_back,link_nodetypes?" /> 
+      <mm:import externid="related_types" />
+      <mm:redirect referids="node at objectnumber,tools?,language?,origin?,nodetypes?,back at kupu_back,link_nodetypes?,related_types?" /> 
     </mm:compare>
     <mm:compare referid="objectnumber" value="new" inverse="true">
       <mm:node id="node" referid="objectnumber" />