From guido at codespeak.net  Wed Feb  1 12:36:55 2006
From: guido at codespeak.net (guido@codespeak.net)
Date: Wed Feb  1 12:36:59 2006
Subject: [kupu-checkins] r22919 - kupu/tag/kupu-1.3.5b1
Message-ID: <20060201113655.EC6F110094@code0.codespeak.net>

Author: guido
Date: Wed Feb  1 12:36:51 2006
New Revision: 22919

Added:
   kupu/tag/kupu-1.3.5b1/
      - copied from r22918, kupu/branch/kupu-1.3/
Modified:
   kupu/tag/kupu-1.3.5b1/version.txt
Log:
Tag for the 1.3.5 release, as requested by Infrae.


Modified: kupu/tag/kupu-1.3.5b1/version.txt
==============================================================================
--- kupu/branch/kupu-1.3/version.txt	(original)
+++ kupu/tag/kupu-1.3.5b1/version.txt	Wed Feb  1 12:36:51 2006
@@ -1 +1 @@
-kupu 1.3.5 pre
+kupu 1.3.5b1
From duncan at codespeak.net  Wed Feb  1 14:43:35 2006
From: duncan at codespeak.net (duncan@codespeak.net)
Date: Wed Feb  1 14:43:38 2006
Subject: [kupu-checkins] r22921 - in kupu/trunk/kupu/plone: kupu_plone_layer
	kupu_references
Message-ID: <20060201134335.D8D5A10086@code0.codespeak.net>

Author: duncan
Date: Wed Feb  1 14:43:31 2006
New Revision: 22921

Modified:
   kupu/trunk/kupu/plone/kupu_plone_layer/kupuplone.css.dtml
   kupu/trunk/kupu/plone/kupu_references/referencebrowser.js
   kupu/trunk/kupu/plone/kupu_references/referencebrowser.pt
Log:
Tidied up display of reference browser. Made the linked elements into links so you can navigate to them.

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 Feb  1 14:43:31 2006
@@ -245,6 +245,24 @@
     border: &dtml-borderWidth; solid &dtml-globalBorderColor;;
 }
 
+.kupu-reference .kupu-preview-row {
+   float: left;
+}
+
+.kupu-reference a .kupu-description-row {
+   display: none;
+}
+
+.kupu-reference a { position: relative; }
+
+.kupu-reference a:hover .kupu-description-row {
+   display: block;
+   position: absolute; top: 20px; left: 128px; width: 200px;
+   padding: 5px; margin: 10px; z-index: 100;
+   color: black; background: #ffffa0;
+   font: 10px Verdana, sans-serif;
+}
+
 .odd .kupu-preview-row {
     background-color: &dtml-oddRowBackgroundColor;;
 }

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	Wed Feb  1 14:43:31 2006
@@ -63,7 +63,10 @@
             var imp = window.document.importNode(result, true);
             div = document.createElement("div");
             div.className = i%2?'odd':'even';
-            Sarissa.copyChildNodes(imp, div, true);
+            var link = document.createElement('a');
+            link.href = node.selectSingleNode('uri/text()').nodeValue.strip()+'/view';
+            Sarissa.copyChildNodes(imp, link, true);
+            div.appendChild(link);
             preview.appendChild(div);
         }
         this.field.value = this.currentSelection.join('\n');

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	Wed Feb  1 14:43:31 2006
@@ -127,13 +127,15 @@
   </em>
   <tal:loop repeat="i info">
      <div tal:define="odd repeat/i/odd" tal:attributes="class python:test(odd,'odd','even');">
-        <div class="kupu-preview-row" tal:condition="i/preview">
+       <a href="#" tal:attributes="href string:${i/url}/view;">
+         <div class="kupu-preview-row" tal:condition="i/preview">
            <img tal:attributes="src i/preview; title i/title;"
-                    onload="kupuFixImage(this);" width="1" height="1"/>
-        </div>
-        <h1 class="kupu-title-row" tal:content="i/title">Item heading</h1>
-        <div tal:content="structure i/description" tal:condition="i/description"></div>
-        <div style="clear:both;line-height:1px;">&nbsp;</div>
+                        onload="kupuFixImage(this);" width="1" height="1"/>
+         </div>
+         <h1 class="kupu-title-row" tal:content="i/title">Item heading</h1>
+         <div class="kupu-description-row" tal:content="structure i/description" tal:condition="i/description"></div>
+         <div style="clear:both;line-height:1px;">&nbsp;</div>
+       </a>
     </div>
  </tal:loop>
 </div>
From guido at codespeak.net  Thu Feb  2 14:50:00 2006
From: guido at codespeak.net (guido@codespeak.net)
Date: Thu Feb  2 14:50:03 2006
Subject: [kupu-checkins] r22957 - kupu/tag/kupu-1.3.5
Message-ID: <20060202135000.0A74F100C0@code0.codespeak.net>

Author: guido
Date: Thu Feb  2 14:49:58 2006
New Revision: 22957

Added:
   kupu/tag/kupu-1.3.5/
      - copied from r22956, kupu/tag/kupu-1.3.5b1/
Log:
Set tag for 1.3.5 release.

From guido at codespeak.net  Thu Feb  2 14:52:46 2006
From: guido at codespeak.net (guido@codespeak.net)
Date: Thu Feb  2 14:52:48 2006
Subject: [kupu-checkins] r22958 - in kupu/tag/kupu-1.3.5: . default plone
Message-ID: <20060202135246.8F8FF100C0@code0.codespeak.net>

Author: guido
Date: Thu Feb  2 14:52:44 2006
New Revision: 22958

Modified:
   kupu/tag/kupu-1.3.5/default/toolbar.kupu
   kupu/tag/kupu-1.3.5/plone/toolbar.kupu
   kupu/tag/kupu-1.3.5/version.txt
Log:
Upped version numbers.


Modified: kupu/tag/kupu-1.3.5/default/toolbar.kupu
==============================================================================
--- kupu/tag/kupu-1.3.5/default/toolbar.kupu	(original)
+++ kupu/tag/kupu-1.3.5/default/toolbar.kupu	Thu Feb  2 14:52:44 2006
@@ -52,7 +52,7 @@
 
   <kupu:part name="logo">
     <span class="kupu-tb-buttongroup kupu-logo" style="float: right" id="kupu-logo">
-      <button type="button" class="kupu-logo" title="Kupu 1.3.4" 
+      <button type="button" class="kupu-logo" title="Kupu 1.3.5" 
               i18n:attributes="title" accesskey="k"
               onclick="window.open('http://kupu.oscom.org');">&#160;</button>
     </span>

Modified: kupu/tag/kupu-1.3.5/plone/toolbar.kupu
==============================================================================
--- kupu/tag/kupu-1.3.5/plone/toolbar.kupu	(original)
+++ kupu/tag/kupu-1.3.5/plone/toolbar.kupu	Thu Feb  2 14:52:44 2006
@@ -10,7 +10,7 @@
 
   <kupu:part name="logo">
     <span class="kupu-tb-buttongroup kupu-logo" style="float: right">
