From duncan at codespeak.net  Mon Jul  2 15:14:51 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Mon,  2 Jul 2007 15:14:51 +0200 (CEST)
Subject: [kupu-checkins] r44665 - kupu/trunk/kupu/plone/kupu_plone_layer
Message-ID: <20070702131451.B89AB80BE@code0.codespeak.net>

Author: duncan
Date: Mon Jul  2 15:14:50 2007
New Revision: 44665

Modified:
   kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneeditor.js
Log:
Corrected two kupu.xxx references to this.xxx. I think though that they were mostly innocuous anyway.

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneeditor.js
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneeditor.js	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneeditor.js	Mon Jul  2 15:14:50 2007
@@ -99,7 +99,7 @@
 
     // We need to get the contents of the body node as xml, but we don't
     // want the body node itself, so we use a regex to remove it
-    var contents = kupu.getXMLBody(transform);
+    var contents = this.getXMLBody(transform);
     if (/^<body[^>]*>(<\/?(p|br)[^>]*>|\&nbsp;)*<\/body>$/.test(contents)) {
         contents = ''; /* Ignore nearly empty contents */
     }
@@ -111,5 +111,5 @@
     // now create the form input
     field.value = contents;
 
-    kupu.content_changed = false;
+    this.content_changed = false;
 };

From duncan at codespeak.net  Mon Jul  2 15:56:15 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Mon,  2 Jul 2007 15:56:15 +0200 (CEST)
Subject: [kupu-checkins] r44667 - kupu/trunk/kupu/common
Message-ID: <20070702135615.7787E80BC@code0.codespeak.net>

Author: duncan
Date: Mon Jul  2 15:56:14 2007
New Revision: 44667

Modified:
   kupu/trunk/kupu/common/kupuspellchecker.js
Log:
Fix for Plone ticket #6440

Modified: kupu/trunk/kupu/common/kupuspellchecker.js
==============================================================================
--- kupu/trunk/kupu/common/kupuspellchecker.js	(original)
+++ kupu/trunk/kupu/common/kupuspellchecker.js	Mon Jul  2 15:56:14 2007
@@ -13,7 +13,9 @@
 
 KupuSpellChecker.prototype.initialize = function(editor) {
     this.editor = editor;
-    addEventHandler(this.button, 'click', this.check, this);
+    if (this.button) {
+        addEventHandler(this.button, 'click', this.check, this);
+    }
 };
 
 KupuSpellChecker.prototype.check = function() {

From duncan at codespeak.net  Mon Jul  2 17:16:18 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Mon,  2 Jul 2007 17:16:18 +0200 (CEST)
Subject: [kupu-checkins] r44672 - in kupu/trunk/kupu: common/kupudrawers
	plone plone/kupu_plone_layer
Message-ID: <20070702151618.CC36A80BB@code0.codespeak.net>

Author: duncan
Date: Mon Jul  2 17:16:18 2007
New Revision: 44672

Modified:
   kupu/trunk/kupu/common/kupudrawers/drawer.xsl
   kupu/trunk/kupu/plone/kupu_config.pt
   kupu/trunk/kupu/plone/kupu_plone_layer/kupucollection.xml.pt
   kupu/trunk/kupu/plone/plonedrawers.py
   kupu/trunk/kupu/plone/plonelibrarytool.py
Log:
Plone ticket #6283
Added config option 'getAllowOriginalImageSize': size 'Original' is not available unless this is turned on.
Reversed the order of image sizes so that 'Preview' appears at the top (and is therefore the default for new images).
Fixed the code for preserving the image scale so you don't have to reselect it every time you edit the image.

Modified: kupu/trunk/kupu/common/kupudrawers/drawer.xsl
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers/drawer.xsl	(original)
+++ kupu/trunk/kupu/common/kupudrawers/drawer.xsl	Mon Jul  2 17:16:18 2007
@@ -400,8 +400,6 @@
              </label>
              <span class="kupu-detail">
                 <select name="image-size-selector">
-                   <option name="image-size-option" value="{uri}"
-                           i18n:translate="option_original">Original</option>
                    <xsl:apply-templates select="sizes/size" />
                 </select>
              </span>
@@ -438,18 +436,12 @@
           <xsl:value-of select="@title" /></option>
     </xsl:template>
     <xsl:template match="size">
-      <xsl:choose>
-        <xsl:when test="selected">
-            <option value="{uri}" selected="">
-                <xsl:value-of select="label" />
-            </option>
-        </xsl:when>
-        <xsl:otherwise>
-            <option value="{uri}">
-                <xsl:value-of select="label" />
-            </option>
-        </xsl:otherwise>
-      </xsl:choose>
+       <option value="{uri}">
+          <xsl:if test="selected">
+             <xsl:attribute name="selected">selected</xsl:attribute>
+          </xsl:if>
+          <xsl:value-of select="label" />
+       </option>
     </xsl:template>
     <xsl:template match="resource|collection" mode="link-properties">
         <xsl:apply-templates select="." mode="base-properties"/>

Modified: kupu/trunk/kupu/plone/kupu_config.pt
==============================================================================
--- kupu/trunk/kupu/plone/kupu_config.pt	(original)
+++ kupu/trunk/kupu/plone/kupu_config.pt	Mon Jul  2 17:16:18 2007
@@ -197,6 +197,29 @@
 
                      </fieldset>
                      <fieldset>
+                        <legend
+                               i18n:translate="legend_alloworiginalsize">Original Image Size</legend>
+                        <div class="field">
+                           <input type="hidden"
+                                  name="allowOriginalImageSize:int:default" value="0" />
+                           <input type="checkbox"
+                                  class="noborder"
+                                  name="allowOriginalImageSize:int"
+                                  id = "kupu_allowOriginalImageSize"
+                                  value="1"
+                                  tal:attributes="checked here/getAllowOriginalImageSize|python:0" />
+                           <label for="kupu_allowOriginalImageSize"
+                                  i18n:translate="label_allowOriginalImageSize">Allow original size images</label>
+
+                           <div class="formHelp"
+                                i18n:translate="help_allow_original_image">
+                              When checked, the image drawer will include
+                              Original as an available size.
+                           </div>
+                        </div>
+
+                     </fieldset>
+                     <fieldset>
                         <legend i18n:translate="legend_styles">Styles</legend>
                         <div class="field">
                            <label for="table_classnames" i18n:translate="label_tables">Tables</label>

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupucollection.xml.pt
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupucollection.xml.pt	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupucollection.xml.pt	Mon Jul  2 17:16:18 2007
@@ -66,9 +66,19 @@
           <tal:sizes tal:condition="info/sizes|nothing">
             <sizes>
               <size tal:repeat="size info/sizes">
+                 <selected
+                     tal:define="src request/src|python:''; uri size/uri;"
+                      tal:condition="python:src.split('/')[-1]==uri.split('/')[-1]" />
                 <label tal:content="size/label" />
                 <uri tal:content="size/uri" />
               </size>
+              <size tal:condition="kupu/getAllowOriginalImageSize|nothing">
+                 <selected
+                     tal:define="src request/src|python:''; uri info/url;"
+                      tal:condition="python:src.split('/')[-1]==uri.split('/')[-1]" />
+                <label i18n:translate="option_original">Original</label>
+                <uri tal:content="info/url" />
+              </size>
             </sizes>
           </tal:sizes>
         </metal:macro>

Modified: kupu/trunk/kupu/plone/plonedrawers.py
==============================================================================
--- kupu/trunk/kupu/plone/plonedrawers.py	(original)
+++ kupu/trunk/kupu/plone/plonedrawers.py	Mon Jul  2 17:16:18 2007
@@ -286,6 +286,7 @@
             image_sizes = image_field.getAvailableSizes(obj)
             sizes = [(v[0], v[1], k, '%s_%s' % (imagefield,k)) for k,v in image_sizes.items()]
             sizes.sort()
+            sizes.reverse()
             IMAGE_SIZES_CACHE[cache_key] = sizes
         else:
             sizes = IMAGE_SIZES_CACHE[cache_key]

Modified: kupu/trunk/kupu/plone/plonelibrarytool.py
==============================================================================
--- kupu/trunk/kupu/plone/plonelibrarytool.py	(original)
+++ kupu/trunk/kupu/plone/plonelibrarytool.py	Mon Jul  2 17:16:18 2007
@@ -292,6 +292,10 @@
     def getFiltersourceedit(self):
         return getattr(self, 'filtersourceedit', True)
 
+    security.declareProtected('View', "getAllowOriginalImageSize")
+    def getAllowOriginalImageSize(self):
+        return getattr(self, 'allowOriginalImageSize', False)
+
     security.declareProtected('View', 'isKupuEnabled')
     def isKupuEnabled(self, useragent='', allowAnonymous=False, REQUEST=None, context=None, fieldName=None):
         if not REQUEST:
@@ -787,6 +791,7 @@
         installBeforeUnload=None, parastyles=None, refbrowser=None,
         captioning=None,
         filterSourceEdit=None,
+        allowOriginalImageSize=None,
         REQUEST=None):
         """Delete resource types through the ZMI"""
         if linkbyuid is not None:
@@ -797,6 +802,8 @@
             self.install_beforeunload = bool(installBeforeUnload)
         if filterSourceEdit is not None:
             self.filtersourceedit = bool(filterSourceEdit)
+        if allowOriginalImageSize is not None:
+            self.allowOriginalImageSize = bool(allowOriginalImageSize)
 
         if parastyles is not None:
             self.paragraph_styles = [ line.strip() for line in parastyles if line.strip() ]

From duncan at codespeak.net  Mon Jul  2 17:26:32 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Mon,  2 Jul 2007 17:26:32 +0200 (CEST)
Subject: [kupu-checkins] r44673 - kupu/trunk/kupu/plone
Message-ID: <20070702152632.6C73F80B3@code0.codespeak.net>

Author: duncan
Date: Mon Jul  2 17:26:30 2007
New Revision: 44673

Modified:
   kupu/trunk/kupu/plone/librarytool.py
Log:
Added spellcheck function to library tool for ?ukasz ?akomy

Modified: kupu/trunk/kupu/plone/librarytool.py
==============================================================================
--- kupu/trunk/kupu/plone/librarytool.py	(original)
+++ kupu/trunk/kupu/plone/librarytool.py	Mon Jul  2 17:26:30 2007
@@ -360,3 +360,16 @@
 
     def _getToolbarFilterOptions(self):
         return getattr(self, '_toolbar_filters', {})
+
+    def spellcheck(self, REQUEST):
+        from Products.kupu.python.spellcheck import SpellChecker, format_result
+        data = REQUEST["text"]
+        c = SpellChecker()
+        result = c.check(data)
+        if result == None:
+            result = ""
+        else:
+            result = format_result(result)
+        REQUEST.RESPONSE.setHeader("Content-Type","text/xml, charset=utf-8")
+        REQUEST.RESPONSE.setHeader("Content-Length",str(len(result)))
+        return result

From duncan at codespeak.net  Tue Jul  3 10:17:56 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Tue,  3 Jul 2007 10:17:56 +0200 (CEST)
Subject: [kupu-checkins] r44687 - kupu/trunk/kupu/common
Message-ID: <20070703081756.8540680B6@code0.codespeak.net>

Author: duncan
Date: Tue Jul  3 10:17:55 2007
New Revision: 44687

Modified:
   kupu/trunk/kupu/common/kupubasetools.js
   kupu/trunk/kupu/common/kupudrawers.js
Log:
Plone ticket #5622
Add a class (even if empty) to internal LinkDrawer
Now adds class="internal-link" to links created/edited by the internal link drawer,
and class="external-link" to links created/edited by the external link drawer.

Modified: kupu/trunk/kupu/common/kupubasetools.js
==============================================================================
--- kupu/trunk/kupu/common/kupubasetools.js	(original)
+++ kupu/trunk/kupu/common/kupubasetools.js	Tue Jul  3 10:17:55 2007
@@ -1039,7 +1039,7 @@
         linkWindow.focus();
     };
 
