From duncan at codespeak.net  Tue May  1 11:15:07 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Tue,  1 May 2007 11:15:07 +0200 (CEST)
Subject: [kupu-checkins] r42518 - kupu/trunk/kupu/doc
Message-ID: <20070501091507.89B998075@code0.codespeak.net>

Author: duncan
Date: Tue May  1 11:15:07 2007
New Revision: 42518

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	Tue May  1 11:15:07 2007
@@ -2,6 +2,16 @@
 Kupu changes
 ============
 
+- 1.4 Beta 6
+
+  - Removed the getToolByName deprecation workround since
+    getToolByName is now officially undeprecated again.
+
+  - Removed most of the illegally nested forms produced by the xsl. 
+    I hope this will stop IE6 crashing. The image upload form is still
+    there as it is going to take more major surgery to get rid of that 
+    one.
+
 - 1.4 Beta 5
 
   - Adjusted some more Plone tests to work on Plone 3.0.

From duncan at codespeak.net  Tue May  1 17:38:18 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Tue,  1 May 2007 17:38:18 +0200 (CEST)
Subject: [kupu-checkins] r42542 - in kupu/branch/duncan-flash: common
	common/kupudrawers plone/kupu_plone_layer/plonekupuimages
Message-ID: <20070501153818.0A3A08076@code0.codespeak.net>

Author: duncan
Date: Tue May  1 17:38:18 2007
New Revision: 42542

Added:
   kupu/branch/duncan-flash/plone/kupu_plone_layer/plonekupuimages/flash-placeholder.png   (contents, props changed)
Modified:
   kupu/branch/duncan-flash/common/kupubasetools.js
   kupu/branch/duncan-flash/common/kupudrawers.js
   kupu/branch/duncan-flash/common/kupudrawers/drawer.xsl
Log:
Still work in progress, but basically working if anyone wants to try out Flash in kupu.


Modified: kupu/branch/duncan-flash/common/kupubasetools.js
==============================================================================
--- kupu/branch/duncan-flash/common/kupubasetools.js	(original)
+++ kupu/branch/duncan-flash/common/kupubasetools.js	Tue May  1 17:38:18 2007
@@ -1254,6 +1254,18 @@
         imageWindow.focus();
     };
 
+    this.newNode = function(name, obj) {
+        var ed = this.editor;
+        var currobj = ed.getNearestParentOfType(ed.getSelectedNode(), name);
+        if (currobj) {
+            var p = currobj.parentNode;
+            p.insertBefore(obj, currobj);
+            p.removeChild(currobj);
+            return obj;
+        } else {
+            return ed.insertNodeAtSelection(obj, 1);
+        }
+    }
     this.createImage = function(url, alttext, imgclass) {
         /* create an image */
         var img = this.editor.getInnerDocument().createElement('img');
@@ -1266,16 +1278,20 @@
         if (imgclass) {
             img.className = imgclass;
         };
-        img = this.editor.insertNodeAtSelection(img, 1);
+        this.newNode('IMG', img);
         this.editor.logMessage(_('Image inserted'));
         return img;
     };
 
-    this.createObject = function(url, type, alttext, className, width, height) {
+    this.create_flash = function(url, alttext, className, width, height) {
         var ed = this.editor;
         var obj = ed.newElement('object',
-            {src:url, alt:alttext, className:className, width:width, height:height, type:type}
-            [ed.newElement('param', {name:'movie', value:url})]);
+            {src:url, alt:alttext, className:className, width:width, height:height, type:'application/x-shockwave-flash',
+            'data':url},
+            [ed.newElement('param', {name:'movie', value:url}),
+            ed.newElement('img', {src:'plonekupuimages/flash-placeholder.png',width:width,height:height})]);
+        this.newNode('OBJECT', obj);
+        this.editor.logMessage(_('Flash inserted'));
     }
 
     this.setImageClass = function(imgclass) {

Modified: kupu/branch/duncan-flash/common/kupudrawers.js
==============================================================================
--- kupu/branch/duncan-flash/common/kupudrawers.js	(original)
+++ kupu/branch/duncan-flash/common/kupudrawers.js	Tue May  1 17:38:18 2007
@@ -1265,17 +1265,20 @@
     }
 
     this.createContent = function() {
-        var currnode = this.editor.getSelectedNode();
-        var currimg = this.editor.getNearestParentOfType(currnode, 'IMG');
-        this.selectedSrc = currimg?currimg.src:null;
+        var ed = this.editor;
+        var currnode = ed.getSelectedNode();
+        var currimg = ed.getNearestParentOfType(currnode, 'OBJECT') || ed.getNearestParentOfType(currnode, 'IMG');
+        this.selectedSrc = currimg.data||currimg.src||null;
         this.options = {};
         if (currimg) {
+            ed.getSelection().selectNodeContents(currimg);
             var className = currimg.className;
             var align = /\bimage-(left|right|inline)\b/.exec(className);
             if (align && align.length > 1) {
                 this.options['image-align'] = align[1];
             };
             this.options['image-caption'] = /\bcaptioned\b/.test(className);
+            this.options['image-class'] = className.replace(/\b(image-(left|right|inline)|captioned)\b/g,'').strip();
         }
         ImageLibraryDrawer.prototype.createContent.call(this);
     };
@@ -1354,8 +1357,18 @@
         if (caption && caption.length>0 && caption[0].checked) {
             imgclass += " captioned";
         };
-
-        this.tool.createImage(uri, alt, imgclass);
+        var classnames = document.getElementById('kupu-image-class');
+        if (classnames && classnames.selectedIndex >= 0) {
+            imgclass += " "+classnames.options[classnames.selectedIndex].value;
+        }
+        var media = document.getElementById('kupu-media').value;
+        var width = document.getElementById('kupu-width').value;
+        var height = document.getElementById('kupu-height').value;
+        if (this.tool['create_'+media]) {
+            this.tool['create_'+media](uri, alt, imgclass, width, height);
+        } else {
+            this.tool.createImage(uri, alt, imgclass);
+        }
         this.drawertool.closeDrawer();
     };
 };

Modified: kupu/branch/duncan-flash/common/kupudrawers/drawer.xsl
==============================================================================
--- kupu/branch/duncan-flash/common/kupudrawers/drawer.xsl	(original)
+++ kupu/branch/duncan-flash/common/kupudrawers/drawer.xsl	Tue May  1 17:38:18 2007
@@ -51,6 +51,7 @@
     <xsl:param name="showanchors">yes</xsl:param>
     <xsl:param name="image-align">inline</xsl:param>
     <xsl:param name="image-caption">true</xsl:param>
+    <xsl:param name="image-class"></xsl:param>
     <xsl:param name="link_target"></xsl:param>
     <xsl:param name="link_name"></xsl:param>
     <xsl:variable name="titlelength" select="60"/>
@@ -301,6 +302,9 @@
         <div>
             <form onsubmit="return false;">
                 <div>
+                   <input id="kupu-media" type="hidden" value="{media}" />
+                   <input id="kupu-width" type="hidden" value="{width}" />
+                   <input id="kupu-height" type="hidden" value="{height}" />
                     <label style="display: block;margin-top: 1em;">Image alignment</label>
                     <input type="radio" name="image-align" id="image-align-left" value="image-left">
                         <xsl:if test="$image-align='left'">
@@ -327,25 +331,32 @@
                     </div>
                 </div>
                 <xsl:if test="$usecaptions='yes'">
-                    <div>
-                        <input type="checkbox" name="image-caption" id="image-caption">
-                            <xsl:if test="$image-caption='true'">
-                                <xsl:attribute name="checked">checked</xsl:attribute>
-                            </xsl:if>
-                            <xsl:attribute name="onclick">document.getElementById('image_alt_div').style.display =
+                   <div>
+                      <input type="checkbox" name="image-caption" id="image-caption">
+                         <xsl:if test="$image-caption='true'">
+                            <xsl:attribute name="checked">checked</xsl:attribute>
+                         </xsl:if>
+                         <xsl:attribute name="onclick">document.getElementById('image_alt_div').style.display =
                             this.checked?'none':'';</xsl:attribute>
-                        </input>
-                        <label for="image-caption" i18n:translate="imagedrawer_caption_label">Caption</label>
-                    </div>
+                      </input>
+                      <label for="image-caption" i18n:translate="imagedrawer_caption_label">Caption</label>
+                   </div>
                 </xsl:if>
                 <xsl:if test="sizes">
                     <label for="image-size-selector"
-                            style="display: block;margin-top: 1em;">Image size</label>
+                            style="margin-top: 1em;">Image size:</label>&#xa0;
                     <select name="image-size-selector">
                         <option name="image-size-option" value="{uri}">Original</option>
                         <xsl:apply-templates select="sizes/size" />
                     </select>
                 </xsl:if>
+                <xsl:if test="class">
+                   <div><xsl:value-of select="$image-class" /></div>
+                   <label for="kupu-image-class-selector">Image style</label>&#xa0;
+                   <select name="kupu-image-class-selector" id="kupu-image-class">
+                      <xsl:apply-templates select="class"/>
+                   </select>
+                </xsl:if>
                 <div id="image_alt_div">
                     <xsl:if test="$usecaptions='yes'">
                         <xsl:attribute name="style">display:none;</xsl:attribute>
@@ -357,6 +368,13 @@
             </form>
         </div>
     </xsl:template>
+    <xsl:template match="class">
+       <option value="{@name}">
+          <xsl:if test="$image-class=@name">
+             <xsl:attribute name="selected">selected</xsl:attribute>
+          </xsl:if>
+          <xsl:value-of select="@title" /></option>
+    </xsl:template>
     <xsl:template match="size">
       <xsl:choose>
         <xsl:when test="selected">

Added: kupu/branch/duncan-flash/plone/kupu_plone_layer/plonekupuimages/flash-placeholder.png
==============================================================================
Binary file. No diff available.

From duncan at codespeak.net  Fri May  4 10:53:31 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Fri,  4 May 2007 10:53:31 +0200 (CEST)
Subject: [kupu-checkins] r42662 -
	kupu/branch/duncan-flash/plone/kupu_plone_layer
Message-ID: <20070504085331.2F69E8062@code0.codespeak.net>

Author: duncan
Date: Fri May  4 10:53:29 2007
New Revision: 42662

Modified:
   kupu/branch/duncan-flash/plone/kupu_plone_layer/kupuplone.css.dtml
Log:
Workround to make it possible to edit flash with Firefox.

Modified: kupu/branch/duncan-flash/plone/kupu_plone_layer/kupuplone.css.dtml
==============================================================================
--- kupu/branch/duncan-flash/plone/kupu_plone_layer/kupuplone.css.dtml	(original)
+++ kupu/branch/duncan-flash/plone/kupu_plone_layer/kupuplone.css.dtml	Fri May  4 10:53:29 2007
@@ -291,5 +291,12 @@
 .kupu-progresstext {
     text-align:center;position:absolute;top:0;width:100%;
 }
+/* Firefox makes Flash objects completely invisible.
+We need to force it to display something otherwise you cannot edit existing Flash. */
+object.image-inline {
+   display: block;
+   background-image: url(plonekupuimages/flash-placeholder.png);
+   border: 2px green solid;
+}
 /* </dtml-let></dtml-with> */
 

From duncan at codespeak.net  Mon May 14 12:15:38 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Mon, 14 May 2007 12:15:38 +0200 (CEST)
Subject: [kupu-checkins] r43355 - in kupu/trunk/kupu: common
	common/kupudrawers doc plone plone/kupu_plone_layer
	plone/kupu_plone_layer/plonekupuimages
Message-ID: <20070514101538.9C4A7807A@code0.codespeak.net>

Author: duncan
Date: Mon May 14 12:15:37 2007
New Revision: 43355

Added:
   kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/flash-placeholder.png
      - copied unchanged from r42662, kupu/branch/duncan-flash/plone/kupu_plone_layer/plonekupuimages/flash-placeholder.png
Modified:
   kupu/trunk/kupu/common/kupubasetools.js
   kupu/trunk/kupu/common/kupudrawers.js
   kupu/trunk/kupu/common/kupudrawers/drawer.xsl
   kupu/trunk/kupu/common/kupuhelpers.js
   kupu/trunk/kupu/doc/CHANGES.txt
   kupu/trunk/kupu/doc/LIBRARIES.txt
   kupu/trunk/kupu/doc/PLONE2.txt
   kupu/trunk/kupu/plone/kupu_plone_layer/kupucollection.xml.pt
   kupu/trunk/kupu/plone/kupu_plone_layer/kupuplone.css.dtml
   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:
Added experimental support for Flash objects.
Media objects (flash + img) now have a customisable list of class names.

Modified: kupu/trunk/kupu/common/kupubasetools.js
==============================================================================
--- kupu/trunk/kupu/common/kupubasetools.js	(original)
+++ kupu/trunk/kupu/common/kupubasetools.js	Mon May 14 12:15:37 2007
@@ -1254,6 +1254,18 @@
         imageWindow.focus();
     };
 
+    this.newNode = function(name, obj) {
+        var ed = this.editor;
+        var currobj = ed.getNearestParentOfType(ed.getSelectedNode(), name);
+        if (currobj) {
+            var p = currobj.parentNode;
+            p.insertBefore(obj, currobj);
+            p.removeChild(currobj);
+            return obj;
+        } else {
+            return ed.insertNodeAtSelection(obj, 1);
+        }
+    }
     this.createImage = function(url, alttext, imgclass) {
         /* create an image */
         var img = this.editor.getInnerDocument().createElement('img');
@@ -1266,11 +1278,21 @@
         if (imgclass) {
             img.className = imgclass;
         };
-        img = this.editor.insertNodeAtSelection(img, 1);
+        this.newNode('IMG', img);
         this.editor.logMessage(_('Image inserted'));
         return img;
     };
 
+    this.create_flash = function(url, alttext, className, width, height) {
+        var ed = this.editor;
+        var obj = ed.newElement('object',
+            {src:url, alt:alttext, className:className, width:width, height:height, type:'application/x-shockwave-flash',
+            'data':url},
+            [ed.newElement('param', {name:'movie', value:url})]);
+        this.newNode('OBJECT', obj);
+        this.editor.logMessage(_('Flash inserted'));
+    }
+
     this.setImageClass = function(imgclass) {
         /* set the class of the selected image */
         var currnode = this.editor.getSelectedNode();

Modified: kupu/trunk/kupu/common/kupudrawers.js
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers.js	(original)
+++ kupu/trunk/kupu/common/kupudrawers.js	Mon May 14 12:15:37 2007
@@ -1265,17 +1265,20 @@
     }
 
     this.createContent = function() {
-        var currnode = this.editor.getSelectedNode();
-        var currimg = this.editor.getNearestParentOfType(currnode, 'IMG');
-        this.selectedSrc = currimg?currimg.src:null;
+        var ed = this.editor;
+        var currnode = ed.getSelectedNode();
+        var currimg = ed.getNearestParentOfType(currnode, 'OBJECT') || ed.getNearestParentOfType(currnode, 'IMG');
+        this.selectedSrc = currimg.data||currimg.src||null;
         this.options = {};
         if (currimg) {
+            ed.getSelection().selectNodeContents(currimg);
             var className = currimg.className;
             var align = /\bimage-(left|right|inline)\b/.exec(className);
             if (align && align.length > 1) {
                 this.options['image-align'] = align[1];
             };
             this.options['image-caption'] = /\bcaptioned\b/.test(className);
+            this.options['image-class'] = className.replace(/\b(image-(left|right|inline)|captioned)\b/g,'').strip();
         }
         ImageLibraryDrawer.prototype.createContent.call(this);
     };
@@ -1354,8 +1357,18 @@
         if (caption && caption.length>0 && caption[0].checked) {
             imgclass += " captioned";
         };
-
-        this.tool.createImage(uri, alt, imgclass);
+        var classnames = document.getElementById('kupu-image-class');
+        if (classnames && classnames.selectedIndex >= 0) {
+            imgclass += " "+classnames.options[classnames.selectedIndex].value;
+        }
+        var media = document.getElementById('kupu-media').value;
+        var width = document.getElementById('kupu-width').value;
+        var height = document.getElementById('kupu-height').value;
+        if (this.tool['create_'+media]) {
+            this.tool['create_'+media](uri, alt, imgclass, width, height);
+        } else {
+            this.tool.createImage(uri, alt, imgclass);
+        }
         this.drawertool.closeDrawer();
     };
 };

Modified: kupu/trunk/kupu/common/kupudrawers/drawer.xsl
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers/drawer.xsl	(original)
+++ kupu/trunk/kupu/common/kupudrawers/drawer.xsl	Mon May 14 12:15:37 2007
@@ -51,6 +51,7 @@
     <xsl:param name="showanchors">yes</xsl:param>
     <xsl:param name="image-align">inline</xsl:param>
     <xsl:param name="image-caption">true</xsl:param>
+    <xsl:param name="image-class"></xsl:param>
     <xsl:param name="link_target"></xsl:param>
     <xsl:param name="link_name"></xsl:param>
     <xsl:variable name="titlelength" select="60"/>
@@ -286,14 +287,18 @@
      If a 'preview' tag is available then that one is used, otherwise 'uri'.
     -->
     <xsl:template match="resource|collection" mode="image-view">
-      <xsl:choose>
-        <xsl:when test="preview">
-          <img src="{preview}" title="{title}" onload="kupuFixImage(this);" width="1" height="1"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <img onload="kupuFixImage(this);" width="1" height="1" src="{uri}" title="{title}"/>
-        </xsl:otherwise>
-      </xsl:choose>
+       <xsl:variable name="p" select="preview|uri"></xsl:variable>
+       <xsl:choose>
+          <xsl:when test="media='flash'">
+             <object src="{$p}" data="{$p}" type="application/x-shockwave-flash"
+                     width="100" height="100">
+                <param name="movie" value="{$p}" />
+             </object>
+          </xsl:when>
+          <xsl:otherwise>
+             <img src="{$p}" title="{title}" onload="kupuFixImage(this);" width="1" height="1"/>
+          </xsl:otherwise>
+       </xsl:choose>
     </xsl:template>
 
     <xsl:template match="resource|collection" mode="image-properties">
@@ -301,6 +306,9 @@
         <div>
            <!-- <form onsubmit="return false;"> -->
                 <div>
+                   <input id="kupu-media" type="hidden" value="{media}" />
+                   <input id="kupu-width" type="hidden" value="{width}" />
+                   <input id="kupu-height" type="hidden" value="{height}" />
                     <label style="display: block;margin-top: 1em;">Image alignment</label>
                     <input type="radio" name="image-align" id="image-align-left" value="image-left">
                        <xsl:attribute name="onkeypress">if(event.keyCode==13)return false;</xsl:attribute>
@@ -329,29 +337,46 @@
                         This is a browser-imposed limitation.
                     </div>
                 </div>
+                
                 <xsl:if test="$usecaptions='yes'">
-                    <div>
-                        <input type="checkbox" name="image-caption" id="image-caption">
-                           <xsl:attribute name="onkeypress">if(event.keyCode==13)return false;</xsl:attribute>
-                           <xsl:if test="$image-caption='true'">
-                              <xsl:attribute name="checked">checked</xsl:attribute>
-                           </xsl:if>
-                           <xsl:attribute name="onclick">document.getElementById('image_alt_div').style.display =
-                              this.checked?'none':'';</xsl:attribute>
-                        </input>
-                        <label for="image-caption" i18n:translate="imagedrawer_caption_label">Caption</label>
-                    </div>
+                   <xsl:choose>
+                      <xsl:when test="media='flash'" />
+                      <xsl:otherwise>
+                         <div>
+                            <input type="checkbox" name="image-caption" id="image-caption">
+                               <xsl:attribute name="onkeypress">if(event.keyCode==13)return false;</xsl:attribute>
+                               <xsl:if test="$image-caption='true'">
+                                  <xsl:attribute name="checked">checked</xsl:attribute>
+                               </xsl:if>
+                               <xsl:attribute name="onclick">document.getElementById('image_alt_div').style.display =
+                                  this.checked?'none':'';</xsl:attribute>
+                            </input>
+                            <label for="image-caption" i18n:translate="imagedrawer_caption_label">Caption</label>
+                         </div>
+                      </xsl:otherwise>
+                   </xsl:choose>
                 </xsl:if>
                 <xsl:if test="sizes">
+                   <div>
                     <label for="image-size-selector"
-                            style="display: block;margin-top: 1em;">Image size</label>
+                            style="margin-top: 1em;">Image size:</label>&#xa0;
                     <select name="image-size-selector">
                         <option name="image-size-option" value="{uri}">Original</option>
                         <xsl:apply-templates select="sizes/size" />
                     </select>
+                   </div>
+                </xsl:if>
+                <xsl:if test="class">
+                   <div>
+                      <label for="kupu-image-class-selector">Image style</label>&#xa0;
+                      <select name="kupu-image-class-selector" id="kupu-image-class">
+                         <xsl:apply-templates select="class"/>
+                      </select>
+                   </div>
                 </xsl:if>
                 <div id="image_alt_div">
-                    <xsl:if test="$usecaptions='yes'">
+                    <xsl:if
+                           test="$usecaptions='yes' and $image-caption='true'">
                         <xsl:attribute name="style">display:none;</xsl:attribute>
                      </xsl:if>   
                     <label for="image_alt" i18n:translate="imagedrawer_upload_alt_text">"alt" attribute text</label>
@@ -362,6 +387,13 @@
                 <!-- </form> -->
         </div>
     </xsl:template>
+    <xsl:template match="class">
+       <option value="{@name}">
+          <xsl:if test="$image-class=@name">
+             <xsl:attribute name="selected">selected</xsl:attribute>
+          </xsl:if>
+          <xsl:value-of select="@title" /></option>
+    </xsl:template>
     <xsl:template match="size">
       <xsl:choose>
         <xsl:when test="selected">

Modified: kupu/trunk/kupu/common/kupuhelpers.js
==============================================================================
--- kupu/trunk/kupu/common/kupuhelpers.js	(original)
+++ kupu/trunk/kupu/common/kupuhelpers.js	Mon May 14 12:15:37 2007
@@ -1011,7 +1011,7 @@
         // to just before the element instead of inside it, and since IE doesn't reserve
         // an index for the element itself as well the way to get it inside the element is
         // by moving the start one pos and then moving it back (yuck!)
-        var range = this.selection.createRange().duplicate();
+        var range = doc.body.createTextRange();
         range.moveToElementText(node);
         range.moveStart('character', 1);
         range.moveStart('character', -1);

Modified: kupu/trunk/kupu/doc/CHANGES.txt
==============================================================================
--- kupu/trunk/kupu/doc/CHANGES.txt	(original)
+++ kupu/trunk/kupu/doc/CHANGES.txt	Mon May 14 12:15:37 2007
@@ -2,6 +2,12 @@
 Kupu changes
 ============
 
+- Recent
+
+  - Added in some support for inserting Flash content.
+
+  - Media objects may now have a list of classes (specific to the portal type).
+
 - 1.4 Beta 6
 
   - Removed the getToolByName deprecation workround since

Modified: kupu/trunk/kupu/doc/LIBRARIES.txt
==============================================================================
--- kupu/trunk/kupu/doc/LIBRARIES.txt	(original)
+++ kupu/trunk/kupu/doc/LIBRARIES.txt	Mon May 14 12:15:37 2007
@@ -120,7 +120,10 @@
        & element label { text }?
        & 
          ## Icon to use in resource pane
-         element icon { xsd:anyURI }?)
+         element icon { xsd:anyURI }?
+       & 
+         ## Type of media to insert in document 
+         element media { text }?)
 
     ## A list of collections and resources with an optional upload button at the end.
     collectionItems =
@@ -405,13 +408,18 @@
   - Go to the kupu configlet/resource types tab. Scroll to the bottom
     of the page.
 
-  - Under 'preview URLs' select the type 'Image' and under URL enter:
+  - Under 'preview URLs' select the type 'Image' and under preview enter:
 
     string:${object_url}/image_thumb
 
   - Hit the 'Save' button.
 
 
+Flash support
+-------------
+
+See PLONE2.txt
+
 Futures
 -------
 

Modified: kupu/trunk/kupu/doc/PLONE2.txt
==============================================================================
--- kupu/trunk/kupu/doc/PLONE2.txt	(original)
+++ kupu/trunk/kupu/doc/PLONE2.txt	Mon May 14 12:15:37 2007
@@ -339,6 +339,15 @@
         Defaults to 'image'. N.B. This is a literal string, not a tal
         expression.
 
+    classes
+        An optional list of class names to be allowed for this media
+        type. The class names will be applied in addition to
+        left/inline/right and captioned class names.
+
+    type
+        This controls whether kupu inserts an img tag or an object
+        tag. Only images and flash objects are supported at this time.
+
 documentation tab
 =================
 
@@ -645,6 +654,45 @@
        clear: both;
     }
 
+Flash
+-----
+Kupu has some support for embedding Flash objects using the
+ATFlashMovie content type, but requires some configuration. Other
+Flash content types may also work but have not been tested.
+
+  1. Install ATFlashMovie.
+
+  2. Got to the resource types tab of the configlet.
+
+  3. Under the resource ``mediaobject`` add Flash Movie to the
+     selection and save.
+
+  4. In the action urls table at the bottom of the page, add a new
+     entry for the type Flash Movie. The preview may be left blank
+     (kupu does not currently support previewing Flash), or you could
+     select a generic 'Flash' image. For 'normal image' you should
+     enter ``string:${object_url}/download``. Leave fieldname blank
+     and in the 'type' field select 'Flash'.
+
+Flash movies should now appear in the image drawer and be insertable
+into the document. Using IE the Flash movie will appear in the
+document and may be edited or moved as desired. Firefox will not play
+the movie while you are editing, so a 'flash placeholder' image is
+displayed instead: you cannot select it in Firefox so if you need to
+delete a Flash movie you will need to include the image in a slightly
+larger selection (e.g. spaces before and after) and delete that.
+
+Known problems
+==============
+When selecting a flash object in IE you need to be sure to get a
+selection only with sizing handles (by clicking exactly on the edge).
+If the selection box also shows cross-hatched then you have clicked
+inside the Flash object and kupu will not be able to determine the
+current selection.
+
+In IE the Flash object sometimes appears over the top of the drawer.
+Workaround: close the drawer and try again.
+
 References from HTML text
 -------------------------
 Kupu can be made to store archetypes references for any HTML field.

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 May 14 12:15:37 2007
@@ -37,6 +37,9 @@
                tal:content="info/url">URI</uri>
           <icon metal:define-slot="icon"
                 tal:content="info/icon">icon</icon>
+          <media tal:condition="info/media|nothing" tal:content="info/media">mime type</media>
+          <class tal:condition="info/classes|nothing" tal:repeat="c info/classes"
+                   tal:attributes="title c/title; name c/classname" />
           <size metal:define-slot="size"
                 tal:condition="info/size"
                 tal:content="info/size">size</size>

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 May 14 12:15:37 2007
@@ -291,5 +291,12 @@
 .kupu-progresstext {
     text-align:center;position:absolute;top:0;width:100%;
 }
+/* Firefox makes Flash objects completely invisible.
+We need to force it to display something otherwise you cannot edit existing Flash. */
+.kupu-html object.image-inline {
+   display: block;
+   background-image: url(plonekupuimages/flash-placeholder.png);
+   border: 2px green solid;
+}
 /* </dtml-let></dtml-with> */
 

Modified: kupu/trunk/kupu/plone/librarytool.py
==============================================================================
--- kupu/trunk/kupu/plone/librarytool.py	(original)
+++ kupu/trunk/kupu/plone/librarytool.py	Mon May 14 12:15:37 2007
@@ -256,12 +256,17 @@
             if normal:
                 normal = Expression(normal)
             scalefield = a.get('scalefield', 'image')
+            classes = a.get('classes', '').split('\n')
+            mediatype = a.get('mediatype', 'image')
             if not portal_type:
                 continue
             action_map[portal_type] = {
                 'expression': Expression(preview),
                 'normal': normal,
-                'scalefield': scalefield, }
+                'scalefield': scalefield,
+                'classes': classes,
+                'mediatype': mediatype,
+            }
         self._preview_actions = action_map
 
     def deleteResourceTypes(self, resource_types):

Modified: kupu/trunk/kupu/plone/plonedrawers.py
==============================================================================
--- kupu/trunk/kupu/plone/plonedrawers.py	(original)
+++ kupu/trunk/kupu/plone/plonedrawers.py	Mon May 14 12:15:37 2007
@@ -207,7 +207,28 @@
         if type is None:
             return None
         return "%s/%s" % (self.base, type.getIcon())
-            
+
+    def media(self, portal_type):
+        """Get the media type to be included in the xml.
+        Since 'image' is the default we can omit it."""
+        media = self.tool.getMediaForType(portal_type)
+        if media=='image':
+            return None
+        return media
+
+    def classes(self, portal_type):
+        stored = self.tool.getClassesForType(portal_type)
+        classes = []
+        for c in stored:
+            c = c.strip()
+            if not c:
+                continue
+            if '|' in c:
+                title, classname = c.split('|', 1)
+                classes.append({'title': title, 'classname': classname})
+            else:
+                classes.append({'title': c, 'classname': c})
+        return classes
 
     def sizes(self, obj):
         """Returns size, width, height"""
@@ -312,6 +333,8 @@
                 normal = url
 
             sizes = self.get_image_sizes(obj, portal_type, url)
+            media = self.media(portal_type)
+            classes = self.classes(portal_type)
 
             icon = self.icon(portal_type)
             size, width, height = self.sizes(obj)
@@ -338,6 +361,8 @@
                 'height': height,
                 'preview': preview,
                 'sizes': sizes,
+                'media': media,
+                'classes': classes,
                 'title': title,
                 'description': description,
                 'linkable': linkable,
@@ -389,6 +414,8 @@
             normal = url
 
         sizes = self.get_image_sizes(brain, portal_type, url)
+        media = self.media(portal_type)
+        classes = self.classes(portal_type)
 
         icon = self.icon(portal_type)
         size, width, height = self.sizes(brain)
@@ -414,6 +441,8 @@
             'height': height,
             'preview': preview,
             'sizes': sizes,
+            'media': media,
+            'classes': classes,
             'title': title,
             'description': description,
             'linkable': linkable,

Modified: kupu/trunk/kupu/plone/plonelibrarytool.py
==============================================================================
--- kupu/trunk/kupu/plone/plonelibrarytool.py	(original)
+++ kupu/trunk/kupu/plone/plonelibrarytool.py	Mon May 14 12:15:37 2007
@@ -682,6 +682,17 @@
         value = action_map.get(portal_type, {}).get('scalefield', 'image')
         return value
 