-      <button type="button" class="kupu-logo" title="Kupu 1.3.4" accesskey="k" id="kupu-logo-button"
+      <button type="button" class="kupu-logo" title="Kupu 1.3.5" accesskey="k" id="kupu-logo-button"
               onclick="window.open('http://kupu.oscom.org');"
               tal:attributes="tabindex python:tabindex+1;">&#160;</button>
     </span>

Modified: kupu/tag/kupu-1.3.5/version.txt
==============================================================================
--- kupu/tag/kupu-1.3.5/version.txt	(original)
+++ kupu/tag/kupu-1.3.5/version.txt	Thu Feb  2 14:52:44 2006
@@ -1 +1 @@
-kupu 1.3.5b1
+kupu 1.3.5
From duncan at codespeak.net  Mon Feb 13 10:26:52 2006
From: duncan at codespeak.net (duncan@codespeak.net)
Date: Mon Feb 13 10:26:54 2006
Subject: [kupu-checkins] r23272 - kupu/tag/ngo-stable/build1.3
Message-ID: <20060213092652.A361D100A5@code0.codespeak.net>

Author: duncan
Date: Mon Feb 13 10:26:51 2006
New Revision: 23272

Removed:
   kupu/tag/ngo-stable/build1.3/
Log:
Replacing tag 'ngo-stable/build1.3'
From duncan at codespeak.net  Mon Feb 13 10:26:55 2006
From: duncan at codespeak.net (duncan@codespeak.net)
Date: Mon Feb 13 10:26:57 2006
Subject: [kupu-checkins] r23273 - kupu/tag/ngo-stable/build1.3
Message-ID: <20060213092655.A8DCA100A7@code0.codespeak.net>

Author: duncan
Date: Mon Feb 13 10:26:52 2006
New Revision: 23273

Added:
   kupu/tag/ngo-stable/build1.3/
      - copied from r23272, kupu/trunk/kupu/
Log:
Create tag 'ngo-stable/build1.3'
From duncan at codespeak.net  Mon Feb 13 11:41:19 2006
From: duncan at codespeak.net (duncan@codespeak.net)
Date: Mon Feb 13 11:41:21 2006
Subject: [kupu-checkins] r23274 - kupu/trunk/kupu/plone
Message-ID: <20060213104119.D5424100A5@code0.codespeak.net>

Author: duncan
Date: Mon Feb 13 11:41:17 2006
New Revision: 23274

Modified:
   kupu/trunk/kupu/plone/plonelibrarytool.py
Log:
Avoid the deprecation warning because of non-ascii character in a comment.

Modified: kupu/trunk/kupu/plone/plonelibrarytool.py
==============================================================================
--- kupu/trunk/kupu/plone/plonelibrarytool.py	(original)
+++ kupu/trunk/kupu/plone/plonelibrarytool.py	Mon Feb 13 11:41:17 2006
@@ -1,3 +1,4 @@
+# -*- coding: latin-1 -*-
 ##############################################################################
 #
 # Copyright (c) 2003-2005 Kupu Contributors. All rights reserved.
From mihxil at codespeak.net  Mon Feb 13 17:04:10 2006
From: mihxil at codespeak.net (mihxil@codespeak.net)
Date: Mon Feb 13 17:04:13 2006
Subject: [kupu-checkins] r23286 - kupu/trunk/kupu/common
Message-ID: <20060213160410.062F010098@code0.codespeak.net>

Author: mihxil
Date: Mon Feb 13 17:04:08 2006
New Revision: 23286

Modified:
   kupu/trunk/kupu/common/kupueditor.js
Log:
it seems that FF does not accept integer in this command any more, but wants an actual boolean. At least, that makes it work again..

Modified: kupu/trunk/kupu/common/kupueditor.js
==============================================================================
--- kupu/trunk/kupu/common/kupueditor.js	(original)
+++ kupu/trunk/kupu/common/kupueditor.js	Mon Feb 13 17:04:08 2006
@@ -344,7 +344,7 @@
                 this.content_changed = true;
                 // Done here otherwise it doesn't always work or gets lost
                 // after some commands
-                this.getDocument().execCommand('styleWithCSS', this.config.use_css);
+                this.getDocument().execCommand('styleWithCSS', this.config.use_css == 1);
             };
         };
         this.getDocument().execCommand(command, param);
From mihxil at codespeak.net  Mon Feb 13 17:05:49 2006
From: mihxil at codespeak.net (mihxil@codespeak.net)
Date: Mon Feb 13 17:05:49 2006
Subject: [kupu-checkins] r23287 - kupu/trunk/kupu/common/kupudrawers
Message-ID: <20060213160549.1BAB810098@code0.codespeak.net>

Author: mihxil
Date: Mon Feb 13 17:05:42 2006
New Revision: 23287

Modified:
   kupu/trunk/kupu/common/kupudrawers/drawer.xsl
Log:
made it easier to add some CSS in your extension, withouth having to respecify a complete template

Modified: kupu/trunk/kupu/common/kupudrawers/drawer.xsl
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers/drawer.xsl	(original)
+++ kupu/trunk/kupu/common/kupudrawers/drawer.xsl	Mon Feb 13 17:05:42 2006
@@ -72,8 +72,9 @@
                     <xsl:value-of select="$i18n_drawertitle"/>
                 </title>
                 <link type="text/css" rel="stylesheet">
-                    <xsl:attribute name="href">kupudrawerstyles.css </xsl:attribute>
+                    <xsl:attribute name="href">kupudrawerstyles.css</xsl:attribute>
                 </link>
+                <xsl:call-template name="mystyle" />
             </head>
             <body>
                 <div class="kupu-drawer">
@@ -169,6 +170,8 @@
       </xsl:choose>
     </xsl:template>
 
+    <xsl:template name="mystyle" />
+
     <xsl:template match="library">
         <div onclick="drawertool.current_drawer.selectLibrary('{@id}');" class="kupu-libsource"
             title="{title}" style="">
@@ -426,7 +429,7 @@
     <xsl:template match="crumb[@href]">
         <a>
             <xsl:attribute name="href">
-                <xsl:value-of select="@href"/>
+              <xsl:value-of select="@href"/>
             </xsl:attribute>
             <xsl:attribute name="onclick">drawertool.current_drawer.selectBreadcrumb(this);return false;</xsl:attribute>
             <xsl:value-of select="node()"/>
From duncan at codespeak.net  Thu Feb 16 10:20:04 2006
From: duncan at codespeak.net (duncan@codespeak.net)
Date: Thu Feb 16 10:20:06 2006
Subject: [kupu-checkins] r23391 - in kupu/trunk/kupu: common/kupudrawers
	plone/kupu_plone_layer
