From kupu-checkins at codespeak.net  Fri Aug  3 11:45:29 2007
From: kupu-checkins at codespeak.net (kupu-checkins at codespeak.net)
Date: Fri,  3 Aug 2007 11:45:29 +0200 (CEST)
Subject: [kupu-checkins] SUMMER SALE: savings up to 85% off Sale-id :
	81917223391844
Message-ID: <20070803155257.4292.qmail@softbank126112026042.bbtec.net>

An HTML attachment was scrubbed...
URL: http://codespeak.net/pipermail/kupu-checkins/attachments/20070803/9f2034ae/attachment.htm 

From limi at codespeak.net  Sun Aug  5 05:01:28 2007
From: limi at codespeak.net (limi at codespeak.net)
Date: Sun,  5 Aug 2007 05:01:28 +0200 (CEST)
Subject: [kupu-checkins] r45489 - kupu/trunk/kupu/plone/kupu_plone_layer
Message-ID: <20070805030128.7AD1F80C2@code0.codespeak.net>

Author: limi
Date: Sun Aug  5 05:01:27 2007
New Revision: 45489

Modified:
   kupu/trunk/kupu/plone/kupu_plone_layer/kupuplone.css.dtml
Log:
Preparing move to CSS sprites for the icons to reduce the number of HTTP requests; committing this to have a better diff later.

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	Sun Aug  5 05:01:27 2007
@@ -151,6 +151,7 @@
   border-color: &dtml-buttonshadow; &dtml-buttonhighlight; &dtml-buttonhighlight; &dtml-buttonshadow;;
 }
 
+.kupu-anchors {background-image:url("&dtml-portal_url;/plonekupuimages/anchor.gif");}
 
 .kupu-bold,
 .kupu-bold-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/bold.gif");}
@@ -167,7 +168,6 @@
 }
 
 .kupu-image {background-image: url("&dtml-portal_url;/plonekupuimages/image.gif");}
-
 .kupu-indent {background-image: url("&dtml-portal_url;/plonekupuimages/indent.gif");}
 .kupu-outdent {background-image: url("&dtml-portal_url;/plonekupuimages/outdent.gif");}
 .kupu-inserthorizontalrule {background-image: url("&dtml-portal_url;/plonekupuimages/hr.gif");}
@@ -192,12 +192,15 @@
 .kupu-justifyright,
 .kupu-justifyright-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/right_just.gif");}
 
-button.kupu-logo {background-image: url("&dtml-portal_url;/kupuimages/kupu_icon.gif");}
+.kupu-logo {background-image: url("&dtml-portal_url;/kupuimages/kupu_icon.gif");}
 .kupu-redo {background-image: url("&dtml-portal_url;/plonekupuimages/redo.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-save {background-image: url("&dtml-portal_url;/kupuimages/save.png");display:none;}
 .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-spellchecker {background-image: url("&dtml-portal_url;/kupuimages/text-check.png");}
 .kupu-subscript,
 .kupu-subscript-pressed  {background-image: url("&dtml-portal_url;/plonekupuimages/subscript.gif");}
 .kupu-superscript,
@@ -208,14 +211,10 @@
 .kupu-underline-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/underline.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 {background-image: url("&dtml-portal_url;/kupuimages/text-check.png");}
 
 .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");}
 
-.kupu-anchors {background-image:url("&dtml-portal_url;/plonekupuimages/anchor.gif");}
 
 div.kupu-drawer {
   border: solid 1px &dtml-contentViewBorderColor;;

From limi at codespeak.net  Sun Aug  5 05:17:00 2007
From: limi at codespeak.net (limi at codespeak.net)
Date: Sun,  5 Aug 2007 05:17:00 +0200 (CEST)
Subject: [kupu-checkins] r45490 - kupu/trunk/kupu/plone/kupu_plone_layer
Message-ID: <20070805031700.D23BB80CB@code0.codespeak.net>

Author: limi
Date: Sun Aug  5 05:16:59 2007
New Revision: 45490

Modified:
   kupu/trunk/kupu/plone/kupu_plone_layer/kupuplone.css.dtml
Log:
Grouping and adding the button.* qualifier for all buttons - no need to traverse all the elements. :)

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	Sun Aug  5 05:16:59 2007
@@ -92,29 +92,10 @@
   border-bottom: 1px solid &dtml-contentViewBorderColor;;
 }
 
-.kupu-tb-buttons button {
-  width: 24px;
-  height: 24px;
-  border-color:&dtml-contentViewBackgroundColor;;
-  background-color: &dtml-contentViewBackgroundColor;;
-  background-position: center center;
-  margin-bottom:4px;
-  margin-right:-2px;
-}
-
 div div.kupu-panels {
   background-color: &dtml-contentViewBackgroundColor;;
 }
 
-span.kupu-tb-buttons button:hover {
-  border:1px solid;
-  border-color:  &dtml-buttonhighlight; &dtml-buttonshadow; &dtml-buttonshadow; &dtml-buttonhighlight;;
-}
-
-div.kupu-tb-buttongroup {
-  margin-right:1px;
-}
-
 .kupu-tb-styles, .kupu-ulstyles, .kupu-olstyles {
   margin-top:3px;
   margin-bottom:4px;
@@ -142,6 +123,29 @@
   width:100%;
 }
 
+/*  Button definitions - these use one image as a CSS sprite, and refer to the
+ *  image they need with an offset instead of loading 24 image files.
+ */
+
+.kupu-tb-buttons button {
+  width: 24px;
+  height: 24px;
+  border-color:&dtml-contentViewBackgroundColor;;
+  background-color: &dtml-contentViewBackgroundColor;;
+  background-position: center center;
+  margin-bottom:4px;
+  margin-right:-2px;
+}
+
+span.kupu-tb-buttons button:hover {
+  border:1px solid;
+  border-color:  &dtml-buttonhighlight; &dtml-buttonshadow; &dtml-buttonshadow; &dtml-buttonhighlight;;
+}
+
+div.kupu-tb-buttongroup {
+  margin-right:1px;
+}
+
 
 span.kupu-tb-buttons .kupu-bold-pressed,
 span.kupu-tb-buttons .kupu-italic-pressed,
@@ -151,69 +155,67 @@
   border-color: &dtml-buttonshadow; &dtml-buttonhighlight; &dtml-buttonhighlight; &dtml-buttonshadow;;
 }
 
-.kupu-anchors {background-image:url("&dtml-portal_url;/plonekupuimages/anchor.gif");}
+button.kupu-anchors {background-image:url("&dtml-portal_url;/plonekupuimages/anchor.gif");}
 
-.kupu-bold,
-.kupu-bold-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/bold.gif");}
+button.kupu-bold,
+button.kupu-bold-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/bold.gif");}
 