-    this.updateLink = function (linkel, url, type, name, target, title) {
+    this.updateLink = function (linkel, url, type, name, target, title, className) {
         if (type && type == 'anchor') {
             linkel.removeAttribute('href');
             linkel.setAttribute('name', name);
@@ -1060,17 +1060,22 @@
             else {
                 linkel.removeAttribute('target');
             };
+            if (className===undefined) {
+                linkel.removeAttribute('className');
+            } else {
+                linkel.className = className;
+            }
             linkel.style.color = this.linkcolor;
         };
     };
 
-    this.formatSelectedLink = function(url, type, name, target, title) {
+    this.formatSelectedLink = function(url, type, name, target, title, className) {
         var currnode = this.editor.getSelectedNode();
 
         // selection inside link
         var linkel = this.editor.getNearestParentOfType(currnode, 'A');
         if (linkel) {
-            this.updateLink(linkel, url, type, name, target, title);
+            this.updateLink(linkel, url, type, name, target, title, className);
             return true;
         }
 
@@ -1083,7 +1088,7 @@
         for (var i = 0; i < linkelements.length; i++) {
             linkel = linkelements[i];
             if (selection.containsNode(linkel)) {
-                this.updateLink(linkel, url, type, name, target, title);
+                this.updateLink(linkel, url, type, name, target, title, className);
                 containsLink = true;
             }
         };
@@ -1102,24 +1107,24 @@
     //
     // the order of the arguments is a bit odd here because of backward
     // compatibility
-    this.createLink = function(url, type, name, target, title) {
+    this.createLink = function(url, type, name, target, title, className) {
         url = url.strip();
         if (!url) {
             this.deleteLink();
             return;
         };
-        if (!this.formatSelectedLink(url, type, name, target, title)) {
+        if (!this.formatSelectedLink(url, type, name, target, title, className)) {
             // No links inside or outside.
             this.editor.execCommand("CreateLink", url);
-            if (!this.formatSelectedLink(url, type, name, target, title)) {
+            if (!this.formatSelectedLink(url, type, name, target, title, className)) {
                 // Insert link with no text selected, insert the title
                 // or URI instead.
                 var doc = this.editor.getInnerDocument();
                 var linkel = doc.createElement("a");
                 linkel.setAttribute('href', url);
-                linkel.setAttribute('class', 'generated');
+                linkel.setAttribute('class', className || 'generated');
                 this.editor.getSelection().replaceWithNode(linkel, true);
-                this.updateLink(linkel, url, type, name, target, title);
+                this.updateLink(linkel, url, type, name, target, title, className);
             };
         }
     };

Modified: kupu/trunk/kupu/common/kupudrawers.js
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers.js	(original)
+++ kupu/trunk/kupu/common/kupudrawers.js	Tue Jul  3 10:17:55 2007
@@ -365,7 +365,7 @@
         this.editor.resumeEditing();
         if (this.getMode()) {
             var url = input.value;
-            this.tool.createLink(url, null, null, this.target);
+            this.tool.createLink(url, null, null, this.target, 'external-link');
             input.value = '';
         } else {
             // Import the html
@@ -1549,7 +1549,7 @@
         var node = getFromSelector('link_target');
         var target = node && node.value;
         
-        this.tool.createLink(uri, null, name, target, title);
+        this.tool.createLink(uri, null, name, target, title, 'internal-link');
         this.drawertool.closeDrawer();
     };
 };

From duncan at codespeak.net  Tue Jul  3 11:01:21 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Tue,  3 Jul 2007 11:01:21 +0200 (CEST)
Subject: [kupu-checkins] r44688 - kupu/trunk/kupu/doc
Message-ID: <20070703090121.4BBF980BB@code0.codespeak.net>

Author: duncan
Date: Tue Jul  3 11:01:20 2007
New Revision: 44688

Modified:
   kupu/trunk/kupu/doc/CHANGES.txt
Log:
Update change log

Modified: kupu/trunk/kupu/doc/CHANGES.txt
==============================================================================
--- kupu/trunk/kupu/doc/CHANGES.txt	(original)
+++ kupu/trunk/kupu/doc/CHANGES.txt	Tue Jul  3 11:01:20 2007
@@ -4,6 +4,10 @@
 
 - Recent
 
+  - Added a 'manage anchors' tab to the anchor drawer
+
+  - Big cleanup of i18n attributes
+
   - Updated the Japanese translation files, thx to Tyam.
 
   - Added in some support for inserting Flash content.
@@ -28,6 +32,20 @@
 
   - Plone tickets:
 
+    * 5622 Add a class (even if empty) to internal LinkDrawer
+
+    * 6283 Do not allow bigger images than Preview by default from Kupu
+
+    * 6440 Browser error: exception element has no properties while
+      registering an event handler for element null, event click, method
+      function ()
+
+    * 6720 i18n error in kupu collection
+
+    * 5985 Kupu should not strip the dir attribute by default.
+
+    * 5985 Range.intersectsNode declared obsolete
+
     * 5189 patch to support embed tag
 
     * 5420 "Edit with kupu" broken for fields on custom fieldset

From duncan at codespeak.net  Tue Jul  3 12:17:58 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Tue,  3 Jul 2007 12:17:58 +0200 (CEST)
Subject: [kupu-checkins] r44691 - in kupu/trunk/kupu: doc plone
	plone/kupu_plone_layer
Message-ID: <20070703101758.91D7B80B6@code0.codespeak.net>

Author: duncan
Date: Tue Jul  3 12:17:58 2007
New Revision: 44691

Modified:
   kupu/trunk/kupu/doc/CHANGES.txt
   kupu/trunk/kupu/plone/head.kupu
   kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
Log:
Plone ticket 4887, editing defaults to kupu, even when javascript turned off
Now degrades cleanly: when javascript is turned off you get the source edit textarea and no toolbar.

Modified: kupu/trunk/kupu/doc/CHANGES.txt
==============================================================================
--- kupu/trunk/kupu/doc/CHANGES.txt	(original)
+++ kupu/trunk/kupu/doc/CHANGES.txt	Tue Jul  3 12:17:58 2007
@@ -32,6 +32,8 @@
 
   - Plone tickets:
 
+    * 4887 editing defaults to kupu, even when javascript turned off
+
     * 5622 Add a class (even if empty) to internal LinkDrawer
 
     * 6283 Do not allow bigger images than Preview by default from Kupu

Modified: kupu/trunk/kupu/plone/head.kupu
==============================================================================
--- kupu/trunk/kupu/plone/head.kupu	(original)
+++ kupu/trunk/kupu/plone/head.kupu	Tue Jul  3 12:17:58 2007
@@ -21,38 +21,48 @@
   </kupu:part>
 
   <kupu:part name="jsincludes">
-   <tal:test condition="not:exists:portal/portal_javascripts" metal:define-macro="kupu_js_include">
-    <tal:test condition="not:kupu_js_loaded|nothing">
-      <tal:var define="global kupu_js_loaded string:yes" />
-    <script type="text/javascript"
-            tal:attributes="src string:${portal_url}/kupunoi18n.js"> </script>
-    <script type="text/javascript"
-            tal:attributes="src string:${portal_url}/sarissa.js"> </script>
-    <script type="text/javascript"
-            tal:attributes="src string:${portal_url}/sarissa_ieemu_xpath.js"> </script>
-    <script type="text/javascript"
-            tal:attributes="src string:${portal_url}/kupuhelpers.js"> </script>
-    <script type="text/javascript"
-            tal:attributes="src string:${portal_url}/kupueditor.js"> </script>
-    <script type="text/javascript"
-            tal:attributes="src string:${portal_url}/kupubasetools.js"> </script>
-    <script type="text/javascript"
-            tal:attributes="src string:${portal_url}/kupuloggers.js"> </script>
-    <script type="text/javascript"
-            tal:attributes="src string:${portal_url}/kupucontentfilters.js"> </script>
-
-    <script type="text/javascript"
-            tal:attributes="src string:${portal_url}/kupuploneeditor.js"> </script>
-    <script type="text/javascript"
-            tal:attributes="src string:${portal_url}/kupuploneui.js"> </script>
-
-    <script type="text/javascript" src="kupusourceedit.js"
-        tal:attributes="src string:${portal_url}/kupusourceedit.js"> </script>
-
-    <script type="text/javascript" src="kupudrawers.js"
-            tal:attributes="src string:${portal_url}/kupudrawers.js"> </script>
-    </tal:test>
-   </tal:test>
+     <tal:test condition="not:kupu_js_loaded|nothing">
+        <noscript>
+           <style>
+iframe.kupu-editor-iframe, .kupu-fulleditor .kupu-tb {
+  display: none !important;
+}
+textarea.kupu-editor-textarea {
+  display: block !important;
+}
+           </style>
+        </noscript>
+        <tal:test condition="not:exists:portal/portal_javascripts" metal:define-macro="kupu_js_include">
+           <script type="text/javascript"
+                   tal:attributes="src string:${portal_url}/kupunoi18n.js"> </script>
+           <script type="text/javascript"
+                   tal:attributes="src string:${portal_url}/sarissa.js"> </script>
+           <script type="text/javascript"
+                   tal:attributes="src string:${portal_url}/sarissa_ieemu_xpath.js"> </script>
+           <script type="text/javascript"
+                   tal:attributes="src string:${portal_url}/kupuhelpers.js"> </script>
+           <script type="text/javascript"
+                   tal:attributes="src string:${portal_url}/kupueditor.js"> </script>
+           <script type="text/javascript"
+                   tal:attributes="src string:${portal_url}/kupubasetools.js"> </script>
+           <script type="text/javascript"
+                   tal:attributes="src string:${portal_url}/kupuloggers.js"> </script>
+           <script type="text/javascript"
+                   tal:attributes="src string:${portal_url}/kupucontentfilters.js"> </script>
+
+           <script type="text/javascript"
+                   tal:attributes="src string:${portal_url}/kupuploneeditor.js"> </script>
+           <script type="text/javascript"
+                   tal:attributes="src string:${portal_url}/kupuploneui.js"> </script>
+
+           <script type="text/javascript" src="kupusourceedit.js"
+                   tal:attributes="src string:${portal_url}/kupusourceedit.js"> </script>
+
+           <script type="text/javascript" src="kupudrawers.js"
+                   tal:attributes="src string:${portal_url}/kupudrawers.js"> </script>
+        </tal:test>
+     </tal:test>
+     <tal:var define="global kupu_js_loaded string:yes" />
   </kupu:part>
 
   <!-- XXX this could be a separate feature, maybe -->

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	Tue Jul  3 12:17:58 2007
@@ -6,28 +6,28 @@
     <!--$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 -->
-    <!--$Id: body.kupu 9779 2005-03-15 11:34:47Z duncan $-->
+    <!--$Id: body.kupu 44538 2007-06-26 10:46:28Z duncan $-->
     <!--$Id: xmlconfig.kupu 12162 2005-05-10 15:53:10Z guido $-->
     <!--$Id: saveonpart.kupu 9520 2005-02-26 16:30:23Z duncan $-->
     <!--$Id: sourceedit.kupu 25717 2006-04-12 10:33:01Z fschulze $-->
     <!--$Id: sourceedit.kupu 9779 2005-03-15 11:34:47Z duncan $-->
     <!--$Id: contextmenu.kupu 9520 2005-02-26 16:30:23Z duncan $-->
-    <!--$Id: toolbar.kupu 27597 2006-05-22 14:27:32Z guido $-->
-    <!--$Id: toolboxes.kupu 44515 2007-06-25 15:18:53Z duncan $-->
-    <!--$Id: colorchooser.kupu 35491 2006-12-08 15:41:49Z duncan $-->
-    <!--$Id: save.kupu 9520 2005-02-26 16:30:23Z duncan $-->
-    <!--$Id: drawers.kupu 44515 2007-06-25 15:18:53Z duncan $-->
+    <!--$Id: toolbar.kupu 44538 2007-06-26 10:46:28Z duncan $-->
+    <!--$Id: toolboxes.kupu 44538 2007-06-26 10:46:28Z duncan $-->
+    <!--$Id: colorchooser.kupu 44538 2007-06-26 10:46:28Z duncan $-->
+    <!--$Id: save.kupu 44538 2007-06-26 10:46:28Z duncan $-->
+    <!--$Id: drawers.kupu 44538 2007-06-26 10:46:28Z duncan $-->
     <!--$Id: include.kupu 39202 2007-02-19 12:06:45Z duncan $-->
     <!--$Id: wire.kupu 25247 2006-04-03 11:23:02Z fschulze $-->
     <!--$Id: head.kupu 34332 2006-11-07 14:50:40Z duncan $-->
     <!--$Id: xmlconfig.kupu 35367 2006-12-06 09:06:21Z duncan $-->
-    <!--$Id: body.kupu 44509 2007-06-25 14:15:02Z duncan $-->
-    <!--$Id: toolbar.kupu 35491 2006-12-08 15:41:49Z duncan $-->
+    <!--$Id: body.kupu 44538 2007-06-26 10:46:28Z duncan $-->
+    <!--$Id: toolbar.kupu 44538 2007-06-26 10:46:28Z duncan $-->
     <!--$Id save.kupu (not yet in svn) $-->
-    <!--$Id: drawers.kupu 35477 2006-12-08 13:20:38Z duncan $-->
+    <!--$Id: drawers.kupu 44538 2007-06-26 10:46:28Z duncan $-->
     <!--$Id: beforeunload.kupu 14546 2005-07-12 14:35:55Z duncan $-->
-    <!--$Id: sourceedit.kupu 35477 2006-12-08 13:20:38Z duncan $-->
-    <!--$Id: wysiwyg_support.kupu 44509 2007-06-25 14:15:02Z duncan $-->
+    <!--$Id: sourceedit.kupu 44538 2007-06-26 10:46:28Z duncan $-->
+    <!--$Id: wysiwyg_support.kupu 44538 2007-06-26 10:46:28Z duncan $-->
     
 
     <div xmlns:metal="http://xml.zope.org/namespaces/metal" xmlns:tal="http://xml.zope.org/namespaces/tal" metal:define-macro="wysiwygEditorBox" id="kupu-editor" tal:define="name fieldName|inputname;                 editorid string:kupu-editor-${name}" tal:attributes="id editorid">
@@ -89,26 +89,36 @@
    </tal:test>
   
   
-   <tal:test condition="not:exists:portal/portal_javascripts" metal:define-macro="kupu_js_include">
-    <tal:test condition="not:kupu_js_loaded|nothing">
-      <tal:var define="global kupu_js_loaded string:yes"/>
-    <script type="text/javascript" tal:attributes="src string:${portal_url}/kupunoi18n.js"> </script>
-    <script type="text/javascript" tal:attributes="src string:${portal_url}/sarissa.js"> </script>
-    <script type="text/javascript" tal:attributes="src string:${portal_url}/sarissa_ieemu_xpath.js"> </script>
-    <script type="text/javascript" tal:attributes="src string:${portal_url}/kupuhelpers.js"> </script>
-    <script type="text/javascript" tal:attributes="src string:${portal_url}/kupueditor.js"> </script>
-    <script type="text/javascript" tal:attributes="src string:${portal_url}/kupubasetools.js"> </script>
-    <script type="text/javascript" tal:attributes="src string:${portal_url}/kupuloggers.js"> </script>
-    <script type="text/javascript" tal:attributes="src string:${portal_url}/kupucontentfilters.js"> </script>
-
-    <script type="text/javascript" tal:attributes="src string:${portal_url}/kupuploneeditor.js"> </script>
-    <script type="text/javascript" tal:attributes="src string:${portal_url}/kupuploneui.js"> </script>
-
-    <script type="text/javascript" src="kupusourceedit.js" tal:attributes="src string:${portal_url}/kupusourceedit.js"> </script>
-
-    <script type="text/javascript" src="kupudrawers.js" tal:attributes="src string:${portal_url}/kupudrawers.js"> </script>
-    </tal:test>
-   </tal:test>
+     <tal:test condition="not:kupu_js_loaded|nothing">
+        <noscript>
+           <style>
+iframe.kupu-editor-iframe, .kupu-fulleditor .kupu-tb {
+  display: none !important;
+}
+textarea.kupu-editor-textarea {
+  display: block !important;
+}
+           </style>
+        </noscript>
+        <tal:test condition="not:exists:portal/portal_javascripts" metal:define-macro="kupu_js_include">
+           <script type="text/javascript" tal:attributes="src string:${portal_url}/kupunoi18n.js"> </script>
+           <script type="text/javascript" tal:attributes="src string:${portal_url}/sarissa.js"> </script>
+           <script type="text/javascript" tal:attributes="src string:${portal_url}/sarissa_ieemu_xpath.js"> </script>
+           <script type="text/javascript" tal:attributes="src string:${portal_url}/kupuhelpers.js"> </script>
+           <script type="text/javascript" tal:attributes="src string:${portal_url}/kupueditor.js"> </script>
+           <script type="text/javascript" tal:attributes="src string:${portal_url}/kupubasetools.js"> </script>
+           <script type="text/javascript" tal:attributes="src string:${portal_url}/kupuloggers.js"> </script>
+           <script type="text/javascript" tal:attributes="src string:${portal_url}/kupucontentfilters.js"> </script>
+
+           <script type="text/javascript" tal:attributes="src string:${portal_url}/kupuploneeditor.js"> </script>
+           <script type="text/javascript" tal:attributes="src string:${portal_url}/kupuploneui.js"> </script>
+
+           <script type="text/javascript" src="kupusourceedit.js" tal:attributes="src string:${portal_url}/kupusourceedit.js"> </script>
+
+           <script type="text/javascript" src="kupudrawers.js" tal:attributes="src string:${portal_url}/kupudrawers.js"> </script>
+        </tal:test>
+     </tal:test>
+     <tal:var define="global kupu_js_loaded string:yes"/>
   
 <tal:condition condition="python:here.kupu_library_tool.installBeforeUnload() and not path('haveBeforeUnload|nothing')">
     <script tal:condition="not:exists:portal/portal_javascripts" type="text/javascript" src="kupubeforeunload.js" tal:attributes="src string:${portal_url}/kupubeforeunload.js" tal:define="global haveBeforeUnload python:True;"> </script>

From fschulze at codespeak.net  Tue Jul  3 13:56:16 2007
From: fschulze at codespeak.net (fschulze at codespeak.net)
Date: Tue,  3 Jul 2007 13:56:16 +0200 (CEST)
Subject: [kupu-checkins] r44693 - kupu/trunk/kupu/plone
Message-ID: <20070703115616.44C8080B3@code0.codespeak.net>

Author: fschulze
Date: Tue Jul  3 13:56:14 2007
New Revision: 44693

Modified:
   kupu/trunk/kupu/plone/librarytool.py
Log:
Fix usage of filters in _setToolbarFilters, it's a dict, not an object.

Modified: kupu/trunk/kupu/plone/librarytool.py
==============================================================================
--- kupu/trunk/kupu/plone/librarytool.py	(original)
+++ kupu/trunk/kupu/plone/librarytool.py	Tue Jul  3 13:56:14 2007
@@ -319,9 +319,9 @@
         filter is a list of records with: id, visible, override"""
         clean = {}
         for f in filters:
-            id = f.id
-            visible = bool(getattr(f, 'visible', False))
-            expr = getattr(f, 'override', None)
+            id = f['id']
+            visible = bool(f.get('visible', False))
+            expr = f.get('override', None)
 
             if not id:
                 continue

From duncan at codespeak.net  Fri Jul  6 17:32:48 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Fri,  6 Jul 2007 17:32:48 +0200 (CEST)
Subject: [kupu-checkins] r44794 - kupu/trunk/kupu/common
Message-ID: <20070706153248.B39B38149@code0.codespeak.net>

Author: duncan
Date: Fri Jul  6 17:32:47 2007
New Revision: 44794

Modified:
   kupu/trunk/kupu/common/sarissa.js
Log:
Fix to importNode to allow kukit to import nodes not in the HTML namespace

Modified: kupu/trunk/kupu/common/sarissa.js
==============================================================================
--- kupu/trunk/kupu/common/sarissa.js	(original)
+++ kupu/trunk/kupu/common/sarissa.js	Fri Jul  6 17:32:47 2007
@@ -441,7 +441,7 @@
             }else{
                 tmp.innerHTML = pNode.xml ? pNode.cloneNode(false).xml : pNode.cloneNode(false).outerHTML;
             };
-            return tmp.getElementsByTagName(oNode.nodeName)[0];
+            return tmp.getElementsByTagName(oNode.nodeName.replace(/^[^:]*:/,''))[0];
         };
     }catch(e){ };
 };

From duncan at codespeak.net  Sat Jul  7 21:01:27 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Sat,  7 Jul 2007 21:01:27 +0200 (CEST)
Subject: [kupu-checkins] r44831 - in kupu/trunk/kupu/plone: .
	kupu_plone_layer
Message-ID: <20070707190127.D8B1E81CD@code0.codespeak.net>

Author: duncan
Date: Sat Jul  7 21:01:27 2007
New Revision: 44831

Modified:
   kupu/trunk/kupu/plone/head.kupu
   kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
Log:
Revert changes from revision 44691: Fix for Plone ticket 4887 appears to upset Plone's inline editing.

Modified: kupu/trunk/kupu/plone/head.kupu
==============================================================================
--- kupu/trunk/kupu/plone/head.kupu	(original)
+++ kupu/trunk/kupu/plone/head.kupu	Sat Jul  7 21:01:27 2007
@@ -21,48 +21,38 @@
   </kupu:part>
 
   <kupu:part name="jsincludes">
-     <tal:test condition="not:kupu_js_loaded|nothing">
-        <noscript>
-           <style>
-iframe.kupu-editor-iframe, .kupu-fulleditor .kupu-tb {
-  display: none !important;
-}
-textarea.kupu-editor-textarea {
-  display: block !important;
-}
-           </style>
-        </noscript>
-        <tal:test condition="not:exists:portal/portal_javascripts" metal:define-macro="kupu_js_include">
-           <script type="text/javascript"
-                   tal:attributes="src string:${portal_url}/kupunoi18n.js"> </script>
-           <script type="text/javascript"
-                   tal:attributes="src string:${portal_url}/sarissa.js"> </script>
-           <script type="text/javascript"
-                   tal:attributes="src string:${portal_url}/sarissa_ieemu_xpath.js"> </script>
-           <script type="text/javascript"
-                   tal:attributes="src string:${portal_url}/kupuhelpers.js"> </script>
-           <script type="text/javascript"
-                   tal:attributes="src string:${portal_url}/kupueditor.js"> </script>
-           <script type="text/javascript"
-                   tal:attributes="src string:${portal_url}/kupubasetools.js"> </script>
-           <script type="text/javascript"
-                   tal:attributes="src string:${portal_url}/kupuloggers.js"> </script>
-           <script type="text/javascript"
-                   tal:attributes="src string:${portal_url}/kupucontentfilters.js"> </script>
-
-           <script type="text/javascript"
-                   tal:attributes="src string:${portal_url}/kupuploneeditor.js"> </script>
-           <script type="text/javascript"
-                   tal:attributes="src string:${portal_url}/kupuploneui.js"> </script>
-
-           <script type="text/javascript" src="kupusourceedit.js"
-                   tal:attributes="src string:${portal_url}/kupusourceedit.js"> </script>
-
-           <script type="text/javascript" src="kupudrawers.js"
-                   tal:attributes="src string:${portal_url}/kupudrawers.js"> </script>
-        </tal:test>
-     </tal:test>
-     <tal:var define="global kupu_js_loaded string:yes" />
+   <tal:test condition="not:exists:portal/portal_javascripts" metal:define-macro="kupu_js_include">
+    <tal:test condition="not:kupu_js_loaded|nothing">
+      <tal:var define="global kupu_js_loaded string:yes" />
+    <script type="text/javascript"
+            tal:attributes="src string:${portal_url}/kupunoi18n.js"> </script>
+    <script type="text/javascript"
+            tal:attributes="src string:${portal_url}/sarissa.js"> </script>
+    <script type="text/javascript"
+            tal:attributes="src string:${portal_url}/sarissa_ieemu_xpath.js"> </script>
+    <script type="text/javascript"
+            tal:attributes="src string:${portal_url}/kupuhelpers.js"> </script>
+    <script type="text/javascript"
+            tal:attributes="src string:${portal_url}/kupueditor.js"> </script>
+    <script type="text/javascript"
+            tal:attributes="src string:${portal_url}/kupubasetools.js"> </script>
+    <script type="text/javascript"
+            tal:attributes="src string:${portal_url}/kupuloggers.js"> </script>
+    <script type="text/javascript"
+            tal:attributes="src string:${portal_url}/kupucontentfilters.js"> </script>
+
+    <script type="text/javascript"
+            tal:attributes="src string:${portal_url}/kupuploneeditor.js"> </script>
+    <script type="text/javascript"
+            tal:attributes="src string:${portal_url}/kupuploneui.js"> </script>
+
+    <script type="text/javascript" src="kupusourceedit.js"
+        tal:attributes="src string:${portal_url}/kupusourceedit.js"> </script>
+
+    <script type="text/javascript" src="kupudrawers.js"
+            tal:attributes="src string:${portal_url}/kupudrawers.js"> </script>
+    </tal:test>
+   </tal:test>
   </kupu:part>
 
   <!-- XXX this could be a separate feature, maybe -->

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	Sat Jul  7 21:01:27 2007
@@ -6,28 +6,28 @@
     <!--$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 -->
-    <!--$Id: body.kupu 44538 2007-06-26 10:46:28Z duncan $-->
+    <!--$Id: body.kupu 9779 2005-03-15 11:34:47Z duncan $-->
     <!--$Id: xmlconfig.kupu 12162 2005-05-10 15:53:10Z guido $-->
     <!--$Id: saveonpart.kupu 9520 2005-02-26 16:30:23Z duncan $-->
     <!--$Id: sourceedit.kupu 25717 2006-04-12 10:33:01Z fschulze $-->
     <!--$Id: sourceedit.kupu 9779 2005-03-15 11:34:47Z duncan $-->
     <!--$Id: contextmenu.kupu 9520 2005-02-26 16:30:23Z duncan $-->
-    <!--$Id: toolbar.kupu 44538 2007-06-26 10:46:28Z duncan $-->
-    <!--$Id: toolboxes.kupu 44538 2007-06-26 10:46:28Z duncan $-->
-    <!--$Id: colorchooser.kupu 44538 2007-06-26 10:46:28Z duncan $-->
-    <!--$Id: save.kupu 44538 2007-06-26 10:46:28Z duncan $-->
-    <!--$Id: drawers.kupu 44538 2007-06-26 10:46:28Z duncan $-->
+    <!--$Id: toolbar.kupu 27597 2006-05-22 14:27:32Z guido $-->
+    <!--$Id: toolboxes.kupu 44515 2007-06-25 15:18:53Z duncan $-->
+    <!--$Id: colorchooser.kupu 35491 2006-12-08 15:41:49Z duncan $-->
+    <!--$Id: save.kupu 9520 2005-02-26 16:30:23Z duncan $-->
+    <!--$Id: drawers.kupu 44515 2007-06-25 15:18:53Z duncan $-->
     <!--$Id: include.kupu 39202 2007-02-19 12:06:45Z duncan $-->
     <!--$Id: wire.kupu 25247 2006-04-03 11:23:02Z fschulze $-->
     <!--$Id: head.kupu 34332 2006-11-07 14:50:40Z duncan $-->
     <!--$Id: xmlconfig.kupu 35367 2006-12-06 09:06:21Z duncan $-->
-    <!--$Id: body.kupu 44538 2007-06-26 10:46:28Z duncan $-->
-    <!--$Id: toolbar.kupu 44538 2007-06-26 10:46:28Z duncan $-->
+    <!--$Id: body.kupu 44509 2007-06-25 14:15:02Z duncan $-->
+    <!--$Id: toolbar.kupu 35491 2006-12-08 15:41:49Z duncan $-->
     <!--$Id save.kupu (not yet in svn) $-->
-    <!--$Id: drawers.kupu 44538 2007-06-26 10:46:28Z duncan $-->
+    <!--$Id: drawers.kupu 35477 2006-12-08 13:20:38Z duncan $-->
     <!--$Id: beforeunload.kupu 14546 2005-07-12 14:35:55Z duncan $-->
-    <!--$Id: sourceedit.kupu 44538 2007-06-26 10:46:28Z duncan $-->
-    <!--$Id: wysiwyg_support.kupu 44538 2007-06-26 10:46:28Z duncan $-->
+    <!--$Id: sourceedit.kupu 35477 2006-12-08 13:20:38Z duncan $-->
+    <!--$Id: wysiwyg_support.kupu 44509 2007-06-25 14:15:02Z duncan $-->
     
 
     <div xmlns:metal="http://xml.zope.org/namespaces/metal" xmlns:tal="http://xml.zope.org/namespaces/tal" metal:define-macro="wysiwygEditorBox" id="kupu-editor" tal:define="name fieldName|inputname;                 editorid string:kupu-editor-${name}" tal:attributes="id editorid">
@@ -89,36 +89,26 @@
    </tal:test>
   
   
-     <tal:test condition="not:kupu_js_loaded|nothing">
-        <noscript>
-           <style>
-iframe.kupu-editor-iframe, .kupu-fulleditor .kupu-tb {
-  display: none !important;
-}
-textarea.kupu-editor-textarea {
-  display: block !important;
-}
-           </style>
-        </noscript>
-        <tal:test condition="not:exists:portal/portal_javascripts" metal:define-macro="kupu_js_include">
-           <script type="text/javascript" tal:attributes="src string:${portal_url}/kupunoi18n.js"> </script>
-           <script type="text/javascript" tal:attributes="src string:${portal_url}/sarissa.js"> </script>
-           <script type="text/javascript" tal:attributes="src string:${portal_url}/sarissa_ieemu_xpath.js"> </script>
-           <script type="text/javascript" tal:attributes="src string:${portal_url}/kupuhelpers.js"> </script>
-           <script type="text/javascript" tal:attributes="src string:${portal_url}/kupueditor.js"> </script>
-           <script type="text/javascript" tal:attributes="src string:${portal_url}/kupubasetools.js"> </script>
-           <script type="text/javascript" tal:attributes="src string:${portal_url}/kupuloggers.js"> </script>
-           <script type="text/javascript" tal:attributes="src string:${portal_url}/kupucontentfilters.js"> </script>
-
-           <script type="text/javascript" tal:attributes="src string:${portal_url}/kupuploneeditor.js"> </script>
-           <script type="text/javascript" tal:attributes="src string:${portal_url}/kupuploneui.js"> </script>
-
-           <script type="text/javascript" src="kupusourceedit.js" tal:attributes="src string:${portal_url}/kupusourceedit.js"> </script>
-
-           <script type="text/javascript" src="kupudrawers.js" tal:attributes="src string:${portal_url}/kupudrawers.js"> </script>
-        </tal:test>
-     </tal:test>
-     <tal:var define="global kupu_js_loaded string:yes"/>
+   <tal:test condition="not:exists:portal/portal_javascripts" metal:define-macro="kupu_js_include">
+    <tal:test condition="not:kupu_js_loaded|nothing">
+      <tal:var define="global kupu_js_loaded string:yes"/>
+    <script type="text/javascript" tal:attributes="src string:${portal_url}/kupunoi18n.js"> </script>
+    <script type="text/javascript" tal:attributes="src string:${portal_url}/sarissa.js"> </script>
+    <script type="text/javascript" tal:attributes="src string:${portal_url}/sarissa_ieemu_xpath.js"> </script>
+    <script type="text/javascript" tal:attributes="src string:${portal_url}/kupuhelpers.js"> </script>
+    <script type="text/javascript" tal:attributes="src string:${portal_url}/kupueditor.js"> </script>
+    <script type="text/javascript" tal:attributes="src string:${portal_url}/kupubasetools.js"> </script>
+    <script type="text/javascript" tal:attributes="src string:${portal_url}/kupuloggers.js"> </script>
+    <script type="text/javascript" tal:attributes="src string:${portal_url}/kupucontentfilters.js"> </script>
+
+    <script type="text/javascript" tal:attributes="src string:${portal_url}/kupuploneeditor.js"> </script>
+    <script type="text/javascript" tal:attributes="src string:${portal_url}/kupuploneui.js"> </script>
+
+    <script type="text/javascript" src="kupusourceedit.js" tal:attributes="src string:${portal_url}/kupusourceedit.js"> </script>
+
+    <script type="text/javascript" src="kupudrawers.js" tal:attributes="src string:${portal_url}/kupudrawers.js"> </script>
+    </tal:test>
+   </tal:test>
   
 <tal:condition condition="python:here.kupu_library_tool.installBeforeUnload() and not path('haveBeforeUnload|nothing')">
     <script tal:condition="not:exists:portal/portal_javascripts" type="text/javascript" src="kupubeforeunload.js" tal:attributes="src string:${portal_url}/kupubeforeunload.js" tal:define="global haveBeforeUnload python:True;"> </script>

From duncan at codespeak.net  Sat Jul  7 21:02:09 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Sat,  7 Jul 2007 21:02:09 +0200 (CEST)
Subject: [kupu-checkins] r44832 - kupu/trunk/kupu/common
Message-ID: <20070707190209.E673F81B2@code0.codespeak.net>

Author: duncan
Date: Sat Jul  7 21:02:09 2007
New Revision: 44832

Modified:
   kupu/trunk/kupu/common/kupudrawers.js
Log:
Put guards around calls to editor.busy/notbusy otherwise compositepack breaks.

Modified: kupu/trunk/kupu/common/kupudrawers.js
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers.js	(original)
+++ kupu/trunk/kupu/common/kupudrawers.js	Sat Jul  7 21:02:09 2007
@@ -9,6 +9,12 @@
  *****************************************************************************/
 // $Id$
 
+function kupu_busy(ed) {
+    if (ed.busy) ed.busy();
+}
+function kupu_notbusy(ed, force) {
+    if (ed.notbusy) ed.notbusy(force);
+}
 function DrawerTool() {
     /* a tool to open and fill drawers
        this tool has to (and should!) only be instantiated once
@@ -57,7 +63,7 @@
         this.current_drawer.hide();
         this.current_drawer.editor.resumeEditing();
         this.current_drawer = null;
-        this.editor.notbusy(true);
+        kupu_notbusy(this.editor, true)
     };
 };
 
@@ -190,14 +196,14 @@
             if (limit-- && anchorframe.src==src) {
                 timer_instance.registerFunction(this, onloadEvent, 500);
             } else {
-                ed.notbusy(true);
+                kupu_notbusy(ed, true);
             }
             return;
         };
         if(window.drawertool && window.drawertool.current_drawer) {
             window.drawertool.current_drawer.anchorframe_loaded();
         };
-        ed.notbusy();
+        kupu_notbusy(ed);
     };
 
     var id = 'kupu-linkdrawer-anchors';
@@ -210,7 +216,7 @@
         var src = inp[0].value;
         inp[0].value = "";
         if (!src) { return; }
-        ed.busy();
+        kupu_busy(ed);
         if (this.anchorframe.readyState) { // IE
             anchorframe.src = src;
             onloadEvent();
@@ -1330,7 +1336,7 @@
             if (xmlhttp.readyState == 4) {
                 if (xmlhttp.status && xmlhttp.status != 200) {
                     var errmessage = 'Error '+xmlhttp.status+' loading '+(uri||'XML');
-                    self.editor.notbusy(true);
+                    kupu_notbusy(ed, true);
                     alert(errmessage);
                     throw "Error loading XML";
                 };
@@ -1340,10 +1346,11 @@
                     dom.loadXML(xmlhttp.responseText);
                 }
                 callback.apply(self, [dom, uri, extra]);
-                self.editor.notbusy();
+                kupu_notbusy(ed);
             };
         };
         var self = this;
+        var ed = this.editor;
         /* load the XML from a uri
            calls callback with one arg (the XML DOM) when done
            the (optional) body arg should contain the body for the request
@@ -1354,7 +1361,7 @@
         // something
         body=body?body:null;
 
-        this.editor.busy();
+        kupu_busy(ed);
         try {
             xmlhttp.open(method, uri, true);
             xmlhttp.onreadystatechange = _sarissaCallback;
@@ -1372,7 +1379,7 @@
             if (e && e.name && e.message) { // Microsoft
                 e = e.name + ': ' + e.message;
             }
-            this.editor.notbusy(true);
+            kupu_notbusy(ed, true);
             alert(e);
         }
     };

From duncan at codespeak.net  Mon Jul  9 09:23:17 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Mon,  9 Jul 2007 09:23:17 +0200 (CEST)
Subject: [kupu-checkins] r44861 - in kupu/trunk/kupu: doc
	plone/kupu_plone_layer
Message-ID: <20070709072317.0261F8211@code0.codespeak.net>

Author: duncan
Date: Mon Jul  9 09:23:17 2007
New Revision: 44861

Modified:
   kupu/trunk/kupu/doc/CHANGES.txt
   kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
Log:
Update CHANGES.txt

Modified: kupu/trunk/kupu/doc/CHANGES.txt
==============================================================================
--- kupu/trunk/kupu/doc/CHANGES.txt	(original)
+++ kupu/trunk/kupu/doc/CHANGES.txt	Mon Jul  9 09:23:17 2007
@@ -32,8 +32,6 @@
 
   - Plone tickets:
 
-    * 4887 editing defaults to kupu, even when javascript turned off
-
     * 5622 Add a class (even if empty) to internal LinkDrawer
 
     * 6283 Do not allow bigger images than Preview by default from Kupu
@@ -64,6 +62,8 @@
 
     * 6598 Default linkables in Kupu: folder is not, plone site is not, ATRelativePathCriterion is
 
+    * 4887 Fix for "editing defaults to kupu, even when javascript turned off" reverted as it breaks inline editing.
+
 - 1.4 Beta 6
 
   - Removed the getToolByName deprecation workround since

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 Jul  9 09:23:17 2007
@@ -6,28 +6,28 @@
     <!--$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 -->
-    <!--$Id: body.kupu 9779 2005-03-15 11:34:47Z duncan $-->
+    <!--$Id: body.kupu 44538 2007-06-26 10:46:28Z duncan $-->
     <!--$Id: xmlconfig.kupu 12162 2005-05-10 15:53:10Z guido $-->
     <!--$Id: saveonpart.kupu 9520 2005-02-26 16:30:23Z duncan $-->
     <!--$Id: sourceedit.kupu 25717 2006-04-12 10:33:01Z fschulze $-->
     <!--$Id: sourceedit.kupu 9779 2005-03-15 11:34:47Z duncan $-->
     <!--$Id: contextmenu.kupu 9520 2005-02-26 16:30:23Z duncan $-->
-    <!--$Id: toolbar.kupu 27597 2006-05-22 14:27:32Z guido $-->
-    <!--$Id: toolboxes.kupu 44515 2007-06-25 15:18:53Z duncan $-->
-    <!--$Id: colorchooser.kupu 35491 2006-12-08 15:41:49Z duncan $-->
-    <!--$Id: save.kupu 9520 2005-02-26 16:30:23Z duncan $-->
-    <!--$Id: drawers.kupu 44515 2007-06-25 15:18:53Z duncan $-->
+    <!--$Id: toolbar.kupu 44538 2007-06-26 10:46:28Z duncan $-->
+    <!--$Id: toolboxes.kupu 44538 2007-06-26 10:46:28Z duncan $-->
+    <!--$Id: colorchooser.kupu 44538 2007-06-26 10:46:28Z duncan $-->
+    <!--$Id: save.kupu 44538 2007-06-26 10:46:28Z duncan $-->
+    <!--$Id: drawers.kupu 44538 2007-06-26 10:46:28Z duncan $-->
     <!--$Id: include.kupu 39202 2007-02-19 12:06:45Z duncan $-->
     <!--$Id: wire.kupu 25247 2006-04-03 11:23:02Z fschulze $-->
-    <!--$Id: head.kupu 34332 2006-11-07 14:50:40Z 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 44509 2007-06-25 14:15:02Z duncan $-->
-    <!--$Id: toolbar.kupu 35491 2006-12-08 15:41:49Z duncan $-->
+    <!--$Id: body.kupu 44538 2007-06-26 10:46:28Z duncan $-->
+    <!--$Id: toolbar.kupu 44538 2007-06-26 10:46:28Z duncan $-->
     <!--$Id save.kupu (not yet in svn) $-->
-    <!--$Id: drawers.kupu 35477 2006-12-08 13:20:38Z duncan $-->
+    <!--$Id: drawers.kupu 44538 2007-06-26 10:46:28Z duncan $-->
     <!--$Id: beforeunload.kupu 14546 2005-07-12 14:35:55Z duncan $-->
-    <!--$Id: sourceedit.kupu 35477 2006-12-08 13:20:38Z duncan $-->
-    <!--$Id: wysiwyg_support.kupu 44509 2007-06-25 14:15:02Z duncan $-->
+    <!--$Id: sourceedit.kupu 44538 2007-06-26 10:46:28Z duncan $-->
+    <!--$Id: wysiwyg_support.kupu 44538 2007-06-26 10:46:28Z duncan $-->
     
 
     <div xmlns:metal="http://xml.zope.org/namespaces/metal" xmlns:tal="http://xml.zope.org/namespaces/tal" metal:define-macro="wysiwygEditorBox" id="kupu-editor" tal:define="name fieldName|inputname;                 editorid string:kupu-editor-${name}" tal:attributes="id editorid">

From duncan at codespeak.net  Mon Jul  9 09:25:41 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Mon,  9 Jul 2007 09:25:41 +0200 (CEST)
Subject: [kupu-checkins] r44862 - kupu/tag/kupu-1.4rc1
Message-ID: <20070709072541.91C618143@code0.codespeak.net>

Author: duncan
Date: Mon Jul  9 09:25:40 2007
New Revision: 44862

Added:
   kupu/tag/kupu-1.4rc1/
      - copied from r44861, kupu/trunk/kupu/
Log:
Tagged for 1.4rc1

From duncan at codespeak.net  Mon Jul  9 16:08:08 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Mon,  9 Jul 2007 16:08:08 +0200 (CEST)
Subject: [kupu-checkins] r44879 - kupu/trunk/kupu/plone
Message-ID: <20070709140808.665258215@code0.codespeak.net>

Author: duncan
Date: Mon Jul  9 16:08:07 2007
New Revision: 44879

Modified:
   kupu/trunk/kupu/plone/html2captioned.py
Log:
Fix width code for image scales

Modified: kupu/trunk/kupu/plone/html2captioned.py
==============================================================================
--- kupu/trunk/kupu/plone/html2captioned.py	(original)
+++ kupu/trunk/kupu/plone/html2captioned.py	Mon Jul  9 16:08:07 2007
@@ -137,7 +137,11 @@
                         tag = END_TAG_PATTERN.sub('\\1 alt="%s"\\2' % escape(target.Title(),1), tag)
                         d['tag'] = tag
                         if not width and srctail:
-                            subtarget = getattr(target, srctail, None)
+                            try:
+                                subtarget = target.restrictedTraverse(srctail)
+                            except:
+                                subtarget = getattr(target, srctail, None)
+
                             if hasattr(aq_base(subtarget), 'getWidth'):
                                 width = subtarget.getWidth()
                             elif hasattr(aq_base(subtarget), 'width'):

From duncan at codespeak.net  Mon Jul  9 17:28:32 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Mon,  9 Jul 2007 17:28:32 +0200 (CEST)
Subject: [kupu-checkins] r44881 - in kupu/trunk/kupu: doc plone
	plone/kupu_plone_layer
Message-ID: <20070709152832.E1FD48223@code0.codespeak.net>

Author: duncan
Date: Mon Jul  9 17:28:32 2007
New Revision: 44881

Added:
   kupu/trunk/kupu/plone/kupu_plone_layer/kupu_captioned_image.pt
Modified:
   kupu/trunk/kupu/doc/CHANGES.txt
   kupu/trunk/kupu/plone/html2captioned.py
   kupu/trunk/kupu/plone/kupu_plone_layer/kupuplone.css.dtml
Log:
Removed hardwired html for captioning transform so the html can be customised in the skin.

Modified: kupu/trunk/kupu/doc/CHANGES.txt
==============================================================================
--- kupu/trunk/kupu/doc/CHANGES.txt	(original)
+++ kupu/trunk/kupu/doc/CHANGES.txt	Mon Jul  9 17:28:32 2007
@@ -2,7 +2,13 @@
 Kupu changes
 ============
 
-- Recent
+- Recent changes
+
+  - Fixed broken code for determining the width of captioned images.
+    Also removed the hardwired html for the transform and use a
+    template instead (so it can be customised).
+
+- 1.4rc1
 
   - Added a 'manage anchors' tab to the anchor drawer
 

Modified: kupu/trunk/kupu/plone/html2captioned.py
==============================================================================
--- kupu/trunk/kupu/plone/html2captioned.py	(original)
+++ kupu/trunk/kupu/plone/html2captioned.py	Mon Jul  9 17:28:32 2007
@@ -37,15 +37,17 @@
 ATTR_VALUE = '=(?:"?)(?P<%s>(?<=")[^"]*|[^ \/>]*)'
 ATTR_CLASS = ATTR_VALUE % 'class'
 ATTR_WIDTH = ATTR_VALUE % 'width'
+ATTR_ALT = ATTR_VALUE % 'alt'
 
 ATTR_PATTERN = re.compile('''
     (?P<tag>\<
      ( class%s
      | src\s*=\s*"resolveuid/(?P<src>([^/"#? ]*))
      | width%s
+     | alt%s
      | .
      )*\>
-    )''' % (ATTR_CLASS, ATTR_WIDTH), re.VERBOSE | re.IGNORECASE | re.DOTALL)
+    )''' % (ATTR_CLASS, ATTR_WIDTH, ATTR_ALT), re.VERBOSE | re.IGNORECASE | re.DOTALL)
 SRC_TAIL = re.compile(r'/([^" \/>]+)')
 
 CLASS_PATTERN = re.compile('\s*class\s*=\s*("[^"]*captioned[^"]*"|[^" \/>]+)')
@@ -111,6 +113,7 @@
         (default: None)
         """
         context = kwargs.get('context', None)
+        template = context.kupu_captioned_image
         if context:
             at_tool = context.archetype_tool
             rc = at_tool.reference_catalog
@@ -125,39 +128,23 @@
                     srctail = m.group(1)
                 else:
                     srctail = None
-                klass = attrs.group('class')
-                width = attrs.group('width')
                 if src:
                     d = attrs.groupdict()
                     target = self.resolveuid(context, rc, src)
                     if target:
+                        d['class'] = attrs.group('class')
+                        d['originalwidth'] = attrs.group('width')
+                        d['originalalt'] = attrs.group('alt')
                         d['caption'] = newline_to_br(html_quote(target.Description()))
-                        tag = CLASS_PATTERN.sub('', d['tag'])
-                        tag = ALT_PATTERN.sub('', tag)
-                        tag = END_TAG_PATTERN.sub('\\1 alt="%s"\\2' % escape(target.Title(),1), tag)
-                        d['tag'] = tag
-                        if not width and srctail:
+                        d['image'] = d['fullimage'] = target
+                        if srctail:
                             try:
                                 subtarget = target.restrictedTraverse(srctail)
                             except:
                                 subtarget = getattr(target, srctail, None)
-
-                            if hasattr(aq_base(subtarget), 'getWidth'):
-                                width = subtarget.getWidth()
-                            elif hasattr(aq_base(subtarget), 'width'):
-                                width = subtarget.width
-                        if not width:
-                            try:
-                                width = target.getWidth()
-                            except AttributeError:
-                                pass
-                        if not width:
-                            try:
-                                width = target.getImage().getWidth()
-                            except:
-                                width = 150
-                        d['width'] = width
-                        return IMAGE_TEMPLATE % d
+                            if subtarget:
+                                d['image'] = subtarget
+                        return template(**d)
                 return match.group(0) # No change
 
             html = IMAGE_PATTERN.sub(replaceImage, data)

Added: kupu/trunk/kupu/plone/kupu_plone_layer/kupu_captioned_image.pt
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupu_captioned_image.pt	Mon Jul  9 17:28:32 2007
@@ -0,0 +1,15 @@
+<dl tal:define="image nocall:options/image;
+    width image/width|image/getWidth|python:150;
+    height image/height|image/getHeight|python:150;
+    oimage nocall:options/fullimage|nocall:options/image;
+    owidth oimage/width|oimage/getWidth|python:150;
+    oheight oimage/height|oimage/getHeight|python:150;"
+    tal:attributes="class options/class">
+<dt><a tal:omit-tag="python:height==oheight and width==owidth"
+ rel="lightbox" tal:attributes="href oimage/absolute_url_path;"><img
+ tal:replace="structure image/tag" /></a></dt>
+ <dd class="image-caption"
+     tal:attributes="style string:width:${width}px;"
+     tal:content="options/caption|nothing">
+ </dd>
+</dl>

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupuplone.css.dtml
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupuplone.css.dtml	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupuplone.css.dtml	Mon Jul  9 17:28:32 2007
@@ -306,5 +306,12 @@
 .kupu-html embed embed, .kupu-html embed object {
    display:none;
 }
+dd.image-caption {
+   text-align:left;
+   padding: 0;
+}
+dl.captioned {
+   padding: 10px;
+}
 /* </dtml-let></dtml-with> */
 

From kupu-checkins at codespeak.net  Wed Jul 11 14:51:46 2007
From: kupu-checkins at codespeak.net (kupu-checkins at codespeak.net)
Date: Wed, 11 Jul 2007 14:51:46 +0200 (CEST)
Subject: [kupu-checkins] Doctor Jillian : 45% off your order
Message-ID: <20070711035228.10215.qmail@MODEA.net.t-com.hr>

An HTML attachment was scrubbed...
URL: http://codespeak.net/pipermail/kupu-checkins/attachments/20070711/92d0b5b7/attachment.htm 

From duncan at codespeak.net  Fri Jul 13 13:23:06 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Fri, 13 Jul 2007 13:23:06 +0200 (CEST)
Subject: [kupu-checkins] r45010 - in kupu/trunk/kupu/plone: .
	kupu_plone_layer
Message-ID: <20070713112306.C7CC08275@code0.codespeak.net>

Author: duncan
Date: Fri Jul 13 13:23:06 2007
New Revision: 45010

Modified:
   kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
   kupu/trunk/kupu/plone/wysiwyg_support.kupu
Log:
Try a fix for text_format not defined problem.

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html	Fri Jul 13 13:23:06 2007
@@ -523,7 +523,7 @@
          <span tal:condition="python:portal.kupu_library_tool.isKupuEnabled(REQUEST=context.REQUEST, context=context, fieldName=fieldName)" tal:define="global kupu_convert_message_generated python:True">
            <a href="#" tal:attributes="href python:portal.kupu_library_tool.forcekupu_url(fieldName);" i18n:translate="convert-to-kupu">Convert to HTML and edit with the visual editor</a></span>
     </tal:archetypes>
-    <tal:nonat condition="not:fieldName|nothing">
+    <tal:nonat condition="not:fieldName|nothing" define="text_format text_format | python: getattr(here,'text_format','html');">
      <label for="text_format" i18n:translate="label_format">Format</label>
 
      <div class="formHelp" i18n:translate="help_format">

Modified: kupu/trunk/kupu/plone/wysiwyg_support.kupu
==============================================================================
--- kupu/trunk/kupu/plone/wysiwyg_support.kupu	(original)
+++ kupu/trunk/kupu/plone/wysiwyg_support.kupu	Fri Jul 13 13:23:06 2007
@@ -73,7 +73,8 @@
                 i18n:translate="convert-to-kupu"
                 >Convert to HTML and edit with the visual editor</a></span>
     </tal:archetypes>
-    <tal:nonat condition="not:fieldName|nothing">
+    <tal:nonat condition="not:fieldName|nothing"
+               define="text_format text_format | python: getattr(here,'text_format','html');">
      <label for="text_format" i18n:translate="label_format">Format</label>
 
      <div class="formHelp" i18n:translate="help_format">

From duncan at codespeak.net  Tue Jul 17 11:38:28 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Tue, 17 Jul 2007 11:38:28 +0200 (CEST)
Subject: [kupu-checkins] r45155 - in kupu/trunk/kupu: doc plone
	plone/kupu_plone_layer
Message-ID: <20070717093828.4EFD08114@code0.codespeak.net>

Author: duncan
Date: Tue Jul 17 11:38:27 2007
New Revision: 45155

Modified:
   kupu/trunk/kupu/doc/CHANGES.txt
   kupu/trunk/kupu/doc/PLONE2.txt
   kupu/trunk/kupu/plone/exportimport.py
   kupu/trunk/kupu/plone/kupu_plone_layer/kupucollection.xml.pt
   kupu/trunk/kupu/plone/librarytool.py
   kupu/trunk/kupu/plone/plonedrawers.py
   kupu/trunk/kupu/plone/plonelibrarytool.py
   kupu/trunk/kupu/plone/resource_types.pt
Log:
Made the default image scale configurable.

Modified: kupu/trunk/kupu/doc/CHANGES.txt
==============================================================================
--- kupu/trunk/kupu/doc/CHANGES.txt	(original)
+++ kupu/trunk/kupu/doc/CHANGES.txt	Tue Jul 17 11:38:27 2007
@@ -8,6 +8,8 @@
     Also removed the hardwired html for the transform and use a
     template instead (so it can be customised).
 
+  - Default image size is now configurable
+
 - 1.4rc1
 
   - Added a 'manage anchors' tab to the anchor drawer

Modified: kupu/trunk/kupu/doc/PLONE2.txt
==============================================================================
--- kupu/trunk/kupu/doc/PLONE2.txt	(original)
+++ kupu/trunk/kupu/doc/PLONE2.txt	Tue Jul 17 11:38:27 2007
@@ -339,6 +339,10 @@
         Defaults to 'image'. N.B. This is a literal string, not a tal
         expression.
 
+    default scale
+        Defaults to 'image_preview'. Use either blank or 'original'
+        for full size images.
+
     classes
         An optional list of class names to be allowed for this media
         type. The class names will be applied in addition to

Modified: kupu/trunk/kupu/plone/exportimport.py
==============================================================================
--- kupu/trunk/kupu/plone/exportimport.py	(original)
+++ kupu/trunk/kupu/plone/exportimport.py	Tue Jul 17 11:38:27 2007
@@ -171,12 +171,14 @@
             previewaction = kupu.getPreviewForType(portal_type)
             normalaction = kupu.getNormalViewForType(portal_type)
             scalefield = kupu.getScaleFieldForType(portal_type)
+            defscale = kupu.getDefaultScaleForType(portal_type)
             classes = kupu.getClassesForType(portal_type)
             mediatype = kupu.getMediaForType(portal_type)
             res.append(dict(portal_type=portal_type,
                 previewaction=previewaction,
                 normalaction=normalaction,
                 scalefield=scalefield,
+                defscale=defscale,
                 classes=classes,
                 mediatype=mediatype,
             ))
@@ -252,6 +254,7 @@
                     'preview': { KEY:'expression', DEFAULT: ''},
                     'normal': { DEFAULT: ''},
                     'scalefield': { DEFAULT: 'image' },
+                    'defscale': { DEFAULT: 'image_preview' },
                     'previewclass': { KEY: 'classes', DEFAULT: ()},
                     'mediatype': { DEFAULT: ''},
                 },

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupucollection.xml.pt
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupucollection.xml.pt	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupucollection.xml.pt	Tue Jul 17 11:38:27 2007
@@ -64,18 +64,19 @@
           <anchor tal:condition="info/anchor|nothing" />
           <src tal:condition="info/src" tal:content="info/src" />
           <tal:sizes tal:condition="info/sizes|nothing">
-            <sizes>
+            <sizes tal:define="src request/src|python:''; tail python:src.split('/')[-1];
+                  defscale info/defscale;">
               <size tal:repeat="size info/sizes">
                  <selected
-                     tal:define="src request/src|python:''; uri size/uri;"
-                      tal:condition="python:src.split('/')[-1]==uri.split('/')[-1]" />
+                     tal:define="uri size/uri; action size/action;"
+                      tal:condition="python:action==test(src, tail, defscale)" />
                 <label tal:content="size/label" />
                 <uri tal:content="size/uri" />
               </size>
               <size tal:condition="kupu/getAllowOriginalImageSize|nothing">
                  <selected
-                     tal:define="src request/src|python:''; uri info/url;"
-                      tal:condition="python:src.split('/')[-1]==uri.split('/')[-1]" />
+                     tal:define="uri info/url;"
+                      tal:condition="python:test(src, tail==uri.split('/')[-1], defscale in ('original', ''))" />
                 <label i18n:translate="option_original">Original</label>
                 <uri tal:content="info/url" />
               </size>

Modified: kupu/trunk/kupu/plone/librarytool.py
==============================================================================
--- kupu/trunk/kupu/plone/librarytool.py	(original)
+++ kupu/trunk/kupu/plone/librarytool.py	Tue Jul 17 11:38:27 2007
@@ -256,6 +256,7 @@
             if normal:
                 normal = Expression(normal)
             scalefield = a.get('scalefield', 'image')
+            defscale = a.get('defscale', 'image_preview')
             classes = a.get('classes', '')
             if isinstance(classes, basestring):
                 classes = classes.split('\n')
@@ -267,6 +268,7 @@
                 'expression': Expression(preview),
                 'normal': normal,
                 'scalefield': scalefield,
+                'defscale': defscale,
                 'classes': classes,
                 'mediatype': mediatype,
             }

Modified: kupu/trunk/kupu/plone/plonedrawers.py
==============================================================================
--- kupu/trunk/kupu/plone/plonedrawers.py	(original)
+++ kupu/trunk/kupu/plone/plonedrawers.py	Tue Jul 17 11:38:27 2007
@@ -293,7 +293,8 @@
         results = []
         for width, height, key, action in sizes:
             results.append({'label':"%s (%s, %s)" % (key.capitalize(), width, height),
-                            'uri':"%s/%s" % (url, action)})
+                            'uri':"%s/%s" % (url, action),
+                            'action': action},)
         return results
     
     def getState(self, review_state):
@@ -348,6 +349,8 @@
                 normal = url
 
             sizes = self.get_image_sizes(obj, portal_type, url)
+            defscale = self.tool.getDefaultScaleForType(portal_type)
+
             media = self.media(portal_type)
             classes = self.classes(portal_type)
 
@@ -376,6 +379,7 @@
                 'height': height,
                 'preview': preview,
                 'sizes': sizes,
+                'defscale': defscale,
                 'media': media,
                 'classes': classes,
                 'title': title,
@@ -429,6 +433,7 @@
             normal = url
 
         sizes = self.get_image_sizes(brain, portal_type, url)
+        defscale = self.tool.getDefaultScaleForType(portal_type)
         media = self.media(portal_type)
         classes = self.classes(portal_type)
 
@@ -456,6 +461,7 @@
             'height': height,
             'preview': preview,
             'sizes': sizes,
+            'defscale': defscale,
             'media': media,
             'classes': classes,
             'title': title,

Modified: kupu/trunk/kupu/plone/plonelibrarytool.py
==============================================================================
--- kupu/trunk/kupu/plone/plonelibrarytool.py	(original)
+++ kupu/trunk/kupu/plone/plonelibrarytool.py	Tue Jul 17 11:38:27 2007
@@ -706,6 +706,12 @@
         value = action_map.get(portal_type, {}).get('scalefield', 'image')
         return value
 
+    security.declareProtected(permissions.ManageLibraries, "getDefaultScaleForType")
+    def getDefaultScaleForType(self, portal_type):
+        action_map = getattr(self, '_preview_actions', {})
+        value = action_map.get(portal_type, {}).get('defscale', 'image_preview')
+        return value
+
     security.declareProtected(permissions.ManageLibraries, "getClassesForType")
     def getClassesForType(self, portal_type):
         action_map = getattr(self, '_preview_actions', {})

Modified: kupu/trunk/kupu/plone/resource_types.pt
==============================================================================
--- kupu/trunk/kupu/plone/resource_types.pt	(original)
+++ kupu/trunk/kupu/plone/resource_types.pt	Tue Jul 17 11:38:27 2007
@@ -171,18 +171,19 @@
                              previewaction python:context.getPreviewForType(portal_type);
                              normalaction python:context.getNormalViewForType(portal_type);
                              scalefield python:context.getScaleFieldForType(portal_type);
+                             defscale python:context.getDefaultScaleForType(portal_type);
                              classes python:context.getClassesForType(portal_type);
                              mediatype python:context.getMediaForType(portal_type);"
                              tal:condition="python:context.getPreviewForType(portal_type)"
                              tal:attributes="class python:test(oddrow, 'even', 'odd');">
                         <tr>
-                           <td rowspan="5">
+                           <td rowspan="6">
                               <input type="hidden" name="preview_action.marker:records" value="x" />
                               <input type="hidden" name="preview_action.portal_type:records" tal:attributes="value id" />
                               <input type="checkbox" name="preview_types:list"
                                      tal:attributes="value id" />
                            </td>
-                           <td rowspan="5" tal:content="fulltitle"></td>
+                           <td rowspan="6" tal:content="fulltitle"></td>
                            <td style="border-right: none;" width="1%"
                                i18n:translate="preview_subheading">preview</td>
                            <td>
@@ -211,6 +212,16 @@
                         </tr>
                         <tr>
                            <td style="border-right: none;" width="1%"
+                               i18n:translate="defscale_subheading">default scale</td>
+                           <td>
+                              <input type="text"
+                                     name="preview_action.defscale:records"
+                                     style="width:90%"
+                                     tal:attributes="value defscale" />
+                           </td>
+                        </tr>
+                        <tr>
+                           <td style="border-right: none;" width="1%"
                                i18n:translate="classes_subheading">classes</td>
                            <td>
                               <textarea name="preview_action.classes:records"
@@ -238,18 +249,18 @@
                   <tbody  tal:define="oddrow python:len(previewable)%2;"
                           tal:attributes="class python:test(oddrow, 'even', 'odd');">
                      <tr>
-                        <td rowspan="5">
+                        <td rowspan="6">
                            <input type="hidden" name="preview_action.marker:records" value="-"/>
                         </td>
-                        <td rowspan="5">
+                        <td rowspan="6">
                            <select name="preview_action.portal_type:records" style="width:15em">
                               <option i18n:translate="select_type" value="">(select type)</option>
                               <tal:block repeat="ti typeinfos">
-                                    <option tal:define="title python:ti[0]; id python:ti[1];
-                                            fulltitle python:title + test(title==id,'',' (%s)'%id);"
-                                            tal:content="fulltitle"
-                                            tal:condition="not:python:context.getPreviewForType(id)"
-                                            tal:attributes="value id;"></option>
+                                 <option tal:define="title python:ti[0]; id python:ti[1];
+                                         fulltitle python:title + test(title==id,'',' (%s)'%id);"
+                                         tal:content="fulltitle"
+                                         tal:condition="not:python:context.getPreviewForType(id)"
+                                         tal:attributes="value id;"></option>
                               </tal:block>
                            </select>
                         </td>
@@ -276,27 +287,36 @@
                                   style="width:90%" value="image" />
                         </td>
                      </tr>
-                        <tr>
-                           <td style="border-right: none;" width="1%"
-                               i18n:translate="classes_subheading">classes</td>
-                           <td>
-                              <textarea type="text" name="preview_action.classes:records"
+                     <tr>
+                        <td style="border-right: none;" width="1%"
+                            i18n:translate="defscale_subheading">default scale</td>
+                        <td>
+                           <input type="text"
+                                  name="preview_action.defscale:records"
+                                  style="width:90%" value="image_preview" />
+                        </td>
+                     </tr>
+                     <tr>
+                        <td style="border-right: none;" width="1%"
+                            i18n:translate="classes_subheading">classes</td>
+                        <td>
+                           <textarea type="text" name="preview_action.classes:records"
                                      style="width:90%"></textarea>
-                           </td>
-                        </tr>
-                        <tr>
-                           <td style="border-right: none;" width="1%"
-                               i18n:translate="type_subheading">type</td>
-                           <td>
-                              <select name="preview_action.mediatype:records" size="1">
-                                 <option value="image"
-                                         selected="selected"
-                                         i18n:translate="image_option">Image</option>
-                                 <option value="flash"
-                                         i18n:translate="flash_option">Flash</option>
-                              </select>
-                           </td>
-                        </tr>
+                        </td>
+                     </tr>
+                     <tr>
+                        <td style="border-right: none;" width="1%"
+                            i18n:translate="type_subheading">type</td>
+                        <td>
+                           <select name="preview_action.mediatype:records" size="1">
+                              <option value="image"
+                                      selected="selected"
+                                      i18n:translate="image_option">Image</option>
+                              <option value="flash"
+                                      i18n:translate="flash_option">Flash</option>
+                           </select>
+                        </td>
+                     </tr>
                   </tbody>
                   <tbody>
                      <tr>

From kupu-checkins at codespeak.net  Tue Jul 17 23:55:37 2007
From: kupu-checkins at codespeak.net (kupu-checkins at codespeak.net)
Date: Tue, 17 Jul 2007 23:55:37 +0200 (CEST)
Subject: [kupu-checkins] Doctor Goldie : 55% off your order 97345831558
Message-ID: <20070717125744.2695.qmail@cdm39.neoplus.adsl.tpnet.pl>

An HTML attachment was scrubbed...
URL: http://codespeak.net/pipermail/kupu-checkins/attachments/20070717/efe93371/attachment-0001.htm 

From duncan at codespeak.net  Wed Jul 18 11:46:50 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Wed, 18 Jul 2007 11:46:50 +0200 (CEST)
Subject: [kupu-checkins] r45177 - kupu/trunk/kupu/common
Message-ID: <20070718094650.9CBBE80DE@code0.codespeak.net>

Author: duncan
Date: Wed Jul 18 11:46:50 2007
New Revision: 45177

Modified:
   kupu/trunk/kupu/common/kupueditor.js
Log:
Changed resumeEditing to restore the selection before making it editable again: setting the contentEditable attribute on the body *sometimes* makes IE's saved range invalid.

Modified: kupu/trunk/kupu/common/kupueditor.js
==============================================================================
--- kupu/trunk/kupu/common/kupueditor.js	(original)
+++ kupu/trunk/kupu/common/kupueditor.js	Wed Jul 18 11:46:50 2007
@@ -846,8 +846,8 @@
         }
         if (this.getBrowserName() == "IE") {
             var body = this.getInnerDocument().getElementsByTagName('body')[0];
-            body.setAttribute('contentEditable', 'true');
             this._restoreSelection();
+            body.setAttribute('contentEditable', 'true');
         } else {
             var doc = this.getInnerDocument();
             this.getDocument().execCommand('contentReadOnly', 'false');

From duncan at codespeak.net  Fri Jul 20 18:48:05 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Fri, 20 Jul 2007 18:48:05 +0200 (CEST)
Subject: [kupu-checkins] r45218 - kupu/trunk/kupu/plone/kupu_plone_layer
Message-ID: <20070720164805.78F708157@code0.codespeak.net>

Author: duncan
Date: Fri Jul 20 18:48:04 2007
New Revision: 45218

Modified:
   kupu/trunk/kupu/plone/kupu_plone_layer/contentUsesKupu.py
Log:
Fix for Plone ticket #6801   'contentUsesKupu' shouldn't expect string type

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/contentUsesKupu.py
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/contentUsesKupu.py	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/contentUsesKupu.py	Fri Jul 20 18:48:04 2007
@@ -32,7 +32,10 @@
   return True
 text_format = REQUEST.get('%s_text_format' % fieldname, context.getContentType(fieldname))
 content = field.getEditAccessor(context)()
-if content.startswith('<!--'):
+try:
+    if content.startswith('<!--'):
+        return False
+except AttributeError:
     return False
 return len(content)==0 or 'html' in text_format.lower()
 

From kupu-checkins at codespeak.net  Sat Jul 21 10:14:35 2007
From: kupu-checkins at codespeak.net (kupu-checkins at codespeak.net)
Date: Sat, 21 Jul 2007 10:14:35 +0200 (CEST)
Subject: [kupu-checkins] Mail-id : 39889609090 - Best Summer Opportunity
Message-ID: <20070721121533.10119.qmail@ctb-cache8-vif1.saix.net>

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

From kupu-checkins at codespeak.net  Tue Jul 24 09:01:36 2007
From: kupu-checkins at codespeak.net (Canadian Doctor Yesenia)
Date: Tue, 24 Jul 2007 09:01:36 +0200 (CEST)
Subject: [kupu-checkins] MedHelp 6908906
Message-ID: <20070724100743.33440.qmail@host154-213-dynamic.20-87-r.retail.telecomitalia.it>

An HTML attachment was scrubbed...
URL: http://codespeak.net/pipermail/kupu-checkins/attachments/20070724/2fd48b19/attachment.htm 

From duncan at codespeak.net  Tue Jul 24 11:44:44 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Tue, 24 Jul 2007 11:44:44 +0200 (CEST)
Subject: [kupu-checkins] r45296 - kupu/trunk/kupu/common
Message-ID: <20070724094444.3D59D8112@code0.codespeak.net>

Author: duncan
Date: Tue Jul 24 11:44:43 2007
New Revision: 45296

Modified:
   kupu/trunk/kupu/common/kupudrawerstyles.css
Log:
Plone ticket 6535: Can't upload image via visual editor in inline edit
Inline edit was hiding the title and description fields. Change CSS to forcibly make them visible again.

Modified: kupu/trunk/kupu/common/kupudrawerstyles.css
==============================================================================
--- kupu/trunk/kupu/common/kupudrawerstyles.css	(original)
+++ kupu/trunk/kupu/common/kupudrawerstyles.css	Tue Jul 24 11:44:43 2007
@@ -322,6 +322,7 @@
   font-weight: normal;
   vertical-align:middle;
   margin-right: 2px;
+  display: inline;
 }
 #kupu-breadcrumbs {
   text-align: left; clear:left;