Message-ID: <20060216092004.62166100B4@code0.codespeak.net>

Author: duncan
Date: Thu Feb 16 10:20:03 2006
New Revision: 23391

Modified:
   kupu/trunk/kupu/common/kupudrawers/drawer.xsl
   kupu/trunk/kupu/plone/kupu_plone_layer/kupuselection.xml.pt
Log:
Move reload button to the right of Ok,Cancel following user feedback.
Generate a full query string for src tag in kupuselection.xml.pt otherwise the reload button barfs.

Modified: kupu/trunk/kupu/common/kupudrawers/drawer.xsl
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers/drawer.xsl	(original)
+++ kupu/trunk/kupu/common/kupudrawers/drawer.xsl	Thu Feb 16 10:20:03 2006
@@ -129,11 +129,11 @@
                         </div>
                         <div class="kupu-dialogbuttons">
                             <button type="button" class="kupu-dialog-button" i18n:translate=""
-                                onclick="drawertool.current_drawer.reloadCurrent();">Reload</button>
-                            <button type="button" class="kupu-dialog-button" i18n:translate=""
                                 onclick="drawertool.current_drawer.save();">Ok</button>
                             <button type="button" class="kupu-dialog-button" i18n:translate=""
                                 onclick="drawertool.closeDrawer();">Cancel</button>
+                            <button type="button" class="kupu-dialog-button" i18n:translate=""
+                                onclick="drawertool.current_drawer.reloadCurrent();">Reload</button>
                         </div>
                     </div>
                 </div>

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 Feb 16 10:20:03 2006
@@ -16,7 +16,7 @@
   <icon tal:content="string:${here/portal_url}/kupuimages/kupusearch_icon.gif">icon</icon>
   <title i18n_translate="box_selected">Selected</title>
   <description>Current selection.</description>
-  <src tal:content="string:${request/URL0}?${request/QUERY_STRING}">Source</src>
+  <src tal:content="string:${request/URL0}?${context/kupu_library_tool/query_string}">Source</src>
 
   <breadcrumbs class="kupu-locate">
     <crumb
From limi at codespeak.net  Thu Feb 16 11:38:28 2006
From: limi at codespeak.net (limi@codespeak.net)
Date: Thu Feb 16 11:38:29 2006
Subject: [kupu-checkins] r23396 - kupu/branch/plone-2.1
Message-ID: <20060216103828.BE5B01009A@code0.codespeak.net>

Author: limi
Date: Thu Feb 16 11:38:26 2006
New Revision: 23396

Modified:
   kupu/branch/plone-2.1/refresh.txt
Log:
Checking if I am commit-capable ;)


Modified: kupu/branch/plone-2.1/refresh.txt
==============================================================================
--- kupu/branch/plone-2.1/refresh.txt	(original)
+++ kupu/branch/plone-2.1/refresh.txt	Thu Feb 16 11:38:26 2006
@@ -1 +1 @@
-this file allows the product to be reloaded in Zope2
\ No newline at end of file
+This file allows the product to be reloaded in Zope2
\ No newline at end of file
From limi at codespeak.net  Thu Feb 16 14:47:50 2006
From: limi at codespeak.net (limi@codespeak.net)
Date: Thu Feb 16 14:47:51 2006
Subject: [kupu-checkins] r23401 - in kupu/branch/plone-2.1/plone: .
	kupu_plone_layer kupu_plone_layer/plonekupuimages
Message-ID: <20060216134750.9EAA7100C2@code0.codespeak.net>

Author: limi
Date: Thu Feb 16 14:47:33 2006
New Revision: 23401

Added:
   kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/image.gif   (contents, props changed)
Modified:
   kupu/branch/plone-2.1/plone/kupu_plone_layer/kupu_wysiwyg_support.html
   kupu/branch/plone-2.1/plone/kupu_plone_layer/kupuplone.css.dtml
   kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/anchor.gif
   kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/bgcolor.gif
   kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/bold.gif
   kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/center.gif
   kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/definitionlist.gif
   kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/hr.gif
   kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/hyperlink.gif
   kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/indent.gif
   kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/italic.gif
   kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/left_just.gif
   kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/list.gif
   kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/numbered_list.gif
   kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/outdent.gif
   kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/redo.gif
   kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/right_just.gif
   kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/strikethrough.gif
   kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/subscript.gif
   kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/superscript.gif
   kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/table.gif
   kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/textcolor.gif
   kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/tools.gif
   kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/underline.gif
   kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/undo.gif
   kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/unformat.gif
   kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/view-source.gif
   kupu/branch/plone-2.1/plone/kupu_plone_layer/wysiwyg_support.pt
   kupu/branch/plone-2.1/plone/wire.kupu
Log:
Updating icons to better match the Plone style; improved tool ordering (growing 
elements like the text format selector should be at the end, since they displace 
all the other icons when they change if not), regenerated plonemacros.


Modified: kupu/branch/plone-2.1/plone/kupu_plone_layer/kupu_wysiwyg_support.html
==============================================================================
--- kupu/branch/plone-2.1/plone/kupu_plone_layer/kupu_wysiwyg_support.html	(original)
+++ kupu/branch/plone-2.1/plone/kupu_plone_layer/kupu_wysiwyg_support.html	Thu Feb 16 14:47:33 2006
@@ -3,7 +3,7 @@
 
   <!--$Id: include.kupu 11657 2005-04-30 17:19:15Z guido $-->
     <!--$Id: wire.kupu 12162 2005-05-10 15:53:10Z guido $-->
-    <!--$Id: html.kupu 14296 2005-07-05 15:02:12Z duncan $-->
+    <!--$Id: html.kupu 13336 2005-06-13 11:03:58Z gotcha $-->
     <!--$Id: head.kupu 16467 2005-08-25 11:08:10Z guido $-->
     <!--$Id: body.kupu 9779 2005-03-15 11:34:47Z duncan $-->
     <!--$Id: xmlconfig.kupu 12162 2005-05-10 15:53:10Z guido $-->
@@ -11,21 +11,21 @@
     <!--$Id: sourceedit.kupu 9779 2005-03-15 11:34:47Z duncan $-->
     <!--$Id: sourceedit.kupu 9779 2005-03-15 11:34:47Z duncan $-->
     <!--$Id: contextmenu.kupu 9520 2005-02-26 16:30:23Z duncan $-->
-    <!--$Id: toolbar.kupu 19931 2005-11-16 14:53:11Z guido $-->
-    <!--$Id: toolboxes.kupu 17247 2005-09-05 15:29:40Z duncan $-->
+    <!--$Id: toolbar.kupu 21203 2005-12-16 09:41:30Z duncan $-->
+    <!--$Id: toolboxes.kupu 16467 2005-08-25 11:08:10Z guido $-->
     <!--$Id: colorchooser.kupu 9520 2005-02-26 16:30:23Z duncan $-->
     <!--$Id: save.kupu 9520 2005-02-26 16:30:23Z duncan $-->
     <!--$Id: drawers.kupu 15807 2005-08-09 11:40:42Z duncan $-->
     <!--$Id: include.kupu 9520 2005-02-26 16:30:23Z duncan $-->