-.kupu-forecolor {background-image: url("&dtml-portal_url;/kupuimages/text-color.png");}
-.kupu-hilitecolor {background-image: url("&dtml-portal_url;/kupuimages/background-color.png");}
-.kupu-inthyperlink {background-image: url("&dtml-portal_url;/plonekupuimages/hyperlink.gif");}
-.kupu-inthyperlink-pressed {
+button.kupu-forecolor {background-image: url("&dtml-portal_url;/kupuimages/text-color.png");}
+button.kupu-hilitecolor {background-image: url("&dtml-portal_url;/kupuimages/background-color.png");}
+button.kupu-inthyperlink {background-image: url("&dtml-portal_url;/plonekupuimages/hyperlink.gif");}
+button.kupu-inthyperlink-pressed {
   border-color: &dtml-buttonshadow; &dtml-buttonhighlight; &dtml-buttonhighlight; &dtml-buttonshadow;;
 }
-.kupu-exthyperlink {background-image: url("&dtml-portal_url;/plonekupuimages/link_icon.gif");}
-.kupu-exthyperlink-pressed {
+button.kupu-exthyperlink {background-image: url("&dtml-portal_url;/plonekupuimages/link_icon.gif");}
+button.kupu-exthyperlink-pressed {
   border-color: &dtml-buttonshadow; &dtml-buttonhighlight; &dtml-buttonhighlight; &dtml-buttonshadow;;
 }
 
-.kupu-image {background-image: url("&dtml-portal_url;/plonekupuimages/image.gif");}
-.kupu-indent {background-image: url("&dtml-portal_url;/plonekupuimages/indent.gif");}
-.kupu-outdent {background-image: url("&dtml-portal_url;/plonekupuimages/outdent.gif");}
-.kupu-inserthorizontalrule {background-image: url("&dtml-portal_url;/plonekupuimages/hr.gif");}
-
-.kupu-insertorderedlist,
-.kupu-insertorderedlist-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/numbered_list.gif");}
-
-.kupu-insertunorderedlist,
-.kupu-insertunorderedlist-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/list.gif");}
-
-.kupu-insertdefinitionlist {background-image: url("&dtml-portal_url;/plonekupuimages/definitionlist.gif");}
-
-.kupu-italic, 
-.kupu-italic-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/italic.gif");}
-
-.kupu-justifycenter,
-.kupu-justifycenter-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/center.gif");}
-
-.kupu-justifyleft,
-.kupu-justifyleft-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/left_just.gif");}
-
-.kupu-justifyright,
-.kupu-justifyright-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/right_just.gif");}
-
-.kupu-logo {background-image: url("&dtml-portal_url;/kupuimages/kupu_icon.gif");}
-.kupu-redo {background-image: url("&dtml-portal_url;/plonekupuimages/redo.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-save {background-image: url("&dtml-portal_url;/kupuimages/save.png");display:none;}
-.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-spellchecker {background-image: url("&dtml-portal_url;/kupuimages/text-check.png");}
-.kupu-subscript,
-.kupu-subscript-pressed  {background-image: url("&dtml-portal_url;/plonekupuimages/subscript.gif");}
-.kupu-superscript,
-.kupu-superscript-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/superscript.gif");}
-
-.kupu-table {background-image: url("&dtml-portal_url;/plonekupuimages/table.gif");}
-.kupu-underline, 
-.kupu-underline-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/underline.gif");}
+button.kupu-image {background-image: url("&dtml-portal_url;/plonekupuimages/image.gif");}
+button.kupu-indent {background-image: url("&dtml-portal_url;/plonekupuimages/indent.gif");}
+button.kupu-outdent {background-image: url("&dtml-portal_url;/plonekupuimages/outdent.gif");}
+button.kupu-inserthorizontalrule {background-image: url("&dtml-portal_url;/plonekupuimages/hr.gif");}
+
+button.kupu-insertorderedlist,
+button.kupu-insertorderedlist-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/numbered_list.gif");}
+button.kupu-insertunorderedlist,
+button.kupu-insertunorderedlist-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/list.gif");}
+button.kupu-insertdefinitionlist {background-image: url("&dtml-portal_url;/plonekupuimages/definitionlist.gif");}
+
+button.kupu-italic, 
+button.kupu-italic-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/italic.gif");}
+
+button.kupu-justifycenter,
+button.kupu-justifycenter-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/center.gif");}
+
+button.kupu-justifyleft,
+button.kupu-justifyleft-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/left_just.gif");}
+
+button.kupu-justifyright,
+button.kupu-justifyright-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/right_just.gif");}
+
+button.kupu-logo {background-image: url("&dtml-portal_url;/kupuimages/kupu_icon.gif");}
+button.kupu-redo {background-image: url("&dtml-portal_url;/plonekupuimages/redo.gif");}
+button.kupu-removelink {background-image: url("&dtml-portal_url;/plonekupuimages/delete_icon.gif");}
+button.kupu-removeimage {background-image: url("&dtml-portal_url;/plonekupuimages/delete_icon.gif");}
+button.kupu-save {background-image: url("&dtml-portal_url;/kupuimages/save.png");display:none;}
+button.kupu-save-and-exit {background-image: url("&dtml-portal_url;/kupuimages/exit.gif");}
+button.kupu-space {background-image: url("&dtml-portal_url;/plonekupuimages/space.gif");}
+button.kupu-source {background-image: url("&dtml-portal_url;/plonekupuimages/view-source.gif");}
+button.kupu-spellchecker {background-image: url("&dtml-portal_url;/kupuimages/text-check.png");}
+button.kupu-subscript,
+button.kupu-subscript-pressed  {background-image: url("&dtml-portal_url;/plonekupuimages/subscript.gif");}
+button.kupu-superscript,
+button.kupu-superscript-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/superscript.gif");}
+
+button.kupu-table {background-image: url("&dtml-portal_url;/plonekupuimages/table.gif");}
+button.kupu-underline, 
+button.kupu-underline-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/underline.gif");}
 
-.kupu-undo {background-image: url("&dtml-portal_url;/plonekupuimages/undo.gif");}
+button.kupu-undo {background-image: url("&dtml-portal_url;/plonekupuimages/undo.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");}
+button.kupu-zoom {background-image: url("&dtml-portal_url;/plonekupuimages/fullscreenexpand_icon.gif");}
+button.kupu-zoom-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/fullscreencollapse_icon.gif");}
 
 
 div.kupu-drawer {

From limi at codespeak.net  Sun Aug  5 08:04:26 2007
From: limi at codespeak.net (limi at codespeak.net)
Date: Sun,  5 Aug 2007 08:04:26 +0200 (CEST)
Subject: [kupu-checkins] r45491 - in kupu/trunk/kupu/plone/kupu_plone_layer:
	. plonekupuimages
Message-ID: <20070805060426.B77B780B7@code0.codespeak.net>

Author: limi
Date: Sun Aug  5 08:04:25 2007
New Revision: 45491

Added:
   kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/kupu_sprite.png   (contents, props changed)
   kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/kupu_sprite.png.metadata
   kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/kupu_sprite.pxi   (contents, props changed)
Modified:
   kupu/trunk/kupu/plone/kupu_plone_layer/kupuplone.css.dtml
   kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/hyperlink.gif
Log:
Moving all icons used in Plone to use sprites. HTTP requests are down from 24
to 7, but there are still some legacy definitions in the main Kupu file that I
need to fix.

Also adding the PXI file for expanding the sprite later.



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	Sun Aug  5 08:04:25 2007
@@ -125,16 +125,26 @@
 
 /*  Button definitions - these use one image as a CSS sprite, and refer to the
  *  image they need with an offset instead of loading 24 image files.
+ *  The sprite file has an empty space at the top to make sure that other
+ *  user-created buttons don't get any additional background bitmaps.
+ *  The original sprite file with the layers is the .pxi file - which 
+ *  unfortunately only runs on the Mac. It's the only open source pixel tool
+ *  that is fit for the purpose, but if you don't have access to it, you 
+ *  should be able to use the PNG directly.
  */
 
 .kupu-tb-buttons button {
   width: 24px;
   height: 24px;
   border-color:&dtml-contentViewBackgroundColor;;
-  background-color: &dtml-contentViewBackgroundColor;;
+/*  background-color: &dtml-contentViewBackgroundColor;; 
   background-position: center center;
+*/
   margin-bottom:4px;
   margin-right:-2px;
+
+        background: transparent url("&dtml-portal_url;/plonekupuimages/kupu_sprite.png") 0 0 no-repeat;
+
 }
 
 span.kupu-tb-buttons button:hover {
@@ -146,7 +156,6 @@
   margin-right:1px;
 }
 
-
 span.kupu-tb-buttons .kupu-bold-pressed,
 span.kupu-tb-buttons .kupu-italic-pressed,
 span.kupu-tb-buttons .kupu-subscript-pressed,
@@ -155,67 +164,71 @@
   border-color: &dtml-buttonshadow; &dtml-buttonhighlight; &dtml-buttonhighlight; &dtml-buttonshadow;;
 }
 
-button.kupu-anchors {background-image:url("&dtml-portal_url;/plonekupuimages/anchor.gif");}
-
-button.kupu-bold,
-button.kupu-bold-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/bold.gif");}
+button.kupu-anchors      { background-position: 0  -20px; }
 
-button.kupu-forecolor {background-image: url("&dtml-portal_url;/kupuimages/text-color.png");}
-button.kupu-hilitecolor {background-image: url("&dtml-portal_url;/kupuimages/background-color.png");}
-button.kupu-inthyperlink {background-image: url("&dtml-portal_url;/plonekupuimages/hyperlink.gif");}
-button.kupu-inthyperlink-pressed {
-  border-color: &dtml-buttonshadow; &dtml-buttonhighlight; &dtml-buttonhighlight; &dtml-buttonshadow;;
-}
-button.kupu-exthyperlink {background-image: url("&dtml-portal_url;/plonekupuimages/link_icon.gif");}
-button.kupu-exthyperlink-pressed {
-  border-color: &dtml-buttonshadow; &dtml-buttonhighlight; &dtml-buttonhighlight; &dtml-buttonshadow;;
-}
+button.kupu-forecolor    { background-position: 0  -60px; }
+button.kupu-hilitecolor  { background-position: 0  -80px; }
+button.kupu-inthyperlink { background-position: 0 -100px; }
+button.kupu-inthyperlink-pressed { border-color: &dtml-buttonshadow; &dtml-buttonhighlight; &dtml-buttonhighlight; &dtml-buttonshadow;; }
+button.kupu-exthyperlink { background-position: 0 -120px; }
+button.kupu-exthyperlink-pressed { border-color: &dtml-buttonshadow; &dtml-buttonhighlight; &dtml-buttonhighlight; &dtml-buttonshadow;; }
+button.kupu-image        { background-position: 0 -140px; }
+button.kupu-indent       { background-position: 0 -160px; }
+button.kupu-outdent      { background-position: 0 -180px; }
 
-button.kupu-image {background-image: url("&dtml-portal_url;/plonekupuimages/image.gif");}
-button.kupu-indent {background-image: url("&dtml-portal_url;/plonekupuimages/indent.gif");}
-button.kupu-outdent {background-image: url("&dtml-portal_url;/plonekupuimages/outdent.gif");}
-button.kupu-inserthorizontalrule {background-image: url("&dtml-portal_url;/plonekupuimages/hr.gif");}
+button.kupu-inserthorizontalrule {}
 
 button.kupu-insertorderedlist,
-button.kupu-insertorderedlist-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/numbered_list.gif");}
+button.kupu-insertorderedlist-pressed 
+                         { background-position: 0 -200px; }
 button.kupu-insertunorderedlist,
-button.kupu-insertunorderedlist-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/list.gif");}
-button.kupu-insertdefinitionlist {background-image: url("&dtml-portal_url;/plonekupuimages/definitionlist.gif");}
+button.kupu-insertunorderedlist-pressed 
+                         { background-position: 0 -220px; }
+button.kupu-insertdefinitionlist 
+                         { background-position: 0 -240px; }
+button.kupu-justifycenter,
+button.kupu-justifycenter-pressed
+                         { background-position: 0 -260px; }
+
+button.kupu-justifyleft,
+button.kupu-justifyleft-pressed 
+                         { background-position: 0 -280px; }
+button.kupu-justifyright,
+button.kupu-justifyright-pressed 
+                         { background-position: 0 -300px; }
+
+button.kupu-logo {}
+button.kupu-redo {}
+button.kupu-removelink,
+button.kupu-removeimage  { background-position: 0 -320px; }
 
+button.kupu-bold,
+button.kupu-bold-pressed { background-position: 0 -340px; }
 button.kupu-italic, 
-button.kupu-italic-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/italic.gif");}
+button.kupu-italic-pressed 
+                         { background-position: 0 -360px; }
 
-button.kupu-justifycenter,
-button.kupu-justifycenter-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/center.gif");}
+button.kupu-source       { background-position: 0 -380px; }
+button.kupu-table        { background-position: 0 -400px; }
+button.kupu-zoom         { background-position: 0 -420px; }
+button.kupu-zoom-pressed { background-position: 0 -440px; }
 
-button.kupu-justifyleft,
-button.kupu-justifyleft-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/left_just.gif");}
 
-button.kupu-justifyright,
-button.kupu-justifyright-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/right_just.gif");}
+button.kupu-save         { background-position: 0 -460px; display:none; }
+button.kupu-save-and-exit { }
 
-button.kupu-logo {background-image: url("&dtml-portal_url;/kupuimages/kupu_icon.gif");}
-button.kupu-redo {background-image: url("&dtml-portal_url;/plonekupuimages/redo.gif");}
-button.kupu-removelink {background-image: url("&dtml-portal_url;/plonekupuimages/delete_icon.gif");}
-button.kupu-removeimage {background-image: url("&dtml-portal_url;/plonekupuimages/delete_icon.gif");}
-button.kupu-save {background-image: url("&dtml-portal_url;/kupuimages/save.png");display:none;}
-button.kupu-save-and-exit {background-image: url("&dtml-portal_url;/kupuimages/exit.gif");}
 button.kupu-space {background-image: url("&dtml-portal_url;/plonekupuimages/space.gif");}
-button.kupu-source {background-image: url("&dtml-portal_url;/plonekupuimages/view-source.gif");}
 button.kupu-spellchecker {background-image: url("&dtml-portal_url;/kupuimages/text-check.png");}
 button.kupu-subscript,
 button.kupu-subscript-pressed  {background-image: url("&dtml-portal_url;/plonekupuimages/subscript.gif");}
 button.kupu-superscript,
 button.kupu-superscript-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/superscript.gif");}
 
-button.kupu-table {background-image: url("&dtml-portal_url;/plonekupuimages/table.gif");}
 button.kupu-underline, 
 button.kupu-underline-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/underline.gif");}
 
 button.kupu-undo {background-image: url("&dtml-portal_url;/plonekupuimages/undo.gif");}
 
-button.kupu-zoom {background-image: url("&dtml-portal_url;/plonekupuimages/fullscreenexpand_icon.gif");}
-button.kupu-zoom-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/fullscreencollapse_icon.gif");}
 
 
 div.kupu-drawer {

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

Added: kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/kupu_sprite.png
==============================================================================
Binary file. No diff available.

Added: kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/kupu_sprite.png.metadata
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/kupu_sprite.png.metadata	Sun Aug  5 08:04:25 2007
@@ -0,0 +1,2 @@
+[default]
+cache=HTTPCache

Added: kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/kupu_sprite.pxi
==============================================================================
Binary file. No diff available.

From limi at codespeak.net  Sun Aug  5 08:21:22 2007
From: limi at codespeak.net (limi at codespeak.net)
Date: Sun,  5 Aug 2007 08:21:22 +0200 (CEST)
Subject: [kupu-checkins] r45492 - kupu/trunk/kupu/doc
Message-ID: <20070805062122.9774980B7@code0.codespeak.net>

Author: limi
Date: Sun Aug  5 08:21:21 2007
New Revision: 45492

Modified:
   kupu/trunk/kupu/doc/FAQ.txt
Log:
Kupu supports Opera 9 now.

Modified: kupu/trunk/kupu/doc/FAQ.txt
==============================================================================
--- kupu/trunk/kupu/doc/FAQ.txt	(original)
+++ kupu/trunk/kupu/doc/FAQ.txt	Sun Aug  5 08:21:21 2007
@@ -2,15 +2,11 @@
 Kupu Frequently Asked Questions
 ===============================
 
-* Will this work with Safari or Opera or ...?
+* Will this work with Safari?
 
   No, Kupu will only run on browsers with the IE engine (IE 5.5+) or those
-  with a Gecko engine (Mozilla 1.3.1+ and Netscape 7.1+), not on the 
-  Konqueror one (which Safari uses) or on Opera or any other browser. 
-  Actually Mozilla copied a feature unique to Internet Explorer, which is 
-  not part of any standard, which Kupu uses. Because it's not part of a
-  standard, it is not very likely any other browsers will implement it,
-  although we keep hoping some day they will.
+  with a Gecko engine (Mozilla 1.3.1+ and Netscape 7.1+), on Opera 9 or later.
+  It will not run on KHTML (which Safari/Konqueror uses) or any other browser. 
 
 * Kupu allows users to do all kinds of things - like coloring text -
   that I don't want in my system.
@@ -84,8 +80,8 @@
 
   The authors of these editors have done great work. They are superb
   applications, but the major drawback is they work in only one browser (as of 
-  this writing). Kupu was created to work in both Mozilla/Netscape and Internet 
-  Explorer.
+  this writing). Kupu was created to work in both Mozilla/Netscape and
+  Internet Explorer.
 
 * What's with the xsltproc error when 'make'ing kupu?
 

From limi at codespeak.net  Sun Aug  5 08:38:48 2007
From: limi at codespeak.net (limi at codespeak.net)
Date: Sun,  5 Aug 2007 08:38:48 +0200 (CEST)
Subject: [kupu-checkins] r45493 - kupu/trunk/kupu/plone
Message-ID: <20070805063848.C244480A9@code0.codespeak.net>

Author: limi
Date: Sun Aug  5 08:38:47 2007
New Revision: 45493

Modified:
   kupu/trunk/kupu/plone/toolbar.kupu
Log:
Moving the delete actions to the end of the toolbar, so they don't disrupt the
rest of the toolbar when they show up. Tried doing "make plonemacros", but it
didn't seem to do anything - so please regenerate whatever needs to be 
regenerated, Duncan? :)


Modified: kupu/trunk/kupu/plone/toolbar.kupu
==============================================================================
--- kupu/trunk/kupu/plone/toolbar.kupu	(original)
+++ kupu/trunk/kupu/plone/toolbar.kupu	Sun Aug  5 08:38:47 2007
@@ -105,19 +105,6 @@
     </span>
   </kupu:part>
 
-  <kupu:part name="buttongroup-remove">
-    <span class="kupu-tb-buttongroup" id="kupu-bg-remove" tal:condition="filter/bg-remove">
-      <button type="button" class="kupu-removeimage invisible"
-              tal:condition="filter/removeimage-button"
-              id="kupu-removeimage-button" title="Remove image"
-              i18n:attributes="title title_removeimage;">&#160;</button>
-      <button type="button" class="kupu-removelink invisible"
-              tal:condition="filter/removelink-button"
-              id="kupu-removelink-button" title="Remove link"
-              i18n:attributes="title title_removelink;">&#160;</button>
-    </span>
-  </kupu:part>
-
   <kupu:part name="buttongroup-undo">
     <span class="kupu-tb-buttongroup" id="kupu-bg-undo" tal:condition="filter/bg-undo">
       <button type="button" class="kupu-undo" 
@@ -164,4 +151,17 @@
               i18n:translate="list-loweralpha">a</option>
     </select>
   </kupu:part>
+
+  <kupu:part name="buttongroup-remove">
+    <span class="kupu-tb-buttongroup" id="kupu-bg-remove" tal:condition="filter/bg-remove">
+      <button type="button" class="kupu-removeimage invisible"
+              tal:condition="filter/removeimage-button"
+              id="kupu-removeimage-button" title="Remove image"
+              i18n:attributes="title title_removeimage;">&#160;</button>
+      <button type="button" class="kupu-removelink invisible"
+              tal:condition="filter/removelink-button"
+              id="kupu-removelink-button" title="Remove link"
+              i18n:attributes="title title_removelink;">&#160;</button>
+    </span>
+  </kupu:part>
 </kupu:feature>

From limi at codespeak.net  Sun Aug  5 08:41:57 2007
From: limi at codespeak.net (limi at codespeak.net)
Date: Sun,  5 Aug 2007 08:41:57 +0200 (CEST)
Subject: [kupu-checkins] r45494 - kupu/trunk/kupu/plone/kupu_plone_layer
Message-ID: <20070805064157.669B880B7@code0.codespeak.net>

Author: limi
Date: Sun Aug  5 08:41:56 2007
New Revision: 45494

Modified:
   kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
Log:
Changing "Normal" to "Normal paragraph", since that makes it clearer. Not sure whether this is the place to do it, but it seems to work (might be overwritten by the macros stuff, though - please double check)

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	Sun Aug  5 08:41:56 2007
@@ -195,7 +195,7 @@
     </span>
   
     <select class="kupu-tb-styles" tal:condition="filter/styles" tal:define="field field|nothing;styles python:tool.getStyleList(field);">
-      <option value="p" i18n:translate="Normal">Normal</option>
+      <option value="p" i18n:translate="Normal">Normal paragraph</option>
       <tal:block condition="styles" repeat="style styles">
         <option i18n:translate="" tal:attributes="value style/value" tal:content="style/content"/>
       </tal:block>

From limi at codespeak.net  Mon Aug  6 00:34:02 2007
From: limi at codespeak.net (limi at codespeak.net)
Date: Mon,  6 Aug 2007 00:34:02 +0200 (CEST)
Subject: [kupu-checkins] r45506 - kupu/trunk/kupu/doc
Message-ID: <20070805223402.9E2A780BA@code0.codespeak.net>

Author: limi
Date: Mon Aug  6 00:34:01 2007
New Revision: 45506

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

Modified: kupu/trunk/kupu/doc/CHANGES.txt
==============================================================================
--- kupu/trunk/kupu/doc/CHANGES.txt	(original)
+++ kupu/trunk/kupu/doc/CHANGES.txt	Mon Aug  6 00:34:01 2007
@@ -2,6 +2,14 @@
 Kupu changes
 ============
 
+  - The icons in the toolbar for Plone now use CSS sprites. This means that
+    instead of having 30 files each being 16x16, we put all the icons  
+    in one file, and reference the file once. Then we use CSS positioning to  
+    pull out the right icon.This has a major impact on how quickly Kupu
+    performs its initial load ? as HTTP roundtripping is very time-consuming.
+    Before, Kupu did 17 HTTP requests for its initial image loading, now it
+    only does one.
+
 - 1.4rc2
 
   - Fixed broken code for determining the width of captioned images.

From duncan at codespeak.net  Mon Aug  6 11:16:49 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Mon,  6 Aug 2007 11:16:49 +0200 (CEST)
Subject: [kupu-checkins] r45510 - kupu/trunk/kupu/plone/kupu_plone_layer
Message-ID: <20070806091649.9AEDE80D2@code0.codespeak.net>

Author: duncan
Date: Mon Aug  6 11:16:49 2007
New Revision: 45510

Modified:
   kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneinit.js
Log:
Fix for plone ticket 6486 formUnload protection invoked for inline kupu editor even after Save
Added a check that the textarea still exists when kupu is asked about changes.


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	Mon Aug  6 11:16:49 2007
@@ -181,8 +181,10 @@
     var beforeunloadTool = window.onbeforeunload && window.onbeforeunload.tool;
     if (beforeunloadTool) {
         var initialBody = kupu.getHTMLBody();
+        var check_id = textarea.id;
         beforeunloadTool.addHandler(function() {
-            return kupu.getHTMLBody() != initialBody;
+            var txt = document.getElementById(check_id);
+            return !!txt && kupu.getHTMLBody() != initialBody;
         });
         beforeunloadTool.chkId[textarea.id] = function() { return false; };
         beforeunloadTool.addForm(form);

From duncan at codespeak.net  Mon Aug  6 11:54:17 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Mon,  6 Aug 2007 11:54:17 +0200 (CEST)
Subject: [kupu-checkins] r45511 - kupu/trunk/kupu/plone/kupu_plone_layer
Message-ID: <20070806095417.727FE80DC@code0.codespeak.net>

Author: duncan
Date: Mon Aug  6 11:54:16 2007
New Revision: 45511

Modified:
   kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneinit.js
Log:
Try another fix for ticket 6486


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	Mon Aug  6 11:54:16 2007
@@ -181,10 +181,13 @@
     var beforeunloadTool = window.onbeforeunload && window.onbeforeunload.tool;
     if (beforeunloadTool) {
         var initialBody = kupu.getHTMLBody();
-        var check_id = textarea.id;
         beforeunloadTool.addHandler(function() {
-            var txt = document.getElementById(check_id);
-            return !!txt && kupu.getHTMLBody() != initialBody;
+            for (var n = textarea; n; n = n.parentNode) {
+                if (n===document) {
+                    return kupu.getHTMLBody() != initialBody;
+                }
+            }
+            return false; /* textarea is no longer in the document */
         });
         beforeunloadTool.chkId[textarea.id] = function() { return false; };
         beforeunloadTool.addForm(form);

From limi at codespeak.net  Thu Aug  9 09:48:52 2007
From: limi at codespeak.net (limi at codespeak.net)
Date: Thu,  9 Aug 2007 09:48:52 +0200 (CEST)
Subject: [kupu-checkins] r45562 - kupu/trunk/kupu/doc
Message-ID: <20070809074852.9FF5B8111@code0.codespeak.net>

Author: limi
Date: Thu Aug  9 09:48:51 2007
New Revision: 45562

Modified:
   kupu/trunk/kupu/doc/README.txt
Log:
Whitespace


Modified: kupu/trunk/kupu/doc/README.txt
==============================================================================
--- kupu/trunk/kupu/doc/README.txt	(original)
+++ kupu/trunk/kupu/doc/README.txt	Thu Aug  9 09:48:51 2007
@@ -14,6 +14,8 @@
   - Internet Explorer 5.5 or higher
 
   - Netscape Navigator 7.1 or higher
+  
+  - Opera 9 or higher
 
 Server-side there are hardly any requirements, except for some way of
 processing data (CGI or something more fancy like PHP, ASP or Python
@@ -23,7 +25,7 @@
 Content copied from an existing web page is pasted with all formatting
 intact. This includes structure such as headings and lists, plus links,
 image references, text styling, and other aspects. Copying text from a
-word processor with an HTML clipboard - such as MSWord - works exactly
+word processor with an HTML clipboard - such as MS Word - works exactly
 the same.
 
 Kupu will clean up the content before it is sent to the server, and can

From limi at codespeak.net  Thu Aug  9 09:49:49 2007
From: limi at codespeak.net (limi at codespeak.net)
Date: Thu,  9 Aug 2007 09:49:49 +0200 (CEST)
Subject: [kupu-checkins] r45563 -
	kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages
Message-ID: <20070809074949.E6FDF8111@code0.codespeak.net>

Author: limi
Date: Thu Aug  9 09:49:49 2007
New Revision: 45563

Modified:
   kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/kupu_sprite.png
Log:
Losslessly reducing the sprite to 8-bit, so IE6 handles it properly.
OptiPNG to the rescue!


Modified: kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/kupu_sprite.png
==============================================================================
Binary files. No diff available.

From duncan at codespeak.net  Fri Aug 10 11:13:27 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Fri, 10 Aug 2007 11:13:27 +0200 (CEST)
Subject: [kupu-checkins] r45579 - kupu/trunk/kupu/plone
Message-ID: <20070810091327.E57FA8139@code0.codespeak.net>

Author: duncan
Date: Fri Aug 10 11:13:25 2007
New Revision: 45579

Modified:
   kupu/trunk/kupu/plone/exportimport.py
Log:
Fix KeyError when importing kupu.xml

Modified: kupu/trunk/kupu/plone/exportimport.py
==============================================================================
--- kupu/trunk/kupu/plone/exportimport.py	(original)
+++ kupu/trunk/kupu/plone/exportimport.py	Fri Aug 10 11:13:25 2007
@@ -260,7 +260,7 @@
                 },
             'previewclass': { '#text': {KEY:None}, },
             'generatepreviews': {},
-            'globaltoolbar': { '#text': { KEY:None }, },
+            'globaltoolbar': { '#text': { KEY:None, DEFAULT: '' }, },
             'toolbar':
                 {
                     'element': { KEY: 'elements' },

From duncan at codespeak.net  Mon Aug 13 14:26:52 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Mon, 13 Aug 2007 14:26:52 +0200 (CEST)
Subject: [kupu-checkins] r45621 - in kupu/trunk/kupu: doc plone
	plone/kupu_plone_layer
Message-ID: <20070813122652.A1A7E8125@code0.codespeak.net>

Author: duncan
Date: Mon Aug 13 14:26:50 2007
New Revision: 45621

Modified:
   kupu/trunk/kupu/doc/CHANGES.txt
   kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
   kupu/trunk/kupu/plone/toolbar.kupu
Log:
Put the 'Normal paragraph text change into the .kupu file rather than the generated one.
Updated CHANGES.txt to contain changes from rc2.

Modified: kupu/trunk/kupu/doc/CHANGES.txt
==============================================================================
--- kupu/trunk/kupu/doc/CHANGES.txt	(original)
+++ kupu/trunk/kupu/doc/CHANGES.txt	Mon Aug 13 14:26:50 2007
@@ -2,6 +2,8 @@
 Kupu changes
 ============
 
+- 1.4
+
   - The icons in the toolbar for Plone now use CSS sprites. This means that
     instead of having 30 files each being 16x16, we put all the icons  
     in one file, and reference the file once. Then we use CSS positioning to  
@@ -10,6 +12,16 @@
     Before, Kupu did 17 HTTP requests for its initial image loading, now it
     only does one.
 
+  - Fixed a KeyError exception when importing a GenericSetup profile.
+
+  - Minor styling changes to the image upload form.
+
+  - Plone tickets
+
+    * 6486: formUnload protection invoked for inline kupu editor even after Save
+
+    * 6833: Error 500 loading kupu_migration.xml
+
 - 1.4rc2
 
   - Fixed broken code for determining the width of captioned images.

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html	Mon Aug 13 14:26:50 2007
@@ -22,7 +22,7 @@
     <!--$Id: head.kupu 44831 2007-07-07 19:01:27Z duncan $-->
     <!--$Id: xmlconfig.kupu 35367 2006-12-06 09:06:21Z duncan $-->
     <!--$Id: body.kupu 45298 2007-07-24 10:38:54Z duncan $-->
-    <!--$Id: toolbar.kupu 44538 2007-06-26 10:46:28Z duncan $-->
+    <!--$Id: toolbar.kupu 45493 2007-08-05 06:38:47Z limi $-->
     <!--$Id save.kupu (not yet in svn) $-->
     <!--$Id: drawers.kupu 44538 2007-06-26 10:46:28Z duncan $-->
     <!--$Id: beforeunload.kupu 14546 2005-07-12 14:35:55Z duncan $-->

Modified: kupu/trunk/kupu/plone/toolbar.kupu
==============================================================================
--- kupu/trunk/kupu/plone/toolbar.kupu	(original)
+++ kupu/trunk/kupu/plone/toolbar.kupu	Mon Aug 13 14:26:50 2007
@@ -123,7 +123,7 @@
             tal:condition="filter/styles"
             
             tal:define="field field|nothing;styles python:tool.getStyleList(field);">
-      <option value="p" i18n:translate="Normal">Normal</option>
+      <option value="p" i18n:translate="Normal">Normal paragraph</option>
       <tal:block condition="styles" repeat="style styles">
         <option i18n:translate=""
                 tal:attributes="value style/value" tal:content="style/content"/>

From guido at codespeak.net  Tue Aug 14 12:04:43 2007
From: guido at codespeak.net (guido at codespeak.net)
Date: Tue, 14 Aug 2007 12:04:43 +0200 (CEST)
Subject: [kupu-checkins] r45650 - in kupu/trunk/kupu: default widgeteer
Message-ID: <20070814100443.1756C8117@code0.codespeak.net>

Author: guido
Date: Tue Aug 14 12:04:42 2007
New Revision: 45650

Modified:
   kupu/trunk/kupu/default/colorchooser.kupu
   kupu/trunk/kupu/widgeteer/kupuinit.js
Log:
Added support for 'widget:tools' attribute in Widgeteer code to allow easy
customization of the tools/buttons used.


Modified: kupu/trunk/kupu/default/colorchooser.kupu
==============================================================================
--- kupu/trunk/kupu/default/colorchooser.kupu	(original)
+++ kupu/trunk/kupu/default/colorchooser.kupu	Tue Aug 14 12:04:42 2007
@@ -16,7 +16,7 @@
   </kupu:part>
 
   <kupu:part name="buttons">
-    <span class="kupu-tb-buttongroup">
+    <span class="kupu-tb-buttongroup" id="kupu-bg-color">
       <!-- Note: the event handlers are attached to these buttons dynamically, like for tools -->
       <button type="button" class="kupu-forecolor" id="kupu-forecolor-button" 
               title="text color: alt-f"

Modified: kupu/trunk/kupu/widgeteer/kupuinit.js
==============================================================================
--- kupu/trunk/kupu/widgeteer/kupuinit.js	(original)
+++ kupu/trunk/kupu/widgeteer/kupuinit.js	Tue Aug 14 12:04:42 2007
@@ -186,108 +186,207 @@
         };
     };
 
-    var boldchecker = parentWithStyleChecker(['b', 'strong'],
-                                             'font-weight', 'bold');
-    var boldbutton = new KupuStateButton('kupu-bold-button',
-                                         execCommand('bold'),
-                                         boldchecker,
-                                         'kupu-bold',
-                                         'kupu-bold-pressed');
-    kupu.registerTool('boldbutton', boldbutton);
-
-    var italicschecker = parentWithStyleChecker(['i', 'em'],
-                                                'font-style', 'italic');
-    var italicsbutton = new KupuStateButton('kupu-italic-button',
-                                            execCommand('italic'),
-                                            italicschecker,
-                                            'kupu-italic',
-                                            'kupu-italic-pressed');
-    kupu.registerTool('italicsbutton', italicsbutton);
-
-    var underlinechecker = parentWithStyleChecker(['u']);
-    var underlinebutton = new KupuStateButton('kupu-underline-button',
-                                              execCommand('underline'),
-                                              underlinechecker,
-                                              'kupu-underline',
-                                              'kupu-underline-pressed');
-    kupu.registerTool('underlinebutton', underlinebutton);
-
-    var subscriptchecker = parentWithStyleChecker(['sub']);
-    var subscriptbutton = new KupuStateButton('kupu-subscript-button',
-                                              execCommand('subscript'),
-                                              subscriptchecker,
-                                              'kupu-subscript',
-                                              'kupu-subscript-pressed');
-    kupu.registerTool('subscriptbutton', subscriptbutton);
+    var tools = parentiframe.textarea.getAttribute('widget:tools');
+    if (tools) {
+        tools = tools.split(',');
+        for (var i=0; i < tools.length; i++) {
+            tools[i] = tools[i].strip();
+        };
+    };
+
+    if (!tools || !tools.length || tools.contains('basicmarkup')) {
+        var boldchecker = parentWithStyleChecker(['b', 'strong'],
+                                                 'font-weight', 'bold');
+        var boldbutton = new KupuStateButton('kupu-bold-button',
+                                             execCommand('bold'),
+                                             boldchecker,
+                                             'kupu-bold',
+                                             'kupu-bold-pressed');
+        kupu.registerTool('boldbutton', boldbutton);
+
+        var italicschecker = parentWithStyleChecker(['i', 'em'],
+                                                    'font-style', 'italic');
+        var italicsbutton = new KupuStateButton('kupu-italic-button',
+                                                execCommand('italic'),
+                                                italicschecker,
+                                                'kupu-italic',
+                                                'kupu-italic-pressed');
+        kupu.registerTool('italicsbutton', italicsbutton);
+
+        var underlinechecker = parentWithStyleChecker(['u']);
+        var underlinebutton = new KupuStateButton('kupu-underline-button',
+                                                  execCommand('underline'),
+                                                  underlinechecker,
+                                                  'kupu-underline',
+                                                  'kupu-underline-pressed');
+        kupu.registerTool('underlinebutton', underlinebutton);
+    } else {
+        var b = document.getElementById('kupu-bg-basicmarkup');
+        b.parentNode.removeChild(b);
+    };
 
-    var superscriptchecker = parentWithStyleChecker(['super', 'sup']);
-    var superscriptbutton = new KupuStateButton('kupu-superscript-button',
+    if (!tools || !tools.length || tools.contains('subsuper')) {
+        var subscriptchecker = parentWithStyleChecker(['sub']);
+        var subscriptbutton = new KupuStateButton('kupu-subscript-button',
+                                                  execCommand('subscript'),
+                                                  subscriptchecker,
+                                                  'kupu-subscript',
+                                                  'kupu-subscript-pressed');
+        kupu.registerTool('subscriptbutton', subscriptbutton);
+
+        var superscriptchecker = parentWithStyleChecker(['super', 'sup']);
+        var superscriptbutton = new KupuStateButton('kupu-superscript-button',
                                                 execCommand('superscript'),
                                                 superscriptchecker,
                                                 'kupu-superscript',
                                                 'kupu-superscript-pressed');
-    kupu.registerTool('superscriptbutton', superscriptbutton);
+        kupu.registerTool('superscriptbutton', superscriptbutton);
+    } else {
+        var b = document.getElementById('kupu-bg-subsuper');
+        b.parentNode.removeChild(b);
+    };
 
-    var undobutton = new KupuButton('kupu-undo-button', execCommand('undo'))
-    kupu.registerTool('undobutton', undobutton);
+    if (!tools || !tools.length || tools.contains('color')) {
+        var colorchoosertool = new ColorchooserTool('kupu-forecolor-button',
+                                                    'kupu-hilitecolor-button',
+                                                    'kupu-colorchooser');
+        kupu.registerTool('colorchooser', colorchoosertool);
+    } else {
+        var b = document.getElementById('kupu-bg-color');
+        b.parentNode.removeChild(b);
+    };
 
-    var redobutton = new KupuButton('kupu-redo-button', execCommand('redo'));
-    kupu.registerTool('redobutton', redobutton);
+    if (!tools || !tools.length || tools.contains('browser')) {
+        var linktool = new LinkTool();
+        kupu.registerTool('linktool', linktool);
+        var handler = function() {
+            var create_handler = new ContextFixer(linktool.createLink, 
+                                                        linktool).execute;
+            parent.browser_manager.startBrowser(create_handler,
+                    parentiframe.textarea.getAttribute('widget:linkpath'));
+        };
+        addEventHandler(document.getElementById('kupu-intlink-button'),
+                        'click', handler);
 
-    var colorchoosertool = new ColorchooserTool('kupu-forecolor-button',
-                                                'kupu-hilitecolor-button',
-                                                'kupu-colorchooser');
-    kupu.registerTool('colorchooser', colorchoosertool);
-
-    var listtool = new ListTool('kupu-list-ul-addbutton',
-                                'kupu-list-ol-addbutton',
-                                'kupu-ulstyles',
-                                'kupu-olstyles');
-    kupu.registerTool('listtool', listtool);
-
-    var definitionlisttool = new DefinitionListTool('kupu-list-dl-addbutton');
-    kupu.registerTool('definitionlisttool', definitionlisttool);
-
-    var linktool = new LinkTool();
-    kupu.registerTool('linktool', linktool);
-    var handler = function() {
-        var create_handler = new ContextFixer(linktool.createLink, 
-                                                    linktool).execute;
-        parent.browser_manager.startBrowser(create_handler,
-                parentiframe.textarea.getAttribute('widget:linkpath'));
-    };
-    addEventHandler(document.getElementById('kupu-intlink-button'), 'click',
-                    handler);
-
-    var imagetool = new ImageTool();
-    kupu.registerTool('imagetool', imagetool);
-    var handler = function() {
-        var create_handler = new ContextFixer(imagetool.createImage, 
-                                                imagetool).execute;
-        parent.browser_manager.startBrowser(create_handler,
-                parentiframe.textarea.getAttribute('widget:imagepath'),
-                                                ['image/jpeg', 'image/png',
-                                                    'image/gif']);
-    };
-    addEventHandler(document.getElementById('kupu-image-button'), 'click',
-                    handler);
-
-    var tabletool = new TableTool();
-    kupu.registerTool('tabletool', tabletool);
-
-    var showpathtool = new ShowPathTool();
-    kupu.registerTool('showpathtool', showpathtool);
-
-    var sourceedittool = new SourceEditTool('kupu-source-button',
-                                            'kupu-editor-textarea');
-    kupu.registerTool('sourceedittool', sourceedittool);
-
-    var spellchecker = new KupuSpellChecker('kupu-spellchecker-button',
-                                            'kupu_spellcheck');
-    kupu.registerTool('spellchecker', spellchecker);
+        var imagetool = new ImageTool();
+        kupu.registerTool('imagetool', imagetool);
+        var handler = function() {
+            var create_handler = new ContextFixer(imagetool.createImage, 
+                                                    imagetool).execute;
+            parent.browser_manager.startBrowser(create_handler,
+                    parentiframe.textarea.getAttribute('widget:imagepath'),
+                                                    ['image/jpeg', 'image/png',
+                                                        'image/gif']);
+        };
+        addEventHandler(document.getElementById('kupu-image-button'), 'click',
+                        handler);
+    } else {
+        var b = document.getElementById('kupu-bg-browser');
+        b.parentNode.removeChild(b);
+    };
+
+    if (!tools || !tools.length || tools.contains('justify')) {
+        var justifyleftbutton = new KupuButton('kupu-justifyleft-button',
+                                               execCommand('justifyleft'));
+        kupu.registerTool('justifyleftbutton', justifyleftbutton);
+
+        var justifycenterbutton = new KupuButton('kupu-justifycenter-button',
+                                                 execCommand('justifycenter'));
+        kupu.registerTool('justifycenterbutton', justifycenterbutton);
+        var justifyrightbutton = new KupuButton('kupu-justifyright-button',
+                                                execCommand('justifyright'));
+        kupu.registerTool('justifyrightbutton', justifyrightbutton);
+    } else {
+        var b = document.getElementById('kupu-bg-justify');
+        b.parentNode.removeChild(b);
+    };
 
-    var viewsourcetool = new ViewSourceTool();
-    kupu.registerTool('viewsourcetool', viewsourcetool);
+    if (!tools || !tools.length || tools.contains('list')) {
+        var listtool = new ListTool('kupu-list-ul-addbutton',
+                                    'kupu-list-ol-addbutton',
+                                    'kupu-ulstyles',
+                                    'kupu-olstyles');
+        kupu.registerTool('listtool', listtool);
+    } else {
+        var b = document.getElementById('kupu-bg-list');
+        b.parentNode.removeChild(b);
+        var b = document.getElementById('kupu-ulstyles');
+        b.parentNode.removeChild(b);
+        var b = document.getElementById('kupu-olstyles');
+        b.parentNode.removeChild(b);
+    };
+
+    if (!tools || !tools.length || tools.contains('definitionlist')) {
+        var definitionlisttool = new DefinitionListTool(
+                                            'kupu-list-dl-addbutton');
+        kupu.registerTool('definitionlisttool', definitionlisttool);
+    } else {
+        var b = document.getElementById('kupu-bg-definitionlist');
+        b.parentNode.removeChild(b);
+    };
+
+    if (!tools || !tools.length || tools.contains('indent')) {
+        var outdentbutton = new KupuButton('kupu-outdent-button',
+                                           execCommand('outdent'));
+        kupu.registerTool('outdentbutton', outdentbutton);
+
+        var indentbutton = new KupuButton('kupu-indent-button',
+                                          execCommand('indent'));
+        kupu.registerTool('indentbutton', indentbutton);
+    } else {
+        var b = document.getElementById('kupu-bg-indent');
+        b.parentNode.removeChild(b);
+    };
+
+    // XXX fix remove buttons later...
+    var b = document.getElementById('kupu-bg-remove');
+    b.parentNode.removeChild(b);
+
+    if (!tools || !tools.length || tools.contains('undo')) {
+        var undobutton = new KupuButton('kupu-undo-button',
+                                        execCommand('undo'))
+        kupu.registerTool('undobutton', undobutton);
+
+        var redobutton = new KupuButton('kupu-redo-button',
+                                        execCommand('redo'));
+        kupu.registerTool('redobutton', redobutton);
+    } else {
+        var b = document.getElementById('kupu-bg-undo');
+        b.parentNode.removeChild(b);
+    };
+
+    if (!tools || !tools.length || tools.contains('spellchecker')) {
+        var spellchecker = new KupuSpellChecker('kupu-spellchecker-button',
+                                                'spellcheck.cgi');
+        kupu.registerTool('spellchecker', spellchecker);
+    } else {
+        var b = document.getElementById('kupu-spellchecker');
+        b.parentNode.removeChild(b);
+    };
+
+    if (!tools || !tools.length || tools.contains('source')) {
+        var sourceedittool = new SourceEditTool('kupu-source-button',
+                                                'kupu-editor-textarea');
+        kupu.registerTool('sourceedittool', sourceedittool);
+    } else {
+        var b = document.getElementById('kupu-source');
+        b.parentNode.removeChild(b);
+    };
+
+    if (!tools || !tools.length || tools.contains('table')) {
+        var tabletool = new TableTool();
+        kupu.registerTool('tabletool', tabletool);
+    };
+
+    if (!tools || !tools.length || tools.contains('path')) {
+        var showpathtool = new ShowPathTool();
+        kupu.registerTool('showpathtool', showpathtool);
+    };
+
+    if (!tools || !tools.length || tools.contains('source')) {
+        var viewsourcetool = new ViewSourceTool();
+        kupu.registerTool('viewsourcetool', viewsourcetool);
+    };
 
     /*
     // Function that returns function to open a drawer

From duncan at codespeak.net  Tue Aug 14 16:37:31 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Tue, 14 Aug 2007 16:37:31 +0200 (CEST)
Subject: [kupu-checkins] r45653 - kupu/tag/kupu-1.4
Message-ID: <20070814143731.6259F8141@code0.codespeak.net>

Author: duncan
Date: Tue Aug 14 16:37:30 2007
New Revision: 45653

Added:
   kupu/tag/kupu-1.4/
      - copied from r45652, kupu/trunk/kupu/
Log:
Tagged 1.4 release.

From duncan at codespeak.net  Tue Aug 14 16:40:31 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Tue, 14 Aug 2007 16:40:31 +0200 (CEST)
Subject: [kupu-checkins] r45654 - kupu/branch/kupu-1.4
Message-ID: <20070814144031.8209D8164@code0.codespeak.net>

Author: duncan
Date: Tue Aug 14 16:40:31 2007
New Revision: 45654

Added:
   kupu/branch/kupu-1.4/
      - copied from r45653, kupu/trunk/kupu/
Log:
Create a maintenance branch for kupu 1.4

From duncan at codespeak.net  Wed Aug 15 12:47:28 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Wed, 15 Aug 2007 12:47:28 +0200 (CEST)
Subject: [kupu-checkins] r45669 - in kupu/trunk/kupu: . default doc plone
	plone/kupu_plone_layer plone/profiles/default
Message-ID: <20070815104728.428CC8113@code0.codespeak.net>

Author: duncan
Date: Wed Aug 15 12:47:27 2007
New Revision: 45669

Modified:
   kupu/trunk/kupu/default/drawers.kupu
   kupu/trunk/kupu/doc/CHANGES.txt
   kupu/trunk/kupu/plone/helpers.py
   kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
   kupu/trunk/kupu/plone/kupu_plone_layer/sample-kupu-customisation-policy.py
   kupu/trunk/kupu/plone/profiles/default/kupu.xml
   kupu/trunk/kupu/plone/wire.kupu
   kupu/trunk/kupu/version.txt
Log:
  Limi asked for some last minute changes for Plone 3:

  - Embed doesn't work out of the box in Plone 3, so shouldn't be shown
    by default (it will only lead to a lot of user frustration).

  - The anchor/table of contents generation is done differently in Plone
    3, so should be off by default (turning on buttons is easy in Kupu
    now).

  - Insert image/link should default to current folder instead of
    Recent, since the Upload button isn't visible if not (which is the
    most common use case)

  - Place the delete link/image button after the pulldown (so it doesn't
    push around the toolbar elements)

Modified: kupu/trunk/kupu/default/drawers.kupu
==============================================================================
--- kupu/trunk/kupu/default/drawers.kupu	(original)
+++ kupu/trunk/kupu/default/drawers.kupu	Wed Aug 15 12:47:27 2007
@@ -5,6 +5,7 @@
     xmlns="http://www.w3.org/1999/xhtml"
     xmlns:kupu="http://kupu.oscom.org/namespaces/dist"
     xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+    xmlns:tal="http://xml.zope.org/namespaces/tal"
     i18n:domain="kupu"
     >
   <kupu:id>$Id$</kupu:id>
@@ -57,7 +58,8 @@
          <ul class="kupu-tabs">
             <li class="kupu-linkdrawer-addlink selected"><a href="#"
             i18n:translate="tab_link">Link to url</a></li>
-            <li class="kupu-linkdrawer-embed"><a href="#"
+            <li class="kupu-linkdrawer-embed"
+                tal:condition="filter/embed-tab|nothing"><a href="#"
             i18n:translate="tab_embed">Embed external object</a></li>
          </ul>
          <table class="kupu-tabbed">
@@ -289,9 +291,11 @@
          <ul class="kupu-tabs">
             <li class="kupu-ins-bm selected"><a href="#"
             i18n:translate="tab_link_anchor">Link to anchor</a></li>
-            <li class="kupu-anchor"><a href="#"
+            <li class="kupu-anchor"
+                tal:condition="filter/manage-anchors-tab"><a href="#"
             i18n:translate="tab_manage_anchors">Manage Anchors</a></li>
-            <li class="kupu-toc"><a href="#" i18n:translate="tab_toc">Table of contents</a></li>
+            <li class="kupu-toc"
+                tal:condition="filter/toc-tab|nothing"><a href="#" i18n:translate="tab_toc">Table of contents</a></li>
          </ul>
         <table class="kupu-tabbed">
           <tr>

Modified: kupu/trunk/kupu/doc/CHANGES.txt
==============================================================================
--- kupu/trunk/kupu/doc/CHANGES.txt	(original)
+++ kupu/trunk/kupu/doc/CHANGES.txt	Wed Aug 15 12:47:27 2007
@@ -2,6 +2,24 @@
 Kupu changes
 ============
 
+- 1.4.1
+
+  Limi asked for some last minute changes for Plone 3:
+
+  - Embed doesn't work out of the box in Plone 3, so shouldn't be shown
+    by default (it will only lead to a lot of user frustration).
+
+  - The anchor/table of contents generation is done differently in Plone
+    3, so should be off by default (turning on buttons is easy in Kupu
+    now).
+
+  - Insert image/link should default to current folder instead of
+    Recent, since the Upload button isn't visible if not (which is the
+    most common use case)
+
+  - Place the delete link/image button after the pulldown (so it doesn't
+    push around the toolbar elements)
+
 - 1.4
 
   - The icons in the toolbar for Plone now use CSS sprites. This means that

Modified: kupu/trunk/kupu/plone/helpers.py
==============================================================================
--- kupu/trunk/kupu/plone/helpers.py	(original)
+++ kupu/trunk/kupu/plone/helpers.py	Wed Aug 15 12:47:27 2007
@@ -35,7 +35,10 @@
     ('imagelibdrawer-button', 'Image drawer button', True, 'kupu-image'),
     ('linklibdrawer-button', 'Link drawer button', True, 'kupu-inthyperlink'),
     ('linkdrawer-button', 'External link drawer button', True, 'kupu-exthyperlink'),
+    ('embed-tab', 'Embed tab in External link drawer', False, None),
     ('anchors-button', 'Anchor drawer button', True, 'kupu-anchors'),
+    ('manage-anchors-tab', 'Manage Anchors tab in anchor drawer', True, None),
+    ('toc-tab', 'Table of Contents in anchor drawer', False, None),
     ('tabledrawer-button', 'Table drawer button', True, 'kupu-table'),
     ('bg-remove', 'Remove group', True, None),
     ('removeimage-button', 'Remove image button', True, 'kupu-removeimage'),

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 Aug 15 12:47:27 2007
@@ -22,7 +22,7 @@
     <!--$Id: head.kupu 44831 2007-07-07 19:01:27Z duncan $-->
     <!--$Id: xmlconfig.kupu 35367 2006-12-06 09:06:21Z duncan $-->
     <!--$Id: body.kupu 45298 2007-07-24 10:38:54Z duncan $-->
-    <!--$Id: toolbar.kupu 45493 2007-08-05 06:38:47Z limi $-->
+    <!--$Id: toolbar.kupu 45621 2007-08-13 12:26:50Z duncan $-->
     <!--$Id save.kupu (not yet in svn) $-->
     <!--$Id: drawers.kupu 44538 2007-06-26 10:46:28Z duncan $-->
     <!--$Id: beforeunload.kupu 14546 2005-07-12 14:35:55Z duncan $-->
@@ -176,11 +176,6 @@
       <button type="button" class="kupu-table" tal:condition="filter/tabledrawer-button" id="kupu-tabledrawer-button" title="Insert table" i18n:attributes="title title_insert_table;">&#160;</button>
     </span>
   
-    <span class="kupu-tb-buttongroup" id="kupu-bg-remove" tal:condition="filter/bg-remove">
-      <button type="button" class="kupu-removeimage invisible" tal:condition="filter/removeimage-button" id="kupu-removeimage-button" title="Remove image" i18n:attributes="title title_removeimage;">&#160;</button>
-      <button type="button" class="kupu-removelink invisible" tal:condition="filter/removelink-button" id="kupu-removelink-button" title="Remove link" i18n:attributes="title title_removelink;">&#160;</button>
-    </span>
-  
     <span class="kupu-tb-buttongroup" id="kupu-bg-undo" tal:condition="filter/bg-undo">
       <button type="button" class="kupu-undo" tal:condition="filter/undo-button" id="kupu-undo-button" title="Undo: Access key (Alt or Ctrl) + Z" i18n:attributes="title title_undo;" accesskey="z">&#160;</button>
       <button type="button" class="kupu-redo" tal:condition="filter/redo-button" id="kupu-redo-button" title="Redo: Access key (Alt or Ctrl) + Y" i18n:attributes="title title_redo;" accesskey="y">&#160;</button>
@@ -201,6 +196,11 @@
       </tal:block>
     </select>
   
+    <span class="kupu-tb-buttongroup" id="kupu-bg-remove" tal:condition="filter/bg-remove">
+      <button type="button" class="kupu-removeimage invisible" tal:condition="filter/removeimage-button" id="kupu-removeimage-button" title="Remove image" i18n:attributes="title title_removeimage;">&#160;</button>
+      <button type="button" class="kupu-removelink invisible" tal:condition="filter/removelink-button" id="kupu-removelink-button" title="Remove link" i18n:attributes="title title_removelink;">&#160;</button>
+    </span>
+  
     </span>
   
     <select id="kupu-ulstyles" class="kupu-ulstyles" tal:condition="filter/ulstyles">
@@ -229,7 +229,7 @@
       <div id="kupu-linkdrawer-addlink" class="kupu-panels kupu-linkdrawer-addlink">
          <ul class="kupu-tabs">
             <li class="kupu-linkdrawer-addlink selected"><a href="#" i18n:translate="tab_link">Link to url</a></li>
-            <li class="kupu-linkdrawer-embed"><a href="#" i18n:translate="tab_embed">Embed external object</a></li>
+            <li class="kupu-linkdrawer-embed" tal:condition="filter/embed-tab|nothing"><a href="#" i18n:translate="tab_embed">Embed external object</a></li>
          </ul>
          <table class="kupu-tabbed">
             <tbody class="kupu-addlink">
@@ -401,8 +401,8 @@
       <div class="kupu-panels kupu-ins-bm">
          <ul class="kupu-tabs">
             <li class="kupu-ins-bm selected"><a href="#" i18n:translate="tab_link_anchor">Link to anchor</a></li>
-            <li class="kupu-anchor"><a href="#" i18n:translate="tab_manage_anchors">Manage Anchors</a></li>
-            <li class="kupu-toc"><a href="#" i18n:translate="tab_toc">Table of contents</a></li>
+            <li class="kupu-anchor" tal:condition="filter/manage-anchors-tab"><a href="#" i18n:translate="tab_manage_anchors">Manage Anchors</a></li>
+            <li class="kupu-toc" tal:condition="filter/toc-tab|nothing"><a href="#" i18n:translate="tab_toc">Table of contents</a></li>
          </ul>
         <table class="kupu-tabbed">
           <tr>

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	Wed Aug 15 12:47:27 2007
@@ -107,7 +107,7 @@
          src="string:${portal_url}/kupurecentitems.xml",
          icon="string:${portal_url}/kupuimages/kupusearch_icon.gif")
     )
-DEFAULT_LIBRARY = 'myitems'
+DEFAULT_LIBRARY = 'current'
 
 INSTALL_BEFOREUNLOAD = False
 LINKBYUID = False

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	Wed Aug 15 12:47:27 2007
@@ -47,7 +47,7 @@
            icon="string:${portal_url}/kupuimages/kupusearch_icon.gif"
            title="string:Recent items">
   </library>
-  <defaultlibrary>myitems</defaultlibrary>
+  <defaultlibrary>current</defaultlibrary>
   <resource id="collection" mode="whitelist">
     <type>Plone Site</type>
     <type>Large Plone Folder</type>

Modified: kupu/trunk/kupu/plone/wire.kupu
==============================================================================
--- kupu/trunk/kupu/plone/wire.kupu	(original)
+++ kupu/trunk/kupu/plone/wire.kupu	Wed Aug 15 12:47:27 2007
@@ -56,11 +56,11 @@
     <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:insert-part feature="toolbar" part="buttongroup-remove" />
   </kupu:fill-slot>
 
 

Modified: kupu/trunk/kupu/version.txt
==============================================================================
--- kupu/trunk/kupu/version.txt	(original)
+++ kupu/trunk/kupu/version.txt	Wed Aug 15 12:47:27 2007
@@ -1 +1 @@
-kupu 1.4
+kupu 1.4.1

From kupu-checkins at codespeak.net  Wed Aug 15 15:35:21 2007
From: kupu-checkins at codespeak.net (kupu-checkins at codespeak.net)
Date: Wed, 15 Aug 2007 15:35:21 +0200 (CEST)
Subject: [kupu-checkins] NEW Products 2802912
Message-ID: <20070815083626.4047.qmail@ppp-143-254.utech.ru>

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

From limi at codespeak.net  Thu Aug 16 08:08:11 2007
From: limi at codespeak.net (limi at codespeak.net)
Date: Thu, 16 Aug 2007 08:08:11 +0200 (CEST)
Subject: [kupu-checkins] r45691 - kupu/trunk/kupu/plone/kupu_plone_layer
Message-ID: <20070816060811.1005E8102@code0.codespeak.net>

Author: limi
Date: Thu Aug 16 08:08:09 2007
New Revision: 45691

Modified:
   kupu/trunk/kupu/plone/kupu_plone_layer/kupuplone.css.dtml
Log:
Adding the "invisible" pseudo table class, as well as a visual representation of the page break for print.

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	Thu Aug 16 08:08:09 2007
@@ -45,19 +45,19 @@
 .pullQuote { float: right; width: 30%; }
 .kupu .pullQuote { float:none; width: auto; }
 */
-.kupu table { 
-  border-left:1px solid ThreeDLightShadow; 
-  border-top:1px solid ThreeDLightShadow; 
-  border-right:1px solid ThreeDDarkShadow; 
-  border-bottom:1px solid ThreeDDarkShadow; 
+.kupu table.invisible { 
+  border:1px solid ThreeDLightShadow; 
 } 
 
-.kupu table tr td { 
-  border-left:1px solid ThreeDDarkShadow; 
-  border-top:1px solid ThreeDDarkShadow; 
-  border-right:1px solid ThreeDLightShadow; 
-  border-bottom:1px solid ThreeDLightShadow; 
+.kupu table.invisible tr td { 
+  border:1px solid ThreeDDarkShadow; 
 } 
+
+.kupu div.pageBreak {
+    border-top: 1px dotted #ccc;
+}
+
+
 /* Hide the 'target' field in the LinkLibraryDrawer 
 
    I've used a class as an identifier here because somehow using id

From duncan at codespeak.net  Thu Aug 16 12:32:00 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Thu, 16 Aug 2007 12:32:00 +0200 (CEST)
Subject: [kupu-checkins] r45701 - in kupu/trunk/kupu: default doc plone
	plone/kupu_plone_layer plone/profiles/default
Message-ID: <20070816103200.D69D28155@code0.codespeak.net>

Author: duncan
Date: Thu Aug 16 12:31:59 2007
New Revision: 45701

Modified:
   kupu/trunk/kupu/default/drawers.kupu
   kupu/trunk/kupu/doc/CHANGES.txt
   kupu/trunk/kupu/doc/PLONE2.txt
   kupu/trunk/kupu/plone/kupu_config.pt
   kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
   kupu/trunk/kupu/plone/plonelibrarytool.py
   kupu/trunk/kupu/plone/profiles/default/kupu.xml
   kupu/trunk/kupu/plone/z3interfaces.py
Log:
Table 'create headings' now on by default.
Various references to 'Paragraph styles' changed to 'Styles'
Added new table styles and styles for page break, clear floats to GS profile (so they won't appear for older versions of Plone using quickinstaller).


Modified: kupu/trunk/kupu/default/drawers.kupu
==============================================================================
--- kupu/trunk/kupu/default/drawers.kupu	(original)
+++ kupu/trunk/kupu/default/drawers.kupu	Thu Aug 16 12:31:59 2007
@@ -169,7 +169,7 @@
                   <th class="kupu-toolbox-label"> </th>
                   <td>
                     <input class="kupu-tabledrawer-makeheader"
-                           type="checkbox"
+                           type="checkbox" checked="checked"
                            onkeypress="return HandleDrawerEnter(event);"
                            id="tabledrawer_makeheader"
                            />

Modified: kupu/trunk/kupu/doc/CHANGES.txt
==============================================================================
--- kupu/trunk/kupu/doc/CHANGES.txt	(original)
+++ kupu/trunk/kupu/doc/CHANGES.txt	Thu Aug 16 12:31:59 2007
@@ -20,6 +20,12 @@
   - Place the delete link/image button after the pulldown (so it doesn't
     push around the toolbar elements)
 
+  - Default table styles now include "grid listing" and "invisible".
+
+  - Paragraph styles now labelled just styles and include: highlight, page break, clear floats
+
+  - Create headings now on by default.
+
 - 1.4
 
   - The icons in the toolbar for Plone now use CSS sprites. This means that

Modified: kupu/trunk/kupu/doc/PLONE2.txt
==============================================================================
--- kupu/trunk/kupu/doc/PLONE2.txt	(original)
+++ kupu/trunk/kupu/doc/PLONE2.txt	Thu Aug 16 12:31:59 2007
@@ -225,8 +225,8 @@
 ``data``. Only ``listing`` is defined in the default Plone css, you
 should add suitable rules for the other styles to ``ploneCustom.css``.
 
-Paragraph Styles
-::::::::::::::::
+Styles
+::::::
 Enter a list of styles to be added to the style pulldown. See `Custom
 Styles`_.
 
@@ -519,7 +519,7 @@
    c) For Archetypes content types additional styles may be defined for
       individual fields.
 
-Styles defined under `Paragraph Styles`_ in the control panel are in the format ``title|tag``
+Styles defined under `Styles`_ in the control panel are in the format ``title|tag``
 or ``title|tag|class``. e.g.::
 
     Heading|h2
@@ -529,7 +529,7 @@
     Highlight|span|highlight
     Table Head|th
 
-Each rich text field can define its own set of paragraph styles to be
+Each rich text field can define its own set of styles to be
 made available in kupu. These are defined on the ``parastyles`` attribute
 of the ``RichWidget``. For example, a typical field definition might be::
 

Modified: kupu/trunk/kupu/plone/kupu_config.pt
==============================================================================
--- kupu/trunk/kupu/plone/kupu_config.pt	(original)
+++ kupu/trunk/kupu/plone/kupu_config.pt	Thu Aug 16 12:31:59 2007
@@ -233,8 +233,8 @@
                         </div>
 
                         <div class="field">
-                           <label for="parastyles" i18n:translate="label_paragraph_styles">Paragraph Styles</label>
-                           <div class="formHelp" i18n:translate="help_paragraph_styles">Enter a list of paragraph styles to appear in the style pulldown. Format is title|tag or title|tag|className, one per line.</div>
+                           <label for="parastyles" i18n:translate="label_paragraph_styles">Styles</label>
+                           <div class="formHelp" i18n:translate="help_paragraph_styles">Enter a list of styles to appear in the style pulldown. Format is title|tag or title|tag|className, one per line.</div>
                            <input type="hidden" name="parastyles:list:default" value=" " />
                            <textarea name="parastyles:lines" id="parastyles"
                                      rows="5" cols="30" style="width:90%"

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	Thu Aug 16 12:31:59 2007
@@ -14,11 +14,11 @@
     <!--$Id: contextmenu.kupu 9520 2005-02-26 16:30:23Z duncan $-->
     <!--$Id: toolbar.kupu 44538 2007-06-26 10:46:28Z duncan $-->
     <!--$Id: toolboxes.kupu 44538 2007-06-26 10:46:28Z duncan $-->
-    <!--$Id: colorchooser.kupu 44538 2007-06-26 10:46:28Z duncan $-->
+    <!--$Id: colorchooser.kupu 45650 2007-08-14 10:04:42Z guido $-->
     <!--$Id: save.kupu 44538 2007-06-26 10:46:28Z duncan $-->
-    <!--$Id: drawers.kupu 44538 2007-06-26 10:46:28Z duncan $-->
+    <!--$Id: drawers.kupu 45669 2007-08-15 10:47:27Z duncan $-->
     <!--$Id: include.kupu 39202 2007-02-19 12:06:45Z duncan $-->
-    <!--$Id: wire.kupu 25247 2006-04-03 11:23:02Z fschulze $-->
+    <!--$Id: wire.kupu 45669 2007-08-15 10:47:27Z duncan $-->
     <!--$Id: head.kupu 44831 2007-07-07 19:01:27Z duncan $-->
     <!--$Id: xmlconfig.kupu 35367 2006-12-06 09:06:21Z duncan $-->
     <!--$Id: body.kupu 45298 2007-07-24 10:38:54Z duncan $-->
@@ -323,7 +323,7 @@
                 <tr>
                   <th class="kupu-toolbox-label"> </th>
                   <td>
-                    <input class="kupu-tabledrawer-makeheader" type="checkbox" onkeypress="return HandleDrawerEnter(event);" id="tabledrawer_makeheader"/>
+                    <input class="kupu-tabledrawer-makeheader" type="checkbox" checked="checked" onkeypress="return HandleDrawerEnter(event);" id="tabledrawer_makeheader"/>
                     <label i18n:translate="tabledrawer_headings_label" for="tabledrawer_makeheader">
                       Create Headings
                     </label>

Modified: kupu/trunk/kupu/plone/plonelibrarytool.py
==============================================================================
--- kupu/trunk/kupu/plone/plonelibrarytool.py	(original)
+++ kupu/trunk/kupu/plone/plonelibrarytool.py	Thu Aug 16 12:31:59 2007
@@ -182,7 +182,7 @@
 
     security.declareProtected('View', "getStyleList")
     def getStyleList(self, field=None):
-        """Return the paragraph styles for a field."""
+        """Return the styles for a field."""
         gstyles = self.getParagraphStyles()
         if field:
             widget = field.widget

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	Thu Aug 16 12:31:59 2007
@@ -2,10 +2,11 @@
 <kupu-settings>
   <config captioning="False" userefbrowser="False"
           linkbyuid="False" filtersourceedit="True">
-    <table>plain</table>
-    <table>listing</table>
-    <table>vertical listing</table>
-    <table>listing nosort|unsorted listing</table>
+    <table>plain|Subdued grid</table>
+    <table>invisible|Invisible grid</table>
+    <table>listing|Fancy listing</table>
+    <table>grid listing|Fancy grid listing</table>
+    <table>vertical listing|Fancy vertical listing</table>
     <style>Heading|h2</style>
     <style>Subheading|h3</style>
     <style>Literal|pre</style>
@@ -16,6 +17,9 @@
     <style>Odd row|tr|odd</style>
     <style>Even row|tr|even</style>
     <style>Heading cell|th|</style>
+    <style>Highlight|span|visualHighlight</style>
+    <style>Page break (print only)|div|pageBreak</style>
+    <style>Clear floats|div|visualClear</style>
     <filter attributes=""
             tags="center tt big small basefont font"/>
     <filter attributes="lang valign halign border frame rules cellspacing cellpadding bgcolor"

Modified: kupu/trunk/kupu/plone/z3interfaces.py
==============================================================================
--- kupu/trunk/kupu/plone/z3interfaces.py	(original)
+++ kupu/trunk/kupu/plone/z3interfaces.py	Thu Aug 16 12:31:59 2007
@@ -26,7 +26,7 @@
         """Return a list of classnames supported by paragraphs"""
 
     def getStyleList(field=None):
-        """Return the paragraph styles for a field."""
+        """Return the styles for a field."""
 
     def filterToolbar(context, field=None):
         """Return a filter helper for toolbar elements.

From duncan at codespeak.net  Thu Aug 16 12:53:00 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Thu, 16 Aug 2007 12:53:00 +0200 (CEST)
Subject: [kupu-checkins] r45705 - kupu/trunk/kupu/plone/profiles/default
Message-ID: <20070816105300.03ABB815C@code0.codespeak.net>

Author: duncan
Date: Thu Aug 16 12:53:00 2007
New Revision: 45705

Modified:
   kupu/trunk/kupu/plone/profiles/default/kupu.xml
Log:
Remove duplicated highlight style

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	Thu Aug 16 12:53:00 2007
@@ -17,7 +17,6 @@
     <style>Odd row|tr|odd</style>
     <style>Even row|tr|even</style>
     <style>Heading cell|th|</style>
-    <style>Highlight|span|visualHighlight</style>
     <style>Page break (print only)|div|pageBreak</style>
     <style>Clear floats|div|visualClear</style>
     <filter attributes=""

From duncan at codespeak.net  Thu Aug 16 13:02:19 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Thu, 16 Aug 2007 13:02:19 +0200 (CEST)
Subject: [kupu-checkins] r45707 - in kupu/trunk/kupu/plone: .
	kupu_plone_layer
Message-ID: <20070816110219.5F649815A@code0.codespeak.net>

Author: duncan
Date: Thu Aug 16 13:02:17 2007
New Revision: 45707

Modified:
   kupu/trunk/kupu/plone/kupu_plone_layer/kupuplone.css.dtml
   kupu/trunk/kupu/plone/zmi_docs.pt
Log:
Documentation page: fixed toc styling, and broken internal jumps

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	Thu Aug 16 13:02:17 2007
@@ -327,5 +327,30 @@
 dl.captioned {
    padding: 10px;
 }
+
+/* Styling for documentation tab */
+.template-zmi_docs .contents {
+    float: right;
+    width: 30%;
+    font-size: 90%;
+    margin: 0 0 0.5em 0.5em; padding-top:0;
+    border: &dtml-borderWidth; &dtml-borderStyle; &dtml-globalBorderColor;;
+}
+.template-zmi_docs ul.auto-toc, .template-zmi_docs ul.simple {
+  list-style: none;
+}
+.template-zmi_docs .topic-title {
+    background-color: &dtml-globalBackgroundColor;;
+    margin-top: 0;
+    padding: 0em 1em;
+    text-transform: &dtml-textTransform;;
+    font-weight: normal;
+    line-height: 1.6em;
+    border-bottom: &dtml-borderWidth; &dtml-borderStyle; &dtml-globalBorderColor;;
+}
+.template-zmi_docs .topic-title a {
+    color: &dtml-fontColor;;
+    border-bottom: none;
+}
 /* </dtml-let></dtml-with> */
 

Modified: kupu/trunk/kupu/plone/zmi_docs.pt
==============================================================================
--- kupu/trunk/kupu/plone/zmi_docs.pt	(original)
+++ kupu/trunk/kupu/plone/zmi_docs.pt	Thu Aug 16 13:02:17 2007
@@ -2,13 +2,30 @@
     lang="en"
     metal:use-macro="here/kupu_config/macros/master"
     i18n:domain="kupuconfig">
+<style metal:fill-slot="style_slot">
+div.system-messages {
+  margin: 5em }
 
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+</style>
 <body>
 
     <div class="documentContent" metal:fill-slot="kupu_content"
  tal:define="convertTo nocall:here/portal_transforms/convertTo|nothing">
 <div tal:condition="nocall:convertTo"
-     tal:content="structure python:convertTo('text/html', here.docs(), mimetype='text/x-rst')"
+     tal:define="tpath template/absolute_url_path;
+        stream python:convertTo('text/html', here.docs(), mimetype='text/x-rst');
+        formatted python:str(stream).replace('href=\x22#','href=\x22'+tpath+'#');"
+     tal:content="structure formatted"
      tal:on-error="structure string:Documentation formatting failed: ${error/value}&lt;pre&gt;${here/docs}&lt;/pre;&gt;">
 </div>
 <pre tal:condition="not:nocall:convertTo"

From duncan at codespeak.net  Thu Aug 16 13:47:17 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Thu, 16 Aug 2007 13:47:17 +0200 (CEST)
Subject: [kupu-checkins] r45713 - kupu/tag/kupu-1.4.1
Message-ID: <20070816114717.450CC80F9@code0.codespeak.net>

Author: duncan
Date: Thu Aug 16 13:47:16 2007
New Revision: 45713

Added:
   kupu/tag/kupu-1.4.1/
      - copied from r45712, kupu/trunk/kupu/
Log:
Tag for a possible 1.4.1 release

From kupu-checkins at codespeak.net  Sun Aug 26 15:46:40 2007
From: kupu-checkins at codespeak.net (kupu-checkins at codespeak.net)
Date: Sun, 26 Aug 2007 15:46:40 +0200 (CEST)
Subject: [kupu-checkins] kupu-checkins@codespeak.net - Special Sale
Message-ID: <20070826044800.49773.qmail@adsl-152-216-103.asm.bellsouth.net>

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

From kupu-checkins at codespeak.net  Mon Aug 27 18:21:09 2007
From: kupu-checkins at codespeak.net (Randi Pearson)
Date: Mon, 27 Aug 2007 18:21:09 +0200
Subject: [kupu-checkins] new pharmacy shop
Message-ID: <509960353.22307620982535@codespeak.net>

new pharmacy shop
http://cinjokm.thangrass.com/?629722365479