From duncan at codespeak.net  Tue Jul 24 12:38:54 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Tue, 24 Jul 2007 12:38:54 +0200 (CEST)
Subject: [kupu-checkins] r45298 - in kupu/trunk/kupu/plone: .
	kupu_plone_layer
Message-ID: <20070724103854.090FE812D@code0.codespeak.net>

Author: duncan
Date: Tue Jul 24 12:38:54 2007
New Revision: 45298

Modified:
   kupu/trunk/kupu/plone/body.kupu
   kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
Log:
Plone ticket 6739
Hide the "edit without visual editor" link when there is only one format available (and since we only show the link when editing html, by definition if there is one format it is text/html).

Modified: kupu/trunk/kupu/plone/body.kupu
==============================================================================
--- kupu/trunk/kupu/plone/body.kupu	(original)
+++ kupu/trunk/kupu/plone/body.kupu	Tue Jul 24 12:38:54 2007
@@ -65,8 +65,8 @@
 
   <kupu:part name="suppress-kupu">
     <div class="kupuoverride"
-        tal:condition="python:exists('kupu_content') and len(kupu_content)==0"
-        tal:define="floated widget/allow_file_upload | python:1;"
+        tal:condition="python:exists('kupu_content') and len(kupu_content)==0 and gAC and len(gAC(here))!=1"
+        tal:define="floated widget/allow_file_upload | python:1;gAC nocall:field/getAllowedContentTypes|nothing"
         tal:attributes="style python:test(floated, 'float:left;;', '');"
       ><span class="discreet"><a class="forcekupu" href="#"
         i18n:translate="suppress-kupu" i18n:attributes="title title_suppress_kupu;"

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html	Tue Jul 24 12:38:54 2007
@@ -27,7 +27,7 @@
     <!--$Id: drawers.kupu 44538 2007-06-26 10:46:28Z duncan $-->
     <!--$Id: beforeunload.kupu 14546 2005-07-12 14:35:55Z duncan $-->
     <!--$Id: sourceedit.kupu 44538 2007-06-26 10:46:28Z duncan $-->