-    <!--$Id: wire.kupu 15258 2005-07-28 15:08:12Z duncan $-->
+    <!--$Id: wire.kupu 14903 2005-07-22 09:56:09Z duncan $-->
     <!--$Id: head.kupu 14546 2005-07-12 14:35:55Z duncan $-->
-    <!--$Id: xmlconfig.kupu 18105 2005-10-03 14:11:10Z duncan $-->
+    <!--$Id: xmlconfig.kupu 18097 2005-10-03 09:51:28Z duncan $-->
     <!--$Id: body.kupu 18006 2005-09-30 12:14:10Z duncan $-->
-    <!--$Id: toolbar.kupu 19931 2005-11-16 14:53:11Z guido $-->
+    <!--$Id: toolbar.kupu 21203 2005-12-16 09:41:30Z duncan $-->
     <!--$Id: drawers.kupu 14546 2005-07-12 14:35:55Z duncan $-->
-    <!--$Id: beforeunload.kupu 14575 2005-07-12 20:18:12Z duncan $-->
-    <!--$Id: sourceedit.kupu 14575 2005-07-12 20:18:12Z duncan $-->
-    <!--$Id: wysiwyg_support.kupu 15258 2005-07-28 15:08:12Z duncan $-->
+    <!--$Id: beforeunload.kupu 14546 2005-07-12 14:35:55Z duncan $-->
+    <!--$Id: sourceedit.kupu 14546 2005-07-12 14:35:55Z duncan $-->
+    <!--$Id: wysiwyg_support.kupu 14903 2005-07-22 09:56:09Z duncan $-->
     
 
     <div xmlns:metal="http://xml.zope.org/namespaces/metal" xmlns:tal="http://xml.zope.org/namespaces/tal" metal:define-macro="wysiwygEditorBox" id="kupu-editor" tal:define="name fieldName|inputname;                 editorid string:kupu-editor-${name}" tal:attributes="id editorid">
@@ -120,23 +120,13 @@
     <span id="kupu-tb-buttons" class="kupu-tb-buttons">
       
     <span class="kupu-tb-buttongroup kupu-logo" style="float: right">
-      <button type="button" class="kupu-logo" title="Kupu 1.3.1" accesskey="k" id="kupu-logo-button" onclick="window.open('http://kupu.oscom.org');" tal:attributes="tabindex python:tabindex+1;">&#160;</button>
+      <button type="button" class="kupu-logo" title="Kupu 1.3.3" accesskey="k" id="kupu-logo-button" onclick="window.open('http://kupu.oscom.org');" tal:attributes="tabindex python:tabindex+1;">&#160;</button>
     </span>
   
     <span class="kupu-tb-buttongroup" style="float: right" id="kupu-zoom">
       <button type="button" class="kupu-zoom" id="kupu-zoom-button" i18n:attributes="title" title="zoom: alt-x" accesskey="x">&#160;</button>
     </span>
   
-    <select class="kupu-tb-styles">
-      <option value="p" i18n:translate="">Normal</option>
-      <tal:block condition="here/kupu_library_tool/getParagraphStyles|nothing" repeat="style here/kupu_library_tool/getParagraphStyles">
-        <option i18n:translate="" tal:define="parts python:style.split('|',1)+['','']" tal:attributes="value python:parts[1]" tal:content="python:parts[0]"/>
-      </tal:block>
-      <tal:block tal:condition="field/widget/parastyles|nothing">
-        <option i18n:translate="" tal:condition="field/widget/parastyles" tal:repeat="style field/widget/parastyles" tal:attributes="value python:style[0]" tal:content="python:style[1]"/>
-      </tal:block>
-    </select>
-  
     <span class="kupu-tb-buttongroup" id="kupu-bg-basicmarkup">
       <button type="button" class="kupu-bold" id="kupu-bold-button" title="bold: alt-b" i18n:attributes="title" accesskey="b">&#160;</button>
       <button type="button" class="kupu-italic" id="kupu-italic-button" title="italic: alt-i" i18n:attributes="title" accesskey="i">&#160;</button>
@@ -195,6 +185,16 @@
       <button type="button" class="kupu-source" id="kupu-source-button" title="edit HTML code" i18n:attributes="title">&#160;</button>
     </span>
   
+    <select class="kupu-tb-styles">
+      <option value="p" i18n:translate="">Normal</option>
+      <tal:block condition="here/kupu_library_tool/getParagraphStyles|nothing" repeat="style here/kupu_library_tool/getParagraphStyles">
+        <option i18n:translate="" tal:define="parts python:style.split('|',1)+['','']" tal:attributes="value python:parts[1]" tal:content="python:parts[0]"/>
+      </tal:block>
+      <tal:block tal:condition="field/widget/parastyles|nothing">
+        <option i18n:translate="" tal:condition="field/widget/parastyles" tal:repeat="style field/widget/parastyles" tal:attributes="value python:style[0]" tal:content="python:style[1]"/>
+      </tal:block>
+    </select>
+  
     </span>
   
     <select id="kupu-ulstyles" class="kupu-ulstyles">

Modified: kupu/branch/plone-2.1/plone/kupu_plone_layer/kupuplone.css.dtml
==============================================================================
--- kupu/branch/plone-2.1/plone/kupu_plone_layer/kupuplone.css.dtml	(original)
+++ kupu/branch/plone-2.1/plone/kupu_plone_layer/kupuplone.css.dtml	Thu Feb 16 14:47:33 2006
@@ -20,7 +20,7 @@
 <dtml-call "REQUEST.RESPONSE.setHeader( 'Expires', expires.toZone('GMT').rfc822() )" >
 </dtml-let>
 */
-/* <dtml-with base_properties><dtml-let buttonhighlight="'#fff'" buttonshadow="contentViewBorderColor"> */
+/* <dtml-with base_properties><dtml-let buttonhighlight="contentViewBorderColor" buttonshadow="contentViewBorderColor"> */
 
 div.kupu-toolboxes {display: none}
 
@@ -138,21 +138,21 @@
 
 
 .kupu-bold,
-.kupu-bold-pressed {background-image: url("kupuimages/bold.gif");}
+.kupu-bold-pressed {background-image: url("plonekupuimages/bold.gif");}
 
 .kupu-forecolor {background-image: url("plonekupuimages/text-color.gif");}
-.kupu-inthyperlink {background-image: url("plonekupuimages/anchor.gif");}
+.kupu-inthyperlink {background-image: url("plonekupuimages/hyperlink.gif");}
 .kupu-inthyperlink-pressed {
   border-color: &dtml-buttonshadow; &dtml-buttonhighlight; &dtml-buttonhighlight; &dtml-buttonshadow;;
 }