+    security.declareProtected(permissions.ManageLibraries, "getClassesForType")
+    def getClassesForType(self, portal_type):
+        action_map = getattr(self, '_preview_actions', {})
+        return action_map.get(portal_type, {}).get('classes', ())
+
+    security.declareProtected(permissions.ManageLibraries, "getMediaForType")
+    def getMediaForType(self, portal_type):
+        action_map = getattr(self, '_preview_actions', {})
+        value = action_map.get(portal_type, {}).get('mediatype', 'image')
+        return value
+
     security.declareProtected(permissions.ManageLibraries, "set_html_exclusions")
     def set_html_exclusions(self, exclusions):
         """Set the html_exclusions.

Modified: kupu/trunk/kupu/plone/resource_types.pt
==============================================================================
--- kupu/trunk/kupu/plone/resource_types.pt	(original)
+++ kupu/trunk/kupu/plone/resource_types.pt	Mon May 14 12:15:37 2007
@@ -1,249 +1,285 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
-    lang="en"
-    metal:use-macro="here/kupu_config/macros/master"
-    i18n:domain="kupuconfig">
-
-<body>
-
-    <div class="documentContent" metal:fill-slot="kupu_content">
-<h1 class="documentFirstHeading"
-    i18n:translate="heading_kupu_resource_types">Kupu Resource Types</h1>
-<form action="" method="post" tal:attributes="action here/absolute_url">
-<p i18n:translate="text_resource_types">While libraries provide abstract locations for objects of any type,
-Kupu distinguishes objects by resource type. For example, a user might
-request a library showing objects to link to or a library showing
-objects to be inserted into a document. The abstract location
-(library) might be the same, but the former library would contain
-documents, the latter images.</p>
-
-<p i18n:translate="text_resource_types2">This management screen allows you to define resource types using a
-list of portal types. A special resource type, <code>collection</code>,
-identifies portal types that are to be treated as collections.
-The resource type <code>containsanchors</code> is used to list types which
-may contain HTML anchors.</p>
-
-<p i18n:translate="text_resource_types3">Also on this screen are urls
-for each type which can be previewed as an image. The expression may
-use <code>object_url</code> and <code>portal_type</code>, but should
-not attempt to access the object directly. The resulting URL should
-ideally return an image no larger than 128 pixels square.</p>
-
-<fieldset tal:define="typestool context/portal_types;
-                typeinfos typestool/listTypeInfo;">
-<legend i18n:translate="legend_map_resource_types">Map resource types</legend>
-
-<table summary="Resource definitions" class="listing nosort">
-<thead>
-  <tr>
-    <th colspan="3">Map resource types</th>
-  </tr>
-</thead>
-
- <tal:loop tal:repeat="resource here/zmi_get_resourcetypes">
-<tbody
-  tal:define="oddrow repeat/resource/odd;name resource/name; types resource/types;"
-  tal:attributes="class python:test(oddrow, 'even', 'odd');"
-  align="left"
-  style="margin-top: 1em !important;"
->
-  <tr><td colspan="3">&nbsp;</td></tr>
-  <tr tal:condition="repeat/resource/end"><td style="border-right:none;"></td><td colspan="2"><em>use this entry to add a new resource</em>
-</td></tr>
-  <tr>
-    <td>
-      <input type="hidden" name="type_info.old_type:records"
-             tal:attributes="value name" />
-      <input type="checkbox" name="resource_types:list"
-             tal:condition="name"
-             tal:attributes="value name" />
-    </td>
-    <th>Resource</th>
-    <td>
-      <input type="text" name="type_info.resource_type:records"
-             tal:attributes="value name" />
-    </td>
-  </tr>
-  <tr>
-    <td></td>
-    <th>Portal Types</th>
-    <td>
-      <select name="type_info.portal_types:list:records" size="5" multiple
-          tal:attributes="size python:max(5,len(types));">
-          <tal:block repeat="ti typeinfos">
-            <option tal:define="title python:path('string:${ti/Title}' + test(ti.Title()==ti.getId(),'',' (${ti/getId})'));
-                        id ti/getId;
-                        selected python:id in types;"
-                    tal:content="title"
-                    tal:condition="selected"
-                    tal:attributes="value ti/getId;" selected></option>
-
-          </tal:block>
-          <tal:block repeat="ti typeinfos">
-            <option tal:define="title python:path('string:${ti/Title}' + test(ti.Title()==ti.getId(),'',' (${ti/getId})'));
-                        id ti/getId;
-                        selected python:id in types;"
-                    tal:content="title"
-                    tal:condition="not:selected"
-                    tal:attributes="value ti/getId;"></option>
-
-          </tal:block>
-      </select>
-    </td>
-  </tr>
-  <tr><td></td><th>New types</th>
-    <td>
-      <select name="type_info.newtypes:int:records" size="1"
-              tal:define="newtype python:context.getNewTypeHandler(name)">
-        <option value="0" tal:attributes="selected python:test(newtype==0,True,None)">are not added to selection</option>
-        <option value="1" tal:attributes="selected python:test(newtype==1,True,None)">are added to selection</option>
-      </select>
-    </td>
-  <tr><td colspan="3">&nbsp;</td></tr>
-</tbody>
- </tal:loop>
-<tbody>
-  <tr>
-    <td style="border-right:none;"></td>
-    <td colspan="2"><em>specify a resource type to be used for reference fields with an empty list of allowed types</em>
-    </td>
-  </tr>
-  <tr>
-    <td> </td>
-    <th>Default resource</th>
-    <td>
-      <select name="default_resource" tal:define="current here/getDefaultResource">
-        <tal:block repeat="resource here/zmi_get_resourcetypes">
-          <option tal:define="name resource/name;"
-                  tal:attributes="value resource/name;selected python:current==name;"
-                  tal:content="resource/name" />
-        </tal:block>
-      </select>
-    </td>
-  </tr>
-  <tr>
-    <td  style="border-right: none;">&nbsp;</td>
-    <td colspan="2" style="padding-top:0.5em;">
-      <input class="context" type="submit" name="zmi_update_resource_types:method" value="Save" i18n:attributes="value" />
-      <input class="context" type="submit" name="zmi_delete_resource_types:method" value="Delete" i18n:attributes="value" />
-    </td>
-  </tr>
-</tbody>
-</table>
-
-<table summary="Preview actions" class="listing nosort" width="90%"
- tal:define="typestool context/portal_types;
-             typeinfos typestool/listTypeInfo;
-             previewable python:[t for t in typeinfos if context.getPreviewForType(t.getId())];">
-<thead>
-  <tr>
-    <th colspan="4">Action URLs</th>
-  </tr>
-  <tr><th width="1%"></th>
-    <th width="1%">Type</th>
-    <th colspan="2">URL</th>
-  </tr>
-</thead>
-
- <tal:loop tal:repeat="ti previewable">
-<tbody  tal:define="oddrow repeat/ti/odd;
-                portal_type ti/getId;
-                previewaction python:context.getPreviewForType(portal_type);
-                normalaction python:context.getNormalViewForType(portal_type);
-                scalefield python:context.getScaleFieldForType(portal_type);"
-       tal:condition="python:context.getPreviewForType(portal_type)"
-  tal:attributes="class python:test(oddrow, 'even', 'odd');">
-  <tr>
-    <td rowspan="3">
-      <input type="hidden" name="preview_action.marker:records" value="x" />
-      <input type="hidden" name="preview_action.portal_type:records" tal:attributes="value ti/getId" />
-      <input type="checkbox" name="preview_types:list"
-             tal:attributes="value ti/getId" />
-    </td>
-    <td rowspan="3" tal:define="title python:path('string:${ti/Title}' + test(ti.Title()==ti.getId(),'',' (${ti/getId})'));"
-        tal:content="title">type</td>
-    <td style="border-right: none;" width="1%">preview</td>
-    <td>
-      <input type="text" name="preview_action.expression:records"
-             style="width:90%"
-             tal:attributes="value previewaction" />
-    </td>
-  </tr>
-  <tr>
-    <td style="border-right: none;" width="1%">Normal&nbsp;mage</td>
-    <td>
-      <input type="text" name="preview_action.normal:records"
-             style="width:90%"
-             tal:attributes="value normalaction" />
-    </td>
-  </tr>
-  <tr>
-    <td style="border-right: none;" width="1%">fieldname</td>
-    <td>
-      <input type="text" name="preview_action.scalefield:records"
-             style="width:90%"
-             tal:attributes="value scalefield" />
-    </td>
-  </tr>
-</tbody>
- </tal:loop>
-<tbody  tal:define="oddrow python:len(previewable)%2;"
-        tal:attributes="class python:test(oddrow, 'even', 'odd');">
-  <tr>
-    <td rowspan="3">
-      <input type="hidden" name="preview_action.marker:records" value="-"/>
-    </td>
-    <td rowspan="3">
-      <select name="preview_action.portal_type:records">
-          <option i18n:translate="" value="">(select type)</option>
-          <tal:block repeat="ti typeinfos">
-            <option tal:define="title python:path('string:${ti/Title}' + test(ti.Title()==ti.getId(),'',' (${ti/getId})'));
-                        id ti/getId;"
-                    tal:content="title"
-                    tal:condition="not:python:context.getPreviewForType(id)"
-                    tal:attributes="value ti/getId;"></option>
-          </tal:block>
-      </select>
-    <td style="border-right: none;" width="1%">preview</td>
-    <td>
-      <input type="text" name="preview_action.expression:records"
-             style="width:90%" value="" />
-    </td>
-  </tr>
-  <tr>
-    <td style="border-right: none;" width="1%">Normal Image</td>
-    <td>
-      <input type="text" name="preview_action.normal:records"
-             style="width:90%" value="" />
-    </td>
-  </tr>
-  <tr>
-    <td style="border-right: none;" width="1%">fieldname</td>
-    <td>
-      <input type="text" name="preview_action.scalefield:records"
-             style="width:90%" value="image" />
-    </td>
-  </tr>
-</tbody>
-<tbody>
-  <tr>
-    <td style="border-right: none;">&nbsp;</td>
-    <td style="padding-top:0.5em;">
-      <input class="context" type="submit" name="zmi_update_resource_types:method" value="Save" i18n:attributes="value" />
-      <input class="context" type="submit" name="zmi_delete_resource_types:method" value="Delete" i18n:attributes="value" />
-    </td>
-    <td colspan="2"><em>Preview is an expression to use for the preview image in the drawer [default is no preview].
-      Normal image is an expression to use for the normal view of a mediaobject [string:$object_url].
-      Fieldname is the name of the field to use for scaled variants of the mediaobject [image].
-      </em>
-    </td>
-  </tr>
-</tbody>
-</table>
-
-</fieldset>
-</form>
-</div>
-</body>
+lang="en"
+metal:use-macro="here/kupu_config/macros/master"
+i18n:domain="kupuconfig">
+
+   <body>
+      <div class="documentContent" metal:fill-slot="kupu_content">
+         <h1 class="documentFirstHeading"
+             i18n:translate="heading_kupu_resource_types">Kupu Resource Types</h1>
+         <form action="" method="post" tal:attributes="action here/absolute_url"
+               tal:define="typestool context/portal_types;
+               typeinfos typestool/listTypeInfo;
+               typeinfos python:[(ti.Title(), ti.getId()) for ti in typeinfos];
+               dummy python:typeinfos.sort()">
+            <p i18n:translate="text_resource_types">While libraries provide abstract locations for objects of any type,
+               Kupu distinguishes objects by resource type. For example, a user might
+               request a library showing objects to link to or a library showing
+               objects to be inserted into a document. The abstract location
+               (library) might be the same, but the former library would contain
+               documents, the latter images.</p>
+            <p i18n:translate="text_resource_types2">This management screen allows you to define resource types using a
+               list of portal types. A special resource type, <code>collection</code>,
+               identifies portal types that are to be treated as collections.
+               The resource type <code>containsanchors</code> is used to list types which
+               may contain HTML anchors.</p>
+
+            <p i18n:translate="text_resource_types3">Also on this screen are urls
+               for each type which can be previewed as an image. The expression may
+               use <code>object_url</code> and <code>portal_type</code>, but should
+               not attempt to access the object directly. The resulting URL should
+               ideally return an image no larger than 128 pixels square.</p>
+
+            <fieldset>
+               <legend i18n:translate="legend_map_resource_types">Map resource types</legend>
+
+               <table summary="Resource definitions" class="listing nosort">
+                  <thead>
+                     <tr>
+                        <th colspan="3">Map resource types</th>
+                     </tr>
+                  </thead>
+
+                  <tal:loop tal:repeat="resource here/zmi_get_resourcetypes">
+                     <tbody
+                           tal:define="oddrow repeat/resource/odd;name resource/name; types resource/types;"
+                           tal:attributes="class python:test(oddrow, 'even', 'odd');"
+                           align="left"
+                           style="margin-top: 1em !important;"
+                           >
+                        <tr><td colspan="3">&nbsp;</td></tr>
+                        <tr tal:condition="repeat/resource/end"><td style="border-right:none;"></td><td colspan="2"><em>use this entry to add a new resource</em>
+                           </td></tr>
+                        <tr>
+                           <td>
+                              <input type="hidden" name="type_info.old_type:records"
+                                     tal:attributes="value name" />
+                              <input type="checkbox" name="resource_types:list"
+                                     tal:condition="name"
+                                     tal:attributes="value name" />
+                           </td>
+                           <th>Resource</th>
+                           <td>
+                              <input type="text" name="type_info.resource_type:records"
+                                     tal:attributes="value name" />
+                           </td>
+                        </tr>
+                        <tr>
+                           <td></td>
+                           <th>Portal Types</th>
+                           <td>
+                              <select name="type_info.portal_types:list:records" size="5" multiple
+                                      tal:attributes="size python:max(5,len(types));">
+                                 <tal:block repeat="ti typeinfos">
+                                    <option tal:define="title python:ti[0]; id python:ti[1];
+                                            fulltitle python:title + test(title==id,'',' (%s)'%id);
+                                            selected python:id in types;"
+                                            tal:content="fulltitle"
+                                            tal:condition="selected"
+                                            tal:attributes="value id;" selected></option>
+                                 </tal:block>
+                                 <tal:block repeat="ti typeinfos">
+                                    <option tal:define="title python:ti[0]; id python:ti[1];
+                                            fulltitle python:title + test(title==id,'',' (%s)'%id);
+                                            selected python:id in types;"
+                                            tal:content="fulltitle"
+                                            tal:condition="not:selected"
+                                            tal:attributes="value id;"></option>
+                                 </tal:block>
+                              </select>
+                           </td>
+                        </tr>
+                        <tr><td></td><th>New types</th>
+                           <td>
+                              <select name="type_info.newtypes:int:records" size="1"
+                                      tal:define="newtype python:context.getNewTypeHandler(name)">
+                                 <option value="0" tal:attributes="selected python:test(newtype==0,True,None)">are not added to selection</option>
+                                 <option value="1" tal:attributes="selected python:test(newtype==1,True,None)">are added to selection</option>
+                              </select>
+                           </td>
+                           <tr><td colspan="3">&nbsp;</td></tr>
+                     </tbody>
+                  </tal:loop>
+                  <tbody>
+                     <tr>
+                        <td style="border-right:none;"></td>
+                        <td colspan="2"><em>specify a resource type to be used for reference fields with an empty list of allowed types</em>
+                        </td>
+                     </tr>
+                     <tr>
+                        <td> </td>
+                        <th>Default resource</th>
+                        <td>
+                           <select name="default_resource" tal:define="current here/getDefaultResource">
+                              <tal:block repeat="resource here/zmi_get_resourcetypes">
+                                 <option tal:define="name resource/name;"
+                                         tal:attributes="value resource/name;selected python:current==name;"
+                                         tal:content="resource/name" />
+                              </tal:block>
+                           </select>
+                        </td>
+                     </tr>
+                     <tr>
+                        <td  style="border-right: none;">&nbsp;</td>
+                        <td colspan="2" style="padding-top:0.5em;">
+                           <input class="context" type="submit" name="zmi_update_resource_types:method" value="Save" i18n:attributes="value" />
+                           <input class="context" type="submit" name="zmi_delete_resource_types:method" value="Delete" i18n:attributes="value" />
+                        </td>
+                     </tr>
+                  </tbody>
+               </table>
+
+               <table summary="Preview actions" class="listing nosort" width="90%"
+                      tal:define="previewable python:[(title,id) for (title,id) in typeinfos if context.getPreviewForType(id)];">
+                  <thead>
+                     <tr>
+                        <th colspan="4">Action URLs</th>
+                     </tr>
+                     <tr><th width="1%"></th>
+                        <th width="1%">Type</th>
+                        <th colspan="2">URL</th>
+                     </tr>
+                  </thead>
+
+                  <tal:loop tal:repeat="ti previewable">
+                     <tbody  tal:define="title python:ti[0];id python:ti[1];oddrow repeat/ti/odd;
+                             fulltitle python:title + test(title==id,'',' (%s)'%id);
+                             portal_type id;
+                             previewaction python:context.getPreviewForType(portal_type);
+                             normalaction python:context.getNormalViewForType(portal_type);
+                             scalefield python:context.getScaleFieldForType(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">
+                              <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">type</td>
+                           <td style="border-right: none;" width="1%">preview</td>
+                           <td>
+                              <input type="text" name="preview_action.expression:records"
+                                     style="width:90%"
+                                     tal:attributes="value previewaction" />
+                           </td>
+                        </tr>
+                        <tr>
+                           <td style="border-right: none;" width="1%">Normal&nbsp;image</td>
+                           <td>
+                              <input type="text" name="preview_action.normal:records"
+                                     style="width:90%"
+                                     tal:attributes="value normalaction" />
+                           </td>
+                        </tr>
+                        <tr>
+                           <td style="border-right: none;" width="1%">fieldname</td>
+                           <td>
+                              <input type="text" name="preview_action.scalefield:records"
+                                     style="width:90%"
+                                     tal:attributes="value scalefield" />
+                           </td>
+                        </tr>
+                        <tr>
+                           <td style="border-right: none;" width="1%">classes</td>
+                           <td>
+                              <textarea name="preview_action.classes:records"
+                                     style="width:90%"
+                                     tal:content="python:'\n'.join(classes)" />
+                           </td>
+                        </tr>
+                        <tr>
+                           <td style="border-right: none;" width="1%">type</td>
+                           <td>
+                              <select name="preview_action.mediatype:records" size="1">
+                                 <option value="image" tal:attributes="selected python:mediatype=='image'">Image</option>
+                                 <option value="flash" tal:attributes="selected python:mediatype=='flash'">Flash</option>
+                              </select>
+                              <div style="height:1em;">&nbsp;</div>
+                           </td>
+                        </tr>
+                     </tbody>
+                  </tal:loop>
+                  <tbody  tal:define="oddrow python:len(previewable)%2;"
+                          tal:attributes="class python:test(oddrow, 'even', 'odd');">
+                     <tr>
+                        <td rowspan="5">
+                           <input type="hidden" name="preview_action.marker:records" value="-"/>
+                        </td>
+                        <td rowspan="5">
+                           <select name="preview_action.portal_type:records" style="width:15em">
+                              <option i18n:translate="" 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>
+                              </tal:block>
+                           </select>
+                           <td style="border-right: none;" width="1%">preview</td>
+                           <td>
+                              <input type="text" name="preview_action.expression:records"
+                                     style="width:90%" value="" />
+                           </td>
+                     </tr>
+                     <tr>
+                        <td style="border-right: none;" width="1%">Normal&nbsp;image</td>
+                        <td>
+                           <input type="text" name="preview_action.normal:records"
+                                  style="width:90%" value="" />
+                        </td>
+                     </tr>
+                     <tr>
+                        <td style="border-right: none;" width="1%">fieldname</td>
+                        <td>
+                           <input type="text" name="preview_action.scalefield:records"
+                                  style="width:90%" value="image" />
+                        </td>
+                     </tr>
+                        <tr>
+                           <td style="border-right: none;" width="1%">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%">type</td>
+                           <td>
+                              <select name="preview_action.mediatype:records" size="1">
+                                 <option value="image" selected>Image</option>
+                                 <option value="flash">Flash</option>
+                              </select>
+                           </td>
+                        </tr>
+                  </tbody>
+                  <tbody>
+                     <tr>
+                        <td style="border-right: none;">&nbsp;</td>
+                        <td style="padding-top:0.5em;" colspan="3">
+                           <input class="context" type="submit" name="zmi_update_resource_types:method" value="Save" i18n:attributes="value" />
+                           <input class="context" type="submit" name="zmi_delete_resource_types:method" value="Delete" i18n:attributes="value" />
+                        </td>
+                     </tr>
+                     <tr>
+                        <td colspan="4">
+                           <em><code>Preview</code> is an expression to use for the preview image in the drawer [default is no preview].
+                           <code>Normal image</code> is an expression to use for the normal view of a mediaobject [string:$object_url].
+                           <code>Fieldname</code> is the name of the field to use for scaled variants of the mediaobject [image].
+                           <code>Classes</code> is a list of classnames which may be selected when inserting the object as media.
+                           <code>Type</code> controls whether kupu inserts an img tag or an object tag to embed flash.
+                           </em>
+                        </td>
+                     </tr>
+                  </tbody>
+               </table>
+
+            </fieldset>
+         </form>
+      </div>
+   </body>
 </html>
-
-

From duncan at codespeak.net  Mon May 14 12:20:54 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Mon, 14 May 2007 12:20:54 +0200 (CEST)
Subject: [kupu-checkins] r43356 - kupu/trunk/kupu/doc
Message-ID: <20070514102054.81D71807A@code0.codespeak.net>

Author: duncan
Date: Mon May 14 12:20:54 2007
New Revision: 43356

Modified:
   kupu/trunk/kupu/doc/PLONE2.txt
Log:
Update documentation.

Modified: kupu/trunk/kupu/doc/PLONE2.txt
==============================================================================
--- kupu/trunk/kupu/doc/PLONE2.txt	(original)
+++ kupu/trunk/kupu/doc/PLONE2.txt	Mon May 14 12:20:54 2007
@@ -668,11 +668,10 @@
      selection and save.
 
   4. In the action urls table at the bottom of the page, add a new
-     entry for the type Flash Movie. The preview may be left blank
-     (kupu does not currently support previewing Flash), or you could
-     select a generic 'Flash' image. For 'normal image' you should
-     enter ``string:${object_url}/download``. Leave fieldname blank
-     and in the 'type' field select 'Flash'.
+     entry for the type Flash Movie. The preview may be left blank or be
+     the same as the 'normal' image. For 'normal image' you should enter
+     ``string:${object_url}/download``. Leave fieldname blank and in the
+     'type' field select 'Flash'.
 
 Flash movies should now appear in the image drawer and be insertable
 into the document. Using IE the Flash movie will appear in the

From duncan at codespeak.net  Mon May 14 12:44:45 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Mon, 14 May 2007 12:44:45 +0200 (CEST)
Subject: [kupu-checkins] r43357 - in kupu/trunk/kupu/plone: .
	kupu_plone_layer
Message-ID: <20070514104445.302AC807A@code0.codespeak.net>

Author: duncan
Date: Mon May 14 12:44:44 2007
New Revision: 43357

Modified:
   kupu/trunk/kupu/plone/exportimport.py
   kupu/trunk/kupu/plone/kupu_plone_layer/sample-kupu-customisation-policy.py
   kupu/trunk/kupu/plone/librarytool.py
   kupu/trunk/kupu/plone/z3interfaces.py
Log:
GS support for image classes.

Modified: kupu/trunk/kupu/plone/exportimport.py
==============================================================================
--- kupu/trunk/kupu/plone/exportimport.py	(original)
+++ kupu/trunk/kupu/plone/exportimport.py	Mon May 14 12:44:44 2007
@@ -171,10 +171,15 @@
             previewaction = kupu.getPreviewForType(portal_type)
             normalaction = kupu.getNormalViewForType(portal_type)
             scalefield = kupu.getScaleFieldForType(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))
+                scalefield=scalefield,
+                classes=classes,
+                mediatype=mediatype,
+            ))
         return res
 
     security.declarePrivate('_getExportTemplate')
@@ -247,7 +252,10 @@
                     'preview': { KEY:'expression', DEFAULT: ''},
                     'normal': { DEFAULT: ''},
                     'scalefield': { DEFAULT: 'image' },
+                    'previewclass': { KEY: 'classes', DEFAULT: ()},
+                    'mediatype': { DEFAULT: ''},
                 },
+            'previewclass': { '#text': {KEY:None}, },
             'generatepreviews': {},
             'globaltoolbar': { '#text': { KEY:None }, },
             'toolbar':

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	Mon May 14 12:44:44 2007
@@ -101,6 +101,8 @@
     'expression': PREVIEW_EXPR % image,
     'normal': None,
     'scalefield': image.split('_',1)[0],
+    'classes': '',
+    'mediatype': 'image',
     }
             for (type, image) in tool.getPreviewable() ]
 # e.g. PREVIEW=[{'portal_type': 'Image',

Modified: kupu/trunk/kupu/plone/librarytool.py
==============================================================================
--- kupu/trunk/kupu/plone/librarytool.py	(original)
+++ kupu/trunk/kupu/plone/librarytool.py	Mon May 14 12:44:44 2007
@@ -256,7 +256,10 @@
             if normal:
                 normal = Expression(normal)
             scalefield = a.get('scalefield', 'image')
-            classes = a.get('classes', '').split('\n')
+            classes = a.get('classes', '')
+            if isinstance(classes, basestring):
+                classes = classes.split('\n')
+            classes = tuple(classes)
             mediatype = a.get('mediatype', 'image')
             if not portal_type:
                 continue

Modified: kupu/trunk/kupu/plone/z3interfaces.py
==============================================================================
--- kupu/trunk/kupu/plone/z3interfaces.py	(original)
+++ kupu/trunk/kupu/plone/z3interfaces.py	Mon May 14 12:44:44 2007
@@ -83,15 +83,20 @@
     def getCookedLibraries(context):
         """Return a list of libraries with our own parameters included"""
 
-    def getPreviewForType(self, portal_type):
+    def getPreviewForType(portal_type):
         """Get the preview url for a specific type"""
 
-    def getNormalViewForType(self, portal_type):
+    def getNormalViewForType(portal_type):
         """Get the normal view url for a specific type"""
 
-    def getScaleFieldForType(self, portal_type):
+    def getScaleFieldForType(portal_type):
         """Get the name of the field containing a scalable image"""
 
+    def getClassesForType(portal_type):
+        """Get a sequence of classes that may be applied"""
+
+    def getMediaForType(portal_type):
+        """Gets the media type image/flash"""
 
     def configure_kupu(
         linkbyuid, table_classnames, html_exclusions, style_whitelist, class_blacklist,

From duncan at codespeak.net  Mon May 14 15:58:47 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Mon, 14 May 2007 15:58:47 +0200 (CEST)
Subject: [kupu-checkins] r43369 - kupu/trunk/kupu/plone
Message-ID: <20070514135847.428F28084@code0.codespeak.net>

Author: duncan
Date: Mon May 14 15:58:46 2007
New Revision: 43369

Modified:
   kupu/trunk/kupu/plone/html2captioned.py
Log:
Output transform fixes up Flash uid urls.

Modified: kupu/trunk/kupu/plone/html2captioned.py
==============================================================================
--- kupu/trunk/kupu/plone/html2captioned.py	(original)
+++ kupu/trunk/kupu/plone/html2captioned.py	Mon May 14 15:58:46 2007
@@ -62,7 +62,7 @@
 </div>
 '''
 
-UID_PATTERN = re.compile('(?P<tag><(?:a|img)\\s[^>]*(?:src|href)\s*=\s*")(?P<url>[^"]*resolveuid/(?P<uid>[^/"#? ]*))', re.DOTALL | re.IGNORECASE)
+UID_PATTERN = re.compile('(?P<tag><(?:a|img|object|param)\\s[^>]*(?:src|href|data|value)\s*=\s*")(?P<url>[^"]*resolveuid/(?P<uid>[^/"#? ]*))', re.DOTALL | re.IGNORECASE)
 
 class HTMLToCaptioned:
     """Transform which adds captions to images embedded in HTML"""

From duncan at codespeak.net  Tue May 15 12:10:59 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Tue, 15 May 2007 12:10:59 +0200 (CEST)
Subject: [kupu-checkins] r43402 - kupu/trunk/kupu/common
Message-ID: <20070515101059.EC248808F@code0.codespeak.net>

Author: duncan
Date: Tue May 15 12:10:58 2007
New Revision: 43402

Modified:
   kupu/trunk/kupu/common/kupubasetools.js
Log:
Danny asked "Can you please add the 'kupu-fulleditor-zoomed' class to the body inside the iframe when it's in zoomed mode? I cannot create a css rule to adjust margins and sizes otherwise."

Modified: kupu/trunk/kupu/common/kupubasetools.js
==============================================================================
--- kupu/trunk/kupu/common/kupubasetools.js	(original)
+++ kupu/trunk/kupu/common/kupubasetools.js	Tue May 15 12:10:58 2007
@@ -1265,7 +1265,7 @@
         } else {
             return ed.insertNodeAtSelection(obj, 1);
         }
-    }
+    };
     this.createImage = function(url, alttext, imgclass) {
         /* create an image */
         var img = this.editor.getInnerDocument().createElement('img');
@@ -1291,7 +1291,7 @@
             [ed.newElement('param', {name:'movie', value:url})]);
         this.newNode('OBJECT', obj);
         this.editor.logMessage(_('Flash inserted'));
-    }
+    };
 
     this.setImageClass = function(imgclass) {
         /* set the class of the selected image */
@@ -2821,17 +2821,20 @@
 
     var body = document.body;
     var html = document.getElementsByTagName('html')[0];
+    var doc = editor.getInnerDocument();
     if (zoom) {
         html.style.overflow = 'hidden';
         window.scrollTo(0, 0);
         editor.setClass(zoomClass);
         body.className += ' '+zoomClass;
+        doc.body.className += ' '+zoomClass;
         this.onresize();
     } else {
         html.style.overflow = '';
         var fulleditor = iframe.parentNode;
         fulleditor.style.width = '';
         body.className = body.className.replace(/ *kupu-fulleditor-zoomed/, '');
+        doc.body.className = doc.body.className.replace(/ *kupu-fulleditor-zoomed/, '');
         editor.clearClass(zoomClass);
 
         iframe.style.width = '';
@@ -2844,7 +2847,6 @@
             sourceArea.style.height = '';
         };
     }
-    var doc = editor.getInnerDocument();
     // Mozilla needs this. Yes, really!
     doc.designMode=doc.designMode;
 

From duncan at codespeak.net  Tue May 15 13:41:46 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Tue, 15 May 2007 13:41:46 +0200 (CEST)
Subject: [kupu-checkins] r43404 - in kupu/trunk/kupu/plone: .
	kupu_plone_layer profiles/default
Message-ID: <20070515114146.219A18092@code0.codespeak.net>

Author: duncan
Date: Tue May 15 13:41:45 2007
New Revision: 43404

Modified:
   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:
Make the 'current folder' icon use the correct icon for the type of the 'folder'.

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	Tue May 15 13:41:45 2007
@@ -68,7 +68,7 @@
          title="string:Current folder",
          uri="string:${folder_url}",
          src="string:${folder_url}/kupucollection.xml",
-         icon="string:${portal_url}/folder_icon.gif"),
+         icon="string:${folder/getIcon}"),
     dict(id="myitems",
          title="string:My recent items",
          uri="string:${portal_url}/kupumyitems.xml",

Modified: kupu/trunk/kupu/plone/plonelibrarytool.py
==============================================================================
--- kupu/trunk/kupu/plone/plonelibrarytool.py	(original)
+++ kupu/trunk/kupu/plone/plonelibrarytool.py	Tue May 15 13:41:45 2007
@@ -59,7 +59,7 @@
          title="string:Current folder",
          uri="string:${folder_url}",
          src="string:${folder_url}/kupucollection.xml",
-         icon="string:${portal_url}/folder_icon.gif"),
+         icon="string:${folder/getIcon}"),
     dict(id="myitems",
          title="string:My recent items",
          uri="string:${portal_url}/kupumyitems.xml",

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	Tue May 15 13:41:45 2007
@@ -32,7 +32,7 @@
   </library>
   <library src="string:${folder_url}/kupucollection.xml"
            uri="string:${folder_url}" id="current"
-           icon="string:${portal_url}/folder_icon.gif"
+           icon="string:${folder/getIcon}"
            title="string:Current folder">
   </library>
   <library src="string:${portal_url}/kupumyitems.xml"

From duncan at codespeak.net  Tue May 15 15:54:36 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Tue, 15 May 2007 15:54:36 +0200 (CEST)
Subject: [kupu-checkins] r43406 - in kupu/trunk/kupu: common
	common/kupudrawers plone/kupu_plone_layer
Message-ID: <20070515135436.CA1718084@code0.codespeak.net>

Author: duncan
Date: Tue May 15 15:54:35 2007
New Revision: 43406

Modified:
   kupu/trunk/kupu/common/kupudrawers.js
   kupu/trunk/kupu/common/kupudrawers/drawer.xsl
   kupu/trunk/kupu/common/kupudrawerstyles.css
   kupu/trunk/kupu/plone/kupu_plone_layer/kupulibraries.xml.pt
   kupu/trunk/kupu/plone/kupu_plone_layer/kupumyitems.xml.pt
   kupu/trunk/kupu/plone/kupu_plone_layer/kupurecentitems.xml.pt
   kupu/trunk/kupu/plone/kupu_plone_layer/kupusearch.xml.pt
   kupu/trunk/kupu/plone/kupu_plone_layer/kupuselection.xml.pt
Log:
Changes to image drawer styling for a neater effect (I hope). Removed explicit styling and shuffled labels round a bit.
'Breadcrumbs' on search results changes to 'Locate'.

Modified: kupu/trunk/kupu/common/kupudrawers.js
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers.js	(original)
+++ kupu/trunk/kupu/common/kupudrawers.js	Tue May 15 15:54:35 2007
@@ -722,7 +722,7 @@
         var divs = librariespanel.getElementsByTagName('div');
         for (var i = 0; i < divs.length; i++) {
             var div = divs[i];
-            div.className = div.className.replace(/ *selected/,'');
+            div.className = div.className.replace(/[ -]*selected/,'');
         }
         /* Deselect the currently active collection or library */
         var selected;

Modified: kupu/trunk/kupu/common/kupudrawers/drawer.xsl
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers/drawer.xsl	(original)
+++ kupu/trunk/kupu/common/kupudrawers/drawer.xsl	Tue May 15 15:54:35 2007
@@ -181,7 +181,7 @@
             </xsl:attribute>
             <xsl:apply-templates select="icon"/>
             <span class="drawer-item-title">
-                <xsl:value-of select="title"/>
+                <xsl:copy-of select="title//*|title/text()"/>
             </span>
         </div>
     </xsl:template>
@@ -309,33 +309,30 @@
                    <input id="kupu-media" type="hidden" value="{media}" />
                    <input id="kupu-width" type="hidden" value="{width}" />
                    <input id="kupu-height" type="hidden" value="{height}" />
-                    <label style="display: block;margin-top: 1em;">Image alignment</label>
-                    <input type="radio" name="image-align" id="image-align-left" value="image-left">
-                       <xsl:attribute name="onkeypress">if(event.keyCode==13)return false;</xsl:attribute>
-                        <xsl:if test="$image-align='left'">
+                   <label class="kupu-detail-label">Align:</label>
+                   <span class="kupu-detail">
+                      <input type="radio" name="image-align" id="image-align-left" value="image-left">
+                         <xsl:attribute name="onkeypress">if(event.keyCode==13)return false;</xsl:attribute>
+                         <xsl:if test="$image-align='left'">
                             <xsl:attribute name="checked">checked</xsl:attribute>
-                        </xsl:if>
-                    </input>
-                    <label for="image-align-left" i18n:translate="imagedrawer_left">Left</label>
-                    <input type="radio" name="image-align" id="image-align-inline" value="image-inline">
-                       <xsl:attribute name="onkeypress">if(event.keyCode==13)return false;</xsl:attribute>
-                       <xsl:if test="$image-align='inline'">
-                          <xsl:attribute name="checked">checked</xsl:attribute>
-                       </xsl:if>
-                    </input>
-                    <label for="image-align-inline" i18n:translate="imagedrawer_inline">Inline</label>
-                    <input type="radio" name="image-align" id="image-align-right" value="image-right">
-                       <xsl:attribute name="onkeypress">if(event.keyCode==13)return false;</xsl:attribute>
-                       <xsl:if test="$image-align='right'">
-                          <xsl:attribute name="checked">checked</xsl:attribute>
-                       </xsl:if>
-                    </input>
-                    <label for="image-align-right" i18n:translate="imagedrawer_right">Right</label>
-                    <div class="discreet" i18n:translate="imagedrawer_image_align_explanation">
-                        You have to select left/right alignment first, then
-                        move the image up or down in the document afterwards.
-                        This is a browser-imposed limitation.
-                    </div>
+                         </xsl:if>
+                      </input>
+                      <label for="image-align-left" i18n:translate="imagedrawer_left">Left</label>
+                      <input type="radio" name="image-align" id="image-align-inline" value="image-inline">
+                         <xsl:attribute name="onkeypress">if(event.keyCode==13)return false;</xsl:attribute>
+                         <xsl:if test="$image-align='inline'">
+                            <xsl:attribute name="checked">checked</xsl:attribute>
+                         </xsl:if>
+                      </input>
+                      <label for="image-align-inline" i18n:translate="imagedrawer_inline">Inline</label>
+                      <input type="radio" name="image-align" id="image-align-right" value="image-right">
+                         <xsl:attribute name="onkeypress">if(event.keyCode==13)return false;</xsl:attribute>
+                         <xsl:if test="$image-align='right'">
+                            <xsl:attribute name="checked">checked</xsl:attribute>
+                         </xsl:if>
+                      </input>
+                      <label for="image-align-right" i18n:translate="imagedrawer_right">Right</label>
+                    </span>
                 </div>
                 
                 <xsl:if test="$usecaptions='yes'">
@@ -343,7 +340,9 @@
                       <xsl:when test="media='flash'" />
                       <xsl:otherwise>
                          <div>
-                            <input type="checkbox" name="image-caption" id="image-caption">
+                            <label class="kupu-detail-label"
+                                   for="image-caption" i18n:translate="imagedrawer_caption_label">Caption:</label>
+                            <input class="kupu-detail" type="checkbox" name="image-caption" id="image-caption">
                                <xsl:attribute name="onkeypress">if(event.keyCode==13)return false;</xsl:attribute>
                                <xsl:if test="$image-caption='true'">
                                   <xsl:attribute name="checked">checked</xsl:attribute>
@@ -351,16 +350,15 @@
                                <xsl:attribute name="onclick">document.getElementById('image_alt_div').style.display =
                                   this.checked?'none':'';</xsl:attribute>
                             </input>
-                            <label for="image-caption" i18n:translate="imagedrawer_caption_label">Caption</label>
                          </div>
                       </xsl:otherwise>
                    </xsl:choose>
                 </xsl:if>
                 <xsl:if test="sizes">
                    <div>
-                    <label for="image-size-selector"
-                            style="margin-top: 1em;">Image size:</label>&#xa0;
-                    <select name="image-size-selector">
+                    <label class="kupu-detail-label"
+                           for="image-size-selector">Size:</label>&#xa0;
+                    <select class="kupu-detail" name="image-size-selector">
                         <option name="image-size-option" value="{uri}">Original</option>
                         <xsl:apply-templates select="sizes/size" />
                     </select>
@@ -368,8 +366,9 @@
                 </xsl:if>
                 <xsl:if test="class">
                    <div>
-                      <label for="kupu-image-class-selector">Image style</label>&#xa0;
-                      <select name="kupu-image-class-selector" id="kupu-image-class">
+                      <label class="kupu-detail-label"
+                             for="kupu-image-class-selector">Style:</label>&#xa0;
+                      <select class="kupu-detail" name="kupu-image-class-selector" id="kupu-image-class">
                          <xsl:apply-templates select="class"/>
                       </select>
                    </div>
@@ -379,8 +378,10 @@
                            test="$usecaptions='yes' and $image-caption='true'">
                         <xsl:attribute name="style">display:none;</xsl:attribute>
                      </xsl:if>   
-                    <label for="image_alt" i18n:translate="imagedrawer_upload_alt_text">"alt" attribute text</label>
-                    <input type="text" id="image_alt" size="20" value="{title}">
+                    <label class="kupu-detail-label"
+                           for="image_alt"
+                           i18n:translate="imagedrawer_upload_alt_text">"alt"&#xa0;text:</label>
+                    <input class="kupu-detail" type="text" id="image_alt" size="20" value="{title}">
                        <xsl:attribute name="onkeypress">if(event.keyCode==13)return false;</xsl:attribute>
                     </input>
                 </div>

Modified: kupu/trunk/kupu/common/kupudrawerstyles.css
==============================================================================
--- kupu/trunk/kupu/common/kupudrawerstyles.css	(original)
+++ kupu/trunk/kupu/common/kupudrawerstyles.css	Tue May 15 15:54:35 2007
@@ -64,7 +64,7 @@
 .kupu-alt-row label {
    display: block;
 }
-
+#image_alt { width:17em; }
 div.kupu-linkdrawer-addlink td {
   border: 0;
 }
@@ -190,10 +190,25 @@
   vertical-align: text-bottom;
   white-space: nowrap;
 }
+.kupu-libsource, .kupu-libsource-selected { margin-left: 20px; }
+.library-icon-library {
+  margin-left: -20px;
+}
 div.kupu-upload {
    text-align: right; font-style: italic;
 }
 
+label.kupu-detail-label {
+  float:left;clear:left;
+  width:7em;
+  text-align:right;
+  margin: 0.2em;
+}
+.kupu-detail {
+  float:left;
+  margin: 0.2em;
+}
+
 /*div.kupu-libsource-selected {
   background-repeat: no-repeat;
 }*/
@@ -273,6 +288,7 @@
 
 .kupu-drawer label {
    font-weight: bold;
+   vertical-align:middle;
 }
 #kupu-breadcrumbs {
   text-align: left; clear:left;
@@ -297,4 +313,4 @@
     background: transparent url(kupuimages/treeCollapsed.gif) 4px 6px no-repeat;
     padding: 1px 0px 1px 16px;
     font-style: italic;
-}
\ No newline at end of file
+}

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupulibraries.xml.pt
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupulibraries.xml.pt	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupulibraries.xml.pt	Tue May 15 15:54:35 2007
@@ -6,6 +6,7 @@
 <libraries
     xmlns:tal="http://xml.zope.org/namespaces/tal"
     xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+    xmlns:xhtml="http://www.w3.org/1999/xhtml"
     i18n:domain="kupu"
     >
 
@@ -13,12 +14,14 @@
     getToolByName nocall:modules/Products.CMFCore.utils/getToolByName;
     kupu_tool     python:getToolByName(context, 'kupu_library_tool');
     libraries     python:kupu_tool.getCookedLibraries(context);
-    ">
+    pss modules/Products/PythonScripts/standard;
+">
 
   <library tal:repeat="library libraries"
            tal:attributes="id library/id;selected library/selected;">
     <uri tal:content="library/uri">URI</uri>
-    <title i18n:translate="" tal:content="library/title">Title</title>
+    <title i18n:translate="" tal:define="title library/title"
+           tal:content="structure python:pss.html_quote(title).replace('\n','\x3cxhtml:br/\x3e')">Title</title>
     <src tal:content="library/src">Source</src>
     <icon tal:content="library/icon">Icon</icon>
   </library>

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupumyitems.xml.pt
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupumyitems.xml.pt	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupumyitems.xml.pt	Tue May 15 15:54:35 2007
@@ -20,7 +20,7 @@
     <crumb tal:define="locator here/kupulocate.xml/absolute_url;
                        url python:kupu.kupuUrl(locator);"
       tal:attributes="href string:$url&src=$$src$$">
-      Breadcrumbs
+      Locate
     </crumb>
   </breadcrumbs>
   <items metal:use-macro="here/kupucollection.xml/macros/collectionItems">

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupurecentitems.xml.pt
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupurecentitems.xml.pt	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupurecentitems.xml.pt	Tue May 15 15:54:35 2007
@@ -20,7 +20,7 @@
     <crumb tal:define="locator here/kupulocate.xml/absolute_url;
                        url python:kupu.kupuUrl(locator);"
       tal:attributes="href string:$url&src=$$src$$">
-      Breadcrumbs
+      Locate
     </crumb>
   </breadcrumbs>
   <items metal:use-macro="here/kupucollection.xml/macros/collectionItems">

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupusearch.xml.pt
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupusearch.xml.pt	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupusearch.xml.pt	Tue May 15 15:54:35 2007
@@ -19,7 +19,7 @@
     <crumb tal:define="locator here/kupulocate.xml/absolute_url;
                        url python:kupu.kupuUrl(locator);"
       tal:attributes="href string:$url&src=$$src$$">
-      Breadcrumbs
+      Locate
     </crumb>
   </breadcrumbs>
   <items metal:use-macro="here/kupucollection.xml/macros/collectionItems">

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupuselection.xml.pt
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupuselection.xml.pt	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupuselection.xml.pt	Tue May 15 15:54:35 2007
@@ -23,7 +23,7 @@
       tal:define="url context/portal_url;
         resource_type request/resource_type | string:mediaobject;"
       tal:attributes="href string:${context/portal_url}/kupulocate.xml?resource_type=${resource_type}&amp;src=$$src$$">
-      Breadcrumbs
+      Locate
     </crumb>
   </breadcrumbs>
   <items metal:use-macro="here/kupucollection.xml/macros/collectionItems">

From duncan at codespeak.net  Tue May 15 15:55:16 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Tue, 15 May 2007 15:55:16 +0200 (CEST)
Subject: [kupu-checkins] r43407 - in kupu/trunk/kupu: common tests
Message-ID: <20070515135516.7E9DF8084@code0.codespeak.net>

Author: duncan
Date: Tue May 15 15:55:16 2007
New Revision: 43407

Modified:
   kupu/trunk/kupu/common/kupucontentfilters.js
   kupu/trunk/kupu/tests/test_xhtml.js
Log:
Improved filtering code: <p> tags can no longer contain tables, captioned images, or other things which make the html go horribly wrong.

Modified: kupu/trunk/kupu/common/kupucontentfilters.js
==============================================================================
--- kupu/trunk/kupu/common/kupucontentfilters.js	(original)
+++ kupu/trunk/kupu/common/kupucontentfilters.js	Tue May 15 15:55:16 2007
@@ -312,7 +312,7 @@
         this.misc = ['noscript'].concat(this.misc_inline);
         this.inline = ['a'].concat(this.special, this.fontstyle, this.phrase, this.inline_forms);
 
-        this.Inline = ['#PCDATA'].concat(this.inline, this.misc_inline);
+        this.Inline = ['#text'].concat(this.inline, this.misc_inline);
 
         this.heading = ['h1','h2','h3','h4','h5','h6'];
         this.lists = ['ul','ol','dl','menu','dir'];
@@ -320,7 +320,7 @@
         this.block = ['p','div','isindex','fieldset','table'].concat(
                      this.heading, this.lists, this.blocktext);
 
-        this.Flow = ['#PCDATA','form'].concat(this.block, this.inline, this.misc);
+        this.Flow = ['#text','form'].concat(this.block, this.inline, this.misc);
     }(this);
 
     this._commonsetting = function(self, names, value) {
@@ -415,7 +415,7 @@
             'base', 'meta', 'link', 'hr', 'param', 'img', 'area', 'input',
             'br', 'basefont', 'isindex', 'col'], []);
 
-        setStates(['title','style','script','option','textarea'], ['#PCDATA']);
+        setStates(['title','style','script','option','textarea'], ['#text']);
         setStates([ 'noscript', 'iframe', 'noframes', 'body', 'div',
             'li', 'dd', 'blockquote', 'center', 'ins', 'del', 'td', 'th'], el.Flow);
 
@@ -430,12 +430,12 @@
         setStates(['dl'], ['dt','dd']);
         setStates(['pre'], validation._exclude(el.Inline, "img|object|embed|applet|big|small|sub|sup|font|basefont"));
         setStates(['a'], validation._exclude(el.Inline, "a"));
-        setStates(['applet', 'object','embed'], ['#PCDATA', 'param','form'].concat(el.block, el.inline, el.misc));
+        setStates(['applet', 'object','embed'], ['#text', 'param','form'].concat(el.block, el.inline, el.misc));
         setStates(['map'], ['form', 'area'].concat(el.block, el.misc));
         setStates(['form'], validation._exclude(el.Flow, ['form']));
         setStates(['select'], ['optgroup','option']);
         setStates(['optgroup'], ['option']);
-        setStates(['fieldset'], ['#PCDATA','legend','form'].concat(el.block,el.inline,el.misc));
+        setStates(['fieldset'], ['#text','legend','form'].concat(el.block,el.inline,el.misc));
         setStates(['button'], validation._exclude(el.Flow, ['a','form','iframe'].concat(el.inline_forms)));
         setStates(['table'], ['caption','col','colgroup','thead','tfoot','tbody','tr']);
         setStates(['thead', 'tfoot', 'tbody'], ['tr']);
@@ -542,26 +542,6 @@
         };
     }(this, editor);
 
-    // Node filtering. May modify html node or xhtml parentNode.
-    // Return true to continue processing html node, false to skip it.
-    this.nodefilters = new function(editor) {
-        // Strip <br> at end of paragraph.
-        // Top level <br>: enclose preceding text (if any) in <p> and
-        // drop the <br>
-        this['br'] = function(node, parentNode) {
-            if (parentNode.tagName=='body') {
-                var p = parentNode.ownerDocument.createElement('p');
-                if (parentNode.lastChild && parentNode.lastChild.nodeType==3) {
-                    p.appendChild(parentNode.lastChild);
-                }
-                parentNode.appendChild(p);
-                return false;
-            }
-            if (!node.nextSibling && /p|div/i.test(parentNode.nodeName)) return false;
-            return true;
-        };
-    }
-
     // Exclude unwanted tags.
     this.excludeTags(['center']);
 
@@ -610,9 +590,101 @@
             if (filter) filter(name, htmlnode, xhtmlnode);
         }
     };
+    this._xmlCopyAttr = function(srcnode, target) {
+        var valid = this.tagAttributes[srcnode.nodeName];
+        for (var i = 0; i < valid.length; i++) {
+            var val = srcnode.getAttribute(valid[i]);
+            if (val) {
+                target.setAttribute(valid[i], val);
+            }
+        };
+    }
+
+    this._convertToSarissaNode = function(ownerdoc, htmlnode) {
+        var root = this._convertNodes(ownerdoc, htmlnode, null, new this.Set(['html']));
+        this._cleanupBr(ownerdoc, root);
+        this._cleanupParas(ownerdoc, root);
+        return root;
+    };
+
+    // Clean up a paragraph. Any direct child which is not allowed in
+    // the paragraph is moved to the parent. This may involved
+    // splitting the paragraph, or if it is at the beginning or end it
+    // may simply mean moving it out of the paragraph.
+    this._cleanupPara = function(ownerdoc, para) {
+        var permitted = this.States.p;
+        var nodes = [[]];
+        var idx = 0;
+        for (var child = para.firstChild; child; child = child.nextSibling) {
+            var nn = child.nodeName.toLowerCase();
+            if (permitted[nn] && (nn != 'img' || !(/\bcaptioned\b/i.test(child.getAttribute('class'))))) {
+                nodes[idx].push(child);
+            } else {
+                if (nodes[idx].length) {
+                    nodes.push(child);
+                } else {
+                    nodes[idx] = child;
+                }
+                nodes.push([]);
+                idx = nodes.length-1;
+            }
+        }
+        if (!nodes[idx].length) {
+            nodes.splice(idx,1);
+        };
+        if (nodes.length > 0 && nodes[0] instanceof Array && !nodes[0].length) {
+            nodes.splice(0,1);
+        }
+        if (nodes.length==0 || (nodes.length==1 && nodes[0] instanceof Array)) {
+            return; /* No change */
+        }
+        /* Need to cleanup this paragraph */
+        var parentnode = para.parentNode;
+        for (var idx = 0; idx < nodes.length; idx++) {
+            var n = nodes[idx];
+            if (n instanceof Array) {
+                var newp = ownerdoc.createElement('p');
+                this._xmlCopyAttr(para, newp);
+                var ln = n.length-1;
+                if (/br/i.test(n[ln].nodeName)) {
+                    n.splice(ln,1);
+                }
+                for (var j = 0; j < n.length; j++) {
+                    newp.appendChild(n[j]);
+                }
+                n = newp;
+            }
+            parentnode.insertBefore(n,para);
+        }
+        parentnode.removeChild(para);
+    };
 
-    this._convertToSarissaNode = function(ownerdoc, htmlnode, xhtmlparent) {
-        return this._convertNodes(ownerdoc, htmlnode, xhtmlparent, new this.Set(['html']));
+    this._cleanupParas = function(ownerdoc, root) {
+        var paras = root.getElementsByTagName('p');
+        for (var i = 0; i < paras.length; i++) {
+            this._cleanupPara(ownerdoc, paras[i]);
+        }
+    };
+    /* Cleanup br tags: br at top level is replaced by a paragraph,
+     * br at end of p|div is dropped.
+     */
+    this._cleanupBr = function(ownerdoc, root) {
+        var breaks = root.getElementsByTagName('br');
+        for (var i = 0; i < breaks.length; i++) {
+            var node = breaks[i];
+            var parentNode = node.parentNode;
+            if (parentNode.tagName=='body') {
+                var p = ownerdoc.createElement('p');
+                var prev = node.previousSibling;
+                if (prev && prev.nodeType==3) {
+                    p.appendChild(prev);
+                }
+                parentNode.insertBefore(p,node);
+                parentNode.removeChild(node);
+            } else if (!node.nextSibling && (/p|div/i.test(parentNode.nodeName))) {
+                parentNode.removeChild(node);
+            }
+        }
     };
 
     this._convertNodes = function(ownerdoc, htmlnode, xhtmlparent, permitted) {
@@ -620,12 +692,6 @@
         var nodename = this._getTagName(htmlnode);
         var nostructure = !this.filterstructure;
 
-        var filter = this.nodefilters[nodename];
-        if (filter) {
-            if (!filter(htmlnode, xhtmlparent)) {
-                return;
-            }
-        }
         // TODO: This permits valid tags anywhere. it should use the state
         // table in xhtmlvalid to only permit tags where the XHTML DTD
         // says they are valid.
@@ -646,7 +712,7 @@
 
         if (kids.length == 0) {
             if (htmlnode.text && htmlnode.text != "" &&
-                (nostructure || permittedChildren['#PCDATA'])) {
+                (nostructure || permittedChildren['#text'])) {
                 var text = htmlnode.text;
                 var tnode = ownerdoc.createTextNode(text);
                 parentnode.appendChild(tnode);
@@ -669,11 +735,11 @@
                         parentnode.appendChild(newkid);
                     };
                 } else if (kid.nodeType == 3) {
-                    if (nostructure || permittedChildren['#PCDATA']) {
+                    if (nostructure || permittedChildren['#text']) {
                         parentnode.appendChild(ownerdoc.createTextNode(kid.nodeValue));
                     }
                 } else if (kid.nodeType == 4) {
-                    if (nostructure || permittedChildren['#PCDATA']) {
+                    if (nostructure || permittedChildren['#text']) {
                         parentnode.appendChild(ownerdoc.createCDATASection(kid.nodeValue));
                     }
                 }

Modified: kupu/trunk/kupu/tests/test_xhtml.js
==============================================================================
--- kupu/trunk/kupu/tests/test_xhtml.js	(original)
+++ kupu/trunk/kupu/tests/test_xhtml.js	Tue May 15 15:55:16 2007
@@ -256,8 +256,45 @@
             '<basefont size="2"/>';
         this.editor.xhtmlvalid.filterstructure = true;
         this.conversionTest(data, data);
+    }
+
+    // Some tests to ensure that we don't put anything in a <p> tag
+    // which isn't allowed in a <p> tag.
+    // Can't test with <p><div>x</div></p> as Firefox DOM fixes that
+    // for us (but not as we want it fixed) so we use something FF doesn't already fix.
+    this.testPcleanup = function() {
+        var data = '<p><table><tbody><tr><td>oops</td></tr></tbody></table></p>';
+        var expected = '<table><tbody><tr><td>oops</td></tr></tbody></table>';
+        this.conversionTest(data, expected);
+    };
+
+    this.testPcleanup2 = function() {
+        var data = '<p class="blue">some text<br/><table><tbody><tr><td>oops</td></tr></tbody></table>more text<br/></p>';
+        var expected = '<p class="blue">some text</p><table><tbody><tr><td>oops</td></tr></tbody></table><p class="blue">more text</p>';
+        this.conversionTest(data, expected);
+    };
+
+    this.testPWithCaptionedImg = function() {
+        // Captioned images are converted to block tags so they must
+        // not be inside a paragraph.
+        var data = '<p>some text<br/><img class="image-inline captioned" src="javascript:" alt="xyzzy" height="1" width="1"/>blah</p>';
+        var expected = '<p>some text</p><img class="image-inline captioned" src="javascript:" alt="xyzzy" height="1" width="1"/><p>blah</p>';
+        this.conversionTest(data, expected);
+        // If there is no surrounding text we don't want empty paras.
+        var data = '<p><img class="image-inline captioned" src="javascript:" alt="xyzzy" height="1" width="1"/></p>';
+        var expected = '<img class="image-inline captioned" src="javascript:" alt="xyzzy" height="1" width="1"/>';
+        this.conversionTest(data, expected);
+        // But ordinary images are fine.
+        var data = '<p>some text<br/><img class="image-inline" src="javascript:" alt="xyzzy" height="1" width="1"/>blah</p>';
+        var expected = '<p>some text<br/><img class="image-inline" src="javascript:" alt="xyzzy" height="1" width="1"/>blah</p>';
+        this.conversionTest(data, expected);
     };
 
+    // Firefox is broken wrt to <br> tags and newlines inside <pre>.
+    // It thinks that <br>\n is two newlines but in fact the HTML spec
+    // says it should ignore any whitespace following a <br>.
+    this.testBrInsidePre = function() {
+    }
     this.tearDown = function() {
         this.body.innerHTML = '';
     };

From duncan at codespeak.net  Tue May 15 16:15:42 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Tue, 15 May 2007 16:15:42 +0200 (CEST)
Subject: [kupu-checkins] r43408 - kupu/trunk/kupu/common/kupudrawers
Message-ID: <20070515141542.6B1B08084@code0.codespeak.net>

Author: duncan
Date: Tue May 15 16:15:42 2007
New Revision: 43408

Modified:
   kupu/trunk/kupu/common/kupudrawers/drawer.xsl
Log:
Description should be inside <p> tags.

Modified: kupu/trunk/kupu/common/kupudrawers/drawer.xsl
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers/drawer.xsl	(original)
+++ kupu/trunk/kupu/common/kupudrawers/drawer.xsl	Tue May 15 16:15:42 2007
@@ -252,7 +252,8 @@
         </h1>
         <xsl:if test="description != ''">
             <div class="kupu-description-row documentDescription">
-                <xsl:copy-of select="description/*|description/text()"/>
+                <p><xsl:copy-of
+                select="description/*|description/text()"/></p>
             </div>
         </xsl:if>
         <div style="clear:both;line-height:1px;">&#xA0;</div>
@@ -276,7 +277,8 @@
         </h1>
         <xsl:if test="description != ''">
             <div class="kupu-description-row documentDescription">
-                <xsl:copy-of select="description/*|description/text()"/>
+               <p><xsl:copy-of
+               select="description/*|description/text()"/></p>
             </div>
         </xsl:if>
         <div style="clear:both;"/>

From duncan at codespeak.net  Tue May 15 17:10:55 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Tue, 15 May 2007 17:10:55 +0200 (CEST)
Subject: [kupu-checkins] r43413 - in kupu/trunk/kupu/common: . kupudrawers
Message-ID: <20070515151055.38A598084@code0.codespeak.net>

Author: duncan
Date: Tue May 15 17:10:54 2007
New Revision: 43413

Modified:
   kupu/trunk/kupu/common/kupudrawers.js
   kupu/trunk/kupu/common/kupudrawers/drawer.xsl
   kupu/trunk/kupu/common/kupudrawerstyles.css
Log:
Fixup race condition on loading preview.
Moved preview image under the title
Fixed up styles for IE

Modified: kupu/trunk/kupu/common/kupudrawers.js
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers.js	(original)
+++ kupu/trunk/kupu/common/kupudrawers.js	Tue May 15 17:10:54 2007
@@ -692,7 +692,10 @@
         if (!this.focussed) {
             this.focusElement();
         }
-
+        var el = targetnode.getElementsByTagName('img')[0];
+        if (el) {
+            kupuFixImage(el);
+        }
         // Mark drawer as having a selection or not
         var el = this.element;
         el.className = el.className.replace(' kupu-has-selection', '');

Modified: kupu/trunk/kupu/common/kupudrawers/drawer.xsl
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers/drawer.xsl	(original)
+++ kupu/trunk/kupu/common/kupudrawers/drawer.xsl	Tue May 15 17:10:54 2007
@@ -244,12 +244,12 @@
     <!-- resource template with no mode can be used to generate a quick preview -->
     <xsl:template match="resource">
       <div>
-        <div class="kupu-preview-row">
-          <xsl:apply-templates select="." mode="image-view" />
-        </div>
         <h1 class="kupu-title-row">
             <xsl:value-of select="title"/>
         </h1>
+        <div class="kupu-preview-row">
+          <xsl:apply-templates select="." mode="image-view" />
+        </div>
         <xsl:if test="description != ''">
             <div class="kupu-description-row documentDescription">
                 <p><xsl:copy-of
@@ -260,6 +260,9 @@
       </div>
     </xsl:template>
     <xsl:template match="resource|collection" mode="base-properties">
+        <h1 class="kupu-title-row">
+            <xsl:value-of select="title"/>
+        </h1>
         <div class="kupu-preview-row">
             <xsl:apply-templates select="status"/>
             <xsl:apply-templates select="." mode="image-view" />
@@ -272,9 +275,6 @@
                     </span>)</xsl:if>
             </div>
         </div>
-        <h1 class="kupu-title-row">
-            <xsl:value-of select="title"/>
-        </h1>
         <xsl:if test="description != ''">
             <div class="kupu-description-row documentDescription">
                <p><xsl:copy-of
@@ -359,7 +359,7 @@
                 <xsl:if test="sizes">
                    <div>
                     <label class="kupu-detail-label"
-                           for="image-size-selector">Size:</label>&#xa0;
+                           for="image-size-selector">Size:</label>
                     <select class="kupu-detail" name="image-size-selector">
                         <option name="image-size-option" value="{uri}">Original</option>
                         <xsl:apply-templates select="sizes/size" />
@@ -369,7 +369,7 @@
                 <xsl:if test="class">
                    <div>
                       <label class="kupu-detail-label"
-                             for="kupu-image-class-selector">Style:</label>&#xa0;
+                             for="kupu-image-class-selector">Style:</label>
                       <select class="kupu-detail" name="kupu-image-class-selector" id="kupu-image-class">
                          <xsl:apply-templates select="class"/>
                       </select>

Modified: kupu/trunk/kupu/common/kupudrawerstyles.css
==============================================================================
--- kupu/trunk/kupu/common/kupudrawerstyles.css	(original)
+++ kupu/trunk/kupu/common/kupudrawerstyles.css	Tue May 15 17:10:54 2007
@@ -97,6 +97,7 @@
    clear: none;
    height: auto; line-height: 1.1em;
 }
+.kupu-description-row p { height: auto !IMPORTANT; }
 
 h1.kupu-title-row { font-size: 136%; }
 

From hannosch at codespeak.net  Wed May 16 05:53:50 2007
From: hannosch at codespeak.net (hannosch at codespeak.net)
Date: Wed, 16 May 2007 05:53:50 +0200 (CEST)
Subject: [kupu-checkins] r43425 - kupu/trunk/kupu/common
Message-ID: <20070516035350.133D98084@code0.codespeak.net>

Author: hannosch
Date: Wed May 16 05:53:49 2007
New Revision: 43425

Modified:
   kupu/trunk/kupu/common/fulldoc.html
Log:
Make ZChecker happy and add missing summary attribute to a table.

Modified: kupu/trunk/kupu/common/fulldoc.html
==============================================================================
--- kupu/trunk/kupu/common/fulldoc.html	(original)
+++ kupu/trunk/kupu/common/fulldoc.html	Wed May 16 05:53:49 2007
@@ -51,7 +51,8 @@
 us a chance to test table editing in Kupu:</p>
 
 <h4>Comparing Data- and Document-Centric</h4>
-<table border="0" class="plain" cellspacing="0">
+<table border="0" class="plain" cellspacing="0"
+       summary="Comparing Data- and Document-Centric">
 <tbody>
     <tr>
         <th>&nbsp;</th>

From duncan at codespeak.net  Wed May 16 11:29:38 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Wed, 16 May 2007 11:29:38 +0200 (CEST)
Subject: [kupu-checkins] r43427 - kupu/trunk/kupu/plone
Message-ID: <20070516092938.2AE14808D@code0.codespeak.net>

Author: duncan
Date: Wed May 16 11:29:37 2007
New Revision: 43427

Modified:
   kupu/trunk/kupu/plone/plonedrawers.py
Log:
Protect against corrupted catalog

Modified: kupu/trunk/kupu/plone/plonedrawers.py
==============================================================================
--- kupu/trunk/kupu/plone/plonedrawers.py	(original)
+++ kupu/trunk/kupu/plone/plonedrawers.py	Wed May 16 11:29:37 2007
@@ -234,9 +234,9 @@
         """Returns size, width, height"""
         if not self.showimagesize:
             return None, None, None
-        if not callable(obj.getId):
-            obj = obj.getObject() # Must be a brain
         try:
+            if not callable(obj.getId):
+                obj = obj.getObject() # Must be a brain
             size = self.tool.getObjSize(obj)
         except:
             size = None

From duncan at codespeak.net  Wed May 16 14:29:32 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Wed, 16 May 2007 14:29:32 +0200 (CEST)
Subject: [kupu-checkins] r43429 - kupu/trunk/kupu/common/kupudrawers
Message-ID: <20070516122932.47D9A808F@code0.codespeak.net>

Author: duncan
Date: Wed May 16 14:29:29 2007
New Revision: 43429

Modified:
   kupu/trunk/kupu/common/kupudrawers/drawer.xsl
Log:
Removed some spurious <div> tags.

Modified: kupu/trunk/kupu/common/kupudrawers/drawer.xsl
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers/drawer.xsl	(original)
+++ kupu/trunk/kupu/common/kupudrawers/drawer.xsl	Wed May 16 14:29:29 2007
@@ -304,91 +304,79 @@
     </xsl:template>
 
     <xsl:template match="resource|collection" mode="image-properties">
-        <xsl:apply-templates select="." mode="base-properties"/>
-        <div>
-           <!-- <form onsubmit="return false;"> -->
-                <div>
-                   <input id="kupu-media" type="hidden" value="{media}" />
-                   <input id="kupu-width" type="hidden" value="{width}" />
-                   <input id="kupu-height" type="hidden" value="{height}" />
-                   <label class="kupu-detail-label">Align:</label>
-                   <span class="kupu-detail">
-                      <input type="radio" name="image-align" id="image-align-left" value="image-left">
-                         <xsl:attribute name="onkeypress">if(event.keyCode==13)return false;</xsl:attribute>
-                         <xsl:if test="$image-align='left'">
-                            <xsl:attribute name="checked">checked</xsl:attribute>
-                         </xsl:if>
-                      </input>
-                      <label for="image-align-left" i18n:translate="imagedrawer_left">Left</label>
-                      <input type="radio" name="image-align" id="image-align-inline" value="image-inline">
-                         <xsl:attribute name="onkeypress">if(event.keyCode==13)return false;</xsl:attribute>
-                         <xsl:if test="$image-align='inline'">
-                            <xsl:attribute name="checked">checked</xsl:attribute>
-                         </xsl:if>
-                      </input>
-                      <label for="image-align-inline" i18n:translate="imagedrawer_inline">Inline</label>
-                      <input type="radio" name="image-align" id="image-align-right" value="image-right">
-                         <xsl:attribute name="onkeypress">if(event.keyCode==13)return false;</xsl:attribute>
-                         <xsl:if test="$image-align='right'">
-                            <xsl:attribute name="checked">checked</xsl:attribute>
-                         </xsl:if>
-                      </input>
-                      <label for="image-align-right" i18n:translate="imagedrawer_right">Right</label>
-                    </span>
-                </div>
-                
-                <xsl:if test="$usecaptions='yes'">
-                   <xsl:choose>
-                      <xsl:when test="media='flash'" />
-                      <xsl:otherwise>
-                         <div>
-                            <label class="kupu-detail-label"
-                                   for="image-caption" i18n:translate="imagedrawer_caption_label">Caption:</label>
-                            <input class="kupu-detail" type="checkbox" name="image-caption" id="image-caption">
-                               <xsl:attribute name="onkeypress">if(event.keyCode==13)return false;</xsl:attribute>
-                               <xsl:if test="$image-caption='true'">
-                                  <xsl:attribute name="checked">checked</xsl:attribute>
-                               </xsl:if>
-                               <xsl:attribute name="onclick">document.getElementById('image_alt_div').style.display =
-                                  this.checked?'none':'';</xsl:attribute>
-                            </input>
-                         </div>
-                      </xsl:otherwise>
-                   </xsl:choose>
+       <xsl:apply-templates select="." mode="base-properties"/>
+       <div class="kupu-image-fields">
+          <input id="kupu-media" type="hidden" value="{media}" />
+          <input id="kupu-width" type="hidden" value="{width}" />
+          <input id="kupu-height" type="hidden" value="{height}" />
+          <label class="kupu-detail-label">Align:</label>
+          <span class="kupu-detail">
+             <input type="radio" name="image-align" id="image-align-left" value="image-left">
+                <xsl:attribute name="onkeypress">if(event.keyCode==13)return false;</xsl:attribute>
+                <xsl:if test="$image-align='left'">
+                   <xsl:attribute name="checked">checked</xsl:attribute>
                 </xsl:if>
-                <xsl:if test="sizes">
-                   <div>
-                    <label class="kupu-detail-label"
-                           for="image-size-selector">Size:</label>
-                    <select class="kupu-detail" name="image-size-selector">
-                        <option name="image-size-option" value="{uri}">Original</option>
-                        <xsl:apply-templates select="sizes/size" />
-                    </select>
-                   </div>
+             </input>
+             <label for="image-align-left" i18n:translate="imagedrawer_left">Left</label>
+             <input type="radio" name="image-align" id="image-align-inline" value="image-inline">
+                <xsl:attribute name="onkeypress">if(event.keyCode==13)return false;</xsl:attribute>
+                <xsl:if test="$image-align='inline'">
+                   <xsl:attribute name="checked">checked</xsl:attribute>
                 </xsl:if>
-                <xsl:if test="class">
-                   <div>
-                      <label class="kupu-detail-label"
-                             for="kupu-image-class-selector">Style:</label>
-                      <select class="kupu-detail" name="kupu-image-class-selector" id="kupu-image-class">
-                         <xsl:apply-templates select="class"/>
-                      </select>
-                   </div>
+             </input>
+             <label for="image-align-inline" i18n:translate="imagedrawer_inline">Inline</label>
+             <input type="radio" name="image-align" id="image-align-right" value="image-right">
+                <xsl:attribute name="onkeypress">if(event.keyCode==13)return false;</xsl:attribute>
+                <xsl:if test="$image-align='right'">
+                   <xsl:attribute name="checked">checked</xsl:attribute>
                 </xsl:if>
-                <div id="image_alt_div">
-                    <xsl:if
-                           test="$usecaptions='yes' and $image-caption='true'">
-                        <xsl:attribute name="style">display:none;</xsl:attribute>
-                     </xsl:if>   
-                    <label class="kupu-detail-label"
-                           for="image_alt"
-                           i18n:translate="imagedrawer_upload_alt_text">"alt"&#xa0;text:</label>
-                    <input class="kupu-detail" type="text" id="image_alt" size="20" value="{title}">
-                       <xsl:attribute name="onkeypress">if(event.keyCode==13)return false;</xsl:attribute>
-                    </input>
-                </div>
-                <!-- </form> -->
-        </div>
+             </input>
+             <label for="image-align-right" i18n:translate="imagedrawer_right">Right</label>
+          </span>
+          <xsl:if test="$usecaptions='yes'">
+             <xsl:choose>
+                <xsl:when test="media='flash'" />
+                <xsl:otherwise>
+                   <label class="kupu-detail-label"
+                          for="image-caption" i18n:translate="imagedrawer_caption_label">Caption:</label>
+                   <input class="kupu-detail" type="checkbox" name="image-caption" id="image-caption">
+                      <xsl:attribute name="onkeypress">if(event.keyCode==13)return false;</xsl:attribute>
+                      <xsl:if test="$image-caption='true'">
+                         <xsl:attribute name="checked">checked</xsl:attribute>
+                      </xsl:if>
+                      <xsl:attribute name="onclick">document.getElementById('image_alt_div').style.display =
+                         this.checked?'none':'';</xsl:attribute>
+                   </input>
+                </xsl:otherwise>
+             </xsl:choose>
+          </xsl:if>
+          <xsl:if test="sizes">
+             <label class="kupu-detail-label"
+                    for="image-size-selector">Size:</label>
+             <select class="kupu-detail" name="image-size-selector">
+                <option name="image-size-option" value="{uri}">Original</option>
+                <xsl:apply-templates select="sizes/size" />
+             </select>
+          </xsl:if>
+          <xsl:if test="class">
+             <label class="kupu-detail-label"
+                    for="kupu-image-class-selector">Style:</label>
+             <select class="kupu-detail" name="kupu-image-class-selector" id="kupu-image-class">
+                <xsl:apply-templates select="class"/>
+             </select>
+          </xsl:if>
+          <div id="image_alt_div">
+             <xsl:if test="$usecaptions='yes' and $image-caption='true'">
+                <xsl:attribute name="style">display:none;</xsl:attribute>
+             </xsl:if>   
+             <label class="kupu-detail-label"
+                    for="image_alt"
+                    i18n:translate="imagedrawer_upload_alt_text">"alt"&#xa0;text:</label>
+             <input class="kupu-detail" type="text" id="image_alt" size="20" value="{title}">
+                <xsl:attribute name="onkeypress">if(event.keyCode==13)return false;</xsl:attribute>
+             </input>
+          </div>
+       </div>
     </xsl:template>
     <xsl:template match="class">
        <option value="{@name}">

From duncan at codespeak.net  Wed May 16 14:44:49 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Wed, 16 May 2007 14:44:49 +0200 (CEST)
Subject: [kupu-checkins] r43431 - in kupu/trunk/kupu/common: . kupudrawers
Message-ID: <20070516124449.1DC308090@code0.codespeak.net>

Author: duncan
Date: Wed May 16 14:44:48 2007
New Revision: 43431

Modified:
   kupu/trunk/kupu/common/kupudrawers/drawer.xsl
   kupu/trunk/kupu/common/kupudrawerstyles.css
Log:
upload button should be a button not a div

Modified: kupu/trunk/kupu/common/kupudrawers/drawer.xsl
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers/drawer.xsl	(original)
+++ kupu/trunk/kupu/common/kupudrawers/drawer.xsl	Wed May 16 14:44:48 2007
@@ -215,11 +215,11 @@
         </div>
     </xsl:template>
     <xsl:template match="uploadbutton" mode="currentpanel">
-        <div class="kupu-upload">
+        <button class="kupu-dialog-button kupu-upload">
             <xsl:attribute name="onclick"> drawertool.current_drawer.selectUpload(); </xsl:attribute>
-            <span class="drawer-item-title" i18n:translate="imagedrawer_upload_link">Upload
-            ...</span>
-        </div>
+            <span class="drawer-item-title"
+                  i18n:translate="imagedrawer_upload_link">Upload&#xa0;image&#xa0;here...</span>
+        </button>
     </xsl:template>
     <xsl:template match="icon">
         <img src="{.}" alt="{../title}">

Modified: kupu/trunk/kupu/common/kupudrawerstyles.css
==============================================================================
--- kupu/trunk/kupu/common/kupudrawerstyles.css	(original)
+++ kupu/trunk/kupu/common/kupudrawerstyles.css	Wed May 16 14:44:48 2007
@@ -185,7 +185,7 @@
 }
 
 div.kupu-libsource, div.kupu-libsource-selected,
-div.kupu-resource, div.kupu-collection, div.kupu-upload {
+div.kupu-resource, div.kupu-collection {
   cursor: pointer;
   margin-bottom: 2px;
   vertical-align: text-bottom;
@@ -195,8 +195,8 @@
 .library-icon-library {
   margin-left: -20px;
 }
-div.kupu-upload {
-   text-align: right; font-style: italic;
+.kupu-upload {
+  margin-top: 1em; float:right;
 }
 
 label.kupu-detail-label {

From duncan at codespeak.net  Wed May 16 15:41:54 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Wed, 16 May 2007 15:41:54 +0200 (CEST)
Subject: [kupu-checkins] r43434 - in kupu/trunk/kupu/common: . kupudrawers
Message-ID: <20070516134154.1F3198092@code0.codespeak.net>

Author: duncan
Date: Wed May 16 15:41:53 2007
New Revision: 43434

Modified:
   kupu/trunk/kupu/common/kupudrawers.js
   kupu/trunk/kupu/common/kupudrawers/drawer.xsl
   kupu/trunk/kupu/common/kupudrawerstyles.css
Log:
Upload button moved to the bottom of the panel.
selected-item class is now applied to the containing div instead of the span.

Modified: kupu/trunk/kupu/common/kupudrawers.js
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers.js	(original)
+++ kupu/trunk/kupu/common/kupudrawers.js	Wed May 16 15:41:53 2007
@@ -1003,7 +1003,8 @@
             if (item) {
                 var spans = item.getElementsByTagName('span');
                 for (var j = 0; j < spans.length; j++) {
-                    spans[j].className = spans[j].className.replace(' selected-item', '');
+                    var p = spans[j].parentNode;
+                    p.className = p.className.replace(/(\s+|^)selected-item/, '');
                 }
             }
         }
@@ -1070,8 +1071,9 @@
         var span = item.getElementsByTagName('span');
         if (span.length > 0) {
             span = span[0];
-            span.className += ' selected-item';
-            var inp = span.parentNode.getElementsByTagName('input');
+            var p = span.parentNode;
+            p.className += ' selected-item';
+            var inp = p.getElementsByTagName('input');
             if (inp) inp[0].checked = check;
         }
 

Modified: kupu/trunk/kupu/common/kupudrawers/drawer.xsl
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers/drawer.xsl	(original)
+++ kupu/trunk/kupu/common/kupudrawers/drawer.xsl	Wed May 16 15:41:53 2007
@@ -119,6 +119,8 @@
                                             <xsl:apply-templates
                                                 select="/libraries/*[@selected]/items"/>
                                         </div>
+                                        <xsl:apply-templates select="/libraries/*[@selected]//uploadbutton"
+                                                                mode="currentpanel"/>
                                     </td>
                                     <td id="kupu-propertiespanel" class="panel">
                                         <div id="kupu-properties" class="overflow">
@@ -186,10 +188,17 @@
         </div>
     </xsl:template>
     <xsl:template match="items">
-        <xsl:apply-templates select="collection|resource|uploadbutton" mode="currentpanel"/>
+        <xsl:apply-templates select="collection|resource" mode="currentpanel"/>
     </xsl:template>
     <xsl:template match="resource|collection" mode="currentpanel">
-        <div id="{@id}" class="kupu-{local-name()} {@class}" title="{description}">
+        <div id="{@id}" title="{description}">
+           <xsl:attribute name="class">
+              <xsl:value-of select="@class"/>
+              kupu-<xsl:value-of select="local-name()"/>
+              <xsl:if test="@selected">
+                 selected-item
+              </xsl:if>
+           </xsl:attribute>
             <xsl:attribute name="onclick">
                 <xsl:choose>
                     <xsl:when test="local-name()='collection'">drawertool.current_drawer.selectCollection(this);</xsl:when>
@@ -229,9 +238,6 @@
     </xsl:template>
     <xsl:template match="label|title">
         <span class="drawer-item-title">
-            <xsl:if test="../@selected">
-                <xsl:attribute name="class">drawer-item-title selected-item</xsl:attribute>
-            </xsl:if>
             <xsl:choose>
                 <xsl:when test="string-length() &gt; $titlelength">
                     <xsl:value-of select="substring(., 0, $titlelength)"/>... </xsl:when>

Modified: kupu/trunk/kupu/common/kupudrawerstyles.css
==============================================================================
--- kupu/trunk/kupu/common/kupudrawerstyles.css	(original)
+++ kupu/trunk/kupu/common/kupudrawerstyles.css	Wed May 16 15:41:53 2007
@@ -195,9 +195,6 @@
 .library-icon-library {
   margin-left: -20px;
 }
-.kupu-upload {
-  margin-top: 1em; float:right;
-}
 
 label.kupu-detail-label {
   float:left;clear:left;
@@ -240,7 +237,7 @@
   padding-top: 2px;
 }
 
-span.drawer-item-title.selected-item {
+.selected-item span.drawer-item-title {
   background-color:#C0C0C0;
 }
 

From duncan at codespeak.net  Wed May 16 17:18:24 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Wed, 16 May 2007 17:18:24 +0200 (CEST)
Subject: [kupu-checkins] r43435 - in kupu/trunk/kupu: common
	common/kupudrawers plone/kupu_plone_layer
Message-ID: <20070516151824.8F7F88092@code0.codespeak.net>

Author: duncan
Date: Wed May 16 17:18:23 2007
New Revision: 43435

Modified:
   kupu/trunk/kupu/common/kupudrawers/drawer.xsl
   kupu/trunk/kupu/common/kupudrawerstyles.css
   kupu/trunk/kupu/plone/kupu_plone_layer/kupuplone.css.dtml
Log:
More style changes

Modified: kupu/trunk/kupu/common/kupudrawers/drawer.xsl
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers/drawer.xsl	(original)
+++ kupu/trunk/kupu/common/kupudrawers/drawer.xsl	Wed May 16 17:18:23 2007
@@ -85,8 +85,7 @@
                                 <xsl:variable name="search_value" i18n:translate="kupudrawer_search"
                                     >Search</xsl:variable>
                                 <input id="kupu-searchbox-input"
-                                    class="kupu-searchbox-input nofocus"
-                                    style="color: #666;">
+                                    class="kupu-searchbox-input nofocus">
                                   <xsl:attribute name="onkeypress">if(event.keyCode==13)return false;</xsl:attribute>
                                     <xsl:attribute name="onkeyup">if(event.keyCode == 13){drawertool.current_drawer.search();return false;}</xsl:attribute>
                                     <xsl:attribute name="value">
@@ -116,6 +115,9 @@
                                     </td>
                                     <td id="kupu-resourcespanel" class="panel">
                                         <div id="kupu-resourceitems" class="overflow">
+                                           <xsl:if test="/libraries/*[@selected]//uploadbutton">
+                                              <xsl:attribute name="class">overflow overflow-with-button</xsl:attribute>
+                                           </xsl:if>
                                             <xsl:apply-templates
                                                 select="/libraries/*[@selected]/items"/>
                                         </div>
@@ -226,8 +228,7 @@
     <xsl:template match="uploadbutton" mode="currentpanel">
         <button class="kupu-dialog-button kupu-upload">
             <xsl:attribute name="onclick"> drawertool.current_drawer.selectUpload(); </xsl:attribute>
-            <span class="drawer-item-title"
-                  i18n:translate="imagedrawer_upload_link">Upload&#xa0;image&#xa0;here...</span>
+            <span tal:omit-tag="" i18n:translate="imagedrawer_upload_link">Upload&#xa0;image&#xa0;here...</span>
         </button>
     </xsl:template>
     <xsl:template match="icon">
@@ -272,8 +273,7 @@
         <div class="kupu-preview-row">
             <xsl:apply-templates select="status"/>
             <xsl:apply-templates select="." mode="image-view" />
-            <div>
-                <xsl:value-of select="size"/>
+            <div class="preview-size">
                 <xsl:if test="width" i18n:translate="imagedrawer_size"> (<span i18n:name="width">
                 <xsl:value-of select="width"/>
                     </span> by <span i18n:name="height">

Modified: kupu/trunk/kupu/common/kupudrawerstyles.css
==============================================================================
--- kupu/trunk/kupu/common/kupudrawerstyles.css	(original)
+++ kupu/trunk/kupu/common/kupudrawerstyles.css	Wed May 16 17:18:23 2007
@@ -109,10 +109,6 @@
   width: 640px; /* Mozilla bug */
 }
 
-div.kupu-drawer button {
-  margin-right: 0.3em;
-}
-
 div.kupu-panels {
   width: 100%;
   background-color: ButtonFace;
@@ -137,7 +133,7 @@
 }
 
 td.panel {
-  height: 260px;
+  height: 260px; padding:0; margin:0;
 }
 
 td#kupu-librariespanel {
@@ -148,7 +144,7 @@
 div#kupu-librariesitems {
   width: 105px;
   white-space: nowrap;
-  height: 100%;
+  height: 260px;
 }
 
 td#kupu-resourcespanel {
@@ -159,11 +155,13 @@
 div#kupu-resourceitems {
   white-space: nowrap;
   width: 200px;
-  height: 100%;
+}
+div#kupu-resourceitems.overflow-with-button {
+  height:236px;
 }
 
 div#kupu-properties {
-  height: 100%;
+  height: 260px;
 }
 
 div#kupu-librariesitems, div#kupu-resourceitems, div#kupu-properties {
@@ -172,7 +170,7 @@
 
 .overflow {
   overflow: auto;
-  height: 100%;
+  height: 260px;
 }
 
 div.response, div.collection {

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	Wed May 16 17:18:23 2007
@@ -223,11 +223,6 @@
   font-size: 100%;
 }
 
-div.kupu-drawer table td button, 
-div.kupu-drawer table td td {
-  font-size: 100%;
-}
-
 div.kupuoverride {
     margin-left: 0.75em;
 }

From duncan at codespeak.net  Wed May 16 17:33:25 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Wed, 16 May 2007 17:33:25 +0200 (CEST)
Subject: [kupu-checkins] r43436 - in kupu/trunk/kupu/common: . kupudrawers
Message-ID: <20070516153325.3EBEE8092@code0.codespeak.net>

Author: duncan
Date: Wed May 16 17:33:24 2007
New Revision: 43436

Modified:
   kupu/trunk/kupu/common/kupudrawers/drawer.xsl
   kupu/trunk/kupu/common/kupudrawerstyles.css
Log:
Tweaked class

Modified: kupu/trunk/kupu/common/kupudrawers/drawer.xsl
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers/drawer.xsl	(original)
+++ kupu/trunk/kupu/common/kupudrawers/drawer.xsl	Wed May 16 17:33:24 2007
@@ -114,10 +114,10 @@
                                         </div>
                                     </td>
                                     <td id="kupu-resourcespanel" class="panel">
+                                       <xsl:if test="/libraries/*[@selected]//uploadbutton">
+                                          <xsl:attribute name="class">panel upload-allowed</xsl:attribute>
+                                       </xsl:if>
                                         <div id="kupu-resourceitems" class="overflow">
-                                           <xsl:if test="/libraries/*[@selected]//uploadbutton">
-                                              <xsl:attribute name="class">overflow overflow-with-button</xsl:attribute>
-                                           </xsl:if>
                                             <xsl:apply-templates
                                                 select="/libraries/*[@selected]/items"/>
                                         </div>

Modified: kupu/trunk/kupu/common/kupudrawerstyles.css
==============================================================================
--- kupu/trunk/kupu/common/kupudrawerstyles.css	(original)
+++ kupu/trunk/kupu/common/kupudrawerstyles.css	Wed May 16 17:33:24 2007
@@ -156,7 +156,7 @@
   white-space: nowrap;
   width: 200px;
 }
-div#kupu-resourceitems.overflow-with-button {
+.upload-allowed div#kupu-resourceitems {
   height:236px;
 }
 

From duncan at codespeak.net  Thu May 17 10:39:30 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Thu, 17 May 2007 10:39:30 +0200 (CEST)
Subject: [kupu-checkins] r43448 - in kupu/trunk/kupu/common: . kupudrawers
Message-ID: <20070517083930.9286F8082@code0.codespeak.net>

Author: duncan
Date: Thu May 17 10:39:30 2007
New Revision: 43448

Modified:
   kupu/trunk/kupu/common/kupudrawers/drawer.xsl
   kupu/trunk/kupu/common/kupudrawerstyles.css
   kupu/trunk/kupu/common/kupuhelpers.js
Log:
Tidied up html/css for image form again: now it lays out correctly in IE6.

Modified: kupu/trunk/kupu/common/kupudrawers/drawer.xsl
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers/drawer.xsl	(original)
+++ kupu/trunk/kupu/common/kupudrawers/drawer.xsl	Thu May 17 10:39:30 2007
@@ -315,7 +315,7 @@
           <input id="kupu-media" type="hidden" value="{media}" />
           <input id="kupu-width" type="hidden" value="{width}" />
           <input id="kupu-height" type="hidden" value="{height}" />
-          <label class="kupu-detail-label">Align:</label>
+          <label class="kupu-detail">Align:</label>
           <span class="kupu-detail">
              <input type="radio" name="image-align" id="image-align-left" value="image-left">
                 <xsl:attribute name="onkeypress">if(event.keyCode==13)return false;</xsl:attribute>
@@ -343,45 +343,53 @@
              <xsl:choose>
                 <xsl:when test="media='flash'" />
                 <xsl:otherwise>
-                   <label class="kupu-detail-label"
+                   <label class="kupu-detail"
                           for="image-caption" i18n:translate="imagedrawer_caption_label">Caption:</label>
-                   <input class="kupu-detail" type="checkbox" name="image-caption" id="image-caption">
-                      <xsl:attribute name="onkeypress">if(event.keyCode==13)return false;</xsl:attribute>
-                      <xsl:if test="$image-caption='true'">
-                         <xsl:attribute name="checked">checked</xsl:attribute>
-                      </xsl:if>
-                      <xsl:attribute name="onclick">document.getElementById('image_alt_div').style.display =
-                         this.checked?'none':'';</xsl:attribute>
-                   </input>
+                   <span class="kupu-detail">
+                      <input type="checkbox" name="image-caption" id="image-caption">
+                         <xsl:attribute name="onkeypress">if(event.keyCode==13)return false;</xsl:attribute>
+                         <xsl:if test="$image-caption='true'">
+                            <xsl:attribute name="checked">checked</xsl:attribute>
+                         </xsl:if>
+                         <xsl:attribute name="onclick">toggleAltFieldVisibility(this);</xsl:attribute>
+                      </input>
+                   </span>
                 </xsl:otherwise>
              </xsl:choose>
           </xsl:if>
           <xsl:if test="sizes">
-             <label class="kupu-detail-label"
+             <label class="kupu-detail"
                     for="image-size-selector">Size:</label>
-             <select class="kupu-detail" name="image-size-selector">
-                <option name="image-size-option" value="{uri}">Original</option>
-                <xsl:apply-templates select="sizes/size" />
-             </select>
+             <span class="kupu-detail">
+                <select name="image-size-selector">
+                   <option name="image-size-option" value="{uri}">Original</option>
+                   <xsl:apply-templates select="sizes/size" />
+                </select>
+             </span>
           </xsl:if>
           <xsl:if test="class">
-             <label class="kupu-detail-label"
+             <label class="kupu-detail"
                     for="kupu-image-class-selector">Style:</label>
-             <select class="kupu-detail" name="kupu-image-class-selector" id="kupu-image-class">
-                <xsl:apply-templates select="class"/>
-             </select>
+             <span class="kupu-detail">
+                <select name="kupu-image-class-selector" id="kupu-image-class">
+                   <xsl:apply-templates select="class"/>
+                </select>
+             </span>
           </xsl:if>
-          <div id="image_alt_div">
+          <label class="kupu-detail" id="image-alt-label"
+                 for="image_alt"
+                 i18n:translate="imagedrawer_upload_alt_text">
+             <xsl:if test="$usecaptions='yes' and $image-caption='true'">
+                <xsl:attribute name="style">display:none;</xsl:attribute>
+             </xsl:if>
+             "alt"&#xa0;text:
+          </label>
+          <input class="kupu-detail" type="text" id="image_alt" size="20" value="{title}">
              <xsl:if test="$usecaptions='yes' and $image-caption='true'">
                 <xsl:attribute name="style">display:none;</xsl:attribute>
              </xsl:if>   
-             <label class="kupu-detail-label"
-                    for="image_alt"
-                    i18n:translate="imagedrawer_upload_alt_text">"alt"&#xa0;text:</label>
-             <input class="kupu-detail" type="text" id="image_alt" size="20" value="{title}">
-                <xsl:attribute name="onkeypress">if(event.keyCode==13)return false;</xsl:attribute>
-             </input>
-          </div>
+             <xsl:attribute name="onkeypress">if(event.keyCode==13)return false;</xsl:attribute>
+          </input>
        </div>
     </xsl:template>
     <xsl:template match="class">

Modified: kupu/trunk/kupu/common/kupudrawerstyles.css
==============================================================================
--- kupu/trunk/kupu/common/kupudrawerstyles.css	(original)
+++ kupu/trunk/kupu/common/kupudrawerstyles.css	Thu May 17 10:39:30 2007
@@ -64,7 +64,7 @@
 .kupu-alt-row label {
    display: block;
 }
-#image_alt { width:17em; }
+
 div.kupu-linkdrawer-addlink td {
   border: 0;
 }
@@ -194,17 +194,18 @@
   margin-left: -20px;
 }
 
-label.kupu-detail-label {
-  float:left;clear:left;
-  width:7em;
-  text-align:right;
-  margin: 0.2em;
+.kupu-image-fields {
+  width: 270px; margin:0; padding:0;
 }
 .kupu-detail {
   float:left;
-  margin: 0.2em;
+  width: 185px;
+  margin: 2px 0; padding: 0;
+}
+label.kupu-detail {
+  clear:left; width:75px; text-align:right;
+  margin-right: 5px;
 }
-
 /*div.kupu-libsource-selected {
   background-repeat: no-repeat;
 }*/

Modified: kupu/trunk/kupu/common/kupuhelpers.js
==============================================================================
--- kupu/trunk/kupu/common/kupuhelpers.js	(original)
+++ kupu/trunk/kupu/common/kupuhelpers.js	Thu May 17 10:39:30 2007
@@ -1508,3 +1508,12 @@
     image.height = height;
     image.width = width;
 }
+function toggleAltFieldVisibility(me) {
+    var label = document.getElementById('image-alt-label');
+    var vis = me.checked?'none':'';
+    if (label) {
+        label.style.display = vis;
+        var fld = document.getElementById(label.htmlFor);
+        if(fld) { fld.style.display = vis; }
+    }
+}
\ No newline at end of file

From hannosch at codespeak.net  Thu May 17 11:41:02 2007
From: hannosch at codespeak.net (hannosch at codespeak.net)
Date: Thu, 17 May 2007 11:41:02 +0200 (CEST)
Subject: [kupu-checkins] r43450 - kupu/trunk/kupu/plone/kupu_references
Message-ID: <20070517094102.C27EA8090@code0.codespeak.net>

Author: hannosch
Date: Thu May 17 11:41:01 2007
New Revision: 43450

Modified:
   kupu/trunk/kupu/plone/kupu_references/referencebrowser.pt
Log:
Even more ZChecker happyness.

Modified: kupu/trunk/kupu/plone/kupu_references/referencebrowser.pt
==============================================================================
--- kupu/trunk/kupu/plone/kupu_references/referencebrowser.pt	(original)
+++ kupu/trunk/kupu/plone/kupu_references/referencebrowser.pt	Thu May 17 11:41:01 2007
@@ -29,9 +29,9 @@
                 tal:define="kupu context/kupu_library_tool;
                 base python:kupu.getBaseUrl(here);
                 uid context/UID|nothing;
-                lib_prefix    string:${base}/kupulibraries.xml?instance=$uid&resource_type=;
-                            search_prefix string:${portal_url}/kupusearch.xml?instance=$uid&resource_type=;
-                            select_prefix string:${portal_url}/kupuselection.xml?instance=$uid&resource_type=;
+                lib_prefix    string:${base}/kupulibraries.xml?instance=$uid&amp;resource_type=;
+                            search_prefix string:${portal_url}/kupusearch.xml?instance=$uid&amp;resource_type=;
+                            select_prefix string:${portal_url}/kupuselection.xml?instance=$uid&amp;resource_type=;
                             xsl_uri string:${portal_url}/kupudrawers/drawer.xsl;"
                 tal:content="string:krb_initdrawer('$xsl_uri','$lib_prefix','$search_prefix','$select_prefix');">
         </script>

From duncan at codespeak.net  Thu May 17 12:03:54 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Thu, 17 May 2007 12:03:54 +0200 (CEST)
Subject: [kupu-checkins] r43451 - in kupu/trunk/kupu/common: . kupudrawers
Message-ID: <20070517100354.83CEC8082@code0.codespeak.net>

Author: duncan
Date: Thu May 17 12:03:53 2007
New Revision: 43451

Modified:
   kupu/trunk/kupu/common/kupudrawers.js
   kupu/trunk/kupu/common/kupudrawers/drawer.xsl
   kupu/trunk/kupu/common/kupuhelpers.js
Log:
upload-allowed class now gets copied to html <td> in Firefox as well as IE.
Image preview size is calculated in the xml (if we have the original sizes available, otherwise it will fall back to the javascript version). This eliminates the horrible flicker as the preview pane layout changes.
Image fixing code no longer gets applied to the 'home' icon (making it disappear in FF).

Modified: kupu/trunk/kupu/common/kupudrawers.js
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers.js	(original)
+++ kupu/trunk/kupu/common/kupudrawers.js	Thu May 17 12:03:53 2007
@@ -688,12 +688,16 @@
         var targetnode = document.getElementById(id);
         if (!sourcenode || !targetnode) return;
 
+        var cls = sourcenode.getAttribute('class');
+        if (cls) {
+            targetnode.className = cls;
+        }
         Sarissa.copyChildNodes(sourcenode, targetnode);
         if (!this.focussed) {
             this.focusElement();
         }
-        var el = targetnode.getElementsByTagName('img')[0];
-        if (el) {
+        var el = document.getElementById('kupu-preview-image');
+        if (el && el.width=='1') {
             kupuFixImage(el);
         }
         // Mark drawer as having a selection or not

Modified: kupu/trunk/kupu/common/kupudrawers/drawer.xsl
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers/drawer.xsl	(original)
+++ kupu/trunk/kupu/common/kupudrawers/drawer.xsl	Thu May 17 12:03:53 2007
@@ -304,7 +304,27 @@
              </object>
           </xsl:when>
           <xsl:otherwise>
-             <img src="{$p}" title="{title}" onload="kupuFixImage(this);" width="1" height="1"/>
+             <img src="{$p}" title="{title}" width="{width}" height="{height}" id="kupu-preview-image">
+                <xsl:choose>
+                   <xsl:when test="height > width">
+                      <xsl:if test="height > 128">
+                         <xsl:attribute name="width"><xsl:value-of select="width*128 div height" /></xsl:attribute>
+                         <xsl:attribute name="height">128</xsl:attribute>
+                      </xsl:if>
+                   </xsl:when>
+                   <xsl:when test="width >= height">
+                      <xsl:if test="width > 128">
+                         <xsl:attribute name="height"><xsl:value-of select="height*128 div width" /></xsl:attribute>
+                         <xsl:attribute name="width">128</xsl:attribute>
+                      </xsl:if>
+                   </xsl:when>
+                   <xsl:otherwise>
+                      <xsl:attribute name="height">1</xsl:attribute>
+                      <xsl:attribute name="width">1</xsl:attribute>
+                      <xsl:attribute name="onload">kupuFixImage(this);</xsl:attribute>
+                   </xsl:otherwise>
+                </xsl:choose>
+             </img>
           </xsl:otherwise>
        </xsl:choose>
     </xsl:template>

Modified: kupu/trunk/kupu/common/kupuhelpers.js
==============================================================================
--- kupu/trunk/kupu/common/kupuhelpers.js	(original)
+++ kupu/trunk/kupu/common/kupuhelpers.js	Thu May 17 12:03:53 2007
@@ -1505,9 +1505,12 @@
             width = 128;
         };
     };
-    image.height = height;
-    image.width = width;
+    if (width&&height) {
+        image.height = height;
+        image.width = width;
+    }
 }
+
 function toggleAltFieldVisibility(me) {
     var label = document.getElementById('image-alt-label');
     var vis = me.checked?'none':'';

From duncan at codespeak.net  Thu May 17 15:27:38 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Thu, 17 May 2007 15:27:38 +0200 (CEST)
Subject: [kupu-checkins] r43454 - in kupu/trunk/kupu:
	apache-lenya/lenya/drawers common common/kupudrawers plone
	plone/kupu_plone_layer
Message-ID: <20070517132738.197268078@code0.codespeak.net>

Author: duncan
Date: Thu May 17 15:27:37 2007
New Revision: 43454

Modified:
   kupu/trunk/kupu/apache-lenya/lenya/drawers/imagedrawer.xsl
   kupu/trunk/kupu/common/kupudrawers.js
   kupu/trunk/kupu/common/kupudrawers/drawer.xsl
   kupu/trunk/kupu/common/kupudrawerstyles.css
   kupu/trunk/kupu/plone/kupu_plone_layer/kupulibraries.xml.pt
   kupu/trunk/kupu/plone/kupu_plone_layer/kupusearch.xml.pt
   kupu/trunk/kupu/plone/kupu_plone_layer/kupuselection.xml.pt
   kupu/trunk/kupu/plone/libraries.pt
   kupu/trunk/kupu/plone/plonedrawers.py
   kupu/trunk/kupu/plone/plonelibrarytool.py
Log:
Fixed wrong class on search library.
Search icon is now customisable, also the icon for the current selection.
Fixed preview image for link drawer.
Labels are no longer bold. 'Text equivalent' caption for the alt attribute, and the field is now a textarea so it is less like staring through a letterbox.

Modified: kupu/trunk/kupu/apache-lenya/lenya/drawers/imagedrawer.xsl
==============================================================================
--- kupu/trunk/kupu/apache-lenya/lenya/drawers/imagedrawer.xsl	(original)
+++ kupu/trunk/kupu/apache-lenya/lenya/drawers/imagedrawer.xsl	Thu May 17 15:27:37 2007
@@ -42,7 +42,7 @@
           <div>
             <strong>ALT-text</strong><br />
             <form onsubmit="return false;">
-              <input type="text" id="image_alt" size="10" />
+              <input type="text" id="image-alt" size="10" />
             </form>
           </div>
         </td>

Modified: kupu/trunk/kupu/common/kupudrawers.js
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers.js	(original)
+++ kupu/trunk/kupu/common/kupudrawers.js	Thu May 17 15:27:37 2007
@@ -1142,7 +1142,7 @@
 
         this.updateDisplay(this.drawerid);
         var newseldiv = getFromSelector(time);
-        newseldiv.className = 'selected';
+        newseldiv.className = 'kupu-libsource-selected';
     };
 
     this.selectCurrent = function() {
@@ -1352,7 +1352,7 @@
             var uri = selnode.selectSingleNode('uri/text()').nodeValue;
         }
         uri = uri.strip();  // needs kupuhelpers.js
-        var alt = getFromSelector('image_alt');
+        var alt = getFromSelector('image-alt');
         alt = alt?alt.value:undefined;
 
         var radios = document.getElementsByName('image-align');

Modified: kupu/trunk/kupu/common/kupudrawers/drawer.xsl
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers/drawer.xsl	(original)
+++ kupu/trunk/kupu/common/kupudrawers/drawer.xsl	Thu May 17 15:27:37 2007
@@ -185,7 +185,9 @@
             </xsl:attribute>
             <xsl:apply-templates select="icon"/>
             <span class="drawer-item-title">
-                <xsl:copy-of select="title//*|title/text()"/>
+               <xsl:call-template name="lf2br">
+                  <xsl:with-param name="StringToTransform" select="title/text()"/>
+               </xsl:call-template>
             </span>
         </div>
     </xsl:template>
@@ -295,7 +297,7 @@
      If a 'preview' tag is available then that one is used, otherwise 'uri'.
     -->
     <xsl:template match="resource|collection" mode="image-view">
-       <xsl:variable name="p" select="preview|uri"></xsl:variable>
+       <xsl:variable name="p" select="preview"></xsl:variable>
        <xsl:choose>
           <xsl:when test="media='flash'">
              <object src="{$p}" data="{$p}" type="application/x-shockwave-flash"
@@ -303,7 +305,7 @@
                 <param name="movie" value="{$p}" />
              </object>
           </xsl:when>
-          <xsl:otherwise>
+          <xsl:when test="$p!=''">
              <img src="{$p}" title="{title}" width="{width}" height="{height}" id="kupu-preview-image">
                 <xsl:choose>
                    <xsl:when test="height > width">
@@ -325,7 +327,8 @@
                    </xsl:otherwise>
                 </xsl:choose>
              </img>
-          </xsl:otherwise>
+          </xsl:when>
+          <xsl:otherwise/>
        </xsl:choose>
     </xsl:template>
 
@@ -335,7 +338,7 @@
           <input id="kupu-media" type="hidden" value="{media}" />
           <input id="kupu-width" type="hidden" value="{width}" />
           <input id="kupu-height" type="hidden" value="{height}" />
-          <label class="kupu-detail">Align:</label>
+          <label class="kupu-detail">Alignment</label>
           <span class="kupu-detail">
              <input type="radio" name="image-align" id="image-align-left" value="image-left">
                 <xsl:attribute name="onkeypress">if(event.keyCode==13)return false;</xsl:attribute>
@@ -364,7 +367,7 @@
                 <xsl:when test="media='flash'" />
                 <xsl:otherwise>
                    <label class="kupu-detail"
-                          for="image-caption" i18n:translate="imagedrawer_caption_label">Caption:</label>
+                          for="image-caption" i18n:translate="imagedrawer_caption_label">Caption</label>
                    <span class="kupu-detail">
                       <input type="checkbox" name="image-caption" id="image-caption">
                          <xsl:attribute name="onkeypress">if(event.keyCode==13)return false;</xsl:attribute>
@@ -379,7 +382,7 @@
           </xsl:if>
           <xsl:if test="sizes">
              <label class="kupu-detail"
-                    for="image-size-selector">Size:</label>
+                    for="image-size-selector">Size</label>
              <span class="kupu-detail">
                 <select name="image-size-selector">
                    <option name="image-size-option" value="{uri}">Original</option>
@@ -389,7 +392,7 @@
           </xsl:if>
           <xsl:if test="class">
              <label class="kupu-detail"
-                    for="kupu-image-class-selector">Style:</label>
+                    for="kupu-image-class-selector">Style</label>
              <span class="kupu-detail">
                 <select name="kupu-image-class-selector" id="kupu-image-class">
                    <xsl:apply-templates select="class"/>
@@ -397,19 +400,19 @@
              </span>
           </xsl:if>
           <label class="kupu-detail" id="image-alt-label"
-                 for="image_alt"
+                 for="image-alt"
                  i18n:translate="imagedrawer_upload_alt_text">
              <xsl:if test="$usecaptions='yes' and $image-caption='true'">
                 <xsl:attribute name="style">display:none;</xsl:attribute>
              </xsl:if>
-             "alt"&#xa0;text:
+             Text equivalent
           </label>
-          <input class="kupu-detail" type="text" id="image_alt" size="20" value="{title}">
+          <textarea class="kupu-detail" type="text" id="image-alt" rows="4">
              <xsl:if test="$usecaptions='yes' and $image-caption='true'">
                 <xsl:attribute name="style">display:none;</xsl:attribute>
              </xsl:if>   
-             <xsl:attribute name="onkeypress">if(event.keyCode==13)return false;</xsl:attribute>
-          </input>
+             <xsl:value-of select="title"/>
+          </textarea>
        </div>
     </xsl:template>
     <xsl:template match="class">
@@ -536,4 +539,21 @@
     <xsl:template match="crumb">
         <xsl:value-of select="node()"/>
     </xsl:template>
+    <xsl:template name="lf2br">
+       <xsl:param name="StringToTransform"/>
+       <xsl:choose>
+          <xsl:when test="contains($StringToTransform,'&lt;br&gt;')">
+             <xsl:value-of select="substring-before($StringToTransform,'&lt;br&gt;')"/>
+             <br/>
+             <xsl:call-template name="lf2br">
+                <xsl:with-param name="StringToTransform">
+                   <xsl:value-of select="substring-after($StringToTransform,'&lt;br&gt;')"/>
+                </xsl:with-param>
+             </xsl:call-template>
+          </xsl:when>
+          <xsl:otherwise>
+             <xsl:value-of select="$StringToTransform"/>
+          </xsl:otherwise>
+       </xsl:choose>
+    </xsl:template>
 </xsl:stylesheet>

Modified: kupu/trunk/kupu/common/kupudrawerstyles.css
==============================================================================
--- kupu/trunk/kupu/common/kupudrawerstyles.css	(original)
+++ kupu/trunk/kupu/common/kupudrawerstyles.css	Thu May 17 15:27:37 2007
@@ -206,6 +206,11 @@
   clear:left; width:75px; text-align:right;
   margin-right: 5px;
 }
+#image-caption, #image-align-left { margin-left: 0; }
+#image-align-left, #image-align-right, #image-align-inline, #image-caption {
+  border: none;
+}
+
 /*div.kupu-libsource-selected {
   background-repeat: no-repeat;
 }*/
@@ -284,8 +289,9 @@
 /* Anchor drawer */
 
 .kupu-drawer label {
-   font-weight: bold;
-   vertical-align:middle;
+  font-weight: normal;
+  vertical-align:middle;
+  margin-right: 5px;
 }
 #kupu-breadcrumbs {
   text-align: left; clear:left;

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupulibraries.xml.pt
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupulibraries.xml.pt	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupulibraries.xml.pt	Thu May 17 15:27:37 2007
@@ -21,7 +21,7 @@
            tal:attributes="id library/id;selected library/selected;">
     <uri tal:content="library/uri">URI</uri>
     <title i18n:translate="" tal:define="title library/title"
-           tal:content="structure python:pss.html_quote(title).replace('\n','\x3cxhtml:br/\x3e')">Title</title>
+           tal:content="structure python:pss.html_quote(title)">Title</title>
     <src tal:content="library/src">Source</src>
     <icon tal:content="library/icon">Icon</icon>
   </library>

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupusearch.xml.pt
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupusearch.xml.pt	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupusearch.xml.pt	Thu May 17 15:27:37 2007
@@ -8,11 +8,12 @@
     xmlns:metal="http://xml.zope.org/namespaces/metal"
     xmlns:i18n="http://xml.zope.org/namespaces/i18n"
     i18n_domain="plone"
-    tal:define="kupu context/kupu_library_tool;">
+    tal:define="kupu context/kupu_library_tool;searchlib python:kupu.getSingleLibrary(context,'_search')">
   <uri tal:content="template/absolute_url">URI</uri>
-  <icon tal:content="string:${here/portal_url}/kupuimages/kupusearch_icon.gif">icon</icon>
+  <icon tal:content="searchlib/icon|string:${here/portal_url}/kupuimages/kupusearch_icon.gif">icon</icon>
   <title i18n_translate="heading_search_results"
-        tal:content="string:Search '${request/SearchableText}'">Search Results</title>
+         tal:define="tpl searchlib/title|string:Search '$$';txt request/SearchableText;"
+         tal:content="python:tpl.replace('$',txt,1)">Search Results</title>
   <description>Search results.</description>
 
   <breadcrumbs class="kupu-locate">

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupuselection.xml.pt
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupuselection.xml.pt	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupuselection.xml.pt	Thu May 17 15:27:37 2007
@@ -11,10 +11,13 @@
     xmlns:metal="http://xml.zope.org/namespaces/metal"
     xmlns:i18n="http://xml.zope.org/namespaces/i18n"
     i18n_domain="plone"
-    >
+    tal:define="kupu context/kupu_library_tool;
+        objects kupu/getCurrentObject;
+        object python:objects and objects[0] or context;
+        lib python:kupu.getSingleLibrary(object,'_selection')">
   <uri tal:content="template/absolute_url">URI</uri>
-  <icon tal:content="string:${here/portal_url}/kupuimages/kupusearch_icon.gif">icon</icon>
-  <title i18n_translate="box_selected">Selected</title>
+  <icon tal:content="lib/icon|string:${here/portal_url}/kupuimages/kupusearch_icon.gif">icon</icon>
+  <title i18n_translate="box_selected" tal:content="lib/title|default">Selected</title>
   <description>Current selection.</description>
   <src tal:content="string:${request/URL0}?${context/kupu_library_tool/query_string}">Source</src>
 

Modified: kupu/trunk/kupu/plone/libraries.pt
==============================================================================
--- kupu/trunk/kupu/plone/libraries.pt	(original)
+++ kupu/trunk/kupu/plone/libraries.pt	Thu May 17 15:27:37 2007
@@ -9,11 +9,18 @@
 <h1 class="documentFirstHeading"
     i18n:translate="heading_kupu_libraries">Kupu Libraries</h1>
 
-<p i18n:translate="text_kupu_drawers">In the below form, you may manage the list of drawer libraries for
+<p i18n:translate="text_kupu_drawers">In the form below, you may manage the list of drawer libraries for
 the Kupu editor. Each property of a library is dynamically expanded at
 execution time using TALES expressions. That way it is possible, to
 support libraries like <em>Current folder</em> or <em>My folder</em>
 very easily.</p>
+<p>Libraries with ids that begin with an underscore will not display in the initial library list.
+   <em>_search</em> will be used to set the icon and title for search results.
+   The first $ character in the title will be replaced by the search string.
+   <em>_selection</em> will be used to set the icon and title for the current selection.
+</p>
+<p>The title string may contain html &lt;br&gt; tags to put a line break in the title (not the xhtml &lt;br/&gt; form),
+   but otherwise tags are not interpreted.</p>
 
 <form action="" method="post" tal:attributes="action here/absolute_url">
 

Modified: kupu/trunk/kupu/plone/plonedrawers.py
==============================================================================
--- kupu/trunk/kupu/plone/plonedrawers.py	(original)
+++ kupu/trunk/kupu/plone/plonedrawers.py	Thu May 17 15:27:37 2007
@@ -593,8 +593,9 @@
             crumbs.append({'Title':title, 'absolute_url':url})
 
         return crumbs
-    
-    def _getCurrentObject(self, portal=None):
+
+    security.declareProtected('View','getCurrentObject')
+    def getCurrentObject(self, portal=None):
         '''Returns object information for a selected object'''
         request = self.REQUEST
         if portal is None:
@@ -645,7 +646,7 @@
         """Find the parent of the object specified in the src string.
         If multiple objects and they don't have the same parent, or if no suitable object
         returns None, otherwise returns the parent."""
-        objects = self._getCurrentObject()
+        objects = self.getCurrentObject()
         parent = None
         for obj in objects:
             if parent is not None and parent is not obj.aq_parent:
@@ -656,7 +657,7 @@
     security.declarePublic("getCurrentSelection")
     def getCurrentSelection(self, portal=None):
         '''Returns object information for a selected object'''
-        objects = self._getCurrentObject(portal)
+        objects = self.getCurrentObject(portal)
         return self.infoForBrains(objects, self.getResourceType(), portal)
 
     security.declarePublic("getMyItems")

Modified: kupu/trunk/kupu/plone/plonelibrarytool.py
==============================================================================
--- kupu/trunk/kupu/plone/plonelibrarytool.py	(original)
+++ kupu/trunk/kupu/plone/plonelibrarytool.py	Thu May 17 15:27:37 2007
@@ -451,8 +451,9 @@
         
     security.declareProtected('View', "getCookedLibraries")
     def getCookedLibraries(self, context):
-        """Return a list of libraries with our own parameters included"""
-        libraries = self.getLibraries(context)
+        """Return a list of libraries with our own parameters included.
+        The library with id 'search' is excluded from this list."""
+        libraries = [l for l in self.getLibraries(context) if not l['id'].startswith('_')]
         default_library = getattr(self, '_default_library', '')
 
         for l in libraries:
@@ -460,6 +461,17 @@
             l['selected'] = l['id']==default_library or None
         return libraries
 
+    security.declareProtected('View', "getSingleLibrary")
+    def getSingleLibrary(self, context, id):
+        """Return the library with id=search or None"""
+        libraries = [l for l in self.getLibraries(context) if l['id']==id]
+
+        for l in libraries:
+            l['src'] = self.kupuUrl(l['src'])
+        if libraries:
+            return libraries[0]
+        return None
+
     # ZMI views
     manage_options = (SimpleItem.manage_options[1:] + (
          dict(label='Config', action='kupu_config'),

From duncan at codespeak.net  Thu May 17 16:01:33 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Thu, 17 May 2007 16:01:33 +0200 (CEST)
Subject: [kupu-checkins] r43456 - in kupu/trunk/kupu: . common
	common/kupudrawers common/kupuimages
	plone/kupu_plone_layer/plonekupuimages
Message-ID: <20070517140133.469AB8078@code0.codespeak.net>

Author: duncan
Date: Thu May 17 16:01:30 2007
New Revision: 43456

Added:
   kupu/trunk/kupu/common/kupuimages/anchor.png.metadata
   kupu/trunk/kupu/common/kupuimages/background-color.png.metadata
   kupu/trunk/kupu/common/kupuimages/bold.gif.metadata
   kupu/trunk/kupu/common/kupuimages/bold.png.metadata
   kupu/trunk/kupu/common/kupuimages/bookmark.png.metadata
   kupu/trunk/kupu/common/kupuimages/buttons.png.metadata
   kupu/trunk/kupu/common/kupuimages/caret.png.metadata
   kupu/trunk/kupu/common/kupuimages/closed.png.metadata
   kupu/trunk/kupu/common/kupuimages/copy.png.metadata
   kupu/trunk/kupu/common/kupuimages/create-new.png.metadata
   kupu/trunk/kupu/common/kupuimages/cut.png.metadata
   kupu/trunk/kupu/common/kupuimages/definitionlist.png.metadata
   kupu/trunk/kupu/common/kupuimages/document.png.metadata
   kupu/trunk/kupu/common/kupuimages/exit.gif.metadata
   kupu/trunk/kupu/common/kupuimages/exthyperlink.png.metadata
   kupu/trunk/kupu/common/kupuimages/folder.png.metadata
   kupu/trunk/kupu/common/kupuimages/fonts.png.metadata
   kupu/trunk/kupu/common/kupuimages/format.png.metadata
   kupu/trunk/kupu/common/kupuimages/hr.png.metadata
   kupu/trunk/kupu/common/kupuimages/image.png.metadata
   kupu/trunk/kupu/common/kupuimages/indent.gif.metadata
   kupu/trunk/kupu/common/kupuimages/indent.png.metadata
   kupu/trunk/kupu/common/kupuimages/inthyperlink.png.metadata
   kupu/trunk/kupu/common/kupuimages/italic.gif.metadata
   kupu/trunk/kupu/common/kupuimages/italic.png.metadata
   kupu/trunk/kupu/common/kupuimages/justify-center.png.metadata
   kupu/trunk/kupu/common/kupuimages/justify-full.png.metadata
   kupu/trunk/kupu/common/kupuimages/justify-left.png.metadata
   kupu/trunk/kupu/common/kupuimages/justify-right.png.metadata
   kupu/trunk/kupu/common/kupuimages/kupu_icon.gif.metadata
   kupu/trunk/kupu/common/kupuimages/kupulibrary.png.metadata
   kupu/trunk/kupu/common/kupuimages/kupusearch_icon.gif.metadata
   kupu/trunk/kupu/common/kupuimages/larger-text.png.metadata
   kupu/trunk/kupu/common/kupuimages/link.png.metadata
   kupu/trunk/kupu/common/kupuimages/opened.png.metadata
   kupu/trunk/kupu/common/kupuimages/ordered-list.png.metadata
   kupu/trunk/kupu/common/kupuimages/outdent.png.metadata
   kupu/trunk/kupu/common/kupuimages/paste.png.metadata
   kupu/trunk/kupu/common/kupuimages/redo-disabled.png.metadata
   kupu/trunk/kupu/common/kupuimages/redo.png.metadata
   kupu/trunk/kupu/common/kupuimages/remove.png.metadata
   kupu/trunk/kupu/common/kupuimages/save.png.metadata
   kupu/trunk/kupu/common/kupuimages/size.png.metadata
   kupu/trunk/kupu/common/kupuimages/smaller-text.png.metadata
   kupu/trunk/kupu/common/kupuimages/space.gif.metadata
   kupu/trunk/kupu/common/kupuimages/strikethrough.png.metadata
   kupu/trunk/kupu/common/kupuimages/subscript.png.metadata
   kupu/trunk/kupu/common/kupuimages/superscript.png.metadata
   kupu/trunk/kupu/common/kupuimages/table.png.metadata
   kupu/trunk/kupu/common/kupuimages/text-check.png.metadata
   kupu/trunk/kupu/common/kupuimages/text-color.png.metadata
   kupu/trunk/kupu/common/kupuimages/toolbarbg_blue.png.metadata
   kupu/trunk/kupu/common/kupuimages/toolbarbg_green.png.metadata
   kupu/trunk/kupu/common/kupuimages/toolbarbg_purple.png.metadata
   kupu/trunk/kupu/common/kupuimages/toolbarbg_wood.png.metadata
   kupu/trunk/kupu/common/kupuimages/treeCollapsed.gif.metadata
   kupu/trunk/kupu/common/kupuimages/underline.gif.metadata
   kupu/trunk/kupu/common/kupuimages/underline.png.metadata
   kupu/trunk/kupu/common/kupuimages/undo-disabled.png.metadata
   kupu/trunk/kupu/common/kupuimages/undo.png.metadata
   kupu/trunk/kupu/common/kupuimages/unlink.png.metadata
   kupu/trunk/kupu/common/kupuimages/unordered-list.png.metadata
   kupu/trunk/kupu/common/kupuimages/view-source.png.metadata
   kupu/trunk/kupu/common/kupuimages/zoom-in.gif.metadata
   kupu/trunk/kupu/common/kupuimages/zoom-out.gif.metadata
   kupu/trunk/kupu/lint.record
   kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/anchor.gif.metadata
   kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/bgcolor.gif.metadata
   kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/bold.gif.metadata
   kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/center.gif.metadata
   kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/definitionlist.gif.metadata
   kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/delete_icon.gif.metadata
   kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/flash-placeholder.png.metadata
   kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/hr.gif.metadata
   kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/hyperlink.gif.metadata
   kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/image.gif.metadata
   kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/indent.gif.metadata
   kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/italic.gif.metadata
   kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/left_just.gif.metadata
   kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/link_icon.gif.metadata
   kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/list.gif.metadata
   kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/numbered_list.gif.metadata
   kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/outdent.gif.metadata
   kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/redo.gif.metadata
   kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/right_just.gif.metadata
   kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/space.gif.metadata
   kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/strikethrough.gif.metadata
   kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/subscript.gif.metadata
   kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/superscript.gif.metadata
   kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/table.gif.metadata
   kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/textcolor.gif.metadata
   kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/tools.gif.metadata
   kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/underline.gif.metadata
   kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/undo.gif.metadata
   kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/unformat.gif.metadata
   kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/view-source.gif.metadata
Modified:
   kupu/trunk/kupu/common/kupudrawers/drawer.xsl
   kupu/trunk/kupu/common/kupudrawerstyles.css
Log:
I'm not sure why kupu's toolbar images have never had cache metadata but it seems like a good idea.
Removed the css reference from the xsl: it isn't needed (since the output is never displayed) and it forces Firefox to retrieve the css every time there's a transform (maybe only when debugging, but even so).
Reduced the label spacing else IE6 line wraps.

Modified: kupu/trunk/kupu/common/kupudrawers/drawer.xsl
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers/drawer.xsl	(original)
+++ kupu/trunk/kupu/common/kupudrawers/drawer.xsl	Thu May 17 16:01:30 2007
@@ -72,9 +72,6 @@
                 <title>
                     <xsl:value-of select="$i18n_drawertitle"/>
                 </title>
-                <link type="text/css" rel="stylesheet">
-                    <xsl:attribute name="href">kupudrawerstyles.css</xsl:attribute>
-                </link>
                 <xsl:call-template name="mystyle" />
             </head>
             <body>

Modified: kupu/trunk/kupu/common/kupudrawerstyles.css
==============================================================================
--- kupu/trunk/kupu/common/kupudrawerstyles.css	(original)
+++ kupu/trunk/kupu/common/kupudrawerstyles.css	Thu May 17 16:01:30 2007
@@ -291,7 +291,7 @@
 .kupu-drawer label {
   font-weight: normal;
   vertical-align:middle;
-  margin-right: 5px;
+  margin-right: 2px;
 }
 #kupu-breadcrumbs {
   text-align: left; clear:left;

Added: kupu/trunk/kupu/common/kupuimages/anchor.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/anchor.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/background-color.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/background-color.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/bold.gif.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/bold.gif.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/bold.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/bold.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/bookmark.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/bookmark.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/buttons.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/buttons.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/caret.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/caret.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/closed.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/closed.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/copy.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/copy.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/create-new.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/create-new.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/cut.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/cut.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/definitionlist.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/definitionlist.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/document.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/document.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/exit.gif.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/exit.gif.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/exthyperlink.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/exthyperlink.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/folder.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/folder.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/fonts.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/fonts.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/format.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/format.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/hr.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/hr.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/image.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/image.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/indent.gif.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/indent.gif.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/indent.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/indent.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/inthyperlink.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/inthyperlink.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/italic.gif.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/italic.gif.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/italic.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/italic.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/justify-center.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/justify-center.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/justify-full.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/justify-full.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/justify-left.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/justify-left.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/justify-right.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/justify-right.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/kupu_icon.gif.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/kupu_icon.gif.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/kupulibrary.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/kupulibrary.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/kupusearch_icon.gif.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/kupusearch_icon.gif.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/larger-text.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/larger-text.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/link.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/link.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/opened.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/opened.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/ordered-list.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/ordered-list.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/outdent.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/outdent.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/paste.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/paste.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/redo-disabled.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/redo-disabled.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/redo.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/redo.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/remove.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/remove.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/save.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/save.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/size.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/size.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/smaller-text.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/smaller-text.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/space.gif.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/space.gif.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/strikethrough.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/strikethrough.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/subscript.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/subscript.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/superscript.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/superscript.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/table.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/table.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/text-check.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/text-check.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/text-color.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/text-color.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/toolbarbg_blue.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/toolbarbg_blue.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/toolbarbg_green.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/toolbarbg_green.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/toolbarbg_purple.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/toolbarbg_purple.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/toolbarbg_wood.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/toolbarbg_wood.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/treeCollapsed.gif.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/treeCollapsed.gif.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/underline.gif.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/underline.gif.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/underline.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/underline.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/undo-disabled.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/undo-disabled.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/undo.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/undo.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/unlink.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/unlink.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/unordered-list.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/unordered-list.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/view-source.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/view-source.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/zoom-in.gif.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/zoom-in.gif.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/common/kupuimages/zoom-out.gif.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/common/kupuimages/zoom-out.gif.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/lint.record
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/lint.record	Thu May 17 16:01:30 2007
@@ -0,0 +1,119 @@
+(dp1
+S'c:\\oxfam\\trunk\\products\\kupu\\common\\kupubasetools.js'
+p2
+F1179223880.015625
+sS'c:\\oxfam\\trunk\\products\\kupu\\common\\kupucontextmenu.js'
+p3
+F1174560406.6875
+sS'c:\\oxfam\\trunk\\products\\kupu\\common\\kupucontentfilters.js'
+p4
+F1179224613.703125
+sS'c:\\oxfam\\trunk\\products\\kupu\\common\\kupuinit_genericelements.js'
+p5
+F1174560406.53125
+sS'c:\\oxfam\\trunk\\products\\kupu\\plone\\kupu_plone_layer\\kupuploneeditor.js'
+p6
+F1174560398.6875
+sS'c:\\oxfam\\trunk\\products\\kupu\\common\\kupudrawers.js'
+p7
+F1179137758.890625
+sS'c:\\oxfam\\trunk\\products\\kupu\\common\\kupusourceedit.js'
+p8
+F1174560406.375
+sS'c:\\oxfam\\trunk\\products\\kupu\\common\\kuputoolcollapser.js'
+p9
+F1174560406.765625
+sS'C:\\oxfam\\trunk\\Products\\kupu\\common\\kupueditor.js'
+p10
+F1179137094.125
+sS'c:\\oxfam\\trunk\\products\\kupu\\common\\kupuinit_multi.js'
+p11
+F1174560406.4375
+sS'c:\\oxfam\\trunk\\products\\kupu\\plone\\kupu_plone_layer\\kupuploneui.js'
+p12
+F1174560398.609375
+sS'c:\\oxfam\\trunk\\products\\kupu\\common\\kupuspellchecker.js'
+p13
+F1174560406.625
+sS'c:\\oxfam\\trunk\\products\\kupu\\common\\kupuinit_form.js'
+p14
+F1174560406.453125
+sS'C:\\oxfam\\trunk\\Products\\kupu\\common\\kupubeforeunload.js'
+p15
+F1174560406.359375
+sS'C:\\oxfam\\trunk\\Products\\kupu\\common\\kupuhelpers.js'
+p16
+F1179137758.921875
+sS'c:\\oxfam\\trunk\\products\\kupu\\common\\kupuhelpers.js'
+p17
+F1179137758.921875
+sS'c:\\oxfam\\trunk\\products\\kupu\\common\\kupuinspector.js'
+p18
+F1174560406.65625
+sS'c:\\oxfam\\trunk\\products\\kupu\\common\\kupusaveonpart.js'
+p19
+F1174560406.765625
+sS'c:\\oxfam\\trunk\\products\\kupu\\common\\kupunoi18n.js'
+p20
+F1174560406.703125
+sS'c:\\oxfam\\trunk\\products\\kupu\\common\\kupustart_form.js'
+p21
+F1174560406.75
+sS'c:\\oxfam\\trunk\\products\\kupu\\common\\kupucnftable.js'
+p22
+F1174560406.734375
+sS'c:\\oxfam\\trunk\\products\\kupu\\common\\kupu_kjax.js'
+p23
+F1174560406.546875
+sS'c:\\oxfam\\trunk\\products\\kupu\\plone\\kupu_plone_layer\\kupusaveonpart.js'
+p24
+F1174560398.671875
+sS'c:\\oxfam\\trunk\\products\\kupu\\common\\kupuinit.js'
+p25
+F1174560406.328125
+sS'c:\\oxfam\\trunk\\products\\kupu\\common\\kupumultieditor.js'
+p26
+F1174560406.578125
+sS'C:\\oxfam\\trunk\\Products\\kupu\\common\\kupucleanupexpressions.js'
+p27
+F1174560406.5
+sS'c:\\oxfam\\trunk\\products\\kupu\\common\\kupuinit_experimental.js'
+p28
+F1174560406.4375
+sS'c:\\oxfam\\trunk\\products\\kupu\\common\\sarissa_ieemu_xpath.js'
+p29
+F1174560406.484375
+sS'c:\\oxfam\\trunk\\products\\kupu\\common\\kupueditor.js'
+p30
+F1179137094.125
+sS'c:\\oxfam\\trunk\\products\\kupu\\common\\kupuloggers.js'
+p31
+F1174560406.3125
+sS'C:\\oxfam\\trunk\\Products\\kupu\\common\\kupucnftable.js'
+p32
+F1174560406.734375
+sS'c:\\oxfam\\trunk\\products\\kupu\\common\\kupubeforeunload.js'
+p33
+F1174560406.359375
+sS'c:\\oxfam\\trunk\\products\\kupu\\common\\kupustart_multi.js'
+p34
+F1174560406.671875
+sS'c:\\oxfam\\trunk\\products\\kupu\\common\\sarissa.js'
+p35
+F1174560406.5625
+sS'C:\\oxfam\\trunk\\Products\\kupu\\common\\kupudrawers.js'
+p36
+F1179137758.890625
+sS'c:\\oxfam\\trunk\\products\\kupu\\plone\\kupu_plone_layer\\kupuploneinit.js'
+p37
+F1174560398.5625
+sS'C:\\oxfam\\trunk\\Products\\kupu\\common\\kupucontextmenu.js'
+p38
+F1174560406.6875
+sS'c:\\oxfam\\trunk\\products\\kupu\\common\\kupustart.js'
+p39
+F1174560406.5625
+sS'c:\\oxfam\\trunk\\products\\kupu\\common\\kupucleanupexpressions.js'
+p40
+F1174560406.5
+s.
\ No newline at end of file

Added: kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/anchor.gif.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/anchor.gif.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/bgcolor.gif.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/bgcolor.gif.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/bold.gif.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/bold.gif.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/center.gif.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/center.gif.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/definitionlist.gif.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/definitionlist.gif.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/delete_icon.gif.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/delete_icon.gif.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/flash-placeholder.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/flash-placeholder.png.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/hr.gif.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/hr.gif.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/hyperlink.gif.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/hyperlink.gif.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/image.gif.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/image.gif.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/indent.gif.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/indent.gif.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/italic.gif.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/italic.gif.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/left_just.gif.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/left_just.gif.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/link_icon.gif.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/link_icon.gif.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/list.gif.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/list.gif.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/numbered_list.gif.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/numbered_list.gif.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/outdent.gif.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/outdent.gif.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/redo.gif.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/redo.gif.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/right_just.gif.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/right_just.gif.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/space.gif.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/space.gif.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/strikethrough.gif.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/strikethrough.gif.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/subscript.gif.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/subscript.gif.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/superscript.gif.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/superscript.gif.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/table.gif.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/table.gif.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/textcolor.gif.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/textcolor.gif.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/tools.gif.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/tools.gif.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/underline.gif.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/underline.gif.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/undo.gif.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/undo.gif.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/unformat.gif.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/unformat.gif.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/view-source.gif.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/view-source.gif.metadata	Thu May 17 16:01:30 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

From duncan at codespeak.net  Thu May 17 16:02:26 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Thu, 17 May 2007 16:02:26 +0200 (CEST)
Subject: [kupu-checkins] r43457 - kupu/trunk/kupu
Message-ID: <20070517140226.736DA8078@code0.codespeak.net>

Author: duncan
Date: Thu May 17 16:02:26 2007
New Revision: 43457

Removed:
   kupu/trunk/kupu/lint.record
Log:
Added one file too many

Deleted: /kupu/trunk/kupu/lint.record
==============================================================================
--- /kupu/trunk/kupu/lint.record	Thu May 17 16:02:26 2007
+++ (empty file)
@@ -1,119 +0,0 @@
-(dp1
-S'c:\\oxfam\\trunk\\products\\kupu\\common\\kupubasetools.js'
-p2
-F1179223880.015625
-sS'c:\\oxfam\\trunk\\products\\kupu\\common\\kupucontextmenu.js'
-p3
-F1174560406.6875
-sS'c:\\oxfam\\trunk\\products\\kupu\\common\\kupucontentfilters.js'
-p4
-F1179224613.703125
-sS'c:\\oxfam\\trunk\\products\\kupu\\common\\kupuinit_genericelements.js'
-p5
-F1174560406.53125
-sS'c:\\oxfam\\trunk\\products\\kupu\\plone\\kupu_plone_layer\\kupuploneeditor.js'
-p6
-F1174560398.6875
-sS'c:\\oxfam\\trunk\\products\\kupu\\common\\kupudrawers.js'
-p7
-F1179137758.890625
-sS'c:\\oxfam\\trunk\\products\\kupu\\common\\kupusourceedit.js'
-p8
-F1174560406.375
-sS'c:\\oxfam\\trunk\\products\\kupu\\common\\kuputoolcollapser.js'
-p9
-F1174560406.765625
-sS'C:\\oxfam\\trunk\\Products\\kupu\\common\\kupueditor.js'
-p10
-F1179137094.125
-sS'c:\\oxfam\\trunk\\products\\kupu\\common\\kupuinit_multi.js'
-p11
-F1174560406.4375
-sS'c:\\oxfam\\trunk\\products\\kupu\\plone\\kupu_plone_layer\\kupuploneui.js'
-p12
-F1174560398.609375
-sS'c:\\oxfam\\trunk\\products\\kupu\\common\\kupuspellchecker.js'
-p13
-F1174560406.625
-sS'c:\\oxfam\\trunk\\products\\kupu\\common\\kupuinit_form.js'
-p14
-F1174560406.453125
-sS'C:\\oxfam\\trunk\\Products\\kupu\\common\\kupubeforeunload.js'
-p15
-F1174560406.359375
-sS'C:\\oxfam\\trunk\\Products\\kupu\\common\\kupuhelpers.js'
-p16
-F1179137758.921875
-sS'c:\\oxfam\\trunk\\products\\kupu\\common\\kupuhelpers.js'
-p17
-F1179137758.921875
-sS'c:\\oxfam\\trunk\\products\\kupu\\common\\kupuinspector.js'
-p18
-F1174560406.65625
-sS'c:\\oxfam\\trunk\\products\\kupu\\common\\kupusaveonpart.js'
-p19
-F1174560406.765625
-sS'c:\\oxfam\\trunk\\products\\kupu\\common\\kupunoi18n.js'
-p20
-F1174560406.703125
-sS'c:\\oxfam\\trunk\\products\\kupu\\common\\kupustart_form.js'
-p21
-F1174560406.75
-sS'c:\\oxfam\\trunk\\products\\kupu\\common\\kupucnftable.js'
-p22
-F1174560406.734375
-sS'c:\\oxfam\\trunk\\products\\kupu\\common\\kupu_kjax.js'
-p23
-F1174560406.546875
-sS'c:\\oxfam\\trunk\\products\\kupu\\plone\\kupu_plone_layer\\kupusaveonpart.js'
-p24
-F1174560398.671875
-sS'c:\\oxfam\\trunk\\products\\kupu\\common\\kupuinit.js'
-p25
-F1174560406.328125
-sS'c:\\oxfam\\trunk\\products\\kupu\\common\\kupumultieditor.js'
-p26
-F1174560406.578125
-sS'C:\\oxfam\\trunk\\Products\\kupu\\common\\kupucleanupexpressions.js'
-p27
-F1174560406.5
-sS'c:\\oxfam\\trunk\\products\\kupu\\common\\kupuinit_experimental.js'
-p28
-F1174560406.4375
-sS'c:\\oxfam\\trunk\\products\\kupu\\common\\sarissa_ieemu_xpath.js'
-p29
-F1174560406.484375
-sS'c:\\oxfam\\trunk\\products\\kupu\\common\\kupueditor.js'
-p30
-F1179137094.125
-sS'c:\\oxfam\\trunk\\products\\kupu\\common\\kupuloggers.js'
-p31
-F1174560406.3125
-sS'C:\\oxfam\\trunk\\Products\\kupu\\common\\kupucnftable.js'
-p32
-F1174560406.734375
-sS'c:\\oxfam\\trunk\\products\\kupu\\common\\kupubeforeunload.js'
-p33
-F1174560406.359375
-sS'c:\\oxfam\\trunk\\products\\kupu\\common\\kupustart_multi.js'
-p34
-F1174560406.671875
-sS'c:\\oxfam\\trunk\\products\\kupu\\common\\sarissa.js'
-p35
-F1174560406.5625
-sS'C:\\oxfam\\trunk\\Products\\kupu\\common\\kupudrawers.js'
-p36
-F1179137758.890625
-sS'c:\\oxfam\\trunk\\products\\kupu\\plone\\kupu_plone_layer\\kupuploneinit.js'
-p37
-F1174560398.5625
-sS'C:\\oxfam\\trunk\\Products\\kupu\\common\\kupucontextmenu.js'
-p38
-F1174560406.6875
-sS'c:\\oxfam\\trunk\\products\\kupu\\common\\kupustart.js'
-p39
-F1174560406.5625
-sS'c:\\oxfam\\trunk\\products\\kupu\\common\\kupucleanupexpressions.js'
-p40
-F1174560406.5
-s.
\ No newline at end of file

From duncan at codespeak.net  Fri May 18 15:02:43 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Fri, 18 May 2007 15:02:43 +0200 (CEST)
Subject: [kupu-checkins] r43479 - in kupu/trunk/kupu: common plone
	plone/kupu_plone_layer plone/kupu_references
Message-ID: <20070518130243.89C388074@code0.codespeak.net>

Author: duncan
Date: Fri May 18 15:02:42 2007
New Revision: 43479

Modified:
   kupu/trunk/kupu/common/kupubasetools.js
   kupu/trunk/kupu/common/kupusourceedit.js
   kupu/trunk/kupu/plone/body.kupu
   kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
   kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneinit.js
   kupu/trunk/kupu/plone/kupu_references/referencebrowser.pt
Log:
Removed tabindex code from all toolbar buttons.
Added tabindex to iframe, added event handler for tab which tabs to next available tabindex (unless zoomed).

Modified: kupu/trunk/kupu/common/kupubasetools.js
==============================================================================
--- kupu/trunk/kupu/common/kupubasetools.js	(original)
+++ kupu/trunk/kupu/common/kupubasetools.js	Fri May 18 15:02:42 2007
@@ -76,12 +76,6 @@
     this._selectSelectItem = function(select, item) {
         this.editor.logMessage(_('Deprecation warning: KupuTool._selectSelectItem'));
     };
-    this._fixTabIndex = function(element) {
-        var tabIndex = this.editor.getDocument().getEditable().tabIndex-1;
-        if (tabIndex && !element.tabIndex) {
-            element.tabIndex = tabIndex;
-        }
-    };
 }
 
 function KupuToolBox() {
@@ -146,7 +140,6 @@
 KupuButton.prototype.initialize = function(editor) {
     this.editor = editor;
     if (!this.button) return;
-    this._fixTabIndex(this.button);
     addEventHandler(this.button, 'click', this.execCommand, this);
 };
 
@@ -272,7 +265,6 @@
         this.cleanStyles();
         this.enableOptions(false);
         if (this.tsselect) {
-            this._fixTabIndex(this.tsselect);
             this._selectevent = addEventHandler(this.tsselect, 'change', this.setTextStyleHandler, this);
         }
     };
@@ -2223,20 +2215,16 @@
         /* attach event handlers */
         this.editor = editor;
         if (this.addulbutton) {
-            this._fixTabIndex(this.addulbutton);
             addEventHandler(this.addulbutton, "click", this.addUnorderedList, this);
         }
         if (this.addolbutton) {
-            this._fixTabIndex(this.addolbutton);
             addEventHandler(this.addolbutton, "click", this.addOrderedList, this);
         }
         if (this.ulselect) {
-            this._fixTabIndex(this.ulselect);
             addEventHandler(this.ulselect, "change", this.setUnorderedListStyle, this);
             this.ulselect.style.display = "none";
         }
         if (this.olselect) {
-            this._fixTabIndex(this.olselect);
             addEventHandler(this.olselect, "change", this.setOrderedListStyle, this);
             this.olselect.style.display = "none";
         }
@@ -2420,7 +2408,6 @@
         /* initialize the tool */
         this.editor = editor;
         if (!this.dlbutton) return;
-        this._fixTabIndex(this.dlbutton);
         addEventHandler(this.dlbutton, 'click', this.createDefinitionList, this);
         addEventHandler(editor.getInnerDocument(), 'keyup', this._keyDownHandler, this);
         addEventHandler(editor.getInnerDocument(), 'keypress', this._keyPressHandler, this);
@@ -2727,7 +2714,6 @@
         this.pressed = false;
         if (!this.button) return;
         this.baseinitialize(editor);
-        this.button.tabIndex = this.editor.document.editable.tabIndex;
         addEventHandler(window, "resize", this.onresize, this);
         addEventHandler(window, "scroll", this.onscroll, this);
 

Modified: kupu/trunk/kupu/common/kupusourceedit.js
==============================================================================
--- kupu/trunk/kupu/common/kupusourceedit.js	(original)
+++ kupu/trunk/kupu/common/kupusourceedit.js	Fri May 18 15:02:42 2007
@@ -39,7 +39,6 @@
     /* attach the event handlers */
     this.editor = editor;
     if (!this.sourceButton) return;
-    this._fixTabIndex(this.sourceButton);
     addEventHandler(this.sourceButton, "click", this.switchSourceEdit, this);
     this.editor.logMessage(_('Source edit tool initialized'));
 };

Modified: kupu/trunk/kupu/plone/body.kupu
==============================================================================
--- kupu/trunk/kupu/plone/body.kupu	(original)
+++ kupu/trunk/kupu/plone/body.kupu	Fri May 18 15:02:42 2007
@@ -11,12 +11,13 @@
     <iframe class="kupu-editor-iframe"
         frameborder="0"
         src="emptypage"
+        tabindex=""
         onfocus="this.contentWindow.focus();"
         tal:define="base python:here.kupu_library_tool.getBaseUrl(here, True);
                     base kupu_base_override|base;"
         tal:attributes="src string:${base}/emptypage;
                         id string:kupu-editor-iframe-${fname};
-                        name string:kupu-editor-iframe-${fname};"
+                        name string:kupu-editor-iframe-${fname};tabindex tabindex|nothing;"
         >
     </iframe>
      <input type="hidden" name="text_format:default" value="text/html"

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 May 18 15:02:42 2007
@@ -436,7 +436,7 @@
     </table>
   <script type="text/javascript">var focuscount = 0;</script>
     <div>
-    <iframe class="kupu-editor-iframe" frameborder="0" src="emptypage" onfocus="this.contentWindow.focus();" tal:define="base python:here.kupu_library_tool.getBaseUrl(here, True);                     base kupu_base_override|base;" tal:attributes="src string:${base}/emptypage;                         id string:kupu-editor-iframe-${fname};                         name string:kupu-editor-iframe-${fname};">
+    <iframe class="kupu-editor-iframe" frameborder="0" src="emptypage" tabindex="" onfocus="this.contentWindow.focus();" tal:define="base python:here.kupu_library_tool.getBaseUrl(here, True);                     base kupu_base_override|base;" tal:attributes="src string:${base}/emptypage;                         id string:kupu-editor-iframe-${fname};                         name string:kupu-editor-iframe-${fname};tabindex tabindex|nothing;">
     </iframe>
      <input type="hidden" name="text_format:default" value="text/html" tal:define="fieldName fieldName|inputname|nothing;                 val python:fieldName and 'text/html' or 'html';                 fieldName python:test(fieldName, fieldName+'_', '') + 'text_format:default';" tal:attributes="name fieldName;value val;"/>
 <tal:test condition="fieldName|nothing">

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneinit.js
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneinit.js	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneinit.js	Fri May 18 15:02:42 2007
@@ -34,7 +34,6 @@
 
     // now we can create the controller
     var kupu = (window.kupu = new KupuEditor(doc, conf, l));
-
     kupu.setHTMLBody(initialtext);
 
     // now we can create a UI object which we can use from the UI
@@ -283,6 +282,35 @@
     };
     addEventHandler(textarea.form, 'submit', prepareForm, textarea);
 
+    function tabHandler(event) {
+        event = event||window.event;
+        if (event.keyCode!=9) { return; }
+        if (!/kupu-fulleditor-zoomed/.test(document.body.className)) {
+            var form = textarea.form;
+            var els = form.elements;
+            var target, targindex;
+            var mytabindex = iframe.tabIndex;
+            for (var i = 0; i < els.length; i++) {
+                var el = els[i];
+                if (el.tabIndex && el.tabIndex > mytabindex && !el.disabled && el.offsetWidth && el.offsetHeight) {
+                    if (!targindex || el.tabIndex < targindex) {
+                        target = el;
+                        targindex = el.tabIndex;
+                    }
+                }
+            }
+            if (target) {
+                window.focus();
+                target.focus();
+            }
+        }
+        if (event.preventDefault) { event.preventDefault(); event.stopPropagation();}
+        event.returnValue = false;
+        return false;
+    }
+    var inner = kupu.getInnerDocument();
+    kupu._addEventHandler(inner.documentElement, "keydown", tabHandler);
+
     kupu.initialize();
     return kupu;
 };
@@ -290,3 +318,8 @@
 // modify LinkDrawer so links don't have a target
 LinkDrawer.prototype.target = '';
 LinkLibraryDrawer.prototype.target = '';
+if (!window.console) {
+    window.console = new function() {
+        this.log = function() {};
+    };
+}

Modified: kupu/trunk/kupu/plone/kupu_references/referencebrowser.pt
==============================================================================
--- kupu/trunk/kupu/plone/kupu_references/referencebrowser.pt	(original)
+++ kupu/trunk/kupu/plone/kupu_references/referencebrowser.pt	Fri May 18 15:02:42 2007
@@ -151,8 +151,10 @@
                         class="searchButton"
                         value="Browse..." 
                         onClick=""
+                        tabindex=""
                         i18n:attributes="value label_browse;"
-                        tal:attributes="onClick string:referencebrowser_draweropen(event,$rFieldName,$rLabel,$multiVal,'$resource_type');;;" />
+                        tal:attributes="onClick string:referencebrowser_draweropen(event,$rFieldName,$rLabel,$multiVal,'$resource_type');;;
+                     tabindex tabindex/next|nothing" />
 
               <input type="button" 
                         class="destructive" 

From duncan at codespeak.net  Fri May 18 15:36:35 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Fri, 18 May 2007 15:36:35 +0200 (CEST)
Subject: [kupu-checkins] r43481 - in kupu/trunk/kupu: common doc tests
Message-ID: <20070518133635.C275C8077@code0.codespeak.net>

Author: duncan
Date: Fri May 18 15:36:35 2007
New Revision: 43481

Modified:
   kupu/trunk/kupu/common/kupucontentfilters.js
   kupu/trunk/kupu/doc/CHANGES.txt
   kupu/trunk/kupu/tests/test_xhtml.js
Log:
Strip only one trailing <br> tag.
Stop unit tests from opening the Firefox error console 3 times every time they run.

Modified: kupu/trunk/kupu/common/kupucontentfilters.js
==============================================================================
--- kupu/trunk/kupu/common/kupucontentfilters.js	(original)
+++ kupu/trunk/kupu/common/kupucontentfilters.js	Fri May 18 15:36:35 2007
@@ -681,7 +681,7 @@
                 }
                 parentNode.insertBefore(p,node);
                 parentNode.removeChild(node);
-            } else if (!node.nextSibling && (/p|div/i.test(parentNode.nodeName))) {
+            } else if (!node.nextSibling && (/p|div/i.test(parentNode.nodeName) && !(node.previousSibling&&node.previousSibling.nodeName=='br'))) {
                 parentNode.removeChild(node);
             }
         }

Modified: kupu/trunk/kupu/doc/CHANGES.txt
==============================================================================
--- kupu/trunk/kupu/doc/CHANGES.txt	(original)
+++ kupu/trunk/kupu/doc/CHANGES.txt	Fri May 18 15:36:35 2007
@@ -8,6 +8,18 @@
 
   - Media objects may now have a list of classes (specific to the portal type).
 
+  - Image drawer layout has been tidied up.
+
+  - Removed the tabindex from all the toolbar buttons and added it to
+    the iframe: this means you can tab into kupu from above without
+    dying of old age as you try to get past the toolbar. Added a
+    handler for the tab key so that pressing tab will take you to the
+    next tabstop in the form.
+
+  - Only single trailing <br> tags are stripped from p and div tags: multiple
+    <br> tags are left unchanged (so those people who insist on using
+    the to generate whitespace still can).
+
 - 1.4 Beta 6
 
   - Removed the getToolByName deprecation workround since

Modified: kupu/trunk/kupu/tests/test_xhtml.js
==============================================================================
--- kupu/trunk/kupu/tests/test_xhtml.js	(original)
+++ kupu/trunk/kupu/tests/test_xhtml.js	Fri May 18 15:36:35 2007
@@ -64,6 +64,7 @@
         }
         return false;
     }
+
     this.testExclude = function() {
         // Check that the exclude functions work as expected.
         var validator = new XhtmlValidation(this.editor);
@@ -129,6 +130,13 @@
         var expected = '<p class="blue">This is a test<br/>with more text</p>';
         this.conversionTest(data, expected);
     };
+    this.testRemoveTrailingBr3 = function() {
+        // If someone is trying to do spacing by inserting extra breaks
+        // we shouldn't remove any of them.
+        var data = '<p class="blue">This is a test<br><br>with more text<br><br></p>';
+        var expected = '<p class="blue">This is a test<br/><br/>with more text<br/><br/></p>';
+        this.conversionTest(data, expected);
+    };
     this.testFixTopLevelBr = function() {
         var data = '<p>alpha</p>beta<br><p>gamma</p>';
         var expected = '<p>alpha</p><p>beta</p><p>gamma</p>';
@@ -277,16 +285,16 @@
     this.testPWithCaptionedImg = function() {
         // Captioned images are converted to block tags so they must
         // not be inside a paragraph.
-        var data = '<p>some text<br/><img class="image-inline captioned" src="javascript:" alt="xyzzy" height="1" width="1"/>blah</p>';
-        var expected = '<p>some text</p><img class="image-inline captioned" src="javascript:" alt="xyzzy" height="1" width="1"/><p>blah</p>';
+        var data = '<p>some text<br/><img class="image-inline captioned" src="data:" alt="xyzzy" height="1" width="1"/>blah</p>';
+        var expected = '<p>some text</p><img class="image-inline captioned" src="data:" alt="xyzzy" height="1" width="1"/><p>blah</p>';
         this.conversionTest(data, expected);
         // If there is no surrounding text we don't want empty paras.
-        var data = '<p><img class="image-inline captioned" src="javascript:" alt="xyzzy" height="1" width="1"/></p>';
-        var expected = '<img class="image-inline captioned" src="javascript:" alt="xyzzy" height="1" width="1"/>';
+        var data = '<p><img class="image-inline captioned" src="data:" alt="xyzzy" height="1" width="1"/></p>';
+        var expected = '<img class="image-inline captioned" src="data:" alt="xyzzy" height="1" width="1"/>';
         this.conversionTest(data, expected);
         // But ordinary images are fine.
-        var data = '<p>some text<br/><img class="image-inline" src="javascript:" alt="xyzzy" height="1" width="1"/>blah</p>';
-        var expected = '<p>some text<br/><img class="image-inline" src="javascript:" alt="xyzzy" height="1" width="1"/>blah</p>';
+        var data = '<p>some text<br/><img class="image-inline" src="data:" alt="xyzzy" height="1" width="1"/>blah</p>';
+        var expected = '<p>some text<br/><img class="image-inline" src="data:" alt="xyzzy" height="1" width="1"/>blah</p>';
         this.conversionTest(data, expected);
     };
 

From duncan at codespeak.net  Fri May 18 15:47:41 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Fri, 18 May 2007 15:47:41 +0200 (CEST)
Subject: [kupu-checkins] r43482 - in kupu/trunk/kupu: doc plone
	plone/kupu_plone_layer
Message-ID: <20070518134741.C3D048074@code0.codespeak.net>

Author: duncan
Date: Fri May 18 15:47:41 2007
New Revision: 43482

Modified:
   kupu/trunk/kupu/doc/CHANGES.txt
   kupu/trunk/kupu/plone/body.kupu
   kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
Log:
Plone ticket 5420: "Edit with kupu" broken for fields on custom fieldset
https://dev.plone.org/plone/ticket/5420

Modified: kupu/trunk/kupu/doc/CHANGES.txt
==============================================================================
--- kupu/trunk/kupu/doc/CHANGES.txt	(original)
+++ kupu/trunk/kupu/doc/CHANGES.txt	Fri May 18 15:47:41 2007
@@ -20,6 +20,8 @@
     <br> tags are left unchanged (so those people who insist on using
     the to generate whitespace still can).
 
+  - Plone tickets: 5420
+
 - 1.4 Beta 6
 
   - Removed the getToolByName deprecation workround since

Modified: kupu/trunk/kupu/plone/body.kupu
==============================================================================
--- kupu/trunk/kupu/plone/body.kupu	(original)
+++ kupu/trunk/kupu/plone/body.kupu	Fri May 18 15:47:41 2007
@@ -69,7 +69,8 @@
         tal:attributes="style python:test(floated, 'float:left;;', '');"
       ><span class="discreet"><a class="forcekupu" href="#"
         i18n:translate="suppress-kupu"
-        tal:attributes="href string:${request/URL0}?kupu.suppress=${fieldName};"
+        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>
@@ -86,7 +87,8 @@
         <span class="discreet"><a class="forcekupu" href="#"
            i18n:translate="force-kupu"
            tal:condition="python:portal.kupu_library_tool.isKupuEnabled(REQUEST=context.REQUEST, context=context, fieldName=fieldName)"
-           tal:attributes="href string:${request/URL0}?kupu.convert=${fieldName};"
+           tal:define="fs fieldset|nothing;fs python:test(fs,'&amp;fieldset=%s'%fs,None);"
+           tal:attributes="href string:${request/URL0}?kupu.convert=${fieldName}${fs};"
            title="reload current page using kupu to edit this field">
            Edit with visual editor
         </a></span>

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 May 18 15:47:41 2007
@@ -21,7 +21,7 @@
     <!--$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 42388 2007-04-28 10:29:22Z limi $-->
+    <!--$Id: body.kupu 43479 2007-05-18 13:02:42Z duncan $-->
     <!--$Id: toolbar.kupu 35491 2006-12-08 15:41:49Z duncan $-->
     <!--$Id save.kupu (not yet in svn) $-->
     <!--$Id: drawers.kupu 35477 2006-12-08 13:20:38Z duncan $-->
@@ -447,7 +447,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" tal:attributes="href string:${request/URL0}?kupu.suppress=${fieldName};" title="reload current page without 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:attributes="style python:test(floated, 'float:left;;', '');"><span class="discreet"><a class="forcekupu" href="#" i18n:translate="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>
@@ -471,7 +471,7 @@
   
     <tal:archetypes tal:condition="fieldName|nothing">
       <div class="kupuoverride" tal:condition="python:path('widget/allow_format_edit|python:True') and not path('kupu_convert_message_generated|nothing')" 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="force-kupu" tal:condition="python:portal.kupu_library_tool.isKupuEnabled(REQUEST=context.REQUEST, context=context, fieldName=fieldName)" tal:attributes="href string:${request/URL0}?kupu.convert=${fieldName};" title="reload current page using kupu to edit this field">
+        <span class="discreet"><a class="forcekupu" href="#" i18n:translate="force-kupu" tal:condition="python:portal.kupu_library_tool.isKupuEnabled(REQUEST=context.REQUEST, context=context, fieldName=fieldName)" tal:define="fs fieldset|nothing;fs python:test(fs,'&amp;fieldset=%s'%fs,None);" tal:attributes="href string:${request/URL0}?kupu.convert=${fieldName}${fs};" title="reload current page using kupu to edit this field">
            Edit with visual editor
         </a></span>
       </div>

From duncan at codespeak.net  Fri May 18 17:12:15 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Fri, 18 May 2007 17:12:15 +0200 (CEST)
Subject: [kupu-checkins] r43492 - in kupu/trunk/kupu: . common
	plone/kupu_plone_layer tests
Message-ID: <20070518151215.7CA408077@code0.codespeak.net>

Author: duncan
Date: Fri May 18 17:12:15 2007
New Revision: 43492

Modified:
   kupu/trunk/kupu/common/kupucontentfilters.js
   kupu/trunk/kupu/common/kupueditor.js
   kupu/trunk/kupu/jslint.opts
   kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneinit.js
   kupu/trunk/kupu/tests/test_xhtml.js
Log:
Cleanup code could miss <br> and <p> tags: removingChild has a side effect of removing a node from a getElementsByTagName result set, so we need to iterate over the <p> and <br> tags in reverse order.
Fix for Plone issue #6056 Extra line breaks added in pre tags (not strictly a kupu bug but we now remove <br> tags from any pre content on saving and therefore avoid triggering the htmlTidy bug).

Modified: kupu/trunk/kupu/common/kupucontentfilters.js
==============================================================================
--- kupu/trunk/kupu/common/kupucontentfilters.js	(original)
+++ kupu/trunk/kupu/common/kupucontentfilters.js	Fri May 18 17:12:15 2007
@@ -598,7 +598,7 @@
                 target.setAttribute(valid[i], val);
             }
         };
-    }
+    };
 
     this._convertToSarissaNode = function(ownerdoc, htmlnode) {
         var root = this._convertNodes(ownerdoc, htmlnode, null, new this.Set(['html']));
@@ -661,7 +661,7 @@
 
     this._cleanupParas = function(ownerdoc, root) {
         var paras = root.getElementsByTagName('p');
-        for (var i = 0; i < paras.length; i++) {
+        for (var i = paras.length-1; i >= 0; i--) {
             this._cleanupPara(ownerdoc, paras[i]);
         }
     };
@@ -670,7 +670,8 @@
      */
     this._cleanupBr = function(ownerdoc, root) {
         var breaks = root.getElementsByTagName('br');
-        for (var i = 0; i < breaks.length; i++) {
+        // Iterate backwards: removeChild removes node from breaks.
+        for (var i = breaks.length-1; i >= 0; i--) {
             var node = breaks[i];
             var parentNode = node.parentNode;
             if (parentNode.tagName=='body') {
@@ -681,7 +682,7 @@
                 }
                 parentNode.insertBefore(p,node);
                 parentNode.removeChild(node);
-            } else if (!node.nextSibling && (/p|div/i.test(parentNode.nodeName) && !(node.previousSibling&&node.previousSibling.nodeName=='br'))) {
+            } else if (!node.nextSibling && (/(p|div)\b/i.test(parentNode.nodeName) && !(node.previousSibling&&node.previousSibling.nodeName=='br'))) {
                 parentNode.removeChild(node);
             }
         }
@@ -748,5 +749,3 @@
         return xhtmlnode;
     };
 }
-
-

Modified: kupu/trunk/kupu/common/kupueditor.js
==============================================================================
--- kupu/trunk/kupu/common/kupueditor.js	(original)
+++ kupu/trunk/kupu/common/kupueditor.js	Fri May 18 17:12:15 2007
@@ -654,7 +654,7 @@
                 return '<'+close+tag+'>';
             });
         };
-        text = text.replace(/<p>(<hr.*?>)<\/p>/,'$1');
+        text = text.replace(/<p>(<hr.*?>)<\/p>/g,'$1');
         bodies[bodies.length-1].innerHTML = text;
     };
 
@@ -769,6 +769,9 @@
             /\s*(<(p|div|h.|ul|ol|dl|menu|dir|pre|blockquote|address|center|table|thead|tbody|tfoot|tr|th|td))\b/ig, '\n$1');
         data = data.replace(
             /\s*(<\/(p|div|h.|ul|ol|dl|menu|dir|pre|blockquote|address|center|table|thead|tbody|tfoot|tr|th|td)>)\s*/ig, '$1\n');
+        data = data.replace(/\<pre\>((?:.|\n)*?)\<\/pre\>/gm, function(s) {
+            return s.replace(/<br\b[^>]*>/gi,'\n');
+            });
         return data.strip();
     };
     this.escapeEntities = function(xml) {

Modified: kupu/trunk/kupu/jslint.opts
==============================================================================
--- kupu/trunk/kupu/jslint.opts	(original)
+++ kupu/trunk/kupu/jslint.opts	Fri May 18 17:12:15 2007
@@ -4,7 +4,7 @@
 --extern ColorchooserTool,ContextFixer,ContextMenu,ContextMenuElement
 --extern DefinitionListTool,DrawerTool,extern,getBaseTagClass,getFromSelector
 --extern IESelection,ImageLibraryDrawer,ImageTool,ImageToolBox,initKupu,kupu
---extern KupuButton,kupuButtonDisable,kupuButtonEnable,KupuDocument,KupuEditor
+--extern KupuButton,kupuButtonDisable,kupuButtonEnable,KupuDocument,KupuEditor,kupuFixImage
 --extern KupuInspector,KupuRemoveElementButton,KupuSpellChecker,KupuStateButton
 --extern KupuUI,KupuZoomTool,LinkDrawer,LinkLibraryDrawer,LinkTool,LinkToolBox
 --extern ListTool,loadDictFromXML,MozillaSelection,newDocumentElement

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneinit.js
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneinit.js	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneinit.js	Fri May 18 17:12:15 2007
@@ -285,7 +285,7 @@
     function tabHandler(event) {
         event = event||window.event;
         if (event.keyCode!=9) { return; }
-        if (!/kupu-fulleditor-zoomed/.test(document.body.className)) {
+        if (!(/kupu-fulleditor-zoomed/.test(document.body.className))) {
             var form = textarea.form;
             var els = form.elements;
             var target, targindex;

Modified: kupu/trunk/kupu/tests/test_xhtml.js
==============================================================================
--- kupu/trunk/kupu/tests/test_xhtml.js	(original)
+++ kupu/trunk/kupu/tests/test_xhtml.js	Fri May 18 17:12:15 2007
@@ -147,7 +147,11 @@
         var expected = '<p>alpha</p><p/><p>gamma</p>';
         this.conversionTest(data, expected);
     };
-    
+    this.testMultipleNakedBr = function() {
+        var data = '<p>alpha</p><br><br><br><br><p>gamma</p>';
+        var expected = '<p>alpha</p><p/><p/><p/><p/><p>gamma</p>';
+        this.conversionTest(data, expected);
+    };
     this.testXmlAttrs = function() {
         var data = '<pre xml:space="preserve" xml:lang="fr">This is a test</pre>';
         var expected1 = '<pre xml:lang="fr" xml:space="preserve">This is a test</pre>';

From duncan at codespeak.net  Fri May 18 17:37:57 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Fri, 18 May 2007 17:37:57 +0200 (CEST)
Subject: [kupu-checkins] r43493 - in kupu/trunk/kupu: . doc
	plone/kupu_plone_layer
Message-ID: <20070518153757.43BF58077@code0.codespeak.net>

Author: duncan
Date: Fri May 18 17:37:56 2007
New Revision: 43493

Modified:
   kupu/trunk/kupu/   (props changed)
   kupu/trunk/kupu/doc/CHANGES.txt
   kupu/trunk/kupu/plone/kupu_plone_layer/resolveuid.py
Log:
resolveuid now generates a proper 404 error for unrecognised uids.
If no uid is specified it now throws an unauthorised error (Plone issue 6103).

Modified: kupu/trunk/kupu/doc/CHANGES.txt
==============================================================================
--- kupu/trunk/kupu/doc/CHANGES.txt	(original)
+++ kupu/trunk/kupu/doc/CHANGES.txt	Fri May 18 17:37:56 2007
@@ -20,7 +20,7 @@
     <br> tags are left unchanged (so those people who insist on using
     the to generate whitespace still can).
 
-  - Plone tickets: 5420
+  - Plone tickets: 5420, 6056, 6103
 
 - 1.4 Beta 6
 

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/resolveuid.py
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/resolveuid.py	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/resolveuid.py	Fri May 18 17:37:56 2007
@@ -9,11 +9,16 @@
 # (reference_url is supposed to do the same thing, but is broken)
 from Products.CMFCore.utils import getToolByName
 from Products.PythonScripts.standard import html_quote
+from AccessControl import Unauthorized
 
 request = context.REQUEST
 response = request.RESPONSE
 
-uuid = traverse_subpath.pop(0)
+try:
+    uuid = traverse_subpath.pop(0)
+except:
+    raise Unauthorized, context
+
 reference_tool = getToolByName(context, 'reference_catalog')
 obj = reference_tool.lookupObject(uuid)
 if not obj:
@@ -21,8 +26,7 @@
     if hook:
         obj = hook(uuid)
     if not obj:
-        return context.standard_error_message(error_type=404,
-            error_message='''The link you followed appears to be broken''')
+        return response.notFoundError('''The link you followed appears to be broken''')
 
 if traverse_subpath:
     traverse_subpath.insert(0, obj.absolute_url())

From duncan at codespeak.net  Mon May 21 10:22:58 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Mon, 21 May 2007 10:22:58 +0200 (CEST)
Subject: [kupu-checkins] r43521 - kupu/trunk/kupu/plone
Message-ID: <20070521082258.9A1BD807E@code0.codespeak.net>

Author: duncan
Date: Mon May 21 10:22:57 2007
New Revision: 43521

Modified:
   kupu/trunk/kupu/plone/html2captioned.py
Log:
Scaled images picked up size of original image in captioning code.

Modified: kupu/trunk/kupu/plone/html2captioned.py
==============================================================================
--- kupu/trunk/kupu/plone/html2captioned.py	(original)
+++ kupu/trunk/kupu/plone/html2captioned.py	Mon May 21 10:22:57 2007
@@ -141,7 +141,7 @@
                             if hasattr(aq_base(subtarget), 'getWidth'):
                                 width = subtarget.getWidth()
                             elif hasattr(aq_base(subtarget), 'width'):
-                                width = subtarget.getWidth()
+                                width = subtarget.width
                         if not width:
                             try:
                                 width = target.getWidth()

From duncan at codespeak.net  Mon May 21 12:28:05 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Mon, 21 May 2007 12:28:05 +0200 (CEST)
Subject: [kupu-checkins] r43522 - in kupu/trunk/kupu/plone: kupu_plone_layer
	profiles/default
Message-ID: <20070521102805.3BFA68082@code0.codespeak.net>

Author: duncan
Date: Mon May 21 12:28:03 2007
New Revision: 43522

Modified:
   kupu/trunk/kupu/plone/kupu_plone_layer/sample-kupu-customisation-policy.py
   kupu/trunk/kupu/plone/profiles/default/kupu.xml
Log:
Fix for Plone ticket #6598: Default linkables in Kupu: folder is not, plone site is not, ATRelativePathCriterion is


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	Mon May 21 12:28:03 2007
@@ -13,11 +13,38 @@
 # preferred kupu configuration.
 from Products.CMFCore.utils import getToolByName
 
+LINKABLE_BLACKLIST = (
+    'ATBooleanCriterion',
+    'ATCurrentAuthorCriterion',
+    'ATDateCriteria',
+    'ATDateRangeCriterion',
+    'ATListCriterion',
+    'ATPathCriterion',
+    'ATPortalTypeCriterion',
+    'ATReferenceCriterion',
+    'ATRelativePathCriterion',
+    'ATSelectionCriterion',
+    'ATSimpleIntCriterion',
+    'ATSimpleStringCriterion',
+    'ATSortCriterion',
+    'ChangeSet',
+    'CMF Document',
+    'CMF Event',
+    'CMF Favorite',
+    'CMF File',
+    'CMF Image',
+    'CMF Link',
+    'CMF News Item',
+    'Discussion Item',
+    'Favorite',
+    'Link',
+    'TempFolder',
+)
 RESOURCES = dict(
-    linkable = ('Document', 'Image', 'File', 'News Item', 'Event', 'Folder', 'Large Plone Folder'),
-    mediaobject = ('Image',),
-    collection = ('Plone Site', 'Folder', 'Large Plone Folder'),
-    containsanchors = ('Document', 'News Item', 'Event'),
+    linkable = ('blacklist', LINKABLE_BLACKLIST),
+    mediaobject = ('whitelist', ('Image',)),
+    collection = ('whitelist', ('Plone Site', 'Folder', 'Large Plone Folder')),
+    containsanchors = ('whitelist', ('Document', 'News Item', 'Event')),
     )
 
 EXCLUDED_HTML = [
@@ -126,8 +153,8 @@
 tool.deleteResourceTypes([ t.name for t in types])
 
 print "add resources"
-for k,v in RESOURCES.items():
-    tool.addResourceType(k, typefilter(v))
+for k,(mode,types) in RESOURCES.items():
+    tool.addResourceType(k, typefilter(types), mode=mode)
 
 mappings = tool.zmi_get_resourcetypes()
 for t in mappings:

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	Mon May 21 12:28:03 2007
@@ -83,7 +83,6 @@
     <type>Image</type>
     <type>Large Plone Folder</type>
     <type>Link</type>
-    <type>Plone Site</type>
     <type>TempFolder</type>
     <type>Topic</type>
   </resource>
@@ -96,10 +95,12 @@
     <type>ATPathCriterion</type>
     <type>ATPortalTypeCriterion</type>
     <type>ATReferenceCriterion</type>
+    <type>ATRelativePathCriterion</type>
     <type>ATSelectionCriterion</type>
     <type>ATSimpleIntCriterion</type>
     <type>ATSimpleStringCriterion</type>
     <type>ATSortCriterion</type>
+    <type>ChangeSet</type>
     <type>CMF Document</type>
     <type>CMF Event</type>
     <type>CMF Favorite</type>
@@ -109,7 +110,6 @@
     <type>CMF News Item</type>
     <type>Discussion Item</type>
     <type>Favorite</type>
-    <type>Folder</type>
     <type>Link</type>
     <type>Plone Site</type>
     <type>TempFolder</type>

From duncan at codespeak.net  Mon May 21 13:06:27 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Mon, 21 May 2007 13:06:27 +0200 (CEST)
Subject: [kupu-checkins] r43524 - in kupu/trunk/kupu: common plone
	plone/kupu_plone_layer
Message-ID: <20070521110627.78769808F@code0.codespeak.net>

Author: duncan
Date: Mon May 21 13:06:27 2007
New Revision: 43524

Modified:
   kupu/trunk/kupu/common/kupu_kjax.js
   kupu/trunk/kupu/plone/kupu_config.pt
   kupu/trunk/kupu/plone/kupu_plone_layer/kupu_migration.xml.pt
   kupu/trunk/kupu/plone/zmi_links.pt
Log:
Fix kupu's Links tab so it works in Plone 3.



Modified: kupu/trunk/kupu/common/kupu_kjax.js
==============================================================================
--- kupu/trunk/kupu/common/kupu_kjax.js	(original)
+++ kupu/trunk/kupu/common/kupu_kjax.js	Mon May 21 13:06:27 2007
@@ -13,7 +13,7 @@
 (function(p){
     p._loadXML = function(uri, callback, body, reload, extra) {
         function _sarissaCallback() {
-        /* callback for Sarissa
+            /* callback for Sarissa
             when the callback is called because the data's ready it
             will get the responseXML DOM and call user_callback
             with the DOM as the first argument and the uri loaded
@@ -21,9 +21,9 @@
 
             note that this method should be called in the context of an 
             xmlhttp object
-        */
+            */
             if (xmlhttp.readyState == 4) {
-                this.xmlhttp = null;
+                self.xmlhttp = null;
                 if (xmlhttp.status && xmlhttp.status != 200) {
                     var errmessage = 'Error '+xmlhttp.status+' loading '+(uri||'XML');
                     alert(errmessage);

Modified: kupu/trunk/kupu/plone/kupu_config.pt
==============================================================================
--- kupu/trunk/kupu/plone/kupu_config.pt	(original)
+++ kupu/trunk/kupu/plone/kupu_config.pt	Mon May 21 13:06:27 2007
@@ -18,6 +18,8 @@
 <div metal:fill-slot="prefs_configlet_content" metal:define-slot="prefs_configlet_main"
     tal:define="errors python:request.get('errors', {});">
 
+<metal:styleslot define-slot="style_slot" />
+
 <div class="documentEditable">
 
     <!-- simulating views -->

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	Mon May 21 13:06:27 2007
@@ -12,15 +12,17 @@
        xmlns:kj="http://kupu.oscom.org/namespaces/kjax"
 
        tal:define="pss modules/Products/PythonScripts/standard;
+       getToolByName nocall:modules/Products.CMFCore.utils/getToolByName;
+       kupu     python:getToolByName(context, 'kupu_library_tool');
        wantform not:request/form.submitted|request/button|nothing;
-       uri string:${context/absolute_url_path}/${template/getId}">
+       uri string:${kupu/absolute_url_path}/${template/getId}">
     <body>
       <div id="target" kj:mode="replace" tal:condition="wantform">
         <form action="kupu_migration.xml"
               method="post"
               name="options_form"
               onsubmit="return kj.submitForm(this);"
-              tal:define="infouri string:${context/absolute_url_path}/kupu_kjax_support.xml;
+              tal:define="infouri string:${kupu/absolute_url_path}/kupu_kjax_support.xml;
               uids request/SESSION/kupu_migrator/pathuids|python:[];"
               >
           <fieldset tal:define="state request/SESSION/kupu_migrator|nothing;
@@ -28,7 +30,7 @@
                     current_portal_type state/portal_type|string:;
                     current string:$current_portal_type.$current_fieldname;" >
             <legend>Type (Field name)</legend>
-          <div tal:repeat="f context/getKupuFields">
+          <div tal:repeat="f kupu/getKupuFields">
             <tal:var define="id string:type_radio_${repeat/f/index};
                      first repeat/f/start;
                      t string:${f/portal_type}.${f/name};
@@ -59,7 +61,7 @@
             <div class="formHelp">
               You may restrict the search to specific folders.
             </div>
-            <div metal:use-macro="context/kupu_kjax_support.xml/macros/edit" />
+            <div metal:use-macro="kupu/kupu_kjax_support.xml/macros/edit" />
           </fieldset>
           <fieldset>
             <legend>Info</legend>
@@ -82,11 +84,11 @@
       <div id="kupu-output" kj:mode="replace" tal:condition="wantform" />
 
       <div tal:condition="not:wantform">
-        <tal:var tal:define="m python:context.link_migration();">
+        <tal:var tal:define="m python:kupu.link_migration();">
           <div tal:condition="m/nexturi" tal:attributes="kj:next m/nexturi;kj:delay m/delay|nothing" />
           <div id="kupu-output" kj:mode="replace" tal:condition="m/firstoutput" />
           <div id="target" kj:mode="replace">
-            <!-- <pre tal:content="context/link_migration">current status</pre> -->
+            <!-- <pre tal:content="kupu/link_migration">current status</pre> -->
             <div tal:condition="m/position|nothing">
               <!-- progress bar -->
               <div class="kupu-progress"><div class="kupu-progressbar"
@@ -139,7 +141,7 @@
                 <a tal:attributes="href o/url" tal:content="o/title" /> [<span tal:content="o/url" />]</div>
               <ul tal:condition="o/info|nothing">
                 <li tal:repeat="link o/info"
-                    tal:define="portal_url context/portal_url">
+                    tal:define="portal_url python:getToolByName(context, 'portal_url')">
                   <code>
                   <span tal:content="link/before" /><a
                      target="badlink"

Modified: kupu/trunk/kupu/plone/zmi_links.pt
==============================================================================
--- kupu/trunk/kupu/plone/zmi_links.pt	(original)
+++ kupu/trunk/kupu/plone/zmi_links.pt	Mon May 21 13:06:27 2007
@@ -3,7 +3,7 @@
 metal:use-macro="here/kupu_config/macros/master"
 i18n:domain="plone">
 
-  <metal:cssslot fill-slot="css_slot">
+  <metal:cssslot fill-slot="style_slot">
     <link href="kupustyles.css" rel="stylesheet" type="text/css" tal:attributes="href string:${portal_url}/kupustyles.css"/>
     <link href="kupuplone.css" rel="stylesheet" type="text/css" tal:attributes="href string:${portal_url}/kupuplone.css"/>
     <link href="kupudrawerstyles.css" rel="stylesheet" type="text/css" tal:attributes="href string:${portal_url}/kupudrawerstyles.css"/>

From duncan at codespeak.net  Mon May 21 14:51:40 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Mon, 21 May 2007 14:51:40 +0200 (CEST)
Subject: [kupu-checkins] r43527 - in kupu/trunk/kupu: doc plone
Message-ID: <20070521125140.45A78808F@code0.codespeak.net>

Author: duncan
Date: Mon May 21 14:51:38 2007
New Revision: 43527

Modified:
   kupu/trunk/kupu/doc/CHANGES.txt
   kupu/trunk/kupu/plone/plonedrawers.py
   kupu/trunk/kupu/plone/plonelibrarytool.py
   kupu/trunk/kupu/plone/zmi_links.pt
Log:
Fix for Plone ticket #6548: Links tab on kupu control panel gives traceback, cannot find kupu_references
The links tab now creates the directory view for kupu_references if it needs it. This should make it robust against a variety of scenarios where the view could be missing.


Modified: kupu/trunk/kupu/doc/CHANGES.txt
==============================================================================
--- kupu/trunk/kupu/doc/CHANGES.txt	(original)
+++ kupu/trunk/kupu/doc/CHANGES.txt	Mon May 21 14:51:38 2007
@@ -20,7 +20,23 @@
     <br> tags are left unchanged (so those people who insist on using
     the to generate whitespace still can).
 
-  - Plone tickets: 5420, 6056, 6103
+  - Plone tickets:
+
+    * 5189 patch to support embed tag
+
+    * 5420 "Edit with kupu" broken for fields on custom fieldset
+
+    * 6056 Extra line breaks added in pre tags
+
+    * 6103 resolveuid does not check input values and throws deep
+      "list index out of bound" error in ZopeGuards.py
+
+    * 6536 Formatting of captioned images is messed up
+
+    * 6548 Links tab on kupu control panel gives traceback, cannot
+      find kupu_references
+
+    * 6598 Default linkables in Kupu: folder is not, plone site is not, ATRelativePathCriterion is
 
 - 1.4 Beta 6
 

Modified: kupu/trunk/kupu/plone/plonedrawers.py
==============================================================================
--- kupu/trunk/kupu/plone/plonedrawers.py	(original)
+++ kupu/trunk/kupu/plone/plonedrawers.py	Mon May 21 14:51:38 2007
@@ -855,8 +855,9 @@
             brains = catalog.searchResults(portal_type=portal_type, limit=1)[:1]
             if brains:
                 info = adaptor.get_image_sizes(brains[0], portal_type, '')
-                for i in info:
-                    sizes[i['uri']] = 1
+                if info:
+                    for i in info:
+                        sizes[i['uri']] = 1
         return sizes
 
     security.declareProtected("View", "convertUidsToPaths")

Modified: kupu/trunk/kupu/plone/plonelibrarytool.py
==============================================================================
--- kupu/trunk/kupu/plone/plonelibrarytool.py	(original)
+++ kupu/trunk/kupu/plone/plonelibrarytool.py	Mon May 21 14:51:38 2007
@@ -148,6 +148,14 @@
         """Returns True if kupu_references is in all skin layers"""
         return util.layer_installed(self, 'kupu_references')
 
+    security.declareProtected(permissions.ManageLibraries, 'ensureReferencesLayer')
+    def ensureReferencesLayer(self, add=False):
+        """Called from the link tab code: we must have the
+        kupu_references directory view at least present for
+        the link tab to work."""
+        out = StringIO()
+        util.register_layer(self, 'plone/kupu_references', 'kupu_references', out, add)
+
     security.declareProtected('View', "getCaptioning")
     def getCaptioning(self):
         """Returns True if captioning is enabled"""
@@ -814,7 +822,7 @@
         if refbrowser is not None:
             out = StringIO()
             if refbrowser:
-                util.register_layer(self, 'plone/kupu_references', 'kupu_references', out)
+                self.ensureReferencesLayer(True);
             else:
                 util.unregister_layers(self, ['kupu_references'], out)
             # Force compressed javascript to be recomputed.

Modified: kupu/trunk/kupu/plone/zmi_links.pt
==============================================================================
--- kupu/trunk/kupu/plone/zmi_links.pt	(original)
+++ kupu/trunk/kupu/plone/zmi_links.pt	Mon May 21 14:51:38 2007
@@ -7,6 +7,8 @@
     <link href="kupustyles.css" rel="stylesheet" type="text/css" tal:attributes="href string:${portal_url}/kupustyles.css"/>
     <link href="kupuplone.css" rel="stylesheet" type="text/css" tal:attributes="href string:${portal_url}/kupuplone.css"/>
     <link href="kupudrawerstyles.css" rel="stylesheet" type="text/css" tal:attributes="href string:${portal_url}/kupudrawerstyles.css"/>
+      <tal:register define="getToolByName nocall:modules/Products.CMFCore.utils/getToolByName;
+       _ python:getToolByName(context, 'kupu_library_tool').ensureReferencesLayer()" />
       <tal:if condition="not:exists:portal/portal_javascripts"
         metal:use-macro="context/kupu_wysiwyg_support/macros/kupu_js_include">
       </tal:if>

From duncan at codespeak.net  Tue May 22 11:49:55 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Tue, 22 May 2007 11:49:55 +0200 (CEST)
Subject: [kupu-checkins] r43558 - in kupu/trunk/kupu: common
	plone/kupu_plone_layer
Message-ID: <20070522094955.2F03F8093@code0.codespeak.net>

Author: duncan
Date: Tue May 22 11:49:54 2007
New Revision: 43558

Modified:
   kupu/trunk/kupu/common/kupucontentfilters.js
   kupu/trunk/kupu/plone/kupu_plone_layer/kupuplone.css.dtml
Log:
embed tag also needs to be forced visible in Firefox.
Attribute filtering for embed tag ('*' attributes) was broken on IE as it added a load of unwanted attributes.

Modified: kupu/trunk/kupu/common/kupucontentfilters.js
==============================================================================
--- kupu/trunk/kupu/common/kupucontentfilters.js	(original)
+++ kupu/trunk/kupu/common/kupucontentfilters.js	Tue May 22 11:49:54 2007
@@ -482,11 +482,12 @@
             var bad = filter.badTagAttributes[nodeName];
             for (var i=0; i < htmlnode.attributes.length; i++) {
                 var attr = htmlnode.attributes[i];
-                if (bad && bad.contains(attr.name)) {
+                var name = attr.name;
+                if (bad && bad.contains(name)) {
                     continue;
                 };
-                if (attr.value !== null && attr.value !== undefined) {
-                    xhtmlnode.setAttribute(attr.name, attr.value);
+                if (attr.specified) {
+                    xhtmlnode.setAttribute(name, attr.value);
                 };
             };
         };

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	Tue May 22 11:49:54 2007
@@ -288,10 +288,10 @@
 }
 /* Firefox makes Flash objects completely invisible.
 We need to force it to display something otherwise you cannot edit existing Flash. */
-.kupu-html object.image-inline {
+.kupu-html object, .kupu-html embed {
    display: block;
    background-image: url(plonekupuimages/flash-placeholder.png);
-   border: 2px green solid;
+   border: 1px black solid;
 }
 /* </dtml-let></dtml-with> */
 

From duncan at codespeak.net  Tue May 22 12:49:26 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Tue, 22 May 2007 12:49:26 +0200 (CEST)
Subject: [kupu-checkins] r43560 - kupu/trunk/kupu/common
Message-ID: <20070522104926.4B8418099@code0.codespeak.net>

Author: duncan
Date: Tue May 22 12:49:25 2007
New Revision: 43560

Modified:
   kupu/trunk/kupu/common/kupudrawers.js
Log:
Fix up the mask frame so it is correctly sized and positioned under all drawers. The frame stops select boxes and embedded objects showing through the drawer in IE.


Modified: kupu/trunk/kupu/common/kupudrawers.js
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers.js	(original)
+++ kupu/trunk/kupu/common/kupudrawers.js	Tue May 22 12:49:25 2007
@@ -39,8 +39,10 @@
         }
         this.current_drawer = drawer;
         if (args===undefined) args = [];
+        drawer.initMask(drawer.element);
         drawer.createContent.apply(drawer, args);
         drawer.editor.suspendEditing();
+        drawer.fixMask();
     };
 
     this.updateState = function(selNode) {
@@ -80,6 +82,9 @@
 };
 
 proto.hide = function() {
+    if (this.maskframe) {
+        this.maskframe.style.display='none';
+    }
     this.element.style.display = 'none';
     this.focussed = false;
 };
@@ -106,6 +111,37 @@
     }
 };
 
+proto.initMask = function(el) {
+    var e = this.maskframe = document.getElementById('kupu-maskframe');
+    if (!this.maskframe) {
+        e = this.maskframe = newElement('iframe',
+            {'id':'kupu-maskframe','src':"javascript:false;", 'frameBorder':"0", 'scrolling':"no" });
+        var style = e.style;
+        style.display = 'none';
+    }
+    el.parentNode.insertBefore(e, el);
+};
+
+proto.fixMask = function() {
+    var mask = this.maskframe;
+    if (mask) {
+        if (mask.parentNode != this.element.parentNode) {
+            this.element.parentNode.insertBefore(mask, this.element);
+        }
+        // display the mask to hide SELECT boxes in IE
+        var el = this.element;
+        var st = mask.style;
+        var st1 = el.style;
+        st.top=st1.top;
+        st.left=st1.left;
+        st.width = el.offsetWidth+'px';
+        st.height = el.offsetHeight+'px';
+        st.left = (el.offsetLeft)+'px';
+        st.position = 'absolute';
+        st.display = '';
+    }
+}
+
 function DrawerWithAnchors(editor, drawertool, anchorui) {
     Drawer.call(this, editor, drawertool);
     this.anchorui = anchorui;
@@ -480,15 +516,7 @@
             this.baseelement = getBaseTagClass(document.body, 'div', 'kupu-librarydrawer-parent');
         }
         this.anchorframe = getBaseTagClass(this.baseelement, 'iframe', 'kupu-anchorframe');
-        this.maskframe = getBaseTagClass(this.baseelement, 'iframe', 'kupu-maskframe');
         var e;
-        if (!this.maskframe) {
-            e = this.maskframe = newElement('iframe',
-                {'className':'kupu-maskframe','src':"javascript:false;", 'frameBorder':"0", 'scrolling':"no" });
-            var style = e.style;
-            style.display = 'none';
-            this.baseelement.insertBefore(e, this.baseelement.firstChild);
-        }
         this.tool = tool;
         this.element = document.getElementById(this.drawerid);
         if (!this.element) {
@@ -532,7 +560,6 @@
     this.hide = function() {
         var el = this.element;
         el.style.left = el.style.top = '';
-        this.maskframe.style.display='none';
         LibraryDrawer.prototype.hide.call(this);
     };
 
@@ -615,13 +642,6 @@
 
         // display the drawer div
         this.element.style.display = 'block';
-        // display the mask to hide SELECT boxes in IE
-        var st = this.maskframe.style;
-        var st1 = this.element.style;
-        st.top=st1.top;st.left=st1.left;
-        st.width = this.element.offsetWidth+'px';
-        st.height = this.element.offsetHeight+'px';
-        st.display = '';
     };
 
     this._singleLibsXslCallback = function(dom) {
@@ -710,6 +730,7 @@
         if (this.editor.getBrowserName() == 'IE' && id == this.resourcespanelid) {
             this.updateDisplay(this.drawerid);
         };
+        this.fixMask();
     };
 
     this.updateResources = function() {

From duncan at codespeak.net  Tue May 22 15:03:43 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Tue, 22 May 2007 15:03:43 +0200 (CEST)
Subject: [kupu-checkins] r43562 - in kupu/trunk/kupu: common default
	plone/kupu_plone_layer
Message-ID: <20070522130343.A7C72806E@code0.codespeak.net>

Author: duncan
Date: Tue May 22 15:03:41 2007
New Revision: 43562

Modified:
   kupu/trunk/kupu/common/kupudrawers.js
   kupu/trunk/kupu/common/kupudrawerstyles.css
   kupu/trunk/kupu/default/drawers.kupu
   kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
   kupu/trunk/kupu/plone/kupu_plone_layer/kupuplone.css.dtml
Log:
Anchor drawer now has tabs instead of radio buttons.

Modified: kupu/trunk/kupu/common/kupudrawers.js
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers.js	(original)
+++ kupu/trunk/kupu/common/kupudrawers.js	Tue May 22 15:03:41 2007
@@ -1464,18 +1464,18 @@
 
     this.initialize = function(editor, tool) {
         Drawer.prototype.initialize.apply(this, [editor, tool]);
-        this.table = this.element.getElementsByTagName('table')[0];
+        this.panel = getBaseTagClass(this.element, 'div', 'kupu-panels');
         this.style1 = getFromSelector('kupu-bm-sel1');
         this.style2 = getFromSelector('kupu-bm-sel2');
         this.ostyle = getFromSelector('kupu-bm-outcls');
         this.nstyle = getFromSelector('kupu-bm-number');
-        this.radio1 = getFromSelector('kupu-ins-bm');
-        this.radio2 = getFromSelector('kupu-toc');
+        var tabs = getBaseTagClass(this.element, 'ul', 'kupu-tabs').getElementsByTagName('a');
         this.paralist = getBaseTagClass(this.element, 'div', 'kupu-bm-paras');
         this.checkall = getFromSelector('kupu-bm-checkall');
-        
-        addEventHandler(this.radio1, 'click', this.switchMode, this);
-        addEventHandler(this.radio2, 'click', this.switchMode, this);
+
+        for (var i = 0; i < tabs.length; i++) {
+            addEventHandler(tabs[i], 'click', this.switchMode, this);
+        }
         addEventHandler(this.checkall, 'click', this.checkAll, this);
         addEventHandler(this.style1, 'change', this.fillList, this);
         addEventHandler(this.style2, 'change', this.fillList, this);
@@ -1484,7 +1484,7 @@
         this.tool.fillStyleSelect(this.ostyle);
     };
     this.getMode = function() {
-        return this.radio1.checked;
+        return !!(/kupu-ins-bm/.test(this.panel.className));
     };
 
     this.checkAll = function() {
@@ -1497,8 +1497,11 @@
     this.switchMode = function(event) {
         event = event || window.event;
         var target = event.currentTarget || event.srcElement;
-        this.table.className = target.id;
+        this.panel.className = 'kupu-panels '+target.parentNode.className;
         this.fillList();
+        if (event.preventDefault) { event.preventDefault();}
+        event.returnValue = false;
+        return false;
     };
     this.fillList = function() {
         var el = newElement;
@@ -1539,7 +1542,6 @@
         };
     };
     this.createContent = function() {
-        if (this.radio2.checked) this.table.className=this.radio2.id;
         this.fillList(); 
         this.element.style.display = 'block';
         this.focusElement();

Modified: kupu/trunk/kupu/common/kupudrawerstyles.css
==============================================================================
--- kupu/trunk/kupu/common/kupudrawerstyles.css	(original)
+++ kupu/trunk/kupu/common/kupudrawerstyles.css	Tue May 22 15:03:41 2007
@@ -130,6 +130,7 @@
  margin: 0; 
  padding: 0; 
  border: 0;
+ clear:left;
 }
 
 td.panel {
@@ -267,6 +268,14 @@
    white-space: nowrap;
 }
 
+.kupu-tabs { border-bottom: 1px solid; margin: 0; padding: 0.5em 0 0 1.5em; }
+.kupu-tabs li {
+  display: inline; padding: 2px; border: 1px solid; margin: 0 5px 0 0;
+}
+.kupu-tabs a { text-decoration: none; }
+.kupu-ins-bm li.kupu-ins-bm, .kupu-toc li.kupu-toc { background: white; border-bottom: none !IMPORTANT; padding-bottom: 3px;}
+table.kupu-tabbed { border-spacing: 0;}
+
 .kupu-ins-bm #kupu-bm-sel2, .kupu-ins-bm .kupu-bm-heading {
    display:none;
 }

Modified: kupu/trunk/kupu/default/drawers.kupu
==============================================================================
--- kupu/trunk/kupu/default/drawers.kupu	(original)
+++ kupu/trunk/kupu/default/drawers.kupu	Tue May 22 15:03:41 2007
@@ -47,6 +47,10 @@
       <h1 class="kupu-drawer-title" i18n:translate="">External Link</h1>
 
       <div id="kupu-linkdrawer-addlink" class="kupu-panels kupu-linkdrawer-addlink">
+         <ul>
+            <li><a href="#">Link to url</a></li>
+            <li><a href="#">Embed external object</a></li>
+         </ul>
         <table cellspacing="0">
         <tr><td><div class="kupu-toolbox-label">
           <!-- Link to items matching the keyword  -->
@@ -240,20 +244,12 @@
   <kupu:part name="anchordrawer">
     <div id="kupu-anchordrawer" class="kupu-drawer kupu-anchordrawer">
       <h1 class="kupu-drawer-title" i18n:translate="anchordrawer_title">Anchors</h1>
-      <div class="kupu-panels">
-        <table class="kupu-ins-bm">
-          <tr style="margin-bottom: 5px">
-            <td colspan="2">
-              <label i18n:translate="" for="kupu-ins-bm">
-                Link to anchor
-              </label>
-              <input type="radio" name="kupu-bm-mode" checked="checked" id="kupu-ins-bm"/>
-              <label for="kupu-toc" i18n:translate="">
-                Table of contents
-              </label>
-              <input type="radio" name="kupu-bm-mode" id="kupu-toc"/> 
-            </td>
-          </tr>
+      <div class="kupu-panels kupu-ins-bm">
+         <ul class="kupu-tabs">
+            <li class="kupu-ins-bm"><a href="#" i18n:translate="">Link to anchor</a></li>
+            <li class="kupu-toc"><a href="#" i18n:translate="">Table of contents</a></li>
+         </ul>
+        <table class="kupu-tabbed">
           <tr>
             <td class="kupu-bm-select">
               <select id="kupu-bm-sel1" size="10"> </select>

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 May 22 15:03:41 2007
@@ -21,7 +21,7 @@
     <!--$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 43479 2007-05-18 13:02:42Z duncan $-->
+    <!--$Id: body.kupu 43482 2007-05-18 13:47:41Z duncan $-->
     <!--$Id: toolbar.kupu 35491 2006-12-08 15:41:49Z duncan $-->
     <!--$Id save.kupu (not yet in svn) $-->
     <!--$Id: drawers.kupu 35477 2006-12-08 13:20:38Z duncan $-->
@@ -227,6 +227,10 @@
       <h1 class="kupu-drawer-title" i18n:translate="">External Link</h1>
 
       <div id="kupu-linkdrawer-addlink" class="kupu-panels kupu-linkdrawer-addlink">
+         <ul>
+            <li><a href="#">Link to url</a></li>
+            <li><a href="#">Embed external object</a></li>
+         </ul>
         <table cellspacing="0">
         <tr><td><div class="kupu-toolbox-label">
           
@@ -366,20 +370,12 @@
   
     <div id="kupu-anchordrawer" class="kupu-drawer kupu-anchordrawer">
       <h1 class="kupu-drawer-title" i18n:translate="anchordrawer_title">Anchors</h1>
-      <div class="kupu-panels">
-        <table class="kupu-ins-bm">
-          <tr style="margin-bottom: 5px">
-            <td colspan="2">
-              <label i18n:translate="" for="kupu-ins-bm">
-                Link to anchor
-              </label>
-              <input type="radio" name="kupu-bm-mode" checked="checked" id="kupu-ins-bm"/>
-              <label for="kupu-toc" i18n:translate="">
-                Table of contents
-              </label>
-              <input type="radio" name="kupu-bm-mode" id="kupu-toc"/> 
-            </td>
-          </tr>
+      <div class="kupu-panels kupu-ins-bm">
+         <ul class="kupu-tabs">
+            <li class="kupu-ins-bm"><a href="#" i18n:translate="">Link to anchor</a></li>
+            <li class="kupu-toc"><a href="#" i18n:translate="">Table of contents</a></li>
+         </ul>
+        <table class="kupu-tabbed">
           <tr>
             <td class="kupu-bm-select">
               <select id="kupu-bm-sel1" size="10"> </select>

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	Tue May 22 15:03:41 2007
@@ -84,6 +84,14 @@
   border:1px solid &dtml-contentViewBorderColor;;
 }
 
+ul.kupu-tabs li {
+  background-color:&dtml-contentViewBackgroundColor;;
+  border:1px solid &dtml-contentViewBorderColor;;
+}
+ul.kupu-tabs {
+  border-bottom: 1px solid &dtml-contentViewBorderColor;;
+}
+
 .kupu-tb-buttons button {
   width: 24px;
   height: 24px;

From duncan at codespeak.net  Tue May 22 17:29:34 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Tue, 22 May 2007 17:29:34 +0200 (CEST)
Subject: [kupu-checkins] r43565 - in kupu/trunk/kupu: common default
	plone/kupu_plone_layer
Message-ID: <20070522152934.24FA8806B@code0.codespeak.net>

Author: duncan
Date: Tue May 22 17:29:33 2007
New Revision: 43565

Modified:
   kupu/trunk/kupu/common/kupudrawers.js
   kupu/trunk/kupu/common/kupudrawerstyles.css
   kupu/trunk/kupu/common/kupuhelpers.js
   kupu/trunk/kupu/default/drawers.kupu
   kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
Log:
Added a tab to the external link drawer to insert 'external' html. This can be used to insert object/embed tags generate by sites such as youtube or picasa.

Modified: kupu/trunk/kupu/common/kupudrawers.js
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers.js	(original)
+++ kupu/trunk/kupu/common/kupudrawers.js	Tue May 22 17:29:33 2007
@@ -39,7 +39,9 @@
         }
         this.current_drawer = drawer;
         if (args===undefined) args = [];
-        drawer.initMask(drawer.element);
+        if (this.isIE) {
+            drawer.initMask(drawer.element);
+        }
         drawer.createContent.apply(drawer, args);
         drawer.editor.suspendEditing();
         drawer.fixMask();
@@ -276,10 +278,25 @@
     DrawerWithAnchors.call(this, elementid, tool);
     
     var input = getBaseTagClass(this.element, 'input', 'kupu-linkdrawer-input');
+    var embed = getBaseTagClass(this.element, 'textarea', 'kupu-embed-input');
     var preview = getBaseTagClass(this.element, 'iframe', 'kupu-linkdrawer-preview');
     this.anchorframe = preview;
     this.anchorui = getBaseTagClass(this.element, 'tr', 'kupu-linkdrawer-anchors');
     this.target = '';
+    this.panel = getBaseTagClass(this.element, 'div', 'kupu-panels');
+    this.switchMode = function(event) {
+        event = event || window.event;
+        var target = event.currentTarget || event.srcElement;
+        this.panel.className = 'kupu-panels '+target.parentNode.className;
+        if (event.preventDefault) { event.preventDefault();}
+        event.returnValue = false;
+        return false;
+    };
+    var tabs = getBaseTagClass(this.element, 'ul', 'kupu-tabs').getElementsByTagName('a');
+    for (var i = 0; i < tabs.length; i++) {
+        addEventHandler(tabs[i], 'click', this.switchMode, this);
+    }
+    addEventHandler(embed, 'click', function() { if(embed.defaultValue==embed.value) {embed.select();} });
 
     this.selChange = function() {
         var anchor = this.getFragment();
@@ -293,8 +310,9 @@
 
     this.createContent = function() {
         /* display the drawer */
-        var currnode = this.editor.getSelectedNode();
-        var linkel = this.editor.getNearestParentOfType(currnode, 'a');
+        var ed = this.editor;
+        var currnode = ed.getSelectedNode();
+        var linkel = ed.getNearestParentOfType(currnode, 'a');
         input.value = "";
 
         this.preview();
@@ -303,6 +321,12 @@
         } else {
             input.value = 'http://';
         };
+        var obj = ed.getNearestParentOfType(currnode, 'object') || ed.getNearestParentOfType(currnode, 'embed');
+        if (obj) {
+            embed.value = getOuterHtml(obj);
+        } else {
+            embed.value = embed.defaultValue;
+        }
         this.element.style.display = 'block';
         this.hideAnchors();
         this.focusElement();
@@ -311,10 +335,22 @@
     this.save = function() {
         /* add or modify a link */
         this.editor.resumeEditing();
-        var url = input.value;
-        this.tool.createLink(url, null, null, this.target);
-        input.value = '';
-
+        if (this.getMode()) {
+            var url = input.value;
+            this.tool.createLink(url, null, null, this.target);
+            input.value = '';
+        } else {
+            // Import the html
+            var doc = this.editor.getInnerDocument();
+            var selection = this.editor.getSelection();
+            var dummy = doc.createElement("div");
+            dummy.innerHTML = embed.value;
+            try {
+                while (dummy.firstChild) {
+                    selection.replaceWithNode(dummy.firstChild, false);
+                };
+            } catch(e) {};
+        }
         // XXX when reediting a link, the drawer does not close for
         // some weird reason. BUG! Close the drawer manually until we
         // find a fix:
@@ -328,13 +364,18 @@
         return current;
     }
     
+    this.getMode = function() {
+        return !!(/addlink/.test(this.panel.className));
+    };
     this.preview = function() {
-        preview.src = input.value;
-        this.showAnchors(currentAnchor());
-        if (this.editor.getBrowserName() == 'IE') {
-            preview.width = "800";
-            preview.height = "365";
-            preview.style.zoom = "60%";
+        if (this.getMode()) {
+            preview.src = input.value;
+            this.showAnchors(currentAnchor());
+            if (this.editor.getBrowserName() == 'IE') {
+                preview.width = "800";
+                preview.height = "365";
+                preview.style.zoom = "60%";
+            };
         };
     };
 
@@ -1637,7 +1678,7 @@
         }
         event.cancelBubble = true;
         if (event.stopPropogation) event.stopPropogation();
-
+        event.returnValue = false;
         return false;
     }
     return true;

Modified: kupu/trunk/kupu/common/kupudrawerstyles.css
==============================================================================
--- kupu/trunk/kupu/common/kupudrawerstyles.css	(original)
+++ kupu/trunk/kupu/common/kupudrawerstyles.css	Tue May 22 17:29:33 2007
@@ -72,8 +72,12 @@
 .kupu-linkdrawer-input {
    width: 500px;
 }
+.kupu-embed-input {
+   width: 500px;
+   height: 20em;
+}
 iframe.kupu-linkdrawer-preview {
-   width: 100%;
+  width: 100%; height:20em;
 }
 .kupu-preview-row {
   float: right;
@@ -273,9 +277,14 @@
   display: inline; padding: 2px; border: 1px solid; margin: 0 5px 0 0;
 }
 .kupu-tabs a { text-decoration: none; }
-.kupu-ins-bm li.kupu-ins-bm, .kupu-toc li.kupu-toc { background: white; border-bottom: none !IMPORTANT; padding-bottom: 3px;}
+.kupu-ins-bm li.kupu-ins-bm, .kupu-toc li.kupu-toc,
+.kupu-linkdrawer-addlink li.kupu-linkdrawer-addlink,
+.kupu-linkdrawer-embed li.kupu-linkdrawer-embed { background: white; border-bottom: none !IMPORTANT; padding-bottom: 3px;}
 table.kupu-tabbed { border-spacing: 0;}
 
+.kupu-linkdrawer-addlink .kupu-embed { display: none; }
+.kupu-linkdrawer-embed .kupu-addlink { display: none; }
+
 .kupu-ins-bm #kupu-bm-sel2, .kupu-ins-bm .kupu-bm-heading {
    display:none;
 }

Modified: kupu/trunk/kupu/common/kupuhelpers.js
==============================================================================
--- kupu/trunk/kupu/common/kupuhelpers.js	(original)
+++ kupu/trunk/kupu/common/kupuhelpers.js	Tue May 22 17:29:33 2007
@@ -1519,4 +1519,22 @@
         var fld = document.getElementById(label.htmlFor);
         if(fld) { fld.style.display = vis; }
     }
-}
\ No newline at end of file
+}
+
+function getOuterHtml(node) {
+    var html = '<';
+    html += node.nodeName.toLowerCase();
+    var attrs = node.attributes;
+    for (var a = 0; a < attrs.length; a++) {
+        var att = attrs[a];
+        if (att.specified) {
+            html += ' ' + att.nodeName.toLowerCase() + '="' + att.nodeValue + '"';
+        }
+    }
+    html += '>';
+    if (!(/hr|br|img|input/i.test(node.nodeName))) {
+        html += node.innerHTML;
+        html += '<\/' + node.nodeName.toLowerCase() + '>';
+    }
+    return html;
+}

Modified: kupu/trunk/kupu/default/drawers.kupu
==============================================================================
--- kupu/trunk/kupu/default/drawers.kupu	(original)
+++ kupu/trunk/kupu/default/drawers.kupu	Tue May 22 17:29:33 2007
@@ -47,37 +47,63 @@
       <h1 class="kupu-drawer-title" i18n:translate="">External Link</h1>
 
       <div id="kupu-linkdrawer-addlink" class="kupu-panels kupu-linkdrawer-addlink">
-         <ul>
-            <li><a href="#">Link to url</a></li>
-            <li><a href="#">Embed external object</a></li>
+         <ul class="kupu-tabs">
+            <li class="kupu-linkdrawer-addlink"><a href="#">Link to url</a></li>
+            <li class="kupu-linkdrawer-embed"><a href="#">Embed external object</a></li>
          </ul>
-        <table cellspacing="0">
-        <tr><td><div class="kupu-toolbox-label">
-          <!-- Link to items matching the keyword  -->
-          <span i18n:translate="">
-            Link the highlighted text to this URL:
-          </span>
-        </div>
-
-        <input class="kupu-toolbox-st kupu-linkdrawer-input" type="text"
-                onkeypress="return HandleDrawerEnter(event, 'linkdrawer-preview');" />
-        </td>
-        <td class="kupu-preview-button">
-          <button class="kupu-dialog-button"
-                  type="button" id="linkdrawer-preview" onclick="drawertool.current_drawer.preview()"
-                  i18n:translate="">Preview</button>
-        </td></tr>
-        <tr class="kupu-linkdrawer-anchors" style="display:none">
-          <td colspan="2">
-            <label i18n:translate="" for="anchorselect">Anchor</label>
-            <select id="anchorselect"><option i18n:translate="" value="">(none)</option></select>
-          </td>
-        </tr>
-        <tr><td colspan="2" align="center">
-        <iframe frameborder="1" scrolling="auto" width="440" height="198"
-                class="kupu-linkdrawer-preview" src="javascript:''">
-        </iframe>
-        </td></tr>
+         <table class="kupu-tabbed">
+            <tbody class="kupu-addlink">
+               <tr>
+                  <td>
+                     <div class="kupu-toolbox-label">
+                        <!-- Link to items matching the keyword  -->
+                        <span i18n:translate="">
+                           Link the highlighted text to this URL:
+                        </span>
+                     </div>
+                     <input class="kupu-toolbox-st kupu-linkdrawer-input" type="text"
+                            onkeypress="return HandleDrawerEnter(event, 'linkdrawer-preview');" />
+                  </td>
+                  <td class="kupu-preview-button">
+                     <button class="kupu-dialog-button"
+                             type="button" id="linkdrawer-preview" onclick="drawertool.current_drawer.preview()"
+                             i18n:translate="">Preview</button>
+                  </td>
+               </tr>
+               <tr class="kupu-linkdrawer-anchors" style="display:none">
+                  <td colspan="2">
+                     <label i18n:translate="" for="anchorselect">Anchor</label>
+                     <select id="anchorselect"><option i18n:translate="" value="">(none)</option></select>
+                  </td>
+               </tr>
+               <tr><td colspan="2" align="center">
+                  <iframe frameborder="1" scrolling="auto" width="440" height="198"
+                          class="kupu-linkdrawer-preview" src="javascript:''">
+                  </iframe>
+                  </td>
+               </tr>
+            </tbody>
+            <tbody class="kupu-embed">
+               <tr>
+                  <td>
+                     <div class="kupu-toolbox-label">
+                        <!-- Link to items matching the keyword  -->
+                        <span i18n:translate="">
+                           Paste &lt;object&gt; or &lt;embed&gt; tag here:
+                        </span>
+                     </div>
+                     <textarea class="kupu-toolbox-st kupu-embed-input">[insert arbitrary HTML code here]</textarea>
+                  </td>
+               </tr>
+               <tr>
+                  <td>
+                  You may use this box to insert custom snippets of
+                  HTML code. There is no guarantee that any code
+                  inserted in this way will be preserved when you save
+                  your edits.
+                  </td>
+               </tr>
+            </tbody>
         </table>
 
         <div class="kupu-dialogbuttons">

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 May 22 17:29:33 2007
@@ -16,7 +16,7 @@
     <!--$Id: toolboxes.kupu 37754 2007-02-01 17:24:29Z yuppie $-->
     <!--$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 41836 2007-04-03 08:36:10Z duncan $-->
+    <!--$Id: drawers.kupu 43562 2007-05-22 13:03:41Z 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 $-->
@@ -227,33 +227,59 @@
       <h1 class="kupu-drawer-title" i18n:translate="">External Link</h1>
 
       <div id="kupu-linkdrawer-addlink" class="kupu-panels kupu-linkdrawer-addlink">
-         <ul>
-            <li><a href="#">Link to url</a></li>
-            <li><a href="#">Embed external object</a></li>
+         <ul class="kupu-tabs">
+            <li class="kupu-linkdrawer-addlink"><a href="#">Link to url</a></li>
+            <li class="kupu-linkdrawer-embed"><a href="#">Embed external object</a></li>
          </ul>
-        <table cellspacing="0">
-        <tr><td><div class="kupu-toolbox-label">
-          
-          <span i18n:translate="">
-            Link the highlighted text to this URL:
-          </span>
-        </div>
-
-        <input class="kupu-toolbox-st kupu-linkdrawer-input" type="text" onkeypress="return HandleDrawerEnter(event, 'linkdrawer-preview');"/>
-        </td>
-        <td class="kupu-preview-button">
-          <button class="kupu-dialog-button" type="button" id="linkdrawer-preview" onclick="drawertool.current_drawer.preview()" i18n:translate="">Preview</button>
-        </td></tr>
-        <tr class="kupu-linkdrawer-anchors" style="display:none">
-          <td colspan="2">
-            <label i18n:translate="" for="anchorselect">Anchor</label>
-            <select id="anchorselect"><option i18n:translate="" value="">(none)</option></select>
-          </td>
-        </tr>
-        <tr><td colspan="2" align="center">
-        <iframe frameborder="1" scrolling="auto" width="440" height="198" class="kupu-linkdrawer-preview" src="javascript:''">
-        </iframe>
-        </td></tr>
+         <table class="kupu-tabbed">
+            <tbody class="kupu-addlink">
+               <tr>
+                  <td>
+                     <div class="kupu-toolbox-label">
+                        
+                        <span i18n:translate="">
+                           Link the highlighted text to this URL:
+                        </span>
+                     </div>
+                     <input class="kupu-toolbox-st kupu-linkdrawer-input" type="text" onkeypress="return HandleDrawerEnter(event, 'linkdrawer-preview');"/>
+                  </td>
+                  <td class="kupu-preview-button">
+                     <button class="kupu-dialog-button" type="button" id="linkdrawer-preview" onclick="drawertool.current_drawer.preview()" i18n:translate="">Preview</button>
+                  </td>
+               </tr>
+               <tr class="kupu-linkdrawer-anchors" style="display:none">
+                  <td colspan="2">
+                     <label i18n:translate="" for="anchorselect">Anchor</label>
+                     <select id="anchorselect"><option i18n:translate="" value="">(none)</option></select>
+                  </td>
+               </tr>
+               <tr><td colspan="2" align="center">
+                  <iframe frameborder="1" scrolling="auto" width="440" height="198" class="kupu-linkdrawer-preview" src="javascript:''">
+                  </iframe>
+                  </td>
+               </tr>
+            </tbody>
+            <tbody class="kupu-embed">
+               <tr>
+                  <td>
+                     <div class="kupu-toolbox-label">
+                        
+                        <span i18n:translate="">
+                           Paste &lt;object&gt; or &lt;embed&gt; tag here:
+                        </span>
+                     </div>
+                     <textarea class="kupu-toolbox-st kupu-embed-input">[insert arbitrary HTML code here]</textarea>
+                  </td>
+               </tr>
+               <tr>
+                  <td>
+                  You may use this box to insert custom snippets of
+                  HTML code. There is no guarantee that any code
+                  inserted in this way will be preserved when you save
+                  your edits.
+                  </td>
+               </tr>
+            </tbody>
         </table>
 
         <div class="kupu-dialogbuttons">

From duncan at codespeak.net  Wed May 23 14:02:09 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Wed, 23 May 2007 14:02:09 +0200 (CEST)
Subject: [kupu-checkins] r43569 - in kupu/trunk/kupu: common
	plone/kupu_plone_layer
Message-ID: <20070523120209.DC05E806E@code0.codespeak.net>

Author: duncan
Date: Wed May 23 14:02:06 2007
New Revision: 43569

Modified:
   kupu/trunk/kupu/common/kupudrawers.js
   kupu/trunk/kupu/common/kupueditor.js
   kupu/trunk/kupu/plone/kupu_plone_layer/kupuplone.css.dtml
Log:
Fix the IE mask for external link and anchor drawers when they switch modes.
Change IE selection save/restore to try to avoid problems with activated embedded objects.
Put a wide border on embedded objects to make them easier to select in IE.

Modified: kupu/trunk/kupu/common/kupudrawers.js
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers.js	(original)
+++ kupu/trunk/kupu/common/kupudrawers.js	Wed May 23 14:02:06 2007
@@ -288,6 +288,7 @@
         event = event || window.event;
         var target = event.currentTarget || event.srcElement;
         this.panel.className = 'kupu-panels '+target.parentNode.className;
+        this.fixMask();
         if (event.preventDefault) { event.preventDefault();}
         event.returnValue = false;
         return false;
@@ -346,8 +347,16 @@
             var dummy = doc.createElement("div");
             dummy.innerHTML = embed.value;
             try {
+                for (i=dummy.childNodes.length-1; i >= 0; i--) {
+                    var c = dummy.childNodes[i];
+                    if (/^\//.test(c.nodeName))
+                    {
+                        dummy.removeChild(c);
+                    }
+                }
                 while (dummy.firstChild) {
-                    selection.replaceWithNode(dummy.firstChild, false);
+                    var c= dummy.firstChild;
+                    selection.replaceWithNode(c, !c.nextSibling);
                 };
             } catch(e) {};
         }
@@ -1540,6 +1549,7 @@
         var target = event.currentTarget || event.srcElement;
         this.panel.className = 'kupu-panels '+target.parentNode.className;
         this.fillList();
+        this.fixMask();
         if (event.preventDefault) { event.preventDefault();}
         event.returnValue = false;
         return false;

Modified: kupu/trunk/kupu/common/kupueditor.js
==============================================================================
--- kupu/trunk/kupu/common/kupueditor.js	(original)
+++ kupu/trunk/kupu/common/kupueditor.js	Wed May 23 14:02:06 2007
@@ -520,6 +520,9 @@
         this._addEventHandler(this.getInnerDocument(), "keyup", this.updateStateHandler, this);
         this._addEventHandler(this.getInnerDocument(), "keyup", function() {this.content_changed = true;}, this);
         this._addEventHandler(this.getInnerDocument(), "mouseup", this.updateStateHandler, this);
+        if (this.getBrowserName() == "IE") {
+            this._addEventHandler(this.getInnerDocument(), "selectionchange", this.onSelectionChange, this);
+        }
     };
 
     this._setDesignModeWhenReady = function() {
@@ -561,21 +564,25 @@
          selection in the iframe gets lost. We only save if the current 
          selection in the document */
         if (this._isDocumentSelected()) {
-            var currange = this.getInnerDocument().selection.createRange();
+            var cursel = this.getInnerDocument().selection;
+            var currange = cursel.createRange();
+            if (cursel.type=="Control" && currange.item(0).nodeName=="BODY") {
+                /* This happens when you try to active an embedded
+                 * object */
+                this._restoreSelection(true);
+                return;
+            }
             this._previous_range = currange;
         };
     };
 
-    this._restoreSelection = function() {
+    this._restoreSelection = function(force) {
         /* re-selects the previous selection in IE. We only restore if the
         current selection is not in the document.*/
-        if (this._previous_range && !this._isDocumentSelected()) {
+        if (this._previous_range && (force || !this._isDocumentSelected())) {
             try {
                 this._previous_range.select();
-            } catch (e) {
-                alert("Error placing back selection");
-                this.logMessage(_('Error placing back selection'));
-            };
+            } catch (e) { };
         };
     };
     
@@ -584,6 +591,10 @@
         this._restoreSelection = function() {};
     }
 
+    this.onSelectionChange = function(event) {
+        this._saveSelection();
+    }
+
     this._isDocumentSelected = function() {
         var editable_body = this.getInnerDocument().getElementsByTagName('body')[0];
         try {
@@ -827,9 +838,9 @@
             this.tools[id].enable();
         }
         if (this.getBrowserName() == "IE") {
-            this._restoreSelection();
             var body = this.getInnerDocument().getElementsByTagName('body')[0];
             body.setAttribute('contentEditable', 'true');
+            this._restoreSelection();
         } else {
             var doc = this.getInnerDocument();
             this.getDocument().execCommand('contentReadOnly', 'false');

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	Wed May 23 14:02:06 2007
@@ -295,11 +295,13 @@
     text-align:center;position:absolute;top:0;width:100%;
 }
 /* Firefox makes Flash objects completely invisible.
-We need to force it to display something otherwise you cannot edit existing Flash. */
+We need to force it to display something otherwise you cannot edit existing Flash.
+A wider border makes selection possible in IE. */
 .kupu-html object, .kupu-html embed {
    display: block;
    background-image: url(plonekupuimages/flash-placeholder.png);
-   border: 1px black solid;
+   border: 5px &dtml-contentViewBorderColor; dotted;
 }
+        
 /* </dtml-let></dtml-with> */
 

From duncan at codespeak.net  Wed May 23 15:06:13 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Wed, 23 May 2007 15:06:13 +0200 (CEST)
Subject: [kupu-checkins] r43571 - in kupu/trunk/kupu: default
	plone/kupu_plone_layer
Message-ID: <20070523130613.B7E8A806E@code0.codespeak.net>

Author: duncan
Date: Wed May 23 15:06:13 2007
New Revision: 43571

Modified:
   kupu/trunk/kupu/default/drawers.kupu
   kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
   kupu/trunk/kupu/plone/kupu_plone_layer/kupuplone.css.dtml
Log:
Added more instructions to embed drawer. Made the border follow plone colours, and avoid showing a double border for nested object/embed tags.

Modified: kupu/trunk/kupu/default/drawers.kupu
==============================================================================
--- kupu/trunk/kupu/default/drawers.kupu	(original)
+++ kupu/trunk/kupu/default/drawers.kupu	Wed May 23 15:06:13 2007
@@ -100,7 +100,8 @@
                   You may use this box to insert custom snippets of
                   HTML code. There is no guarantee that any code
                   inserted in this way will be preserved when you save
-                  your edits.
+                  your edits. To select an existing object from IE click on
+                  the border, from Firefox double click it.
                   </td>
                </tr>
             </tbody>

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	Wed May 23 15:06:13 2007
@@ -16,7 +16,7 @@
     <!--$Id: toolboxes.kupu 37754 2007-02-01 17:24:29Z yuppie $-->
     <!--$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 43562 2007-05-22 13:03:41Z duncan $-->
+    <!--$Id: drawers.kupu 43565 2007-05-22 15:29:33Z 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 $-->
@@ -276,7 +276,8 @@
                   You may use this box to insert custom snippets of
                   HTML code. There is no guarantee that any code
                   inserted in this way will be preserved when you save
-                  your edits.
+                  your edits. To select an existing object from IE click on
+                  the border, from Firefox double click it.
                   </td>
                </tr>
             </tbody>

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	Wed May 23 15:06:13 2007
@@ -302,6 +302,9 @@
    background-image: url(plonekupuimages/flash-placeholder.png);
    border: 5px &dtml-contentViewBorderColor; dotted;
 }
-        
+.kupu-html object embed, .kupu-html object object,
+.kupu-html embed embed, .kupu-html embed object {
+   display:none;
+}
 /* </dtml-let></dtml-with> */
 

From deo at codespeak.net  Wed May 23 17:24:22 2007
From: deo at codespeak.net (deo at codespeak.net)
Date: Wed, 23 May 2007 17:24:22 +0200 (CEST)
Subject: [kupu-checkins] r43577 - kupu/trunk/kupu/plone
Message-ID: <20070523152422.DD986806E@code0.codespeak.net>

Author: deo
Date: Wed May 23 17:24:22 2007
New Revision: 43577

Modified:
   kupu/trunk/kupu/plone/plonedrawers.py
Log:
Fixed the UnicodeDecodeError which happens on kupu_migration.xml.pt when the field's label from any content-type contains non-ascii chars.

Modified: kupu/trunk/kupu/plone/plonedrawers.py
==============================================================================
--- kupu/trunk/kupu/plone/plonedrawers.py	(original)
+++ kupu/trunk/kupu/plone/plonedrawers.py	Wed May 23 17:24:22 2007
@@ -23,6 +23,7 @@
 from Products.PythonScripts.standard import html_quote, newline_to_br
 from Products.kupu.plone.librarytool import KupuError
 from Products.CMFCore.utils import getToolByName
+from Products.CMFPlone.utils import getSiteEncoding
 import html2captioned
 
 try:
@@ -763,9 +764,11 @@
     def getKupuFields(self, filter=1):
         """Returns a list of all kupu editable fields"""
         inuse = getToolByName(self, 'portal_catalog').uniqueValuesFor('portal_type')
+        site_encoding = getSiteEncoding(self)
         for t,f,pt in self._getKupuFields():
             if html2captioned.sanitize_portal_type(pt) in inuse or not filter:
-                yield { 'type': t, 'name': f.getName(), 'label': f.widget.Label(self), 'portal_type':pt }
+                yield dict(type=t, name=f.getName(), portal_type=pt,
+                           label=f.widget.Label(self).decode(site_encoding))
 
     def _getKupuFields(self):
         """Yield all fields which are editable using kupu"""

From duncan at codespeak.net  Thu May 24 14:13:46 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Thu, 24 May 2007 14:13:46 +0200 (CEST)
Subject: [kupu-checkins] r43594 - in kupu/trunk/kupu: common
	common/kupudrawers plone/kupu_references
Message-ID: <20070524121346.C014E80AB@code0.codespeak.net>

Author: duncan
Date: Thu May 24 14:13:44 2007
New Revision: 43594

Modified:
   kupu/trunk/kupu/common/kupudrawers.js
   kupu/trunk/kupu/common/kupudrawers/drawer.xsl
   kupu/trunk/kupu/common/kupudrawerstyles.css
   kupu/trunk/kupu/common/kupueditor.js
   kupu/trunk/kupu/plone/kupu_references/referencebrowser.js
Log:
More style changes in the drawers.
Made any server-side request in the drawers show an hourglass cursor until it completes (new methods busy/notbusy on the editor).

Modified: kupu/trunk/kupu/common/kupudrawers.js
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers.js	(original)
+++ kupu/trunk/kupu/common/kupudrawers.js	Thu May 24 14:13:44 2007
@@ -57,6 +57,7 @@
         this.current_drawer.hide();
         this.current_drawer.editor.resumeEditing();
         this.current_drawer = null;
+        this.editor.notbusy(true);
     };
 };
 
@@ -1245,7 +1246,7 @@
         // library as selected
         this.deselectActiveCollection();
         resultlib.setAttribute("selected", "1");
-
+        
         // now hook the result library into our DOM
         if (this.editor.getBrowserName() == 'IE') {
             resultlib = resultlib.cloneNode(true);
@@ -1256,6 +1257,7 @@
         libraries.appendChild(resultlib);
         this.useCollection(resultlib);
         this.updateDisplay(this.librariespanelid);
+        this.flagSelectedLib(id);
         this.updateDisplay(this.breadcrumbsid);
     };
 
@@ -1286,6 +1288,7 @@
             if (xmlhttp.readyState == 4) {
                 if (xmlhttp.status && xmlhttp.status != 200) {
                     var errmessage = 'Error '+xmlhttp.status+' loading '+(uri||'XML');
+                    self.editor.notbusy(true);
                     alert(errmessage);
                     throw "Error loading XML";
                 };
@@ -1295,6 +1298,7 @@
                     dom.loadXML(xmlhttp.responseText);
                 }
                 callback.apply(self, [dom, uri, extra]);
+                self.editor.notbusy();
             };
         };
         var self = this;
@@ -1308,6 +1312,7 @@
         // something
         body=body?body:null;
 
+        this.editor.busy();
         try {
             xmlhttp.open(method, uri, true);
             xmlhttp.onreadystatechange = _sarissaCallback;
@@ -1325,6 +1330,7 @@
             if (e && e.name && e.message) { // Microsoft
                 e = e.name + ': ' + e.message;
             }
+            this.editor.notbusy(true);
             alert(e);
         }
     };

Modified: kupu/trunk/kupu/common/kupudrawers/drawer.xsl
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers/drawer.xsl	(original)
+++ kupu/trunk/kupu/common/kupudrawers/drawer.xsl	Thu May 24 14:13:44 2007
@@ -180,6 +180,9 @@
             <xsl:attribute name="id">
                 <xsl:value-of select="@id"/>
             </xsl:attribute>
+            <xsl:if test="@selected=1">
+               <xsl:attribute name="class">kupu-libsource-selected</xsl:attribute>
+            </xsl:if>
             <xsl:apply-templates select="icon"/>
             <span class="drawer-item-title">
                <xsl:call-template name="lf2br">
@@ -206,22 +209,24 @@
                     <xsl:otherwise>drawertool.current_drawer.selectItem(this, event)</xsl:otherwise>
                 </xsl:choose>
             </xsl:attribute>
-            <input name="drawer-item-radio">
-                <xsl:attribute name="type">
-                    <xsl:choose>
+            <span>
+               <input name="drawer-item-radio">
+                  <xsl:attribute name="type">
+                     <xsl:choose>
                         <xsl:when test="$multiple='yes'">checkbox</xsl:when>
                         <xsl:otherwise>radio</xsl:otherwise>
-                    </xsl:choose>
-                </xsl:attribute>
-                <xsl:if test="@checked">
-                    <xsl:attribute name="checked">checked</xsl:attribute>
-                </xsl:if>
-                <xsl:if test="not(local-name()='resource')">
-                    <xsl:attribute name="style">visibility:hidden;</xsl:attribute>
-                </xsl:if>
-            </input>
-            <xsl:apply-templates select="icon"/>
-            <xsl:apply-templates select="(label|title)[1]"/>
+                     </xsl:choose>
+                  </xsl:attribute>
+                  <xsl:if test="@checked">
+                     <xsl:attribute name="checked">checked</xsl:attribute>
+                  </xsl:if>
+                  <xsl:if test="not(local-name()='resource')">
+                     <xsl:attribute name="style">visibility:hidden;</xsl:attribute>
+                  </xsl:if>
+               </input>
+               <xsl:apply-templates select="icon"/>
+               <xsl:apply-templates select="(label|title)[1]"/>
+            </span>
         </div>
     </xsl:template>
     <xsl:template match="uploadbutton" mode="currentpanel">

Modified: kupu/trunk/kupu/common/kupudrawerstyles.css
==============================================================================
--- kupu/trunk/kupu/common/kupudrawerstyles.css	(original)
+++ kupu/trunk/kupu/common/kupudrawerstyles.css	Thu May 24 14:13:44 2007
@@ -135,6 +135,7 @@
  padding: 0; 
  border: 0;
  clear:left;
+ border-spacing: 2px;
 }
 
 td.panel {
@@ -143,13 +144,14 @@
 
 td#kupu-librariespanel {
   overflow: auto;
-  width: 105px;
+  width: 130px;
 }
 
 div#kupu-librariesitems {
-  width: 105px;
+  width: 130px;
   white-space: nowrap;
   height: 260px;
+  padding: 0;
 }
 
 td#kupu-resourcespanel {
@@ -160,6 +162,7 @@
 div#kupu-resourceitems {
   white-space: nowrap;
   width: 200px;
+  padding: 0;
 }
 .upload-allowed div#kupu-resourceitems {
   height:236px;
@@ -167,10 +170,7 @@
 
 div#kupu-properties {
   height: 260px;
-}
-
-div#kupu-librariesitems, div#kupu-resourceitems, div#kupu-properties {
-  padding: 6px;
+  padding: 0 6px;
 }
 
 .overflow {
@@ -190,13 +190,32 @@
 div.kupu-libsource, div.kupu-libsource-selected,
 div.kupu-resource, div.kupu-collection {
   cursor: pointer;
-  margin-bottom: 2px;
+  margin-bottom: 0;
+  padding: 2px 2px 2px 20px;
   vertical-align: text-bottom;
   white-space: nowrap;
 }
-.kupu-libsource, .kupu-libsource-selected { margin-left: 20px; }
+
+.kupu-busy, .kupu-busy div, .kupu-busy a:hover {
+  cursor: wait !IMPORTANT;
+}
+
+div.kupu-resource, div.kupu-collection { padding: 0; }
+div.kupu-resource span, div.kupu-collection span { padding: 4px 1ex 4px 0; }
+div.kupu-resource input, div.kupu-collection input {
+  margin-bottom: 5px;
+  background: transparent;
+  border: none;
+}
+
+.drawer-item-radio {
+  vertical-align: text-middle;
+  margin: 0;
+}
+
 .library-icon-library {
-  margin-left: -20px;
+  width:16px; height:16px;
+  margin: 0 2px 0 -18px;
 }
 
 .kupu-image-fields {
@@ -216,17 +235,7 @@
   border: none;
 }
 
-/*div.kupu-libsource-selected {
-  background-repeat: no-repeat;
-}*/
-
-/*div.kupu-libsource-selected span,
- div.kupu-libsource span{
-  margin-top: 3px;
-  display: inline;
-}*/
-
-div.kupu-libsource-selected span {
+div.kupu-libsource-selected {
   background-color: ButtonFace;  
 }
 
@@ -235,18 +244,12 @@
 }
 
 img.library-icon-collection, img.library-icon-resource {
-  margin-right: 5px;
+  padding-right: 5px;
   height: 16px;
   width: 16px;
 }
 
-span.drawer-item-title {
-  padding-left: 2px;
-  padding-right: 2px;
-  padding-top: 2px;
-}
-
-.selected-item span.drawer-item-title {
+.selected-item span {
   background-color:#C0C0C0;
 }
 
@@ -314,6 +317,9 @@
 #kupu-breadcrumbs {
   text-align: left; clear:left;
   padding-left: 1em; padding-right: 1em;
+  height: 20px;
+  width: 600px;
+  overflow:hidden;
 }
 #kupu-breadcrumbs a {
  text-decoration: none;

Modified: kupu/trunk/kupu/common/kupueditor.js
==============================================================================
--- kupu/trunk/kupu/common/kupueditor.js	(original)
+++ kupu/trunk/kupu/common/kupueditor.js	Thu May 24 14:13:44 2007
@@ -813,6 +813,20 @@
         fulleditor.className = fulleditor.className.replace(' '+name, '');
     };
 
+    var busycount = 0;
+    this.busy = function() {
+        if (busycount <= 0) {
+            this.setClass('kupu-busy');
+        }
+        busycount++;
+    }
+    this.notbusy = function(force) {
+        busycount = force?0:busycount?busycount-1:0;
+        if (busycount <= 0) {
+            this.clearClass('kupu-busy');
+        }
+    }
+
     this.suspendEditing = function() {
         this._previous_range = this.getSelection().getRange();
         this.setClass('kupu-modal');

Modified: kupu/trunk/kupu/plone/kupu_references/referencebrowser.js
==============================================================================
--- kupu/trunk/kupu/plone/kupu_references/referencebrowser.js	(original)
+++ kupu/trunk/kupu/plone/kupu_references/referencebrowser.js	Thu May 24 14:13:44 2007
@@ -157,6 +157,8 @@
     this.suspendEditing = function() {};
     this.config = {};
     this._saveSelection = function() {};
+    this.busy = function() {};
+    this.notbusy = function() {};
 };
 
 var drawertool;

From duncan at codespeak.net  Thu May 24 15:05:49 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Thu, 24 May 2007 15:05:49 +0200 (CEST)
Subject: [kupu-checkins] r43596 - kupu/trunk/kupu/plone
Message-ID: <20070524130549.B3D6880B2@code0.codespeak.net>

Author: duncan
Date: Thu May 24 15:05:48 2007
New Revision: 43596

Modified:
   kupu/trunk/kupu/plone/plonedrawers.py
Log:
Deo's patch broke backward compatibility.

Modified: kupu/trunk/kupu/plone/plonedrawers.py
==============================================================================
--- kupu/trunk/kupu/plone/plonedrawers.py	(original)
+++ kupu/trunk/kupu/plone/plonedrawers.py	Thu May 24 15:05:48 2007
@@ -23,7 +23,13 @@
 from Products.PythonScripts.standard import html_quote, newline_to_br
 from Products.kupu.plone.librarytool import KupuError
 from Products.CMFCore.utils import getToolByName
-from Products.CMFPlone.utils import getSiteEncoding
+try:
+    from Products.CMFPlone.utils import getSiteEncoding
+except ImportError:
+    def getSiteEncoding(context):
+        tool = getToolByName(context, 'plone_utils')
+        return tool.getSiteEncoding()
+    
 import html2captioned
 
 try:

From duncan at codespeak.net  Fri May 25 11:16:12 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Fri, 25 May 2007 11:16:12 +0200 (CEST)
Subject: [kupu-checkins] r43612 - in kupu/trunk/kupu: common
	common/kupudrawers default doc plone/kupu_plone_layer
Message-ID: <20070525091612.639458095@code0.codespeak.net>

Author: duncan
Date: Fri May 25 11:16:10 2007
New Revision: 43612

Modified:
   kupu/trunk/kupu/common/kupubeforeunload.js
   kupu/trunk/kupu/common/kupudrawers.js
   kupu/trunk/kupu/common/kupudrawers/drawer.xsl
   kupu/trunk/kupu/common/kupudrawerstyles.css
   kupu/trunk/kupu/common/kupustyles.css
   kupu/trunk/kupu/default/drawers.kupu
   kupu/trunk/kupu/doc/CHANGES.txt
   kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
   kupu/trunk/kupu/plone/kupu_plone_layer/kupumyitems.xml.pt
   kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneinit.js
   kupu/trunk/kupu/plone/kupu_plone_layer/kupurecentitems.xml.pt
   kupu/trunk/kupu/plone/kupu_plone_layer/kupusearch.xml.pt
   kupu/trunk/kupu/plone/kupu_plone_layer/kupuselection.xml.pt
Log:
Changed the ui for anchors in link drawer.xsl
Added some i18n attributes for recent drawer features.

Modified: kupu/trunk/kupu/common/kupubeforeunload.js
==============================================================================
--- kupu/trunk/kupu/common/kupubeforeunload.js	(original)
+++ kupu/trunk/kupu/common/kupubeforeunload.js	Fri May 25 11:16:10 2007
@@ -143,7 +143,7 @@
     };
 
     Class.isElementChanged = function(ele) {
-        var method = ele.id && this.chkId[ele.id];
+        var method = (ele.id && this.chkId.hasOwnProperty(ele.id))?this.chkId[ele.id]:null;
         if (!method && ele.type && ele.name) {
             method = this.chkType[ele.type];
         }

Modified: kupu/trunk/kupu/common/kupudrawers.js
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers.js	(original)
+++ kupu/trunk/kupu/common/kupudrawers.js	Fri May 25 11:16:10 2007
@@ -154,37 +154,47 @@
 proto = DrawerWithAnchors.prototype;
 
 proto.initAnchors = function() {
-    var limit = 200;
+    var limit = 40;
     var anchorframe = this.anchorframe;
+    var ed = this.editor;
     function onloadEvent() {
         var state = anchorframe.readyState;
-        if (state && state != 'complete') {
+        if (state && !(/complete/.test(state))) {
+            console.log("state="+state+", limit="+limit);
             if (limit-- && anchorframe.src==src) {
-                timer_instance.registerFunction(this, onloadEvent, 50);
+                timer_instance.registerFunction(this, onloadEvent, 500);
+            } else {
+                ed.notbusy(true);
             }
             return;
         };
         if(window.drawertool && window.drawertool.current_drawer) {
             window.drawertool.current_drawer.anchorframe_loaded();
         };
+        ed.notbusy();
     };
 
     var id = 'kupu-linkdrawer-anchors';
     var base = getBaseTagClass(this.element, 'div', id);
+    var self = this;
     if (base) {
         this.anchorui = getBaseTagClass(base, 'div', id);
 
         var inp = base.getElementsByTagName('input');
+        if (inp.length > 1) {
+            inp[1].disabled = true;
+        }
         var src = inp[0].value;
-        anchorframe.src = src;
-
+        inp[0].value = "";
+        if (!src) { return; }
+        ed.busy();
         if (this.anchorframe.readyState) { // IE
-            timer_instance.registerFunction(this, onloadEvent, 50);
+            anchorframe.src = src;
+            onloadEvent();
         } else { // FF
             this.anchorframe.onload = onloadEvent;
+            anchorframe.src = src;
         }
-
-        inp[1].style.display = 'none';
     }
 };
 proto.anchorSelect = function() {
@@ -260,6 +270,7 @@
             select.options.add(opt);
         }
     }
+    select.disabled = false;
     if (opts.length > 1) {
         this.anchorui.style.display = '';
     }
@@ -633,6 +644,7 @@
             var xsltproc =  new XSLTProcessor();
             this.shared.xsltproc = xsltproc;
             xsltproc.importStylesheet(dom);
+            xsltproc.setParameter("", "ie", this.editor.getBrowserName() == 'IE');
             xsltproc.setParameter("", "drawertype", this.drawertype);
             xsltproc.setParameter("", "drawertitle", this.drawertitle);
             xsltproc.setParameter("", "showupload", this.showupload);

Modified: kupu/trunk/kupu/common/kupudrawers/drawer.xsl
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers/drawer.xsl	(original)
+++ kupu/trunk/kupu/common/kupudrawers/drawer.xsl	Fri May 25 11:16:10 2007
@@ -54,6 +54,7 @@
     <xsl:param name="image-class"></xsl:param>
     <xsl:param name="link_target"></xsl:param>
     <xsl:param name="link_name"></xsl:param>
+    <xsl:param name="ie"></xsl:param>
     <xsl:variable name="titlelength" select="60"/>
     <xsl:variable name="i18n_drawertitle"> 
         <xsl:choose>
@@ -340,7 +341,7 @@
           <input id="kupu-media" type="hidden" value="{media}" />
           <input id="kupu-width" type="hidden" value="{width}" />
           <input id="kupu-height" type="hidden" value="{height}" />
-          <label class="kupu-detail">Alignment</label>
+          <label class="kupu-detail" i18n:translate="image_alignment">Alignment</label>
           <span class="kupu-detail">
              <input type="radio" name="image-align" id="image-align-left" value="image-left">
                 <xsl:attribute name="onkeypress">if(event.keyCode==13)return false;</xsl:attribute>
@@ -383,8 +384,14 @@
              </xsl:choose>
           </xsl:if>
           <xsl:if test="sizes">
-             <label class="kupu-detail"
-                    for="image-size-selector">Size</label>
+             <label class="kupu-detail" i18n:translate="imagedrawer_size"
+                    for="image-size-selector">Size
+                <span class="image-dimensions">
+                   (<span i18n:name="width"><xsl:value-of select="width"/></span>
+                   by
+                   <span i18n:name="height"><xsl:value-of select="height"/></span>)
+                </span>
+             </label>
              <span class="kupu-detail">
                 <select name="image-size-selector">
                    <option name="image-size-option" value="{uri}">Original</option>
@@ -393,7 +400,7 @@
              </span>
           </xsl:if>
           <xsl:if test="class">
-             <label class="kupu-detail"
+             <label class="kupu-detail" i18n:translate="imagedrawer_style"
                     for="kupu-image-class-selector">Style</label>
              <span class="kupu-detail">
                 <select name="kupu-image-class-selector" id="kupu-image-class">
@@ -402,12 +409,11 @@
              </span>
           </xsl:if>
           <label class="kupu-detail" id="image-alt-label"
-                 for="image-alt"
-                 i18n:translate="imagedrawer_upload_alt_text">
+                 for="image-alt">
              <xsl:if test="$usecaptions='yes' and $image-caption='true'">
                 <xsl:attribute name="style">display:none;</xsl:attribute>
              </xsl:if>
-             Text equivalent
+             <span tal:omit-tag="" i18n:translate="imagedrawer_upload_alt_text">Text equivalent</span>
           </label>
           <textarea class="kupu-detail" type="text" id="image-alt" rows="4">
              <xsl:if test="$usecaptions='yes' and $image-caption='true'">
@@ -469,13 +475,18 @@
     <xsl:template match="anchor">
         <div class="kupu-linkdrawer-anchors">
             <input type="hidden" value="{../uri}"/>
-            <input type="button" class="kupu-dialog-button" value="Anchors..."
-                onclick="drawertool.current_drawer.initAnchors()"/>
-            <div style="display:none;" class="kupu-linkdrawer-anchors">
-                <label for="kupu-anchor-select">Anchor</label>
-                <br/>
-                <select>
-                    <option i18n:translate="" value="">(none)</option>
+            <div class="kupu-linkdrawer-anchors">
+                <label for="kupu-anchor-select" i18n:translate="linkdrawer_anchor">Link to anchor</label>
+                <xsl:if test="$ie='true'">
+                   <input type="checkbox">
+                      <xsl:attribute name="onclick">drawertool.current_drawer.initAnchors();</xsl:attribute>
+                   </input>
+                </xsl:if>
+                <select onmousedown="drawertool.current_drawer.initAnchors();">
+                   <xsl:if test="$ie='true'">
+                      <xsl:attribute name="disabled">disabled</xsl:attribute>
+                   </xsl:if>
+                   <option i18n:translate="" value="">top of page (default)</option>
                 </select>
             </div>
         </div>

Modified: kupu/trunk/kupu/common/kupudrawerstyles.css
==============================================================================
--- kupu/trunk/kupu/common/kupudrawerstyles.css	(original)
+++ kupu/trunk/kupu/common/kupudrawerstyles.css	Fri May 25 11:16:10 2007
@@ -196,7 +196,7 @@
   white-space: nowrap;
 }
 
-.kupu-busy, .kupu-busy div, .kupu-busy a:hover {
+.kupu-busy, .kupu-busy div, .kupu-busy a:hover, .kupu-busy input , .kupu-busy select {
   cursor: wait !IMPORTANT;
 }
 

Modified: kupu/trunk/kupu/common/kupustyles.css
==============================================================================
--- kupu/trunk/kupu/common/kupustyles.css	(original)
+++ kupu/trunk/kupu/common/kupustyles.css	Fri May 25 11:16:10 2007
@@ -274,7 +274,7 @@
    overflow: auto;
 }
 
-button.disabled {
+input.disabled, button.disabled {
    opacity:0.5;
    filter:alpha(opacity=50);
 }

Modified: kupu/trunk/kupu/default/drawers.kupu
==============================================================================
--- kupu/trunk/kupu/default/drawers.kupu	(original)
+++ kupu/trunk/kupu/default/drawers.kupu	Fri May 25 11:16:10 2007
@@ -48,8 +48,8 @@
 
       <div id="kupu-linkdrawer-addlink" class="kupu-panels kupu-linkdrawer-addlink">
          <ul class="kupu-tabs">
-            <li class="kupu-linkdrawer-addlink"><a href="#">Link to url</a></li>
-            <li class="kupu-linkdrawer-embed"><a href="#">Embed external object</a></li>
+            <li class="kupu-linkdrawer-addlink"><a href="#" i18n:translate="">Link to url</a></li>
+            <li class="kupu-linkdrawer-embed"><a href="#" i18n:translate="">Embed external object</a></li>
          </ul>
          <table class="kupu-tabbed">
             <tbody class="kupu-addlink">
@@ -73,7 +73,8 @@
                <tr class="kupu-linkdrawer-anchors" style="display:none">
                   <td colspan="2">
                      <label i18n:translate="" for="anchorselect">Anchor</label>
-                     <select id="anchorselect"><option i18n:translate="" value="">(none)</option></select>
+                     <select id="anchorselect"><option
+                     i18n:translate="" value="">top of page (default)</option></select>
                   </td>
                </tr>
                <tr><td colspan="2" align="center">
@@ -92,11 +93,11 @@
                            Paste &lt;object&gt; or &lt;embed&gt; tag here:
                         </span>
                      </div>
-                     <textarea class="kupu-toolbox-st kupu-embed-input">[insert arbitrary HTML code here]</textarea>
+                     <textarea class="kupu-toolbox-st kupu-embed-input" i18n:translate="">[insert arbitrary HTML code here]</textarea>
                   </td>
                </tr>
                <tr>
-                  <td>
+                  <td i18n:translate="custom_html_help">
                   You may use this box to insert custom snippets of
                   HTML code. There is no guarantee that any code
                   inserted in this way will be preserved when you save
@@ -303,10 +304,10 @@
                 <input type="checkbox" checked="checked" id="kupu-bm-checkall"/>
               </div>
               <div class="kupu-bm-paras">&#xa0;</div>
-              <div class="kupu-bm-helpanchor">
+              <div class="kupu-bm-helpanchor" i18n_translate="create_anchor_help">
                 Select a paragraph style then choose a paragraph and Ok to insert a link to that location.
               </div>
-              <div class="kupu-bm-helptoc">
+              <div class="kupu-bm-helptoc" i18n_translate="create_toc_help">
                 Select one or two paragraph styles, then Ok to insert a table of contents.
               </div>
             </td>

Modified: kupu/trunk/kupu/doc/CHANGES.txt
==============================================================================
--- kupu/trunk/kupu/doc/CHANGES.txt	(original)
+++ kupu/trunk/kupu/doc/CHANGES.txt	Fri May 25 11:16:10 2007
@@ -10,6 +10,10 @@
 
   - Image drawer layout has been tidied up.
 
+  - Anchors in the link drawer now have a slightly cleaner ui.
+
+  - Drawer actions which do server requests now display a wait cursor.
+
   - Removed the tabindex from all the toolbar buttons and added it to
     the iframe: this means you can tab into kupu from above without
     dying of old age as you try to get past the toolbar. Added a

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 May 25 11:16:10 2007
@@ -16,7 +16,7 @@
     <!--$Id: toolboxes.kupu 37754 2007-02-01 17:24:29Z yuppie $-->
     <!--$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 43565 2007-05-22 15:29:33Z duncan $-->
+    <!--$Id: drawers.kupu 43571 2007-05-23 13:06:13Z 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 $-->
@@ -250,7 +250,7 @@
                <tr class="kupu-linkdrawer-anchors" style="display:none">
                   <td colspan="2">
                      <label i18n:translate="" for="anchorselect">Anchor</label>
-                     <select id="anchorselect"><option i18n:translate="" value="">(none)</option></select>
+                     <select id="anchorselect"><option i18n:translate="" value="">top of page (default)</option></select>
                   </td>
                </tr>
                <tr><td colspan="2" align="center">

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupumyitems.xml.pt
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupumyitems.xml.pt	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupumyitems.xml.pt	Fri May 25 11:16:10 2007
@@ -19,7 +19,7 @@
   <breadcrumbs class="kupu-locate">
     <crumb tal:define="locator here/kupulocate.xml/absolute_url;
                        url python:kupu.kupuUrl(locator);"
-      tal:attributes="href string:$url&src=$$src$$">
+      tal:attributes="href string:$url&src=$$src$$" i18n:translate="locate_content">
       Locate
     </crumb>
   </breadcrumbs>

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneinit.js
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneinit.js	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneinit.js	Fri May 25 11:16:10 2007
@@ -181,9 +181,9 @@
     // Use the generic beforeUnload handler if we have it:
     var beforeunloadTool = window.onbeforeunload && window.onbeforeunload.tool;
     if (beforeunloadTool) {
-        var initialBody = ibody.innerHTML;
+        var initialBody = kupu.getHTMLBody();
         beforeunloadTool.addHandler(function() {
-            return ibody.innerHTML != initialBody;
+            return kupu.getHTMLBody() != initialBody;
         });
         beforeunloadTool.chkId[textarea.id] = function() { return false; };
         beforeunloadTool.addForm(form);

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupurecentitems.xml.pt
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupurecentitems.xml.pt	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupurecentitems.xml.pt	Fri May 25 11:16:10 2007
@@ -19,7 +19,7 @@
   <breadcrumbs class="kupu-locate">
     <crumb tal:define="locator here/kupulocate.xml/absolute_url;
                        url python:kupu.kupuUrl(locator);"
-      tal:attributes="href string:$url&src=$$src$$">
+      tal:attributes="href string:$url&src=$$src$$" i18n:translate="locate_content">
       Locate
     </crumb>
   </breadcrumbs>

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupusearch.xml.pt
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupusearch.xml.pt	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupusearch.xml.pt	Fri May 25 11:16:10 2007
@@ -19,7 +19,7 @@
   <breadcrumbs class="kupu-locate">
     <crumb tal:define="locator here/kupulocate.xml/absolute_url;
                        url python:kupu.kupuUrl(locator);"
-      tal:attributes="href string:$url&src=$$src$$">
+      tal:attributes="href string:$url&src=$$src$$" i18n:translate="locate_content">
       Locate
     </crumb>
   </breadcrumbs>

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupuselection.xml.pt
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupuselection.xml.pt	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupuselection.xml.pt	Fri May 25 11:16:10 2007
@@ -25,7 +25,8 @@
     <crumb
       tal:define="url context/portal_url;
         resource_type request/resource_type | string:mediaobject;"
-      tal:attributes="href string:${context/portal_url}/kupulocate.xml?resource_type=${resource_type}&amp;src=$$src$$">
+      tal:attributes="href string:${context/portal_url}/kupulocate.xml?resource_type=${resource_type}&amp;src=$$src$$"
+      i18n:translate="locate_content">
       Locate
     </crumb>
   </breadcrumbs>

From duncan at codespeak.net  Fri May 25 13:05:52 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Fri, 25 May 2007 13:05:52 +0200 (CEST)
Subject: [kupu-checkins] r43614 - in kupu/trunk/kupu: common
	plone/kupu_plone_layer
Message-ID: <20070525110552.4321E807A@code0.codespeak.net>

Author: duncan
Date: Fri May 25 13:05:50 2007
New Revision: 43614

Modified:
   kupu/trunk/kupu/common/kupudrawerstyles.css
   kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
Log:
Hide image dimensions again.

Modified: kupu/trunk/kupu/common/kupudrawerstyles.css
==============================================================================
--- kupu/trunk/kupu/common/kupudrawerstyles.css	(original)
+++ kupu/trunk/kupu/common/kupudrawerstyles.css	Fri May 25 13:05:50 2007
@@ -288,10 +288,9 @@
 .kupu-linkdrawer-addlink .kupu-embed { display: none; }
 .kupu-linkdrawer-embed .kupu-addlink { display: none; }
 
-.kupu-ins-bm #kupu-bm-sel2, .kupu-ins-bm .kupu-bm-heading {
-   display:none;
-}
-.kupu-ins-bm .kupu-bm-helptoc,.kupu-toc .kupu-bm-helpanchor {
+.kupu-ins-bm #kupu-bm-sel2, .kupu-ins-bm .kupu-bm-heading,
+.kupu-ins-bm .kupu-bm-helptoc,.kupu-toc .kupu-bm-helpanchor,
+.image-dimensions {
   display: none;
 }
 

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 May 25 13:05:50 2007
@@ -16,7 +16,7 @@
     <!--$Id: toolboxes.kupu 37754 2007-02-01 17:24:29Z yuppie $-->
     <!--$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 43571 2007-05-23 13:06:13Z duncan $-->
+    <!--$Id: drawers.kupu 43612 2007-05-25 09:16:10Z 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 $-->
@@ -228,8 +228,8 @@
 
       <div id="kupu-linkdrawer-addlink" class="kupu-panels kupu-linkdrawer-addlink">
          <ul class="kupu-tabs">
-            <li class="kupu-linkdrawer-addlink"><a href="#">Link to url</a></li>
-            <li class="kupu-linkdrawer-embed"><a href="#">Embed external object</a></li>
+            <li class="kupu-linkdrawer-addlink"><a href="#" i18n:translate="">Link to url</a></li>
+            <li class="kupu-linkdrawer-embed"><a href="#" i18n:translate="">Embed external object</a></li>
          </ul>
          <table class="kupu-tabbed">
             <tbody class="kupu-addlink">
@@ -268,11 +268,11 @@
                            Paste &lt;object&gt; or &lt;embed&gt; tag here:
                         </span>
                      </div>
-                     <textarea class="kupu-toolbox-st kupu-embed-input">[insert arbitrary HTML code here]</textarea>
+                     <textarea class="kupu-toolbox-st kupu-embed-input" i18n:translate="">[insert arbitrary HTML code here]</textarea>
                   </td>
                </tr>
                <tr>
-                  <td>
+                  <td i18n:translate="custom_html_help">
                   You may use this box to insert custom snippets of
                   HTML code. There is no guarantee that any code
                   inserted in this way will be preserved when you save
@@ -429,10 +429,10 @@
                 <input type="checkbox" checked="checked" id="kupu-bm-checkall"/>
               </div>
               <div class="kupu-bm-paras">&#160;</div>
-              <div class="kupu-bm-helpanchor">
+              <div class="kupu-bm-helpanchor" i18n_translate="create_anchor_help">
                 Select a paragraph style then choose a paragraph and Ok to insert a link to that location.
               </div>
-              <div class="kupu-bm-helptoc">
+              <div class="kupu-bm-helptoc" i18n_translate="create_toc_help">
                 Select one or two paragraph styles, then Ok to insert a table of contents.
               </div>
             </td>

From duncan at codespeak.net  Fri May 25 14:29:38 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Fri, 25 May 2007 14:29:38 +0200 (CEST)
Subject: [kupu-checkins] r43624 - kupu/trunk/kupu/common/kupudrawers
Message-ID: <20070525122938.435158082@code0.codespeak.net>

Author: duncan
Date: Fri May 25 14:29:34 2007
New Revision: 43624

Modified:
   kupu/trunk/kupu/common/kupudrawers/drawer.xsl
Log:
Added text '...fetching anchors...' to the anchor pulldown

Modified: kupu/trunk/kupu/common/kupudrawers/drawer.xsl
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers/drawer.xsl	(original)
+++ kupu/trunk/kupu/common/kupudrawers/drawer.xsl	Fri May 25 14:29:34 2007
@@ -487,6 +487,7 @@
                       <xsl:attribute name="disabled">disabled</xsl:attribute>
                    </xsl:if>
                    <option i18n:translate="" value="">top of page (default)</option>
+                   <option i18n:translate="" value=""><em>...fetching anchors...</em></option>
                 </select>
             </div>
         </div>

From duncan at codespeak.net  Fri May 25 15:45:36 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Fri, 25 May 2007 15:45:36 +0200 (CEST)
Subject: [kupu-checkins] r43634 - in kupu/trunk/kupu: common
	common/kupudrawers default plone/kupu_plone_layer
Message-ID: <20070525134536.C2A948084@code0.codespeak.net>

Author: duncan
Date: Fri May 25 15:45:36 2007
New Revision: 43634

Modified:
   kupu/trunk/kupu/common/kupudrawers.js
   kupu/trunk/kupu/common/kupudrawers/drawer.xsl
   kupu/trunk/kupu/common/kupudrawerstyles.css
   kupu/trunk/kupu/default/drawers.kupu
   kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
Log:
Add "selected" classname to li elements in tabs.

Modified: kupu/trunk/kupu/common/kupudrawers.js
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers.js	(original)
+++ kupu/trunk/kupu/common/kupudrawers.js	Fri May 25 15:45:36 2007
@@ -145,6 +145,33 @@
     }
 }
 
+proto.switchMode = function(event) {
+    event = event || window.event;
+    var target = event.currentTarget || event.srcElement;
+    var el = target;
+    while (el.nodeName != 'LI') { el = el.parentNode; };
+    var thistab = el;
+    while (el.nodeName != 'UL') { el = el.parentNode; };
+    var tabs = el.getElementsByTagName('li');
+    for (var i = 0; i < tabs.length; i++) {
+        var el = tabs[i];
+        var cls = el.className.replace(/\s*selected/g, '');
+        if (el===thistab) {
+            this.panel.className = 'kupu-panels '+cls;
+            cls += ' selected';
+        }
+        if (el.className != cls) {
+            el.className = cls;
+        }
+    }
+    if (this.fillList) this.fillList();
+    this.fixMask();
+    if (event.preventDefault) { event.preventDefault();}
+    event.returnValue = false;
+    return false;
+};
+
+
 function DrawerWithAnchors(editor, drawertool, anchorui) {
     Drawer.call(this, editor, drawertool);
     this.anchorui = anchorui;
@@ -175,11 +202,9 @@
     };
 
     var id = 'kupu-linkdrawer-anchors';
-    var base = getBaseTagClass(this.element, 'div', id);
+    var base = this.anchorui = getBaseTagClass(this.element, 'div', id);
     var self = this;
     if (base) {
-        this.anchorui = getBaseTagClass(base, 'div', id);
-
         var inp = base.getElementsByTagName('input');
         if (inp.length > 1) {
             inp[1].disabled = true;
@@ -296,15 +321,6 @@
     this.anchorui = getBaseTagClass(this.element, 'tr', 'kupu-linkdrawer-anchors');
     this.target = '';
     this.panel = getBaseTagClass(this.element, 'div', 'kupu-panels');
-    this.switchMode = function(event) {
-        event = event || window.event;
-        var target = event.currentTarget || event.srcElement;
-        this.panel.className = 'kupu-panels '+target.parentNode.className;
-        this.fixMask();
-        if (event.preventDefault) { event.preventDefault();}
-        event.returnValue = false;
-        return false;
-    };
     var tabs = getBaseTagClass(this.element, 'ul', 'kupu-tabs').getElementsByTagName('a');
     for (var i = 0; i < tabs.length; i++) {
         addEventHandler(tabs[i], 'click', this.switchMode, this);
@@ -1562,16 +1578,7 @@
             nodes[i].checked = state;
         };
     };
-    this.switchMode = function(event) {
-        event = event || window.event;
-        var target = event.currentTarget || event.srcElement;
-        this.panel.className = 'kupu-panels '+target.parentNode.className;
-        this.fillList();
-        this.fixMask();
-        if (event.preventDefault) { event.preventDefault();}
-        event.returnValue = false;
-        return false;
-    };
+
     this.fillList = function() {
         var el = newElement;
         while (this.paralist.firstChild) {

Modified: kupu/trunk/kupu/common/kupudrawers/drawer.xsl
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers/drawer.xsl	(original)
+++ kupu/trunk/kupu/common/kupudrawers/drawer.xsl	Fri May 25 15:45:36 2007
@@ -473,24 +473,22 @@
     </xsl:template>
     
     <xsl:template match="anchor">
-        <div class="kupu-linkdrawer-anchors">
-            <input type="hidden" value="{../uri}"/>
-            <div class="kupu-linkdrawer-anchors">
-                <label for="kupu-anchor-select" i18n:translate="linkdrawer_anchor">Link to anchor</label>
-                <xsl:if test="$ie='true'">
-                   <input type="checkbox">
-                      <xsl:attribute name="onclick">drawertool.current_drawer.initAnchors();</xsl:attribute>
-                   </input>
-                </xsl:if>
-                <select onmousedown="drawertool.current_drawer.initAnchors();">
-                   <xsl:if test="$ie='true'">
-                      <xsl:attribute name="disabled">disabled</xsl:attribute>
-                   </xsl:if>
-                   <option i18n:translate="" value="">top of page (default)</option>
-                   <option i18n:translate="" value=""><em>...fetching anchors...</em></option>
-                </select>
-            </div>
-        </div>
+       <div class="kupu-linkdrawer-anchors">
+          <input type="hidden" value="{../uri}"/>
+          <label for="kupu-anchor-select" i18n:translate="linkdrawer_anchor">Link to anchor</label>
+          <xsl:if test="$ie='true'">
+             <input type="checkbox">
+                <xsl:attribute name="onclick">drawertool.current_drawer.initAnchors();</xsl:attribute>
+             </input>
+          </xsl:if>
+          <select onmousedown="drawertool.current_drawer.initAnchors();">
+             <xsl:if test="$ie='true'">
+                <xsl:attribute name="disabled">disabled</xsl:attribute>
+             </xsl:if>
+             <option i18n:translate="" value="">top of page (default)</option>
+             <option i18n:translate="" value=""><em>...fetching anchors...</em></option>
+          </select>
+       </div>
     </xsl:template>
 
     <xsl:template match="status">

Modified: kupu/trunk/kupu/common/kupudrawerstyles.css
==============================================================================
--- kupu/trunk/kupu/common/kupudrawerstyles.css	(original)
+++ kupu/trunk/kupu/common/kupudrawerstyles.css	Fri May 25 15:45:36 2007
@@ -280,12 +280,10 @@
   display: inline; padding: 2px; border: 1px solid; margin: 0 5px 0 0;
 }
 .kupu-tabs a { text-decoration: none; }
-.kupu-ins-bm li.kupu-ins-bm, .kupu-toc li.kupu-toc,
-.kupu-linkdrawer-addlink li.kupu-linkdrawer-addlink,
-.kupu-linkdrawer-embed li.kupu-linkdrawer-embed { background: white; border-bottom: none !IMPORTANT; padding-bottom: 3px;}
+.kupu-tabs li.selected { background: white; border-bottom: none !IMPORTANT; padding-bottom: 3px;}
 table.kupu-tabbed { border-spacing: 0;}
 
-.kupu-linkdrawer-addlink .kupu-embed { display: none; }
+.kupu-linkdrawer-addlink .kupu-embed,
 .kupu-linkdrawer-embed .kupu-addlink { display: none; }
 
 .kupu-ins-bm #kupu-bm-sel2, .kupu-ins-bm .kupu-bm-heading,

Modified: kupu/trunk/kupu/default/drawers.kupu
==============================================================================
--- kupu/trunk/kupu/default/drawers.kupu	(original)
+++ kupu/trunk/kupu/default/drawers.kupu	Fri May 25 15:45:36 2007
@@ -48,7 +48,7 @@
 
       <div id="kupu-linkdrawer-addlink" class="kupu-panels kupu-linkdrawer-addlink">
          <ul class="kupu-tabs">
-            <li class="kupu-linkdrawer-addlink"><a href="#" i18n:translate="">Link to url</a></li>
+            <li class="kupu-linkdrawer-addlink selected"><a href="#" i18n:translate="">Link to url</a></li>
             <li class="kupu-linkdrawer-embed"><a href="#" i18n:translate="">Embed external object</a></li>
          </ul>
          <table class="kupu-tabbed">
@@ -274,7 +274,7 @@
       <h1 class="kupu-drawer-title" i18n:translate="anchordrawer_title">Anchors</h1>
       <div class="kupu-panels kupu-ins-bm">
          <ul class="kupu-tabs">
-            <li class="kupu-ins-bm"><a href="#" i18n:translate="">Link to anchor</a></li>
+            <li class="kupu-ins-bm selected"><a href="#" i18n:translate="">Link to anchor</a></li>
             <li class="kupu-toc"><a href="#" i18n:translate="">Table of contents</a></li>
          </ul>
         <table class="kupu-tabbed">

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 May 25 15:45:36 2007
@@ -228,7 +228,7 @@
 
       <div id="kupu-linkdrawer-addlink" class="kupu-panels kupu-linkdrawer-addlink">
          <ul class="kupu-tabs">
-            <li class="kupu-linkdrawer-addlink"><a href="#" i18n:translate="">Link to url</a></li>
+            <li class="kupu-linkdrawer-addlink selected"><a href="#" i18n:translate="">Link to url</a></li>
             <li class="kupu-linkdrawer-embed"><a href="#" i18n:translate="">Embed external object</a></li>
          </ul>
          <table class="kupu-tabbed">
@@ -399,7 +399,7 @@
       <h1 class="kupu-drawer-title" i18n:translate="anchordrawer_title">Anchors</h1>
       <div class="kupu-panels kupu-ins-bm">
          <ul class="kupu-tabs">
-            <li class="kupu-ins-bm"><a href="#" i18n:translate="">Link to anchor</a></li>
+            <li class="kupu-ins-bm selected"><a href="#" i18n:translate="">Link to anchor</a></li>
             <li class="kupu-toc"><a href="#" i18n:translate="">Table of contents</a></li>
          </ul>
         <table class="kupu-tabbed">

From duncan at codespeak.net  Wed May 30 13:26:20 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Wed, 30 May 2007 13:26:20 +0200 (CEST)
Subject: [kupu-checkins] r43894 - kupu/trunk/kupu/plone
Message-ID: <20070530112620.9A9F5807F@code0.codespeak.net>

Author: duncan
Date: Wed May 30 13:26:19 2007
New Revision: 43894

Modified:
   kupu/trunk/kupu/plone/plonedrawers.py
Log:
Fix problem arising because some content can return unicode Title and unicode.translate is not compatible with str.translate.

Modified: kupu/trunk/kupu/plone/plonedrawers.py
==============================================================================
--- kupu/trunk/kupu/plone/plonedrawers.py	(original)
+++ kupu/trunk/kupu/plone/plonedrawers.py	Wed May 30 13:26:19 2007
@@ -41,6 +41,13 @@
 
 UIDURL = re.compile(".*\\bresolveuid/([^/?#]+)")
 NOCC = nocc = string.maketrans(''.join([chr(c) for c in range(32) if c not in (9,10,13)]), "?"*29)
+uNOCC = dict([(c,ord('?')) for c in range(32) if c not in (9,10,13)])
+def filterControlChars(s):
+    """convert characters which are illegal in xml to '?'"""
+    if isinstance(s, unicode):
+        return s.translate(uNOCC)
+    else:
+        return s.translate(NOCC)
 
 # mapping (thread-id, portal-physicalPath, portal_type) ->
 # imagefield-getAvailableSizes (as tuple sorted by dimension) (width, height, key)
@@ -346,7 +353,7 @@
             icon = self.icon(portal_type)
             size, width, height = self.sizes(obj)
 
-            title = (obj.Title() or obj.getId()).translate(NOCC)
+            title = filterControlChars(obj.Title() or obj.getId())
             description = newline_to_br(html_quote(obj.Description()))
 
             linkable = None
@@ -427,7 +434,7 @@
         icon = self.icon(portal_type)
         size, width, height = self.sizes(brain)
 
-        title = (brain.Title or brain.getId).translate(NOCC)
+        title = filterControlChars(brain.Title or brain.getId)
         description = newline_to_br(html_quote(brain.Description))
         linkable = None
         if allowLink:

From duncan at codespeak.net  Wed May 30 15:42:41 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Wed, 30 May 2007 15:42:41 +0200 (CEST)
Subject: [kupu-checkins] r43895 - in kupu/trunk/kupu: common default
	plone/kupu_plone_layer
Message-ID: <20070530134241.28CD18078@code0.codespeak.net>

Author: duncan
Date: Wed May 30 15:42:40 2007
New Revision: 43895

Modified:
   kupu/trunk/kupu/common/kupudrawers.js
   kupu/trunk/kupu/common/kupudrawerstyles.css
   kupu/trunk/kupu/default/drawers.kupu
   kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
Log:
Added a preview watermark to external link drawer.

Modified: kupu/trunk/kupu/common/kupudrawers.js
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers.js	(original)
+++ kupu/trunk/kupu/common/kupudrawers.js	Wed May 30 15:42:40 2007
@@ -115,7 +115,7 @@
 };
 
 proto.initMask = function(el) {
-    var e = this.maskframe = document.getElementById('kupu-maskframe');
+    var e = (this.maskframe = document.getElementById('kupu-maskframe'));
     if (!this.maskframe) {
         e = this.maskframe = newElement('iframe',
             {'id':'kupu-maskframe','src':"javascript:false;", 'frameBorder':"0", 'scrolling':"no" });
@@ -317,6 +317,7 @@
     var input = getBaseTagClass(this.element, 'input', 'kupu-linkdrawer-input');
     var embed = getBaseTagClass(this.element, 'textarea', 'kupu-embed-input');
     var preview = getBaseTagClass(this.element, 'iframe', 'kupu-linkdrawer-preview');
+    var watermark = getBaseTagClass(this.element, 'div', 'watermark');
     this.anchorframe = preview;
     this.anchorui = getBaseTagClass(this.element, 'tr', 'kupu-linkdrawer-anchors');
     this.target = '';
@@ -406,17 +407,32 @@
     };
     this.preview = function() {
         if (this.getMode()) {
-            preview.src = input.value;
-            this.showAnchors(currentAnchor());
-            if (this.editor.getBrowserName() == 'IE') {
-                preview.width = "800";
-                preview.height = "365";
-                preview.style.zoom = "60%";
-            };
+            var ok = false;
+            watermark.style.display='';
+            if (/^http(s?):\x2f\x2f./.test(input.value)) {
+                try {
+                    preview.src = input.value;
+                    ok = true;
+                } catch(e) { alert('Preview blew up"'+input.value+'"');};
+            } else {
+                preview.src = '';
+                if (input.value.strip()) {
+                    alert(_('Can only preview web urls'));
+                }
+            }
+            if (ok) {
+                this.showAnchors(currentAnchor());
+                if (this.editor.getBrowserName() == 'IE') {
+                    preview.width = "800";
+                    preview.height = "365";
+                    preview.style.zoom = "60%";
+                };
+            }
         };
     };
 
     this.preview_loaded = function() {
+        watermark.style.display = (/^http(s?):\x2f\x2f./.test(input.value))?'none':'';
         var here = input.value;
         try {
             var there = preview.contentWindow.location.href;
@@ -1700,14 +1716,14 @@
 
 /* Function to suppress enter key in drawers */
 function HandleDrawerEnter(event, clickid) {
-    var key;
     event = event || window.event;
-    key = event.which || event.keyCode;
-
+    var key = event.which || event.keyCode;
+    var target = event.currentTarget || event.srcElement;
+    var button;
     if (key==13) {
         if (clickid) {
-            var button = document.getElementById(clickid);
-            if (button) {
+            button = document.getElementById(clickid);
+            if (button && !button.disabled) {
                 button.click();
             }
         }
@@ -1718,3 +1734,5 @@
     }
     return true;
 }
+
+

Modified: kupu/trunk/kupu/common/kupudrawerstyles.css
==============================================================================
--- kupu/trunk/kupu/common/kupudrawerstyles.css	(original)
+++ kupu/trunk/kupu/common/kupudrawerstyles.css	Wed May 30 15:42:40 2007
@@ -285,7 +285,17 @@
 
 .kupu-linkdrawer-addlink .kupu-embed,
 .kupu-linkdrawer-embed .kupu-addlink { display: none; }
-
+.kupu-linkdrawer-addlink .watermark {
+  position: relative;
+  text-align:center;
+  top: 98px;
+  font-size: 20pt;
+}
+.kupu-linkdrawer-addlink .watermark span {
+  background-color: white;
+  opacity:0.5;
+  filter:alpha(opacity=50);
+}
 .kupu-ins-bm #kupu-bm-sel2, .kupu-ins-bm .kupu-bm-heading,
 .kupu-ins-bm .kupu-bm-helptoc,.kupu-toc .kupu-bm-helpanchor,
 .image-dimensions {

Modified: kupu/trunk/kupu/default/drawers.kupu
==============================================================================
--- kupu/trunk/kupu/default/drawers.kupu	(original)
+++ kupu/trunk/kupu/default/drawers.kupu	Wed May 30 15:42:40 2007
@@ -62,7 +62,7 @@
                         </span>
                      </div>
                      <input class="kupu-toolbox-st kupu-linkdrawer-input" type="text"
-                            onkeypress="return HandleDrawerEnter(event, 'linkdrawer-preview');" />
+                            onkeypress="return HandleDrawerEnter(event, 'linkdrawer-preview');"/>
                   </td>
                   <td class="kupu-preview-button">
                      <button class="kupu-dialog-button"
@@ -78,6 +78,7 @@
                   </td>
                </tr>
                <tr><td colspan="2" align="center">
+                  <div class="watermark"><span i18n:translate="">Preview</span></div>
                   <iframe frameborder="1" scrolling="auto" width="440" height="198"
                           class="kupu-linkdrawer-preview" src="javascript:''">
                   </iframe>

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	Wed May 30 15:42:40 2007
@@ -16,7 +16,7 @@
     <!--$Id: toolboxes.kupu 37754 2007-02-01 17:24:29Z yuppie $-->
     <!--$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 43612 2007-05-25 09:16:10Z duncan $-->
+    <!--$Id: drawers.kupu 43634 2007-05-25 13:45:36Z 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 $-->
@@ -241,7 +241,7 @@
                            Link the highlighted text to this URL:
                         </span>
                      </div>
-                     <input class="kupu-toolbox-st kupu-linkdrawer-input" type="text" onkeypress="return HandleDrawerEnter(event, 'linkdrawer-preview');"/>
+                     <input class="kupu-toolbox-st kupu-linkdrawer-input" type="text" onkeypress="return HandleDrawerEnter(event, 'linkdrawer-preview');" onchange="return HandleDrawerEnter(event, 'linkdrawer-preview');"/>
                   </td>
                   <td class="kupu-preview-button">
                      <button class="kupu-dialog-button" type="button" id="linkdrawer-preview" onclick="drawertool.current_drawer.preview()" i18n:translate="">Preview</button>
@@ -254,6 +254,7 @@
                   </td>
                </tr>
                <tr><td colspan="2" align="center">
+                  <div class="watermark"><span i18n:translate="">Preview</span></div>
                   <iframe frameborder="1" scrolling="auto" width="440" height="198" class="kupu-linkdrawer-preview" src="javascript:''">
                   </iframe>
                   </td>

From duncan at codespeak.net  Thu May 31 14:44:53 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Thu, 31 May 2007 14:44:53 +0200 (CEST)
Subject: [kupu-checkins] r43939 - in kupu/trunk/kupu: . common plone
	plone/kupu_plone_layer
Message-ID: <20070531124453.16C1380A9@code0.codespeak.net>

Author: duncan
Date: Thu May 31 14:44:51 2007
New Revision: 43939

Modified:
   kupu/trunk/kupu/common/kupudrawers.js
   kupu/trunk/kupu/common/kupueditor.js
   kupu/trunk/kupu/jslint.opts
   kupu/trunk/kupu/plone/html2captioned.py
   kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneinit.js
Log:
Lint clean again.
Captioned images now go <dl><dt/><dd/></dl> instead of <div><div/><div/></div>.


Modified: kupu/trunk/kupu/common/kupudrawers.js
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers.js	(original)
+++ kupu/trunk/kupu/common/kupudrawers.js	Thu May 31 14:44:51 2007
@@ -143,7 +143,7 @@
         st.position = 'absolute';
         st.display = '';
     }
-}
+};
 
 proto.switchMode = function(event) {
     event = event || window.event;
@@ -187,7 +187,6 @@
     function onloadEvent() {
         var state = anchorframe.readyState;
         if (state && !(/complete/.test(state))) {
-            console.log("state="+state+", limit="+limit);
             if (limit-- && anchorframe.src==src) {
                 timer_instance.registerFunction(this, onloadEvent, 500);
             } else {
@@ -202,8 +201,7 @@
     };
 
     var id = 'kupu-linkdrawer-anchors';
-    var base = this.anchorui = getBaseTagClass(this.element, 'div', id);
-    var self = this;
+    var base = (this.anchorui = getBaseTagClass(this.element, 'div', id));
     if (base) {
         var inp = base.getElementsByTagName('input');
         if (inp.length > 1) {
@@ -376,7 +374,7 @@
             var dummy = doc.createElement("div");
             dummy.innerHTML = embed.value;
             try {
-                for (i=dummy.childNodes.length-1; i >= 0; i--) {
+                for (var j=dummy.childNodes.length-1; j >= 0; j--) {
                     var c = dummy.childNodes[i];
                     if (/^\//.test(c.nodeName))
                     {

Modified: kupu/trunk/kupu/common/kupueditor.js
==============================================================================
--- kupu/trunk/kupu/common/kupueditor.js	(original)
+++ kupu/trunk/kupu/common/kupueditor.js	Thu May 31 14:44:51 2007
@@ -593,7 +593,7 @@
 
     this.onSelectionChange = function(event) {
         this._saveSelection();
-    }
+    };
 
     this._isDocumentSelected = function() {
         var editable_body = this.getInnerDocument().getElementsByTagName('body')[0];
@@ -819,13 +819,13 @@
             this.setClass('kupu-busy');
         }
         busycount++;
-    }
+    };
     this.notbusy = function(force) {
         busycount = force?0:busycount?busycount-1:0;
         if (busycount <= 0) {
             this.clearClass('kupu-busy');
         }
-    }
+    };
 
     this.suspendEditing = function() {
         this._previous_range = this.getSelection().getRange();

Modified: kupu/trunk/kupu/jslint.opts
==============================================================================
--- kupu/trunk/kupu/jslint.opts	(original)
+++ kupu/trunk/kupu/jslint.opts	Thu May 31 14:44:51 2007
@@ -2,7 +2,7 @@
 --extern _,_IE_VERSION,_SARISSA_IS_IE,_SARISSA_IS_MOZ,ActiveXObject
 --extern addEventHandler,AnchorDrawer,AnchorTool,CleanupExpressionsTool
 --extern ColorchooserTool,ContextFixer,ContextMenu,ContextMenuElement
---extern DefinitionListTool,DrawerTool,extern,getBaseTagClass,getFromSelector
+--extern DefinitionListTool,DrawerTool,extern,getBaseTagClass,getFromSelector, getOuterHtml
 --extern IESelection,ImageLibraryDrawer,ImageTool,ImageToolBox,initKupu,kupu
 --extern KupuButton,kupuButtonDisable,kupuButtonEnable,KupuDocument,KupuEditor,kupuFixImage
 --extern KupuInspector,KupuRemoveElementButton,KupuSpellChecker,KupuStateButton

Modified: kupu/trunk/kupu/plone/html2captioned.py
==============================================================================
--- kupu/trunk/kupu/plone/html2captioned.py	(original)
+++ kupu/trunk/kupu/plone/html2captioned.py	Thu May 31 14:44:51 2007
@@ -52,14 +52,14 @@
 ALT_PATTERN = re.compile('\\balt\s*=\s*("[^"]*"|[^" \/>]+)')
 END_TAG_PATTERN = re.compile('(<img[^>]*?)( */?>)')
 IMAGE_TEMPLATE = '''\
-<div class="%(class)s" style="width:%(width)spx;">
- <div style="width:%(width)spx;">
+<dl class="%(class)s" style="width:%(width)spx;">
+ <dt style="width:%(width)spx;">
   %(tag)s
- </div>
- <div class="image-caption">
+ </dt>
+ <dd class="image-caption">
   %(caption)s
- </div>
-</div>
+ </dd>
+</dl>
 '''
 
 UID_PATTERN = re.compile('(?P<tag><(?:a|img|object|param)\\s[^>]*(?:src|href|data|value)\s*=\s*")(?P<url>[^"]*resolveuid/(?P<uid>[^/"#? ]*))', re.DOTALL | re.IGNORECASE)

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneinit.js
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneinit.js	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneinit.js	Thu May 31 14:44:51 2007
@@ -19,7 +19,6 @@
     };
     iframe._kupuIsInitialized = true;
     var textarea = getFromSelector(prefix+'textarea.kupu-editor-textarea');
-    var ibody = iframe.contentWindow.document.body;
     var form = textarea.form;
     var initialtext = textarea.value || (_SARISSA_IS_IE?'<p></p>':'<p><br></p>');