-    <!--$Id: wysiwyg_support.kupu 44538 2007-06-26 10:46:28Z duncan $-->
+    <!--$Id: wysiwyg_support.kupu 45010 2007-07-13 11:23:06Z duncan $-->
     
 
     <div xmlns:metal="http://xml.zope.org/namespaces/metal" xmlns:tal="http://xml.zope.org/namespaces/tal" metal:define-macro="wysiwygEditorBox" id="kupu-editor" tal:define="name fieldName|inputname;                 editorid string:kupu-editor-${name}" tal:attributes="id editorid">
@@ -477,7 +477,7 @@
     </textarea>
     </div>
   
-    <div class="kupuoverride" tal:condition="python:exists('kupu_content') and len(kupu_content)==0" tal:define="floated widget/allow_file_upload | python:1;" tal:attributes="style python:test(floated, 'float:left;;', '');"><span class="discreet"><a class="forcekupu" href="#" i18n:translate="suppress-kupu" i18n:attributes="title title_suppress_kupu;" tal:define="fs fieldset|nothing;fs python:test(fs,'&amp;fieldset=%s'%fs,None);" tal:attributes="href string:${request/URL0}?kupu.suppress=${fieldName}${fs};" title="reload current page without kupu">
+    <div class="kupuoverride" tal:condition="python:exists('kupu_content') and len(kupu_content)==0 and gAC and len(gAC(here))!=1" tal:define="floated widget/allow_file_upload | python:1;gAC nocall:field/getAllowedContentTypes|nothing" tal:attributes="style python:test(floated, 'float:left;;', '');"><span class="discreet"><a class="forcekupu" href="#" i18n:translate="suppress-kupu" i18n:attributes="title title_suppress_kupu;" tal:define="fs fieldset|nothing;fs python:test(fs,'&amp;fieldset=%s'%fs,None);" tal:attributes="href string:${request/URL0}?kupu.suppress=${fieldName}${fs};" title="reload current page without kupu">
          Edit without visual editor
       </a></span>
     </div>