-.kupu-exthyperlink {background-image: url("plonekupuimages/hyperlink.gif");}
+.kupu-exthyperlink {background-image: url("link_icon.gif");}
 .kupu-exthyperlink-pressed {
   border-color: &dtml-buttonshadow; &dtml-buttonhighlight; &dtml-buttonhighlight; &dtml-buttonshadow;;
 }
 
-.kupu-image {background-image: url("kupuimages/image.png");}
+.kupu-image {background-image: url("plonekupuimages/image.gif");}
 
-.kupu-indent {background-image: url("kupuimages/indent.gif");}
+.kupu-indent {background-image: url("plonekupuimages/indent.gif");}
 .kupu-inserthorizontalrule {background-image: url("plonekupuimages/hr.gif");}
 
 .kupu-insertorderedlist,
@@ -164,7 +164,7 @@
 .kupu-insertdefinitionlist {background-image: url("plonekupuimages/definitionlist.gif");}
 
 .kupu-italic, 
-.kupu-italic-pressed {background-image: url("kupuimages/italic.gif");}
+.kupu-italic-pressed {background-image: url("plonekupuimages/italic.gif");}
 
 .kupu-justifycenter,
 .kupu-justifycenter-pressed {background-image: url("plonekupuimages/center.gif");}
@@ -178,7 +178,7 @@
 button.kupu-logo {background-image: url("kupuimages/kupu_icon.gif");}
 .kupu-outdent {background-image: url("plonekupuimages/outdent.gif");}
 .kupu-redo {background-image: url("plonekupuimages/redo.gif");}
-.kupu-save {background-image: url("kupuimages/save.png");}
+.kupu-save {background-image: url("plonekupuimages/save.png");}
 .kupu-save-and-exit {background-image: url("kupuimages/exit.gif");}
 .kupu-space {background-image: url("plonekupuimages/space.gif");}
 .kupu-source {background-image: url("plonekupuimages/view-source.gif");}
@@ -189,7 +189,7 @@
 
 .kupu-table {background-image: url("plonekupuimages/table.gif");}
 .kupu-underline, 
-.kupu-underline-pressed {background-image: url("kupuimages/underline.gif");}
+.kupu-underline-pressed {background-image: url("plonekupuimages/underline.gif");}
 
 .kupu-undo {background-image: url("plonekupuimages/undo.gif");}
 .kupu-removelink {background-image: url("plonekupuimages/delete_icon.gif");}

Modified: kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/anchor.gif
==============================================================================
Binary files. No diff available.

Modified: kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/bgcolor.gif
==============================================================================
Binary files. No diff available.

Modified: kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/bold.gif
==============================================================================
Binary files. No diff available.

Modified: kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/center.gif
==============================================================================
Binary files. No diff available.

Modified: kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/definitionlist.gif
==============================================================================
Binary files. No diff available.

Modified: kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/hr.gif
==============================================================================
Binary files. No diff available.

Modified: kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/hyperlink.gif
==============================================================================
Binary files. No diff available.

Added: kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/image.gif
==============================================================================
Binary file. No diff available.

Modified: kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/indent.gif
==============================================================================
Binary files. No diff available.

Modified: kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/italic.gif
==============================================================================
Binary files. No diff available.

Modified: kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/left_just.gif
==============================================================================
Binary files. No diff available.

Modified: kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/list.gif
==============================================================================
Binary files. No diff available.

Modified: kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/numbered_list.gif
==============================================================================
Binary files. No diff available.

Modified: kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/outdent.gif
==============================================================================
Binary files. No diff available.

Modified: kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/redo.gif
==============================================================================
Binary files. No diff available.

Modified: kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/right_just.gif
==============================================================================
Binary files. No diff available.

Modified: kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/strikethrough.gif
==============================================================================
Binary files. No diff available.

Modified: kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/subscript.gif
==============================================================================
Binary files. No diff available.

Modified: kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/superscript.gif
==============================================================================
Binary files. No diff available.

Modified: kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/table.gif
==============================================================================
Binary files. No diff available.

Modified: kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/textcolor.gif
==============================================================================
Binary files. No diff available.

Modified: kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/tools.gif
==============================================================================
Binary files. No diff available.

Modified: kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/underline.gif
==============================================================================
Binary files. No diff available.

Modified: kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/undo.gif
==============================================================================
Binary files. No diff available.

Modified: kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/unformat.gif
==============================================================================
Binary files. No diff available.

Modified: kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/view-source.gif
==============================================================================
Binary files. No diff available.

Modified: kupu/branch/plone-2.1/plone/kupu_plone_layer/wysiwyg_support.pt
==============================================================================
--- kupu/branch/plone-2.1/plone/kupu_plone_layer/wysiwyg_support.pt	(original)
+++ kupu/branch/plone-2.1/plone/kupu_plone_layer/wysiwyg_support.pt	Thu Feb 16 14:47:33 2006
@@ -6,7 +6,7 @@
   <tal:block define="editor python: member.getProperty('wysiwyg_editor','').lower();
         editor python: test(editor=='fck editor', 'editor_fck', editor);
         support python: path('nocall:here/%s_wysiwyg_support|here/%s/wysiwyg_support|here/portal_skins/plone_wysiwyg/wysiwyg_support' % (editor, editor));"
-        on-error="string:Kupu not installed correctly: ${error/value}">
+>
  <metal:block metal:use-macro="support/macros/wysiwygEditorBox">
  </metal:block>
  </tal:block>
@@ -17,7 +17,7 @@
   <tal:block define="editor python: member.getProperty('wysiwyg_editor','').lower().replace(' ', '_');
         editor python: test(editor=='fck editor', 'editor_fck', editor);
         support python: path('nocall:here/%s_wysiwyg_support|here/%s/wysiwyg_support|here/portal_skins/plone_wysiwyg/wysiwyg_support' % (editor, editor));"
-        on-error="string:Kupu not installed correctly: ${error/value}">
+>
  <metal:block metal:use-macro="support/macros/textFormatSelector">
  </metal:block>
  </tal:block>

Modified: kupu/branch/plone-2.1/plone/wire.kupu
==============================================================================
--- kupu/branch/plone-2.1/plone/wire.kupu	(original)
+++ kupu/branch/plone-2.1/plone/wire.kupu	Thu Feb 16 14:47:33 2006
@@ -44,4 +44,25 @@
     <kupu:insert-part feature="body" part="suppress-kupu" />
   </kupu:fill-slot>
 
+  <kupu:fill-slot name="toolbar-buttons">
+    <kupu:insert-part feature="toolbar" part="logo" />
+    <kupu:insert-part feature="toolbar" part="zoom" />
+    <kupu:insert-part feature="save" part="buttons" />
+    <kupu:insert-part feature="toolbar" part="buttongroup-basicmarkup" />
+    <kupu:insert-part feature="toolbar" part="buttongroup-subsuper" />
+    <kupu:insert-part feature="colorchooser" part="buttons" />
+    <kupu:insert-part feature="toolbar" part="buttongroup-justify" />
+    <kupu:insert-part feature="toolbar" part="buttongroup-list" />
+    <kupu:insert-part feature="toolbar" part="buttongroup-definitionlist" />
+    <kupu:insert-part feature="toolbar" part="buttongroup-indent" />
+    <kupu:insert-part feature="drawers" part="buttons" />
+    <kupu:insert-part feature="toolbar" part="buttongroup-remove" />
+    <kupu:insert-part feature="toolbar" part="buttongroup-undo" />
+    <kupu:insert-part feature="spellchecker" part="buttons" />
+    <kupu:insert-part feature="sourceedit" part="buttons" />
+    <kupu:insert-part feature="toolbar" part="select-styles" />
+  </kupu:fill-slot>
+
+
 </kupu:wire>
+
From limi at codespeak.net  Thu Feb 16 14:50:02 2006
From: limi at codespeak.net (limi@codespeak.net)
Date: Thu Feb 16 14:50:04 2006
Subject: [kupu-checkins] r23402 -
	kupu/branch/plone-2.1/plone/kupu_plone_layer
Message-ID: <20060216135002.C8FE8100C2@code0.codespeak.net>

Author: limi
Date: Thu Feb 16 14:50:00 2006
New Revision: 23402

Modified:
   kupu/branch/plone-2.1/plone/kupu_plone_layer/kupuplone.css.dtml
Log:
Border color should be black on selection/hover.


Modified: kupu/branch/plone-2.1/plone/kupu_plone_layer/kupuplone.css.dtml
==============================================================================
--- kupu/branch/plone-2.1/plone/kupu_plone_layer/kupuplone.css.dtml	(original)
+++ kupu/branch/plone-2.1/plone/kupu_plone_layer/kupuplone.css.dtml	Thu Feb 16 14:50:00 2006
@@ -20,7 +20,7 @@
 <dtml-call "REQUEST.RESPONSE.setHeader( 'Expires', expires.toZone('GMT').rfc822() )" >
 </dtml-let>
 */
-/* <dtml-with base_properties><dtml-let buttonhighlight="contentViewBorderColor" buttonshadow="contentViewBorderColor"> */
+/* <dtml-with base_properties><dtml-let buttonhighlight="'Black'" buttonshadow="'Black'"> */
 
 div.kupu-toolboxes {display: none}
 
From limi at codespeak.net  Thu Feb 16 16:05:56 2006
From: limi at codespeak.net (limi@codespeak.net)
Date: Thu Feb 16 16:05:58 2006
Subject: [kupu-checkins] r23412 -
	kupu/branch/plone-2.1/plone/kupu_plone_layer
Message-ID: <20060216150556.9694D100B7@code0.codespeak.net>

Author: limi
Date: Thu Feb 16 16:05:53 2006
New Revision: 23412

Modified:
   kupu/branch/plone-2.1/plone/kupu_plone_layer/kupuplone.css.dtml
Log:
Fixing stupid bug in Mozilla by explicitly setting the link styling.


Modified: kupu/branch/plone-2.1/plone/kupu_plone_layer/kupuplone.css.dtml
==============================================================================
--- kupu/branch/plone-2.1/plone/kupu_plone_layer/kupuplone.css.dtml	(original)
+++ kupu/branch/plone-2.1/plone/kupu_plone_layer/kupuplone.css.dtml	Thu Feb 16 16:05:53 2006
@@ -22,6 +22,14 @@
 */
 /* <dtml-with base_properties><dtml-let buttonhighlight="'Black'" buttonshadow="'Black'"> */
 
+.kupu a {
+    color: &dtml-linkColor; !important;
+    background-color: transparent;
+    text-decoration: none !important;
+    border-bottom: 1px #cccccc solid !important;
+}
+
+
 div.kupu-toolboxes {display: none}
 
 /*select.kupu-tb-styles {display: block}*/
@@ -237,5 +245,5 @@
     border: &dtml-borderWidth; solid &dtml-globalBorderColor;;
     background-color: white;
 }
-/* </dtml-let></dtml-with> */
 
+/* </dtml-let></dtml-with> */
From limi at codespeak.net  Thu Feb 16 17:26:15 2006
From: limi at codespeak.net (limi@codespeak.net)
Date: Thu Feb 16 17:26:17 2006
Subject: [kupu-checkins] r23419 -
	kupu/branch/plone-2.1/plone/kupu_plone_layer
Message-ID: <20060216162615.E13AF100C2@code0.codespeak.net>

Author: limi
Date: Thu Feb 16 17:26:13 2006
New Revision: 23419

Modified:
   kupu/branch/plone-2.1/plone/kupu_plone_layer/kupuplone.css.dtml
Log:
Fixing the collapse/expand icons, disabling the butterfly until it has a
purpose.


Modified: kupu/branch/plone-2.1/plone/kupu_plone_layer/kupuplone.css.dtml
==============================================================================
--- kupu/branch/plone-2.1/plone/kupu_plone_layer/kupuplone.css.dtml	(original)
+++ kupu/branch/plone-2.1/plone/kupu_plone_layer/kupuplone.css.dtml	Thu Feb 16 17:26:13 2006
@@ -204,6 +204,10 @@
 .kupu-removeimage {background-image: url("plonekupuimages/delete_icon.gif");}
 .kupu-spellchecker { display:none; }
 
+.kupu-zoom {background-image: url("plonekupuimages/fullscreenexpand_icon.gif");}
+.kupu-zoom-pressed {background-image: url("plonekupuimages/fullscreencollapse_icon.gif");}
+
+
 div.kupu-drawer {
   border: solid 1px &dtml-contentViewBorderColor;;
   background-color: &dtml-contentViewBackgroundColor;;
@@ -246,4 +250,8 @@
     background-color: white;
 }
 
+#kupu-logo-button {
+    display: none;
+}
+
 /* </dtml-let></dtml-with> */
From limi at codespeak.net  Sat Feb 18 06:56:42 2006
From: limi at codespeak.net (limi@codespeak.net)
Date: Sat Feb 18 06:56:46 2006
Subject: [kupu-checkins] r23466 - in
	kupu/branch/plone-2.1/plone/kupu_plone_layer: . plonekupuimages
Message-ID: <20060218055642.79F5310069@code0.codespeak.net>

Author: limi
Date: Sat Feb 18 06:56:29 2006
New Revision: 23466

Modified:
   kupu/branch/plone-2.1/plone/kupu_plone_layer/kupuplone.css.dtml
   kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/definitionlist.gif
   kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/redo.gif
   kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/subscript.gif
   kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/superscript.gif
   kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/undo.gif
   kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/view-source.gif
Log:
Made all images load from an absolute URL to improve caching; improved icons.