From duncan at codespeak.net  Fri Jul 27 11:16:56 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Fri, 27 Jul 2007 11:16:56 +0200 (CEST)
Subject: [kupu-checkins] r45376 - in kupu/trunk/kupu/plone: .
	kupu_plone_layer profiles/default
Message-ID: <20070727091656.E33FE830C@code0.codespeak.net>

Author: duncan
Date: Fri Jul 27 11:16:56 2007
New Revision: 45376

Modified:
   kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
   kupu/trunk/kupu/plone/kupu_plone_layer/sample-kupu-customisation-policy.py
   kupu/trunk/kupu/plone/plonelibrarytool.py
   kupu/trunk/kupu/plone/profiles/default/kupu.xml
Log:
Plone ticket 6756: Kupu Pull-quote style not working in IE
Turned the default pull-quote from blockquote.pullQuote into div.pullQuote because setting styles doesn't work cleanly with blockquote tags.

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html	Fri Jul 27 11:16:56 2007
@@ -21,7 +21,7 @@
     <!--$Id: wire.kupu 25247 2006-04-03 11:23:02Z fschulze $-->
     <!--$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 44538 2007-06-26 10:46:28Z duncan $-->
+    <!--$Id: body.kupu 45298 2007-07-24 10:38:54Z duncan $-->
     <!--$Id: toolbar.kupu 44538 2007-06-26 10:46:28Z duncan $-->
     <!--$Id save.kupu (not yet in svn) $-->
     <!--$Id: drawers.kupu 44538 2007-06-26 10:46:28Z duncan $-->

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/sample-kupu-customisation-policy.py
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/sample-kupu-customisation-policy.py	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/sample-kupu-customisation-policy.py	Fri Jul 27 11:16:56 2007
@@ -75,7 +75,7 @@
     "Subheading|h3",
     "Literal|pre",
     "Discreet|p|discreet",
-    "Pull-quote|blockquote|pullquote",
+    "Pull-quote|div|pullquote",
     "Call-out|p|callout",
     "Highlight|span|visualHighlight",
     "Odd row|tr|odd",

Modified: kupu/trunk/kupu/plone/plonelibrarytool.py
==============================================================================
--- kupu/trunk/kupu/plone/plonelibrarytool.py	(original)
+++ kupu/trunk/kupu/plone/plonelibrarytool.py	Fri Jul 27 11:16:56 2007
@@ -94,7 +94,7 @@
     "Subheading|h3",
     "Literal|pre",
     "Discreet|p|discreet",
-    "Pull-quote|blockquote|pullquote",
+    "Pull-quote|div|pullquote",
     "Call-out|p|callout",
     "Highlight|span|visualHighlight",
     "Odd row|tr|odd",

Modified: kupu/trunk/kupu/plone/profiles/default/kupu.xml
==============================================================================
--- kupu/trunk/kupu/plone/profiles/default/kupu.xml	(original)
+++ kupu/trunk/kupu/plone/profiles/default/kupu.xml	Fri Jul 27 11:16:56 2007
@@ -10,7 +10,7 @@
     <style>Subheading|h3</style>
     <style>Literal|pre</style>
     <style>Discreet|p|discreet</style>