Modified: kupu/branch/plone-2.1/plone/kupu_plone_layer/kupuplone.css.dtml
==============================================================================
--- kupu/branch/plone-2.1/plone/kupu_plone_layer/kupuplone.css.dtml	(original)
+++ kupu/branch/plone-2.1/plone/kupu_plone_layer/kupuplone.css.dtml	Sat Feb 18 06:56:29 2006
@@ -11,16 +11,9 @@
 
 /* $Id: kupuplone.css 7217 2004-11-11 13:20:56Z duncan $ */
 /*
-<dtml-var "enableHTTPCompression(request=REQUEST, debug=1, js=1)">
-<dtml-let last_modified="_.DateTime()-14"
-expires="_.DateTime()+7" >
-<dtml-call "REQUEST.RESPONSE.setHeader( 'Content-Type', 'text/css' )">
-<dtml-call "REQUEST.RESPONSE.setHeader( 'Last-Modified', last_modified.toZone('GMT').rfc822() )">
-<dtml-call "REQUEST.RESPONSE.setHeader( 'Cache-Control', 'max-age=36000, must-revalidate' )">
-<dtml-call "REQUEST.RESPONSE.setHeader( 'Expires', expires.toZone('GMT').rfc822() )" >
-</dtml-let>
-*/
-/* <dtml-with base_properties><dtml-let buttonhighlight="'Black'" buttonshadow="'Black'"> */
+/* <dtml-with base_properties>
+ * <dtml-let buttonhighlight="'Black'" buttonshadow="'Black'"> 
+ * <dtml-call "REQUEST.set('portal_url', portal_url())"> */
 
 .kupu a {
     color: &dtml-linkColor; !important;
@@ -146,66 +139,66 @@
 
 
 .kupu-bold,
-.kupu-bold-pressed {background-image: url("plonekupuimages/bold.gif");}
+.kupu-bold-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/bold.gif");}
 
-.kupu-forecolor {background-image: url("plonekupuimages/text-color.gif");}
-.kupu-inthyperlink {background-image: url("plonekupuimages/hyperlink.gif");}
+.kupu-forecolor {background-image: url("&dtml-portal_url;/plonekupuimages/text-color.gif");}
+.kupu-inthyperlink {background-image: url("&dtml-portal_url;/plonekupuimages/hyperlink.gif");}
 .kupu-inthyperlink-pressed {
   border-color: &dtml-buttonshadow; &dtml-buttonhighlight; &dtml-buttonhighlight; &dtml-buttonshadow;;
 }
-.kupu-exthyperlink {background-image: url("link_icon.gif");}
+.kupu-exthyperlink {background-image: url("&dtml-portal_url;/link_icon.gif");}
 .kupu-exthyperlink-pressed {
   border-color: &dtml-buttonshadow; &dtml-buttonhighlight; &dtml-buttonhighlight; &dtml-buttonshadow;;
 }
 
-.kupu-image {background-image: url("plonekupuimages/image.gif");}
+.kupu-image {background-image: url("&dtml-portal_url;/plonekupuimages/image.gif");}
 
-.kupu-indent {background-image: url("plonekupuimages/indent.gif");}
-.kupu-inserthorizontalrule {background-image: url("plonekupuimages/hr.gif");}
+.kupu-indent {background-image: url("&dtml-portal_url;/plonekupuimages/indent.gif");}
+.kupu-inserthorizontalrule {background-image: url("&dtml-portal_url;/plonekupuimages/hr.gif");}
 
 .kupu-insertorderedlist,
-.kupu-insertorderedlist-pressed {background-image: url("plonekupuimages/numbered_list.gif");}
+.kupu-insertorderedlist-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/numbered_list.gif");}
 
 .kupu-insertunorderedlist,
-.kupu-insertunorderedlist-pressed {background-image: url("plonekupuimages/list.gif");}
+.kupu-insertunorderedlist-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/list.gif");}
 
-.kupu-insertdefinitionlist {background-image: url("plonekupuimages/definitionlist.gif");}
+.kupu-insertdefinitionlist {background-image: url("&dtml-portal_url;/plonekupuimages/definitionlist.gif");}
 
 .kupu-italic, 
-.kupu-italic-pressed {background-image: url("plonekupuimages/italic.gif");}
+.kupu-italic-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/italic.gif");}
 
 .kupu-justifycenter,
-.kupu-justifycenter-pressed {background-image: url("plonekupuimages/center.gif");}
+.kupu-justifycenter-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/center.gif");}
 
 .kupu-justifyleft,
-.kupu-justifyleft-pressed {background-image: url("plonekupuimages/left_just.gif");}
+.kupu-justifyleft-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/left_just.gif");}
 
 .kupu-justifyright,
-.kupu-justifyright-pressed {background-image: url("plonekupuimages/right_just.gif");}
+.kupu-justifyright-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/right_just.gif");}
 
-button.kupu-logo {background-image: url("kupuimages/kupu_icon.gif");}
-.kupu-outdent {background-image: url("plonekupuimages/outdent.gif");}
-.kupu-redo {background-image: url("plonekupuimages/redo.gif");}
-.kupu-save {background-image: url("plonekupuimages/save.png");}
-.kupu-save-and-exit {background-image: url("kupuimages/exit.gif");}
-.kupu-space {background-image: url("plonekupuimages/space.gif");}
-.kupu-source {background-image: url("plonekupuimages/view-source.gif");}
+button.kupu-logo {background-image: url("&dtml-portal_url;/kupuimages/kupu_icon.gif");}
+.kupu-outdent {background-image: url("&dtml-portal_url;/plonekupuimages/outdent.gif");}
+.kupu-redo {background-image: url("&dtml-portal_url;/plonekupuimages/redo.gif");}
+.kupu-save {background-image: url("&dtml-portal_url;/plonekupuimages/save.png");}
+.kupu-save-and-exit {background-image: url("&dtml-portal_url;/kupuimages/exit.gif");}
+.kupu-space {background-image: url("&dtml-portal_url;/plonekupuimages/space.gif");}
+.kupu-source {background-image: url("&dtml-portal_url;/plonekupuimages/view-source.gif");}
 .kupu-subscript,
-.kupu-subscript-pressed  {background-image: url("plonekupuimages/subscript.gif");}
+.kupu-subscript-pressed  {background-image: url("&dtml-portal_url;/plonekupuimages/subscript.gif");}
 .kupu-superscript,
-.kupu-superscript-pressed {background-image: url("plonekupuimages/superscript.gif");}
+.kupu-superscript-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/superscript.gif");}
 
-.kupu-table {background-image: url("plonekupuimages/table.gif");}
+.kupu-table {background-image: url("&dtml-portal_url;/plonekupuimages/table.gif");}
 .kupu-underline, 
-.kupu-underline-pressed {background-image: url("plonekupuimages/underline.gif");}
+.kupu-underline-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/underline.gif");}
 
-.kupu-undo {background-image: url("plonekupuimages/undo.gif");}
-.kupu-removelink {background-image: url("plonekupuimages/delete_icon.gif");}
-.kupu-removeimage {background-image: url("plonekupuimages/delete_icon.gif");}
+.kupu-undo {background-image: url("&dtml-portal_url;/plonekupuimages/undo.gif");}
+.kupu-removelink {background-image: url("&dtml-portal_url;/plonekupuimages/delete_icon.gif");}
+.kupu-removeimage {background-image: url("&dtml-portal_url;/plonekupuimages/delete_icon.gif");}
 .kupu-spellchecker { display:none; }
 
-.kupu-zoom {background-image: url("plonekupuimages/fullscreenexpand_icon.gif");}
-.kupu-zoom-pressed {background-image: url("plonekupuimages/fullscreencollapse_icon.gif");}
+.kupu-zoom {background-image: url("&dtml-portal_url;/plonekupuimages/fullscreenexpand_icon.gif");}
+.kupu-zoom-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/fullscreencollapse_icon.gif");}
 
 
 div.kupu-drawer {

Modified: kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/definitionlist.gif
==============================================================================
Binary files. No diff available.

Modified: kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/redo.gif
==============================================================================
Binary files. No diff available.

Modified: kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/subscript.gif
==============================================================================
Binary files. No diff available.

Modified: kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/superscript.gif
==============================================================================
Binary files. No diff available.

Modified: kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/undo.gif
==============================================================================
Binary files. No diff available.

Modified: kupu/branch/plone-2.1/plone/kupu_plone_layer/plonekupuimages/view-source.gif
==============================================================================
Binary files. No diff available.
From limi at codespeak.net  Sat Feb 18 08:38:27 2006
From: limi at codespeak.net (limi@codespeak.net)
Date: Sat Feb 18 08:38:30 2006
Subject: [kupu-checkins] r23467 - in kupu/branch/plone-2.1: plone tests
Message-ID: <20060218073827.9994C10071@code0.codespeak.net>

Author: limi
Date: Sat Feb 18 08:38:23 2006
New Revision: 23467

Modified:
   kupu/branch/plone-2.1/plone/plonelibrarytool.py
   kupu/branch/plone-2.1/tests/run_tests.html
Log:
Adding pull quote and call out classes. Supported from 2.1.3 and up.


Modified: kupu/branch/plone-2.1/plone/plonelibrarytool.py
==============================================================================
--- kupu/branch/plone-2.1/plone/plonelibrarytool.py	(original)
+++ kupu/branch/plone-2.1/plone/plonelibrarytool.py	Sat Feb 18 08:38:23 2006
@@ -70,9 +70,12 @@
 _style_whitelist = ['text-align', 'list-style-type', 'float']
 
 _default_paragraph_styles = (
-    "Heading|h2|Heading",
-    "Subheading|h3|Subheading",
-    "Formatted|pre",
+    "Heading|h2",
+    "Subheading|h3",
+    "Literal|pre",
+    "Discreet|p|discreet",
+    "Pull-quote|blockquote|pullquote",
+    "Call-out|p|callout"
 )
 
 class PloneKupuLibraryTool(UniqueObject, SimpleItem, KupuLibraryTool):

Modified: kupu/branch/plone-2.1/tests/run_tests.html
==============================================================================
--- kupu/branch/plone-2.1/tests/run_tests.html	(original)
+++ kupu/branch/plone-2.1/tests/run_tests.html	Sat Feb 18 08:38:23 2006
@@ -96,8 +96,8 @@
 </div>
 <select id="kupu-tb-styles" style="display:none">
 <option value="p">Normal</option>
-<option value="h2|Heading">Heading</option>
-<option value="h3|Subheading">Subheading</option>
+<option value="h2">Heading</option>
+<option value="h3">Subheading</option>
 <option value="pre">Formatted</option>
 <option value="div|Caption">Caption</option>
 </select>
From duncan at codespeak.net  Mon Feb 20 10:54:02 2006
From: duncan at codespeak.net (duncan@codespeak.net)
Date: Mon Feb 20 10:54:04 2006
Subject: [kupu-checkins] r23507 - kupu/branch/kupu-1.3/common/kupudrawers
Message-ID: <20060220095402.6CA0B10072@code0.codespeak.net>

Author: duncan
Date: Mon Feb 20 10:54:01 2006
New Revision: 23507

Modified:
   kupu/branch/kupu-1.3/common/kupudrawers/drawer.xsl
Log:
Backport patch for image uploading from trunk:
Firefox 1.5 disagrees with all other browsers over the meaning of the target attribute in form submission: it expects to find the target name in the iframe's id attribute where everything else uses the name attribute. The fix is to make the id and the name the same.

Modified: kupu/branch/kupu-1.3/common/kupudrawers/drawer.xsl
==============================================================================
--- kupu/branch/kupu-1.3/common/kupudrawers/drawer.xsl	(original)
+++ kupu/branch/kupu-1.3/common/kupudrawers/drawer.xsl	Mon Feb 20 10:54:01 2006
@@ -298,7 +298,7 @@
             <input id="kupu-upload-title" type="text" name="node_prop_caption" size="23" value=""/><br/>
         </form>
 
-        <iframe id="kupu-upload-form-target" name="kupu_upload_form_target"
+        <iframe id="kupu_upload_form_target" name="kupu_upload_form_target"
                 src="kupublank.html" scrolling="off" frameborder="0" width="0px" height="0px" display="None">
         </iframe>
       </div>
From guido at codespeak.net  Thu Feb 23 17:16:35 2006
From: guido at codespeak.net (guido@codespeak.net)
Date: Thu Feb 23 17:16:37 2006
Subject: [kupu-checkins] r23620 - kupu/trunk/ecmaunit
Message-ID: <20060223161635.66A231016B@code0.codespeak.net>

Author: guido
Date: Thu Feb 23 17:16:28 2006
New Revision: 23620

Modified:
   kupu/trunk/ecmaunit/ecmaunit.js
Log:
Fixed some missing 'this'.


Modified: kupu/trunk/ecmaunit/ecmaunit.js
==============================================================================
--- kupu/trunk/ecmaunit/ecmaunit.js	(original)
+++ kupu/trunk/ecmaunit/ecmaunit.js	Thu Feb 23 17:16:28 2006
@@ -291,7 +291,8 @@
     };
 };
 
-StdoutReporter.prototype.reportError = function(testcase, attr, exception, raw) {
+StdoutReporter.prototype.reportError = function(testcase, attr, 
+                                                exception, raw) {
     /* report a test failure */
     if (this.verbose) {
         print(testcase + '.' + attr + '(): FAILED!');
@@ -310,7 +311,7 @@
             var exception = exceptions[i][2];
             var raw = exceptions[i][3];
             print(testcase + '.' + attr + ', exception: ' + exception);
-            if (verbose) {
+            if (this.verbose) {
                 this._printStackTrace(raw);
             };
         };