-    <style>Pull-quote|blockquote|pullquote</style>
+    <style>Pull-quote|div|pullquote</style>
     <style>Call-out|p|callout</style>
     <style>Highlight|span|visualHighlight</style>
     <style>Odd row|tr|odd</style>

From duncan at codespeak.net  Fri Jul 27 11:20:53 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Fri, 27 Jul 2007 11:20:53 +0200 (CEST)
Subject: [kupu-checkins] r45378 - kupu/trunk/kupu/doc
Message-ID: <20070727092053.2D84F82FF@code0.codespeak.net>

Author: duncan
Date: Fri Jul 27 11:20:52 2007
New Revision: 45378

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

Modified: kupu/trunk/kupu/doc/CHANGES.txt
==============================================================================
--- kupu/trunk/kupu/doc/CHANGES.txt	(original)
+++ kupu/trunk/kupu/doc/CHANGES.txt	Fri Jul 27 11:20:52 2007
@@ -2,7 +2,7 @@
 Kupu changes
 ============
 
-- Recent changes
+- 1.4rc2
 
   - Fixed broken code for determining the width of captioned images.
     Also removed the hardwired html for the transform and use a
@@ -10,6 +10,18 @@
 
   - Default image size is now configurable
 
+  - Plone tickets
+
+    * 6756: Kupu Pull-quote style not working in IE
+
+    * 6739 Hide the "edit without visual editor" link when there is only one format available
+
+    * 6535: Can't upload image via visual editor in inline edit
+
+    * 6801 'contentUsesKupu' shouldn't expect string type
+
+    * 6759: Kupu caption CSS needs some love.
+
 - 1.4rc1
 
   - Added a 'manage anchors' tab to the anchor drawer

From duncan at codespeak.net  Mon Jul 30 16:24:51 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Mon, 30 Jul 2007 16:24:51 +0200 (CEST)
Subject: [kupu-checkins] r45438 - kupu/tag/kupu-1.4rc2
Message-ID: <20070730142451.BA1D380C1@code0.codespeak.net>

Author: duncan
Date: Mon Jul 30 16:24:51 2007
New Revision: 45438

Added:
   kupu/tag/kupu-1.4rc2/
      - copied from r45437, kupu/trunk/kupu/
Log:
Forgot to tag the release

From duncan at codespeak.net  Mon Jul 30 17:25:43 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Mon, 30 Jul 2007 17:25:43 +0200 (CEST)
Subject: [kupu-checkins] r45440 - kupu/trunk/kupu/common/kupudrawers
Message-ID: <20070730152543.318A580A3@code0.codespeak.net>

Author: duncan
Date: Mon Jul 30 17:25:41 2007
New Revision: 45440

Modified:
   kupu/trunk/kupu/common/kupudrawers/drawer.xsl
Log:
Style changes to upload form

Modified: kupu/trunk/kupu/common/kupudrawers/drawer.xsl
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers/drawer.xsl	(original)
+++ kupu/trunk/kupu/common/kupudrawers/drawer.xsl	Mon Jul 30 17:25:41 2007
@@ -499,7 +499,6 @@
     
     <!-- image upload form -->
     <xsl:template match="uploadbutton" mode="image-upload">
-        <div class="overflow">
             <div id="kupu-upload-instructions" i18n:translate="imagedrawer_upload_instructions">
                 Select an image from your computer and click ok to have it automatically uploaded to
                 selected folder and inserted into the editor. </div>
@@ -509,23 +508,24 @@
                 border: 0;">
               <xsl:attribute name="action"><xsl:value-of select="uri"/></xsl:attribute>
                 <label i18n:translate="imagedrawer_upload_to_label">Upload
-                    to: <span i18n:name="folder">
+                    to: <span tal:omit-tag="" i18n:name="folder">
                         <xsl:value-of select="/libraries/*[@selected]/title"/>
-                    </span></label>
-                <input id="kupu-upload-file" type="file" name="node_prop_image" size="20"/>
-                <br/>
+                    </span>
+                    <input id="kupu-upload-file" type="file" name="node_prop_image" size="20"/>
+                </label>
                 <label>
-                   <span i18n:translate="imagedrawer_upload_title_label">Title</span>
+                   <span tal:omit-tag=""
+                         i18n:translate="imagedrawer_upload_title_label">Title</span>
                    <input id="kupu-upload-title" type="text" name="node_prop_title" size="23" value=""/>
                 </label>
                 <label>
-                   <span i18n:translate="imagedrawer_upload_desc_label">Description</span><br />
+                   <span tal:omit-tag=""
+                         i18n:translate="imagedrawer_upload_desc_label">Description</span>
                    <textarea rows="5" cols="40" name="node_prop_desc">&#160;</textarea>
                 </label>
             </form>
             <iframe id="kupu_upload_form_target" name="kupu_upload_form_target" src="javascript:''"
                 scrolling="off" frameborder="0" width="0px" height="0px" display="None">&#160;</iframe>
-        </div>
     </xsl:template>
     <xsl:template match="breadcrumbs">
         <span>

From duncan at codespeak.net  Tue Jul 31 09:12:34 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Tue, 31 Jul 2007 09:12:34 +0200 (CEST)
Subject: [kupu-checkins] r45441 - kupu/trunk/kupu/plone/kupu_plone_layer
Message-ID: <20070731071234.7F95480E2@code0.codespeak.net>

Author: duncan
Date: Tue Jul 31 09:12:33 2007
New Revision: 45441

Modified:
   kupu/trunk/kupu/plone/kupu_plone_layer/kupu_migration.xml.pt
Log:
Fix plone ticket #6833.
Error: explicit message id and tal:content can't be used together
so I've put a span with the i18n message id into the content.

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupu_migration.xml.pt
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupu_migration.xml.pt	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupu_migration.xml.pt	Tue Jul 31 09:12:33 2007
@@ -154,8 +154,8 @@
                   <span tal:content="link/before" /><a
                      target="badlink"
                      tal:attributes="href link/url"
-                     tal:content="link/text|default"
-                     i18n:translate="no_text_in_link">[no text in link]</a><span
+                     tal:content="link/text|default">
+                     <span i18n:translate="no_text_in_link">[no text in link]</span></a><span
                      tal:content="link/after" />
                   </code>
                 </li>