[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kupu-checkins
Subject:    [kupu-checkins] r58239 - in kupu/trunk/kupu/mmbase: . drawers i18n
From:       mihxil () codespeak ! net
Date:       2008-09-19 15:55:38
Message-ID: 20080919155538.0495E169FA8 () codespeak ! net
[Download RAW message or body]

Author: mihxil
Date: Fri Sep 19 17:55:36 2008
New Revision: 58239

Added:
   kupu/trunk/kupu/mmbase/divstool.js   (contents, props changed)
      - copied, changed from r57810, kupu/trunk/kupu/mmbase/mmbasetools.js
   kupu/trunk/kupu/mmbase/drawers/flashobjects.items.jspx
   kupu/trunk/kupu/mmbase/flash.jspx
   kupu/trunk/kupu/mmbase/flashtool.js
   kupu/trunk/kupu/mmbase/icons/flash.png   (contents, props changed)
Removed:
   kupu/trunk/kupu/mmbase/mmbasetools.js
Modified:
   kupu/trunk/kupu/mmbase/   (props changed)
   kupu/trunk/kupu/mmbase/drawers/collection.jspx
   kupu/trunk/kupu/mmbase/drawers/drawer.xsl.jspx
   kupu/trunk/kupu/mmbase/drawers/images.items.jspx
   kupu/trunk/kupu/mmbase/head.kupu
   kupu/trunk/kupu/mmbase/i18n/de.po
   kupu/trunk/kupu/mmbase/i18n/en.po
   kupu/trunk/kupu/mmbase/i18n/eo.po
   kupu/trunk/kupu/mmbase/i18n/fr.po
   kupu/trunk/kupu/mmbase/i18n/it.po
   kupu/trunk/kupu/mmbase/i18n/nl.po
   kupu/trunk/kupu/mmbase/kupuinit.js
   kupu/trunk/kupu/mmbase/layout.js
   kupu/trunk/kupu/mmbase/node.body.jspx
   kupu/trunk/kupu/mmbase/toolboxes.kupu
   kupu/trunk/kupu/mmbase/wire.kupu
   kupu/trunk/kupu/mmbase/xmlconfig.kupu
Log:
support for flash

Copied: kupu/trunk/kupu/mmbase/divstool.js (from r57810, \
kupu/trunk/kupu/mmbase/mmbasetools.js) \
                ==============================================================================
                
--- kupu/trunk/kupu/mmbase/mmbasetools.js	(original)
+++ kupu/trunk/kupu/mmbase/divstool.js	Fri Sep 19 17:55:36 2008
@@ -2,7 +2,7 @@
 
 /**
  * This tool is to create 'blocks'
- * $Id: $
+ * $Id$
  */
 
 function DivsTool() {
@@ -146,5 +146,3 @@
 };
 
 
-
-

Modified: kupu/trunk/kupu/mmbase/drawers/collection.jspx
==============================================================================
--- kupu/trunk/kupu/mmbase/drawers/collection.jspx	(original)
+++ kupu/trunk/kupu/mmbase/drawers/collection.jspx	Fri Sep 19 17:55:36 2008
@@ -28,10 +28,10 @@
           <mm:maxnumber value="${max}" />
           <mm:offset    value="${page * max}" />
           <mm:haspage page="${nodetype}.items.jspx">
-            <mm:include referids="kupubasedir,max" page="${nodetype}.items.jspx" />
+            <mm:include debug="xml" referids="kupubasedir,max" \
page="${nodetype}.items.jspx" />  </mm:haspage>
           <mm:haspage page="${nodetype}.items.jspx" inverse="true">
-            <mm:include referids="kupubasedir,max" page="texts.items.jspx" />
+            <mm:include debug="xml" referids="kupubasedir,max" \
page="texts.items.jspx" />  </mm:haspage>
         </mm:listnodescontainer>
       </mm:context>

Modified: kupu/trunk/kupu/mmbase/drawers/drawer.xsl.jspx
==============================================================================
--- kupu/trunk/kupu/mmbase/drawers/drawer.xsl.jspx	(original)
+++ kupu/trunk/kupu/mmbase/drawers/drawer.xsl.jspx	Fri Sep 19 17:55:36 2008
@@ -21,89 +21,110 @@
   xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0"
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
   >
-  <mm:link absolute="true" page="../../common/kupudrawers/drawer.xsl">
-    <!-- Must be absolute, or otherwise IE chokes -->
-    <xsl:import href="${_}" />
-  </mm:link>
-
-
-  <!--
-       Overridden to use the 'showupload' parameter always, if an 'uploadbutton' tab \
                is present
-  -->
-  <xsl:template match="*" mode="panel">
-    <xsl:choose>
-      <xsl:when test="$drawertype='image'">
-        <xsl:if test="//resource[@selected]">
+  <mm:content type="application/xml"
+              expires="0">
+    <mm:link absolute="true" page="../../common/kupudrawers/drawer.xsl">
+      <!-- Must be absolute, or otherwise IE chokes -->
+      <xsl:import href="${_}" />
+    </mm:link>
+
+
+    <!--
+        Overridden to use the 'showupload' parameter always, if an 'uploadbutton' \
tab is present +    -->
+    <xsl:template match="*" mode="panel">
+      <xsl:choose>
+        <xsl:when test="$drawertype='image'">
+          <xsl:if test="//resource[@selected]">
+            <xsl:apply-templates
+                select="/libraries/*[@selected]//resource[@selected]"
+                mode="image-properties"/>
+          </xsl:if>
+        </xsl:when>
+        <xsl:when test="$drawertype='link'">
           <xsl:apply-templates
               select="/libraries/*[@selected]//resource[@selected]"
-              mode="image-properties"/>
-        </xsl:if>
-      </xsl:when>
-      <xsl:when test="$drawertype='link'">
-        <xsl:apply-templates
-            select="/libraries/*[@selected]//resource[@selected]"
-            mode="link-properties"/>
-      </xsl:when>
-      <xsl:otherwise>
+              mode="link-properties"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:apply-templates
+              select="//resource[@selected]"
+              mode="properties"/>
+        </xsl:otherwise>
+      </xsl:choose>
+      <xsl:if test="$showupload='yes'">
         <xsl:apply-templates
-            select="//resource[@selected]"
-            mode="properties"/>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:if test="$showupload='yes'">
-      <xsl:apply-templates
-          select="/libraries/*[@selected]/uploadbutton"
-          mode="upload"/>
-    </xsl:if>
-  </xsl:template>
-
-  <!--
-      Just overridden to rename it, because we use upload also for attachments, not \
                only for images
-      (Called in 'panel' mode)
-  -->
-  <xsl:template match="uploadbutton" mode="upload">
-    <xsl:apply-templates select="." mode="image-upload" />
-  </xsl:template>
-
-
-  <!--
-      Overridden to remove 'target', we're not interested in that.
-  -->
-  <xsl:template match="resource|collection" mode="link-properties">
-    <xsl:apply-templates select="." mode="base-properties"/>
-  </xsl:template>
-
-  <!--
-       We know height and width beforehand, so we don't use the 'kupuFixImage' \
                function.
-       That works faster and more reliable.
-       They are added as attributes on all tags (icon, preview and uri).
-  -->
-  <xsl:template match="icon">
-    <img src="{.}" alt="{../title}">
-      <xsl:if test="@height">
-        <xsl:attribute name="height"><xsl:value-of select="@height" \
                /></xsl:attribute>
-      </xsl:if>
-      <xsl:if test="@width">
-        <xsl:attribute name="width"><xsl:value-of select="@width" /></xsl:attribute>
+            select="/libraries/*[@selected]/uploadbutton"
+            mode="upload"/>
       </xsl:if>
-    </img>
-  </xsl:template>
+    </xsl:template>
+
+
+    <!--
+        Just overridden to rename it, because we use upload also for attachments, \
not only for images +        (Called in 'panel' mode)
+    -->
+    <xsl:template match="uploadbutton" mode="upload">
+      <xsl:apply-templates select="." mode="image-upload" />
+    </xsl:template>
+
+
+
+    <xsl:template match="label|title">
+      <span class="drawer-item-title">
+        <xsl:copy-of select="./*|text()" />
+      </span>
+    </xsl:template>
+
+    <!--
+        Overridden to remove 'target', we're not interested in that.
+    -->
+    <xsl:template match="resource|collection" mode="link-properties">
+      <xsl:apply-templates select="." mode="base-properties"/>
+    </xsl:template>
+
+    <!--
+        We know height and width beforehand, so we don't use the 'kupuFixImage' \
function. +        That works faster and more reliable.
+        They are added as attributes on all tags (icon, preview and uri).
+    -->
+    <xsl:template match="icon">
+      <img src="{.}" alt="{../title}">
+        <xsl:if test="@height">
+          <xsl:attribute name="height"><xsl:value-of select="@height" \
/></xsl:attribute> +        </xsl:if>
+        <xsl:if test="@width">
+          <xsl:attribute name="width"><xsl:value-of select="@width" \
/></xsl:attribute> +        </xsl:if>
+      </img>
+    </xsl:template>
 
-  <xsl:template match="resource|collection" mode="image-view">
-    <xsl:choose>
-      <xsl:when test="preview">
-        <img src="{preview}" title="{title}"  width="{preview/@width}" \
                height="{preview/@height}"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <img width="{uri/@width}" height="{uri/@height}" src="{uri}" \
                title="{title}"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template name="mystyle">
-    <link type="text/css" rel="stylesheet" media="all">
-      <xsl:attribute name="href">mydrawerstyle.css</xsl:attribute>
-    </link>
-  </xsl:template>
 
+    <xsl:template match="resource|collection" mode="image-view">
+      <xsl:choose>
+        <xsl:when test="media = 'flash'">
+          <xsl:variable name="p" select="preview"></xsl:variable>
+          <object src="{$p}" data="{$p}" type="application/x-shockwave-flash"
+                  width="100" height="100">
+            <param name="movie" value="{$p}" />
+          </object>
+        </xsl:when>
+        <xsl:when test="preview">
+          <img src="{preview}" title="{title}"  width="{preview/@width}" \
height="{preview/@height}"/> +        </xsl:when>
+        <xsl:otherwise>
+          <img width="{uri/@width}" height="{uri/@height}" src="{uri}" \
title="{title}"/> +        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:template>
+
+    <xsl:template name="mystyle">
+      <!--
+
+          <link type="text/css" rel="stylesheet" media="all">
+          <xsl:attribute name="href">mydrawerstyle.css</xsl:attribute>
+          </link>
+      -->
+    </xsl:template>
+  </mm:content>
 </xsl:stylesheet>

Added: kupu/trunk/kupu/mmbase/drawers/flashobjects.items.jspx
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/mmbase/drawers/flashobjects.items.jspx	Fri Sep 19 17:55:36 2008
@@ -0,0 +1,42 @@
+<!--
+    Produces: 'items' for images
+    Needs: a request context 'drawer', containing a listcontainer 'query'.
+-->
+<mm:context
+    xmlns:jsp="http://java.sun.com/JSP/Page"
+    xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0"
+    id="drawer" scope="request">
+  <jsp:output omit-xml-declaration="yes" />
+  <mm:import externid="surpressupload" />
+  <mm:content type="text/xml">
+    <mm:notpresent referid="query">
+      <mm:cloud method="asis">
+        <mm:listnodescontainer id="query" type="flashobjects" />
+      </mm:cloud>
+    </mm:notpresent>
+    <mm:import externid="max">100</mm:import>
+    <mm:listnodescontainer referid="query">
+      <mm:sortorder field="number" direction="down" />
+      <media>flash</media>
+      <items>
+        <mm:context>
+          <mm:notpresent referid="surpressupload">
+            <uploadbutton>yes</uploadbutton>
+          </mm:notpresent>
+          <mm:listnodes id="o">
+            <resource id="${o.number}">
+              <media>flash</media>
+              <uri><mm:url page="/mmbase/kupu/mmbase/icons/flash.png" \
referids="_node@o" /></uri> +              <title><mm:field name="title" /> \
<mm:nodeinfo type="gui" /></title> +              <size><mm:field name="filesize" \
/>b</size> +              <height>100</height>
+              <width>100</width>
+              <icon><mm:nodeinfo type="gui" /></icon>
+              <preview><mm:function name="url" /></preview>
+            </resource>
+          </mm:listnodes>
+        </mm:context>
+      </items>
+    </mm:listnodescontainer>
+  </mm:content>
+</mm:context>

Modified: kupu/trunk/kupu/mmbase/drawers/images.items.jspx
==============================================================================
--- kupu/trunk/kupu/mmbase/drawers/images.items.jspx	(original)
+++ kupu/trunk/kupu/mmbase/drawers/images.items.jspx	Fri Sep 19 17:55:36 2008
@@ -3,8 +3,8 @@
     Needs: a request context 'drawer', containing a listcontainer 'query'.
 -->
 <mm:context
-    xmlns:jsp="http://java.sun.com/JSP/Page" 
-    xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0" 
+    xmlns:jsp="http://java.sun.com/JSP/Page"
+    xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0"
     id="drawer" scope="request">
   <jsp:output omit-xml-declaration="yes" />
   <mm:import externid="surpressupload" />
@@ -23,7 +23,7 @@
             <uploadbutton>yes</uploadbutton>
           </mm:notpresent>
           <mm:listnodes id="image">
-            <resource id="${image.number}">          
+            <resource id="${image.number}">
               <mm:image template="s(100x100&gt;)">
                 <uri height="${dimension.height}" \
width="${dimension.width}">${mm:escape('text/xml', _)}</uri>  </mm:image>

Added: kupu/trunk/kupu/mmbase/flash.jspx
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/mmbase/flash.jspx	Fri Sep 19 17:55:36 2008
@@ -0,0 +1,22 @@
+<mm:content
+    type="text/html"
+    xmlns="http://www.w3.org/1999/xhtml"
+    language="client" expires="0" postprocessor="none" jspvar="locale"
+    xmlns:c="http://java.sun.com/jsp/jstl/core"
+    xmlns:fn="http://java.sun.com/jsp/jstl/functions"
+    xmlns:jsp="http://java.sun.com/JSP/Page"
+    xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0">
+  <mm:import externid="o" required="true" />
+  <mm:cloud>
+    <mm:node referid="o">
+      <mm:function name="url">
+        <object
+            height="100" width="100"
+            type="application/x-shockwave-flash"
+            data="${_}">
+          <param name="movie" value="${_}"/>
+        </object>
+      </mm:function>
+    </mm:node>
+  </mm:cloud>
+</mm:content>

Added: kupu/trunk/kupu/mmbase/flashtool.js
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/mmbase/flashtool.js	Fri Sep 19 17:55:36 2008
@@ -0,0 +1,81 @@
+
+/**
+ * This tool is to create 'flash'
+ * $Id: $
+ */
+
+function FlashTool() {
+    /* tool to add 'divs' */
+
+}
+FlashTool.prototype = new KupuTool;
+
+FlashTool.prototype.initialize = function(editor) {
+    /* attach the event handlers */
+    this.editor = editor;
+    this.editor.logMessage(_("Flash tool initialized"));
+};
+
+
+
+function FlashToolBox(insertbuttonid, classselectid, toolboxid, plainclass, \
activeclass) { +    this.insertbutton = getFromSelector(insertbuttonid);
+    this.classselect  = getFromSelector(classselectid);
+    this.toolboxel    = getFromSelector(toolboxid);
+    this.plainclass   = plainclass;
+    this.activeclass  = activeclass;
+}
+
+FlashToolBox.srcRe = new \
RegExp('.*/mmbase/kupu/mmbase/icons/flash\\.png\\?o=([0-9]+)', 'i'); +
+
+
+FlashToolBox.prototype.initialize = function(tool, editor) {
+    this.tool = tool;
+    this.editor = editor;
+    addEventHandler(this.classselect, "change", this.setDivClass, this);
+    addEventHandler(this.insertbutton, "click", this.addDiv, this);
+};
+
+FlashToolBox.prototype.updateState = function(selNode, event) {
+    /* update the state of the toolbox element */
+    var flashel = this.editor.getNearestParentOfType(selNode, 'img');
+    var result = flashel && FlashToolBox.srcRe.exec(flashel.src);
+    if (result) {
+        this.toolboxel.className = this.activeclass;
+        $(this.toolboxel).find(".flashobject").load("flash.jspx?o=" + result[1]);
+
+    } else {
+        this.toolboxel.className = this.plainclass;
+        $(this.toolboxel).find(".flashobject").empty();
+
+    };
+};
+
+
+FlashToolBox.prototype.setDivClass = function() {
+    var sel_class = this.classselect.options[this.classselect.selectedIndex].value;
+    this.tool.setDivClass(sel_class);
+    this.editor.focusDocument();
+};
+
+
+
+ImageToolBox.prototype.originalUpdateState = ImageToolBox.prototype.updateState;
+
+ImageToolBox.prototype.updateState = function(selNode, event) {
+    /* update the state of the toolbox element */
+    var imageel = this.editor.getNearestParentOfType(selNode, 'img');
+    if (imageel && ! FlashToolBox.srcRe.test(imageel.src)) {
+        return this.originalUpdateState(selNode, event);
+    }  else {
+        this.toolboxel.className = this.plainclass;
+    };
+};
+
+ImageTool.prototype.create_flash = function(url, alttext, className, width, height) \
{ +    var img = this.createImage(url, alttext, className);
+    img.height = height;
+    img.width = width;
+    return img;
+};

Modified: kupu/trunk/kupu/mmbase/head.kupu
==============================================================================
--- kupu/trunk/kupu/mmbase/head.kupu	(original)
+++ kupu/trunk/kupu/mmbase/head.kupu	Fri Sep 19 17:55:36 2008
@@ -43,7 +43,8 @@
     <script type="text/javascript" src="cross-browser.js"><jsp:text> \
                </jsp:text></script>
     <script type="text/javascript" src="layout.js"><jsp:text> </jsp:text></script>
     <jsp:directive.include file="/mmbase/validation/javascript.jspxf" />
-    <script type="text/javascript" src="mmbasetools.js"><jsp:text> \
</jsp:text></script> +    <script type="text/javascript" src="divstool.js"><jsp:text> \
</jsp:text></script> +    <script type="text/javascript" \
                src="flashtool.js"><jsp:text> </jsp:text></script>
     <script type="text/javascript" src="mmbase.js"><jsp:text> </jsp:text></script>
   </kupu:part>
 

Modified: kupu/trunk/kupu/mmbase/i18n/de.po
==============================================================================
--- kupu/trunk/kupu/mmbase/i18n/de.po	(original)
+++ kupu/trunk/kupu/mmbase/i18n/de.po	Fri Sep 19 17:55:36 2008
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: mmbase 18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-06 14:05+0100\n"
+"POT-Creation-Date: 2008-09-19 17:41+0200\n"
 "PO-Revision-Date: 2005-06-09 00:42+0200\n"
 "Last-Translator: Michiel Meeuwissen <EMAIL@ADDRESS>\n"
 "Language-Team: German <de@li.org>\n"
@@ -16,51 +16,51 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: mmbase.js:141 mmbase.js:158 mmbase.js:159
+#: mmbase.js:141 mmbase.js:158 mmbase.js:159 mmbase.js:167
 msgid "Saving body (kupu)"
 msgstr ""
 
-#: mmbase.js:144 mmbase.js:161 mmbase.js:162
+#: mmbase.js:144 mmbase.js:161 mmbase.js:162 mmbase.js:170
 msgid "Saving fields (form)"
 msgstr ""
 
-#: mmbase.js:173 mmbase.js:191 mmbase.js:192
+#: mmbase.js:173 mmbase.js:191 mmbase.js:192 mmbase.js:201
 msgid "saved"
 msgstr ""
 
-#: mmbase.js:202 mmbase.js:242 mmbase.js:243
+#: mmbase.js:202 mmbase.js:242 mmbase.js:243 mmbase.js:262
 msgid "RELOAD"
 msgstr ""
 
-#: mmbase.js:223 mmbase.js:264
+#: mmbase.js:223 mmbase.js:264 mmbase.js:283
 msgid "Getting node fields for "
 msgstr ""
 
-#: mmbase.js:231 mmbase.js:275
+#: mmbase.js:231 mmbase.js:275 mmbase.js:294
 msgid "Loading node fields for "
 msgstr ""
 
-#: mmbase.js:243 mmbase.js:289
+#: mmbase.js:243 mmbase.js:289 mmbase.js:309
 msgid "Getting node body "
 msgstr ""
 
-#: mmbase.js:250 mmbase.js:300 mmbase.js:299
+#: mmbase.js:250 mmbase.js:300 mmbase.js:299 mmbase.js:319
 msgid "Loading node body "
 msgstr ""
 
-#: mmbasetools.js:13 mmbasetools.js:14
+#: mmbasetools.js:13 mmbasetools.js:14 divstool.js:17
 msgid "Div tool initialized"
 msgstr ""
 
-#: mmbasetools.js:39 mmbasetools.js:40 mmbasetools.js:48
+#: mmbasetools.js:39 mmbasetools.js:40 mmbasetools.js:48 divstool.js:50
 msgid "Found paragraph"
 msgstr ""
 
-#: mmbasetools.js:43 mmbasetools.js:44 mmbasetools.js:52
+#: mmbasetools.js:43 mmbasetools.js:44 mmbasetools.js:52 divstool.js:54
 msgid "Didn't find paragraph"
 msgstr ""
 
-#: mmbasetools.js:48 mmbasetools.js:50 mmbasetools.js:57
+#: mmbasetools.js:48 mmbasetools.js:50 mmbasetools.js:57 divstool.js:59
 msgid "Div inserted"
 msgstr ""
 
@@ -73,6 +73,7 @@
 msgstr ""
 
 #: phony.js:3 phony.js:5 phony.js:2 phony.js:1 phony.js:116 phony.js:118
+#: phony.js:4
 msgid "Richtext editor"
 msgstr ""
 
@@ -84,23 +85,23 @@
 msgid "default"
 msgstr ""
 
-#: phony.js:7 phony.js:4 phony.js:6 phony.js:110 phony.js:123
+#: phony.js:7 phony.js:4 phony.js:6 phony.js:110 phony.js:123 phony.js:8
 msgid "Block"
 msgstr ""
 
-#: phony.js:8 phony.js:5 phony.js:7 phony.js:111 phony.js:124
+#: phony.js:8 phony.js:5 phony.js:7 phony.js:111 phony.js:124 phony.js:9
 msgid "Block class"
 msgstr ""
 
-#: phony.js:9 phony.js:6 phony.js:8 phony.js:112 phony.js:125
+#: phony.js:9 phony.js:6 phony.js:8 phony.js:112 phony.js:125 phony.js:10
 msgid "Note left"
 msgstr ""
 
-#: phony.js:10 phony.js:7 phony.js:9 phony.js:113 phony.js:126
+#: phony.js:10 phony.js:7 phony.js:9 phony.js:113 phony.js:126 phony.js:11
 msgid "Note right"
 msgstr ""
 
-#: phony.js:11 phony.js:8 phony.js:10 phony.js:114 phony.js:127
+#: phony.js:11 phony.js:8 phony.js:10 phony.js:114 phony.js:127 phony.js:12
 msgid "Insert block"
 msgstr ""
 
@@ -112,19 +113,19 @@
 msgid "emphasis: alt-i"
 msgstr ""
 
-#: mmbase.js:197 mmbase.js:198
+#: mmbase.js:197 mmbase.js:198 mmbase.js:216
 msgid "Not saved"
 msgstr ""
 
-#: mmbase.js:215 mmbase.js:216
+#: mmbase.js:215 mmbase.js:216 mmbase.js:235
 msgid "Reinited "
 msgstr ""
 
-#: phony.js:4 phony.js:88 phony.js:120
+#: phony.js:4 phony.js:88 phony.js:120 phony.js:5
 msgid "Left (Big)"
 msgstr ""
 
-#: phony.js:5 phony.js:89 phony.js:121
+#: phony.js:5 phony.js:89 phony.js:121 phony.js:6
 msgid "Right (Big)"
 msgstr ""
 
@@ -504,7 +505,7 @@
 msgid "Right"
 msgstr ""
 
-#: phony.js:90 phony.js:122
+#: phony.js:90 phony.js:122 phony.js:7
 msgid "Big"
 msgstr ""
 
@@ -579,3 +580,27 @@
 #: phony.js:115
 msgid "Debug Log"
 msgstr ""
+
+#: flashtool.js:16
+msgid "Flash tool initialized"
+msgstr ""
+
+#: phony.js:13
+msgid "Flash"
+msgstr ""
+
+#: phony.js:14
+msgid "Flash class"
+msgstr ""
+
+#: phony.js:15
+msgid "Flash inline"
+msgstr ""
+
+#: phony.js:16
+msgid "Flash left"
+msgstr ""
+
+#: phony.js:17
+msgid "Flash right"
+msgstr ""

Modified: kupu/trunk/kupu/mmbase/i18n/en.po
==============================================================================
--- kupu/trunk/kupu/mmbase/i18n/en.po	(original)
+++ kupu/trunk/kupu/mmbase/i18n/en.po	Fri Sep 19 17:55:36 2008
@@ -8,59 +8,59 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-06 14:05+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"POT-Creation-Date: 2008-09-19 17:41+0200\n"
+"PO-Revision-Date: 2008-09-19 17:49+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: mmbase.js:141 mmbase.js:158 mmbase.js:159
+#: mmbase.js:141 mmbase.js:158 mmbase.js:159 mmbase.js:167
 msgid "Saving body (kupu)"
 msgstr "Saving body (kupu)"
 
-#: mmbase.js:144 mmbase.js:161 mmbase.js:162
+#: mmbase.js:144 mmbase.js:161 mmbase.js:162 mmbase.js:170
 msgid "Saving fields (form)"
 msgstr "Saving fields (form)"
 
-#: mmbase.js:173 mmbase.js:191 mmbase.js:192
+#: mmbase.js:173 mmbase.js:191 mmbase.js:192 mmbase.js:201
 msgid "saved"
 msgstr "saved"
 
-#: mmbase.js:202 mmbase.js:242 mmbase.js:243
+#: mmbase.js:202 mmbase.js:242 mmbase.js:243 mmbase.js:262
 msgid "RELOAD"
 msgstr "RELOAD"
 
-#: mmbase.js:223 mmbase.js:264
+#: mmbase.js:223 mmbase.js:264 mmbase.js:283
 msgid "Getting node fields for "
 msgstr "Getting node fields for "
 
-#: mmbase.js:231 mmbase.js:275
+#: mmbase.js:231 mmbase.js:275 mmbase.js:294
 msgid "Loading node fields for "
 msgstr "Loading node fields for "
 
-#: mmbase.js:243 mmbase.js:289
+#: mmbase.js:243 mmbase.js:289 mmbase.js:309
 msgid "Getting node body "
 msgstr "Getting node body "
 
-#: mmbase.js:250 mmbase.js:300 mmbase.js:299
+#: mmbase.js:250 mmbase.js:300 mmbase.js:299 mmbase.js:319
 msgid "Loading node body "
 msgstr "Loading node body "
 
-#: mmbasetools.js:13 mmbasetools.js:14
+#: mmbasetools.js:13 mmbasetools.js:14 divstool.js:17
 msgid "Div tool initialized"
 msgstr "Div tool initialized"
 
-#: mmbasetools.js:39 mmbasetools.js:40 mmbasetools.js:48
+#: mmbasetools.js:39 mmbasetools.js:40 mmbasetools.js:48 divstool.js:50
 msgid "Found paragraph"
 msgstr "Found paragraph"
 
-#: mmbasetools.js:43 mmbasetools.js:44 mmbasetools.js:52
+#: mmbasetools.js:43 mmbasetools.js:44 mmbasetools.js:52 divstool.js:54
 msgid "Didn't find paragraph"
 msgstr "Didn't find paragraph"
 
-#: mmbasetools.js:48 mmbasetools.js:50 mmbasetools.js:57
+#: mmbasetools.js:48 mmbasetools.js:50 mmbasetools.js:57 divstool.js:59
 msgid "Div inserted"
 msgstr "Div inserted"
 
@@ -73,6 +73,7 @@
 msgstr "Normal"
 
 #: phony.js:3 phony.js:5 phony.js:2 phony.js:1 phony.js:116 phony.js:118
+#: phony.js:4
 msgid "Richtext editor"
 msgstr "Richtext editor"
 
@@ -84,23 +85,23 @@
 msgid "default"
 msgstr "default"
 
-#: phony.js:7 phony.js:4 phony.js:6 phony.js:110 phony.js:123
+#: phony.js:7 phony.js:4 phony.js:6 phony.js:110 phony.js:123 phony.js:8
 msgid "Block"
 msgstr "Block"
 
-#: phony.js:8 phony.js:5 phony.js:7 phony.js:111 phony.js:124
+#: phony.js:8 phony.js:5 phony.js:7 phony.js:111 phony.js:124 phony.js:9
 msgid "Block class"
 msgstr "Block class"
 
-#: phony.js:9 phony.js:6 phony.js:8 phony.js:112 phony.js:125
+#: phony.js:9 phony.js:6 phony.js:8 phony.js:112 phony.js:125 phony.js:10
 msgid "Note left"
 msgstr "Note left"
 
-#: phony.js:10 phony.js:7 phony.js:9 phony.js:113 phony.js:126
+#: phony.js:10 phony.js:7 phony.js:9 phony.js:113 phony.js:126 phony.js:11
 msgid "Note right"
 msgstr "Note right"
 
-#: phony.js:11 phony.js:8 phony.js:10 phony.js:114 phony.js:127
+#: phony.js:11 phony.js:8 phony.js:10 phony.js:114 phony.js:127 phony.js:12
 msgid "Insert block"
 msgstr "Insert block"
 
@@ -112,19 +113,19 @@
 msgid "emphasis: alt-i"
 msgstr "emphasis: alt-i"
 
-#: mmbase.js:197 mmbase.js:198
+#: mmbase.js:197 mmbase.js:198 mmbase.js:216
 msgid "Not saved"
 msgstr ""
 
-#: mmbase.js:215 mmbase.js:216
+#: mmbase.js:215 mmbase.js:216 mmbase.js:235
 msgid "Reinited "
 msgstr ""
 
-#: phony.js:4 phony.js:88 phony.js:120
+#: phony.js:4 phony.js:88 phony.js:120 phony.js:5
 msgid "Left (Big)"
 msgstr ""
 
-#: phony.js:5 phony.js:89 phony.js:121
+#: phony.js:5 phony.js:89 phony.js:121 phony.js:6
 msgid "Right (Big)"
 msgstr ""
 
@@ -504,7 +505,7 @@
 msgid "Right"
 msgstr ""
 
-#: phony.js:90 phony.js:122
+#: phony.js:90 phony.js:122 phony.js:7
 msgid "Big"
 msgstr ""
 
@@ -579,3 +580,27 @@
 #: phony.js:115
 msgid "Debug Log"
 msgstr ""
+
+#: flashtool.js:16
+msgid "Flash tool initialized"
+msgstr ""
+
+#: phony.js:13
+msgid "Flash"
+msgstr "Flash"
+
+#: phony.js:14
+msgid "Flash class"
+msgstr "Flash-soort"
+
+#: phony.js:15
+msgid "Flash inline"
+msgstr "Inline"
+
+#: phony.js:16
+msgid "Flash left"
+msgstr "Left"
+
+#: phony.js:17
+msgid "Flash right"
+msgstr "Right"

Modified: kupu/trunk/kupu/mmbase/i18n/eo.po
==============================================================================
--- kupu/trunk/kupu/mmbase/i18n/eo.po	(original)
+++ kupu/trunk/kupu/mmbase/i18n/eo.po	Fri Sep 19 17:55:36 2008
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: mmbase 18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-06 14:05+0100\n"
-"PO-Revision-Date: 2007-02-06 14:06+0100\n"
+"POT-Creation-Date: 2008-09-19 17:41+0200\n"
+"PO-Revision-Date: 2008-09-19 17:50+0200\n"
 "Last-Translator: Michiel Meeuwissen <mihxil@xs4all.nl>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -16,51 +16,51 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: mmbase.js:141 mmbase.js:158 mmbase.js:159
+#: mmbase.js:141 mmbase.js:158 mmbase.js:159 mmbase.js:167
 msgid "Saving body (kupu)"
 msgstr "Savante tekston (kupan)"
 
-#: mmbase.js:144 mmbase.js:161 mmbase.js:162
+#: mmbase.js:144 mmbase.js:161 mmbase.js:162 mmbase.js:170
 msgid "Saving fields (form)"
 msgstr "Savante kampojn (formularajn)"
 
-#: mmbase.js:173 mmbase.js:191 mmbase.js:192
+#: mmbase.js:173 mmbase.js:191 mmbase.js:192 mmbase.js:201
 msgid "saved"
 msgstr "Savita"
 
-#: mmbase.js:202 mmbase.js:242 mmbase.js:243
+#: mmbase.js:202 mmbase.js:242 mmbase.js:243 mmbase.js:262
 msgid "RELOAD"
 msgstr "RETIRAS"
 
-#: mmbase.js:223 mmbase.js:264
+#: mmbase.js:223 mmbase.js:264 mmbase.js:283
 msgid "Getting node fields for "
 msgstr "Tirante kampojn"
 
-#: mmbase.js:231 mmbase.js:275
+#: mmbase.js:231 mmbase.js:275 mmbase.js:294
 msgid "Loading node fields for "
 msgstr "Enŝutante kampojn por "
 
-#: mmbase.js:243 mmbase.js:289
+#: mmbase.js:243 mmbase.js:289 mmbase.js:309
 msgid "Getting node body "
 msgstr "Tirante nodan korpon "
 
-#: mmbase.js:250 mmbase.js:300 mmbase.js:299
+#: mmbase.js:250 mmbase.js:300 mmbase.js:299 mmbase.js:319
 msgid "Loading node body "
 msgstr "Enŝutante objekton"
 
-#: mmbasetools.js:13 mmbasetools.js:14
+#: mmbasetools.js:13 mmbasetools.js:14 divstool.js:17
 msgid "Div tool initialized"
 msgstr ""
 
-#: mmbasetools.js:39 mmbasetools.js:40 mmbasetools.js:48
+#: mmbasetools.js:39 mmbasetools.js:40 mmbasetools.js:48 divstool.js:50
 msgid "Found paragraph"
 msgstr ""
 
-#: mmbasetools.js:43 mmbasetools.js:44 mmbasetools.js:52
+#: mmbasetools.js:43 mmbasetools.js:44 mmbasetools.js:52 divstool.js:54
 msgid "Didn't find paragraph"
 msgstr ""
 
-#: mmbasetools.js:48 mmbasetools.js:50 mmbasetools.js:57
+#: mmbasetools.js:48 mmbasetools.js:50 mmbasetools.js:57 divstool.js:59
 msgid "Div inserted"
 msgstr ""
 
@@ -73,6 +73,7 @@
 msgstr ""
 
 #: phony.js:3 phony.js:5 phony.js:2 phony.js:1 phony.js:116 phony.js:118
+#: phony.js:4
 msgid "Richtext editor"
 msgstr "Riĉa redaktilo"
 
@@ -84,23 +85,23 @@
 msgid "default"
 msgstr "defaŭlto"
 
-#: phony.js:7 phony.js:4 phony.js:6 phony.js:110 phony.js:123
+#: phony.js:7 phony.js:4 phony.js:6 phony.js:110 phony.js:123 phony.js:8
 msgid "Block"
 msgstr ""
 
-#: phony.js:8 phony.js:5 phony.js:7 phony.js:111 phony.js:124
+#: phony.js:8 phony.js:5 phony.js:7 phony.js:111 phony.js:124 phony.js:9
 msgid "Block class"
 msgstr ""
 
-#: phony.js:9 phony.js:6 phony.js:8 phony.js:112 phony.js:125
+#: phony.js:9 phony.js:6 phony.js:8 phony.js:112 phony.js:125 phony.js:10
 msgid "Note left"
 msgstr ""
 
-#: phony.js:10 phony.js:7 phony.js:9 phony.js:113 phony.js:126
+#: phony.js:10 phony.js:7 phony.js:9 phony.js:113 phony.js:126 phony.js:11
 msgid "Note right"
 msgstr ""
 
-#: phony.js:11 phony.js:8 phony.js:10 phony.js:114 phony.js:127
+#: phony.js:11 phony.js:8 phony.js:10 phony.js:114 phony.js:127 phony.js:12
 msgid "Insert block"
 msgstr ""
 
@@ -112,20 +113,20 @@
 msgid "emphasis: alt-i"
 msgstr "emfaze: alt-e"
 
-#: mmbase.js:197 mmbase.js:198
+#: mmbase.js:197 mmbase.js:198 mmbase.js:216
 #, fuzzy
 msgid "Not saved"
 msgstr "Savita"
 
-#: mmbase.js:215 mmbase.js:216
+#: mmbase.js:215 mmbase.js:216 mmbase.js:235
 msgid "Reinited "
 msgstr ""
 
-#: phony.js:4 phony.js:88 phony.js:120
+#: phony.js:4 phony.js:88 phony.js:120 phony.js:5
 msgid "Left (Big)"
 msgstr "Maldekstra (kaj granda)"
 
-#: phony.js:5 phony.js:89 phony.js:121
+#: phony.js:5 phony.js:89 phony.js:121 phony.js:6
 msgid "Right (Big)"
 msgstr "Dekstra (kaj granda)"
 
@@ -505,7 +506,7 @@
 msgid "Right"
 msgstr "Dekstra"
 
-#: phony.js:90 phony.js:122
+#: phony.js:90 phony.js:122 phony.js:7
 msgid "Big"
 msgstr "Granda"
 
@@ -580,3 +581,27 @@
 #: phony.js:115
 msgid "Debug Log"
 msgstr ""
+
+#: flashtool.js:16
+msgid "Flash tool initialized"
+msgstr ""
+
+#: phony.js:13
+msgid "Flash"
+msgstr "Flaŝ"
+
+#: phony.js:14
+msgid "Flash class"
+msgstr ""
+
+#: phony.js:15
+msgid "Flash inline"
+msgstr ""
+
+#: phony.js:16
+msgid "Flash left"
+msgstr "Maldekstra"
+
+#: phony.js:17
+msgid "Flash right"
+msgstr "Dekstra"

Modified: kupu/trunk/kupu/mmbase/i18n/fr.po
==============================================================================
--- kupu/trunk/kupu/mmbase/i18n/fr.po	(original)
+++ kupu/trunk/kupu/mmbase/i18n/fr.po	Fri Sep 19 17:55:36 2008
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: mmbase 18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-06 14:05+0100\n"
+"POT-Creation-Date: 2008-09-19 17:41+0200\n"
 "PO-Revision-Date: 2006-12-13 14:37+0100\n"
 "Last-Translator: Michiel Meeuwissen <EMAIL@ADDRESS>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -16,51 +16,51 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: mmbase.js:141 mmbase.js:158 mmbase.js:159
+#: mmbase.js:141 mmbase.js:158 mmbase.js:159 mmbase.js:167
 msgid "Saving body (kupu)"
 msgstr ""
 
-#: mmbase.js:144 mmbase.js:161 mmbase.js:162
+#: mmbase.js:144 mmbase.js:161 mmbase.js:162 mmbase.js:170
 msgid "Saving fields (form)"
 msgstr ""
 
-#: mmbase.js:173 mmbase.js:191 mmbase.js:192
+#: mmbase.js:173 mmbase.js:191 mmbase.js:192 mmbase.js:201
 msgid "saved"
 msgstr ""
 
-#: mmbase.js:202 mmbase.js:242 mmbase.js:243
+#: mmbase.js:202 mmbase.js:242 mmbase.js:243 mmbase.js:262
 msgid "RELOAD"
 msgstr ""
 
-#: mmbase.js:223 mmbase.js:264
+#: mmbase.js:223 mmbase.js:264 mmbase.js:283
 msgid "Getting node fields for "
 msgstr ""
 
-#: mmbase.js:231 mmbase.js:275
+#: mmbase.js:231 mmbase.js:275 mmbase.js:294
 msgid "Loading node fields for "
 msgstr ""
 
-#: mmbase.js:243 mmbase.js:289
+#: mmbase.js:243 mmbase.js:289 mmbase.js:309
 msgid "Getting node body "
 msgstr ""
 
-#: mmbase.js:250 mmbase.js:300 mmbase.js:299
+#: mmbase.js:250 mmbase.js:300 mmbase.js:299 mmbase.js:319
 msgid "Loading node body "
 msgstr ""
 
-#: mmbasetools.js:13 mmbasetools.js:14
+#: mmbasetools.js:13 mmbasetools.js:14 divstool.js:17
 msgid "Div tool initialized"
 msgstr ""
 
-#: mmbasetools.js:39 mmbasetools.js:40 mmbasetools.js:48
+#: mmbasetools.js:39 mmbasetools.js:40 mmbasetools.js:48 divstool.js:50
 msgid "Found paragraph"
 msgstr ""
 
-#: mmbasetools.js:43 mmbasetools.js:44 mmbasetools.js:52
+#: mmbasetools.js:43 mmbasetools.js:44 mmbasetools.js:52 divstool.js:54
 msgid "Didn't find paragraph"
 msgstr ""
 
-#: mmbasetools.js:48 mmbasetools.js:50 mmbasetools.js:57
+#: mmbasetools.js:48 mmbasetools.js:50 mmbasetools.js:57 divstool.js:59
 msgid "Div inserted"
 msgstr ""
 
@@ -73,6 +73,7 @@
 msgstr ""
 
 #: phony.js:3 phony.js:5 phony.js:2 phony.js:1 phony.js:116 phony.js:118
+#: phony.js:4
 msgid "Richtext editor"
 msgstr "Richtext editor"
 
@@ -84,23 +85,23 @@
 msgid "default"
 msgstr ""
 
-#: phony.js:7 phony.js:4 phony.js:6 phony.js:110 phony.js:123
+#: phony.js:7 phony.js:4 phony.js:6 phony.js:110 phony.js:123 phony.js:8
 msgid "Block"
 msgstr ""
 
-#: phony.js:8 phony.js:5 phony.js:7 phony.js:111 phony.js:124
+#: phony.js:8 phony.js:5 phony.js:7 phony.js:111 phony.js:124 phony.js:9
 msgid "Block class"
 msgstr ""
 
-#: phony.js:9 phony.js:6 phony.js:8 phony.js:112 phony.js:125
+#: phony.js:9 phony.js:6 phony.js:8 phony.js:112 phony.js:125 phony.js:10
 msgid "Note left"
 msgstr ""
 
-#: phony.js:10 phony.js:7 phony.js:9 phony.js:113 phony.js:126
+#: phony.js:10 phony.js:7 phony.js:9 phony.js:113 phony.js:126 phony.js:11
 msgid "Note right"
 msgstr ""
 
-#: phony.js:11 phony.js:8 phony.js:10 phony.js:114 phony.js:127
+#: phony.js:11 phony.js:8 phony.js:10 phony.js:114 phony.js:127 phony.js:12
 msgid "Insert block"
 msgstr ""
 
@@ -112,19 +113,19 @@
 msgid "emphasis: alt-i"
 msgstr ""
 
-#: mmbase.js:197 mmbase.js:198
+#: mmbase.js:197 mmbase.js:198 mmbase.js:216
 msgid "Not saved"
 msgstr ""
 
-#: mmbase.js:215 mmbase.js:216
+#: mmbase.js:215 mmbase.js:216 mmbase.js:235
 msgid "Reinited "
 msgstr ""
 
-#: phony.js:4 phony.js:88 phony.js:120
+#: phony.js:4 phony.js:88 phony.js:120 phony.js:5
 msgid "Left (Big)"
 msgstr "Gauche (Grand)"
 
-#: phony.js:5 phony.js:89 phony.js:121
+#: phony.js:5 phony.js:89 phony.js:121 phony.js:6
 msgid "Right (Big)"
 msgstr "Droite (Grand)"
 
@@ -505,7 +506,7 @@
 msgid "Right"
 msgstr "Droite (Grand)"
 
-#: phony.js:90 phony.js:122
+#: phony.js:90 phony.js:122 phony.js:7
 msgid "Big"
 msgstr ""
 
@@ -580,3 +581,27 @@
 #: phony.js:115
 msgid "Debug Log"
 msgstr ""
+
+#: flashtool.js:16
+msgid "Flash tool initialized"
+msgstr ""
+
+#: phony.js:13
+msgid "Flash"
+msgstr ""
+
+#: phony.js:14
+msgid "Flash class"
+msgstr ""
+
+#: phony.js:15
+msgid "Flash inline"
+msgstr ""
+
+#: phony.js:16
+msgid "Flash left"
+msgstr ""
+
+#: phony.js:17
+msgid "Flash right"
+msgstr ""

Modified: kupu/trunk/kupu/mmbase/i18n/it.po
==============================================================================
--- kupu/trunk/kupu/mmbase/i18n/it.po	(original)
+++ kupu/trunk/kupu/mmbase/i18n/it.po	Fri Sep 19 17:55:36 2008
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: mmbase 18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-06 14:05+0100\n"
+"POT-Creation-Date: 2008-09-19 17:41+0200\n"
 "PO-Revision-Date: 2005-06-09 00:45+0200\n"
 "Last-Translator: Michiel Meeuwissen <EMAIL@ADDRESS>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -16,51 +16,51 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: mmbase.js:141 mmbase.js:158 mmbase.js:159
+#: mmbase.js:141 mmbase.js:158 mmbase.js:159 mmbase.js:167
 msgid "Saving body (kupu)"
 msgstr ""
 
-#: mmbase.js:144 mmbase.js:161 mmbase.js:162
+#: mmbase.js:144 mmbase.js:161 mmbase.js:162 mmbase.js:170
 msgid "Saving fields (form)"
 msgstr ""
 
-#: mmbase.js:173 mmbase.js:191 mmbase.js:192
+#: mmbase.js:173 mmbase.js:191 mmbase.js:192 mmbase.js:201
 msgid "saved"
 msgstr ""
 
-#: mmbase.js:202 mmbase.js:242 mmbase.js:243
+#: mmbase.js:202 mmbase.js:242 mmbase.js:243 mmbase.js:262
 msgid "RELOAD"
 msgstr ""
 
-#: mmbase.js:223 mmbase.js:264
+#: mmbase.js:223 mmbase.js:264 mmbase.js:283
 msgid "Getting node fields for "
 msgstr ""
 
-#: mmbase.js:231 mmbase.js:275
+#: mmbase.js:231 mmbase.js:275 mmbase.js:294
 msgid "Loading node fields for "
 msgstr ""
 
-#: mmbase.js:243 mmbase.js:289
+#: mmbase.js:243 mmbase.js:289 mmbase.js:309
 msgid "Getting node body "
 msgstr ""
 
-#: mmbase.js:250 mmbase.js:300 mmbase.js:299
+#: mmbase.js:250 mmbase.js:300 mmbase.js:299 mmbase.js:319
 msgid "Loading node body "
 msgstr ""
 
-#: mmbasetools.js:13 mmbasetools.js:14
+#: mmbasetools.js:13 mmbasetools.js:14 divstool.js:17
 msgid "Div tool initialized"
 msgstr ""
 
-#: mmbasetools.js:39 mmbasetools.js:40 mmbasetools.js:48
+#: mmbasetools.js:39 mmbasetools.js:40 mmbasetools.js:48 divstool.js:50
 msgid "Found paragraph"
 msgstr ""
 
-#: mmbasetools.js:43 mmbasetools.js:44 mmbasetools.js:52
+#: mmbasetools.js:43 mmbasetools.js:44 mmbasetools.js:52 divstool.js:54
 msgid "Didn't find paragraph"
 msgstr ""
 
-#: mmbasetools.js:48 mmbasetools.js:50 mmbasetools.js:57
+#: mmbasetools.js:48 mmbasetools.js:50 mmbasetools.js:57 divstool.js:59
 msgid "Div inserted"
 msgstr ""
 
@@ -73,6 +73,7 @@
 msgstr ""
 
 #: phony.js:3 phony.js:5 phony.js:2 phony.js:1 phony.js:116 phony.js:118
+#: phony.js:4
 msgid "Richtext editor"
 msgstr ""
 
@@ -84,23 +85,23 @@
 msgid "default"
 msgstr ""
 
-#: phony.js:7 phony.js:4 phony.js:6 phony.js:110 phony.js:123
+#: phony.js:7 phony.js:4 phony.js:6 phony.js:110 phony.js:123 phony.js:8
 msgid "Block"
 msgstr ""
 
-#: phony.js:8 phony.js:5 phony.js:7 phony.js:111 phony.js:124
+#: phony.js:8 phony.js:5 phony.js:7 phony.js:111 phony.js:124 phony.js:9
 msgid "Block class"
 msgstr ""
 
-#: phony.js:9 phony.js:6 phony.js:8 phony.js:112 phony.js:125
+#: phony.js:9 phony.js:6 phony.js:8 phony.js:112 phony.js:125 phony.js:10
 msgid "Note left"
 msgstr ""
 
-#: phony.js:10 phony.js:7 phony.js:9 phony.js:113 phony.js:126
+#: phony.js:10 phony.js:7 phony.js:9 phony.js:113 phony.js:126 phony.js:11
 msgid "Note right"
 msgstr ""
 
-#: phony.js:11 phony.js:8 phony.js:10 phony.js:114 phony.js:127
+#: phony.js:11 phony.js:8 phony.js:10 phony.js:114 phony.js:127 phony.js:12
 msgid "Insert block"
 msgstr ""
 
@@ -112,19 +113,19 @@
 msgid "emphasis: alt-i"
 msgstr ""
 
-#: mmbase.js:197 mmbase.js:198
+#: mmbase.js:197 mmbase.js:198 mmbase.js:216
 msgid "Not saved"
 msgstr ""
 
-#: mmbase.js:215 mmbase.js:216
+#: mmbase.js:215 mmbase.js:216 mmbase.js:235
 msgid "Reinited "
 msgstr ""
 
-#: phony.js:4 phony.js:88 phony.js:120
+#: phony.js:4 phony.js:88 phony.js:120 phony.js:5
 msgid "Left (Big)"
 msgstr ""
 
-#: phony.js:5 phony.js:89 phony.js:121
+#: phony.js:5 phony.js:89 phony.js:121 phony.js:6
 msgid "Right (Big)"
 msgstr ""
 
@@ -504,7 +505,7 @@
 msgid "Right"
 msgstr ""
 
-#: phony.js:90 phony.js:122
+#: phony.js:90 phony.js:122 phony.js:7
 msgid "Big"
 msgstr ""
 
@@ -579,3 +580,27 @@
 #: phony.js:115
 msgid "Debug Log"
 msgstr ""
+
+#: flashtool.js:16
+msgid "Flash tool initialized"
+msgstr ""
+
+#: phony.js:13
+msgid "Flash"
+msgstr ""
+
+#: phony.js:14
+msgid "Flash class"
+msgstr ""
+
+#: phony.js:15
+msgid "Flash inline"
+msgstr ""
+
+#: phony.js:16
+msgid "Flash left"
+msgstr ""
+
+#: phony.js:17
+msgid "Flash right"
+msgstr ""

Modified: kupu/trunk/kupu/mmbase/i18n/nl.po
==============================================================================
--- kupu/trunk/kupu/mmbase/i18n/nl.po	(original)
+++ kupu/trunk/kupu/mmbase/i18n/nl.po	Fri Sep 19 17:55:36 2008
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: mmbase 19\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-06 14:05+0100\n"
-"PO-Revision-Date: 2007-02-06 14:06+0100\n"
+"POT-Creation-Date: 2008-09-19 17:41+0200\n"
+"PO-Revision-Date: 2008-09-19 17:49+0200\n"
 "Last-Translator: Michiel Meeuwissen <mihxil@xs4all.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,51 +16,51 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: mmbase.js:141 mmbase.js:158 mmbase.js:159
+#: mmbase.js:141 mmbase.js:158 mmbase.js:159 mmbase.js:167
 msgid "Saving body (kupu)"
 msgstr "Schrijft tekst weg (kupu)"
 
-#: mmbase.js:144 mmbase.js:161 mmbase.js:162
+#: mmbase.js:144 mmbase.js:161 mmbase.js:162 mmbase.js:170
 msgid "Saving fields (form)"
 msgstr "Schrijft velden weg (formulier)"
 
-#: mmbase.js:173 mmbase.js:191 mmbase.js:192
+#: mmbase.js:173 mmbase.js:191 mmbase.js:192 mmbase.js:201
 msgid "saved"
 msgstr "opgeslagen"
 
-#: mmbase.js:202 mmbase.js:242 mmbase.js:243
+#: mmbase.js:202 mmbase.js:242 mmbase.js:243 mmbase.js:262
 msgid "RELOAD"
 msgstr "Herladen"
 
-#: mmbase.js:223 mmbase.js:264
+#: mmbase.js:223 mmbase.js:264 mmbase.js:283
 msgid "Getting node fields for "
 msgstr "Haalt velden (formulier) voor"
 
-#: mmbase.js:231 mmbase.js:275
+#: mmbase.js:231 mmbase.js:275 mmbase.js:294
 msgid "Loading node fields for "
 msgstr "Schrijft velden weg (formulier)"
 
-#: mmbase.js:243 mmbase.js:289
+#: mmbase.js:243 mmbase.js:289 mmbase.js:309
 msgid "Getting node body "
 msgstr "Haalt node text"
 
-#: mmbase.js:250 mmbase.js:300 mmbase.js:299
+#: mmbase.js:250 mmbase.js:300 mmbase.js:299 mmbase.js:319
 msgid "Loading node body "
 msgstr "Haalt node op"
 
-#: mmbasetools.js:13 mmbasetools.js:14
+#: mmbasetools.js:13 mmbasetools.js:14 divstool.js:17
 msgid "Div tool initialized"
 msgstr "Blok-tool geinitialiseerd"
 
-#: mmbasetools.js:39 mmbasetools.js:40 mmbasetools.js:48
+#: mmbasetools.js:39 mmbasetools.js:40 mmbasetools.js:48 divstool.js:50
 msgid "Found paragraph"
 msgstr "Alinea gevonden"
 
-#: mmbasetools.js:43 mmbasetools.js:44 mmbasetools.js:52
+#: mmbasetools.js:43 mmbasetools.js:44 mmbasetools.js:52 divstool.js:54
 msgid "Didn't find paragraph"
 msgstr "Geen alinea gevonden"
 
-#: mmbasetools.js:48 mmbasetools.js:50 mmbasetools.js:57
+#: mmbasetools.js:48 mmbasetools.js:50 mmbasetools.js:57 divstool.js:59
 msgid "Div inserted"
 msgstr "Blok ingevoegd"
 
@@ -73,6 +73,7 @@
 msgstr "Normaal"
 
 #: phony.js:3 phony.js:5 phony.js:2 phony.js:1 phony.js:116 phony.js:118
+#: phony.js:4
 msgid "Richtext editor"
 msgstr "Richtext editor"
 
@@ -84,23 +85,23 @@
 msgid "default"
 msgstr "default"
 
-#: phony.js:7 phony.js:4 phony.js:6 phony.js:110 phony.js:123
+#: phony.js:7 phony.js:4 phony.js:6 phony.js:110 phony.js:123 phony.js:8
 msgid "Block"
 msgstr "Blok"
 
-#: phony.js:8 phony.js:5 phony.js:7 phony.js:111 phony.js:124
+#: phony.js:8 phony.js:5 phony.js:7 phony.js:111 phony.js:124 phony.js:9
 msgid "Block class"
 msgstr "Blok-soort"
 
-#: phony.js:9 phony.js:6 phony.js:8 phony.js:112 phony.js:125
+#: phony.js:9 phony.js:6 phony.js:8 phony.js:112 phony.js:125 phony.js:10
 msgid "Note left"
 msgstr "Noot (links)"
 
-#: phony.js:10 phony.js:7 phony.js:9 phony.js:113 phony.js:126
+#: phony.js:10 phony.js:7 phony.js:9 phony.js:113 phony.js:126 phony.js:11
 msgid "Note right"
 msgstr "Noot (rechts)"
 
-#: phony.js:11 phony.js:8 phony.js:10 phony.js:114 phony.js:127
+#: phony.js:11 phony.js:8 phony.js:10 phony.js:114 phony.js:127 phony.js:12
 msgid "Insert block"
 msgstr "Voeg blok in"
 
@@ -112,19 +113,19 @@
 msgid "emphasis: alt-i"
 msgstr "benadrukt: alt-i"
 
-#: mmbase.js:197 mmbase.js:198
+#: mmbase.js:197 mmbase.js:198 mmbase.js:216
 msgid "Not saved"
 msgstr "Niet opgeslagen"
 
-#: mmbase.js:215 mmbase.js:216
+#: mmbase.js:215 mmbase.js:216 mmbase.js:235
 msgid "Reinited "
 msgstr "Herladen "
 
-#: phony.js:4 phony.js:88 phony.js:120
+#: phony.js:4 phony.js:88 phony.js:120 phony.js:5
 msgid "Left (Big)"
 msgstr "Links (Groot)"
 
-#: phony.js:5 phony.js:89 phony.js:121
+#: phony.js:5 phony.js:89 phony.js:121 phony.js:6
 msgid "Right (Big)"
 msgstr "Rechts (Groot)"
 
@@ -158,7 +159,7 @@
 #: phony.js:3 phony.js:18 phony.js:19 phony.js:20 phony.js:21 phony.js:22
 #: phony.js:23 phony.js:26
 msgid "title"
-msgstr ""
+msgstr "Titel"
 
 #: phony.js:3
 msgid "window.open('http://kupu.oscom.org');"
@@ -214,7 +215,7 @@
 
 #: phony.js:18
 msgid "image"
-msgstr ""
+msgstr "plaatjes"
 
 #: phony.js:18
 msgid "kupu-image"
@@ -501,11 +502,10 @@
 msgstr ""
 
 #: phony.js:87 phony.js:104
-#, fuzzy
 msgid "Right"
 msgstr "Rechts (Groot)"
 
-#: phony.js:90 phony.js:122
+#: phony.js:90 phony.js:122 phony.js:7
 msgid "Big"
 msgstr "Groot"
 
@@ -580,3 +580,27 @@
 #: phony.js:115
 msgid "Debug Log"
 msgstr ""
+
+#: flashtool.js:16
+msgid "Flash tool initialized"
+msgstr "Blok-tool geinitialiseerd"
+
+#: phony.js:13
+msgid "Flash"
+msgstr ""
+
+#: phony.js:14
+msgid "Flash class"
+msgstr "Blok-soort"
+
+#: phony.js:15
+msgid "Flash inline"
+msgstr "Flash inline"
+
+#: phony.js:16
+msgid "Flash left"
+msgstr "Links"
+
+#: phony.js:17
+msgid "Flash right"
+msgstr "Rechts"

Added: kupu/trunk/kupu/mmbase/icons/flash.png
==============================================================================
Binary file. No diff available.

Modified: kupu/trunk/kupu/mmbase/kupuinit.js
==============================================================================
--- kupu/trunk/kupu/mmbase/kupuinit.js	(original)
+++ kupu/trunk/kupu/mmbase/kupuinit.js	Fri Sep 19 17:55:36 2008
@@ -78,13 +78,13 @@
     kupu.registerTool('redobutton', redobutton);
 
     var removeimagebutton = new KupuRemoveElementButton('kupu-removeimage-button',
-                                                        'img',
-                                                        'kupu-removeimage');
+        'img',
+        'kupu-removeimage');
     kupu.registerTool('removeimagebutton', removeimagebutton);
 
     var removelinkbutton = new KupuRemoveElementButton('kupu-removelink-button',
-                                                       'a',
-                                                       'kupu-removelink');
+        'a',
+        'kupu-removelink');
     kupu.registerTool('removelinkbutton', removelinkbutton);
 
     var removedivbutton = new KupuRemoveElementButton('kupu-removediv-button', \
'div', 'kupu-removediv'); @@ -115,7 +115,7 @@
     };
     kupu.registerTool('imagetool', imagetool);
     var imagetoolbox = new ImageToolBox('kupu-image-input', 'kupu-image-addbutton',
-                                        'kupu-image-float-select', \
'kupu-toolbox-images',  'kupu-toolbox', 'kupu-toolbox-active'); +        \
'kupu-image-float-select', 'kupu-toolbox-images',  'kupu-toolbox', \
'kupu-toolbox-active');  imagetool.registerToolBox('imagetoolbox', imagetoolbox);
 
     var tabletool = new TableTool();
@@ -135,13 +135,20 @@
     kupu.registerTool('divstool', divstool);
 
     var divstoolbox = new DivsToolBox('kupu-div-addbutton',
-                                       'kupu-divs-float-select', \
'kupu-toolbox-divs',  'kupu-toolbox', 'kupu-toolbox-active'); +        \
'kupu-divs-float-select', 'kupu-toolbox-divs',  'kupu-toolbox', \
'kupu-toolbox-active');  divstool.registerToolBox('divstoolbox', divstoolbox);
 
+    var flashtool = new FlashTool();
+    kupu.registerTool('flashtool', flashtool);
+
+    var flashtoolbox = new FlashToolBox('kupu-div-addbutton',
+        'kupu-divs-float-select', 'kupu-toolbox-flash',  'kupu-toolbox', \
'kupu-toolbox-active'); +    flashtool.registerToolBox('flashtoolbox', flashtoolbox);
+
 
 
     var spellchecker = new KupuSpellChecker('kupu-spellchecker-button',
-                                            'spellcheck.jspx');
+        'spellcheck.jspx');
     kupu.registerTool('spellchecker', spellchecker);
 
     // like the zoom tool, but it doens' realy work.
@@ -154,142 +161,143 @@
     var drawertool = new DrawerTool();
     kupu.registerTool('drawertool', drawertool);
 
-   /*
+    /*
    var sourceedittool = new SourceEditTool('kupu-source-button', \
'kupu-editor-textarea');  kupu.registerTool('sourceedittool', sourceedittool);
    */
 
-   // Drawers...
+    // Drawers...
+
+    // Function that returns function to open a drawer
+    var opendrawer = function(drawerid) {
+	return function(button, editor) {
+            drawertool.openDrawer(drawerid);
+	};
+    };
+
+    var imagelibdrawerbutton = new KupuButton('kupu-imagelibdrawer-button', \
opendrawer('imagelibdrawer')); +    kupu.registerTool('imagelibdrawerbutton', \
imagelibdrawerbutton); +
+    var linklibdrawerbutton = new KupuButton('kupu-linklibdrawer-button',
+        opendrawer('linklibdrawer'));
+    kupu.registerTool('linklibdrawerbutton', linklibdrawerbutton);
+
+    var linkdrawerbutton = new KupuButton('kupu-linkdrawer-button',
+        opendrawer('linkdrawer'));
+    kupu.registerTool('linkdrawerbutton', linkdrawerbutton);
 
-   // Function that returns function to open a drawer
-   var opendrawer = function(drawerid) {
-       return function(button, editor) {
-           drawertool.openDrawer(drawerid);
-       };
-   };
-
-   var imagelibdrawerbutton = new KupuButton('kupu-imagelibdrawer-button', \
                opendrawer('imagelibdrawer'));
-   kupu.registerTool('imagelibdrawerbutton', imagelibdrawerbutton);
-
-   var linklibdrawerbutton = new KupuButton('kupu-linklibdrawer-button',
-                                            opendrawer('linklibdrawer'));
-   kupu.registerTool('linklibdrawerbutton', linklibdrawerbutton);
-
-   var linkdrawerbutton = new KupuButton('kupu-linkdrawer-button',
-                                         opendrawer('linkdrawer'));
-   kupu.registerTool('linkdrawerbutton', linkdrawerbutton);
-
-
-   // create some drawers, drawers are some sort of popups that appear when a
-   // toolbar button is clicked
-   var drawertool = new DrawerTool();
-   kupu.registerTool('drawertool', drawertool);
-
-   drawertool.search = function() {
-       alert('haaai');
-   }
-
-   try {
-       var linklibdrawer = new ResourceLibraryDrawer(linktool,
-                                                 conf['link_xsl_uri'],
-                                                 conf['link_libraries_uri'],
-                                                 conf['search_links_uri']);
-       drawertool.registerDrawer('linklibdrawer', linklibdrawer);
-
-       var imagelibdrawer = new ImageLibraryDrawer(imagetool,
-                                                   conf['image_xsl_uri'],
-                                                   conf['image_libraries_uri'],
-                                                   conf['search_images_uri']);
-       drawertool.registerDrawer('imagelibdrawer', imagelibdrawer);
 
-       /*
+    // create some drawers, drawers are some sort of popups that appear when a
+    // toolbar button is clicked
+    var drawertool = new DrawerTool();
+    kupu.registerTool('drawertool', drawertool);
+
+    drawertool.search = function() {
+	alert('haaai');
+    }
+
+    try {
+	var linklibdrawer = new ResourceLibraryDrawer(linktool,
+            conf['link_xsl_uri'],
+            conf['link_libraries_uri'],
+            conf['search_links_uri']);
+	drawertool.registerDrawer('linklibdrawer', linklibdrawer);
+
+	var imagelibdrawer = new ImageLibraryDrawer(imagetool,
+            conf['image_xsl_uri'],
+            conf['image_libraries_uri'],
+            conf['search_images_uri']);
+	drawertool.registerDrawer('imagelibdrawer', imagelibdrawer);
+
+	/*
        var imagelibdrawer2 = new ImageLibraryDrawer(null,
                                                     conf['image_xsl_uri'],
                                                     conf['image_libraries_uri'],
                                                     conf['search_images_uri']);
        drawertool.registerDrawer('nodeimagedrawer', imagelibdrawer2);
        */
-   } catch(e) {
-       var msg = _('There was a problem initializing the drawers. Most ' +
-               'likely the XSLT or XML files aren\'t available. If this ' +
-               'is not the Kupu demo version, check your files or the ' +
-               'service that provide them (error: ${error}).',
-               {'error': (e.message || e.toString())});
-       alert(msg);
-   };
-   var linkdrawer = new LinkDrawer('kupu-linkdrawer', linktool);
-   drawertool.registerDrawer('linkdrawer', linkdrawer);
+    } catch(e) {
+	var msg = _('There was a problem initializing the drawers. Most ' +
+		    'likely the XSLT or XML files aren\'t available. If this ' +
+		    'is not the Kupu demo version, check your files or the ' +
+		    'service that provide them (error: ${error}).',
+		    {'error': (e.message || e.toString())});
+	alert(msg);
+    };
+    var linkdrawer = new LinkDrawer('kupu-linkdrawer', linktool);
+    drawertool.registerDrawer('linkdrawer', linkdrawer);
 
     /*
    var tabledrawerbutton = new KupuButton('kupu-tabledrawer-button',
                                            opendrawer('tabledrawer'));
    kupu.registerTool('tabledrawerbutton', tabledrawerbutton);
     */
-   //var tabledrawer = new TableDrawer('kupu-tabledrawer', tabletool);
-   // drawertool.registerDrawer('tabledrawer', tabledrawer);
+    //var tabledrawer = new TableDrawer('kupu-tabledrawer', tabletool);
+    // drawertool.registerDrawer('tabledrawer', tabledrawer);
 
     // register some cleanup filter
     // remove tags that aren't in the XHTML DTD
-   var nonxhtmltagfilter = new NonXHTMLTagFilter(
-   {'html': 1,
-        'body': 1,
-        'head': 1,
-        'title': 1,
-        'a': 1,
-        'abbr': 0,
-        'acronym': 0,
-        'address': 0,
-        'b': 1,
-        'base': 0,
-        'blockquote': 0,
-        'br': 1,
-        'caption': 1,
-        'cite': 0,
-        'code': 0,
-        'col': 0,
-        'colgroup': 0,
-        'dd': 0,
-        'dfn': 0,
-        'div': 1,
-        'dl': 0,
-        'dt': 0,
-        'em': 1,
-        'h1': 1,
-        'h2': 1,
-        'h3': 1,
-        'h4': 1,
-        'h5': 1,
-        'h6': 1,
-        'h7': 1,
-        'i': 1,
-        'img': 1,
-        'kbd': 1,
-        'li': 1,
-        'link': 0,
-        'meta': 1,
-        'ol': 1,
-        'p': 1,
-        'pre': 0,
-        'q': 0,
-        'samp': 0,
-        'script': 0,
-        'span': 0,
-        'strong': 1,
-        'style': 0,
-        'sub': 1,
-        'sup': 1,
-        'table': 1,
-        'tbody': 1,
-        'td': 1,
-        'tfoot': 0,
-        'th': 1,
-        'thead': 0,
-        'tr': 1,
-        'ul': 1,
-        'u': 0,
-        'var': 0,
-        'font': 0,
-        'center': 0
+    var nonxhtmltagfilter = new NonXHTMLTagFilter(
+	{'html': 1,
+         'body': 1,
+         'head': 1,
+         'title': 1,
+         'a': 1,
+         'abbr': 0,
+         'acronym': 0,
+         'address': 0,
+         'b': 1,
+         'base': 0,
+         'blockquote': 0,
+         'br': 1,
+         'caption': 1,
+         'cite': 0,
+         'code': 0,
+         'col': 0,
+         'colgroup': 0,
+         'dd': 0,
+         'dfn': 0,
+         'div': 1,
+         'dl': 0,
+         'dt': 0,
+         'em': 1,
+         'h1': 1,
+         'h2': 1,
+         'h3': 1,
+         'h4': 1,
+         'h5': 1,
+         'h6': 1,
+         'h7': 1,
+         'i': 1,
+         'img': 1,
+         'kbd': 1,
+         'li': 1,
+         'link': 0,
+         'meta': 1,
+	 'object': 1,
+         'ol': 1,
+         'p': 1,
+         'pre': 0,
+         'q': 0,
+         'samp': 0,
+         'script': 0,
+         'span': 0,
+         'strong': 1,
+         'style': 0,
+         'sub': 1,
+         'sup': 1,
+         'table': 1,
+         'tbody': 1,
+         'td': 1,
+         'tfoot': 0,
+         'th': 1,
+         'thead': 0,
+         'tr': 1,
+         'ul': 1,
+         'u': 0,
+         'var': 0,
+         'font': 0,
+         'center': 0
         });
     kupu.registerFilter(nonxhtmltagfilter);
 

Modified: kupu/trunk/kupu/mmbase/layout.js
==============================================================================
--- kupu/trunk/kupu/mmbase/layout.js	(original)
+++ kupu/trunk/kupu/mmbase/layout.js	Fri Sep 19 17:55:36 2008
@@ -51,6 +51,9 @@
     xTop("kupu-toolbox-divs", toolbox);
     this.rePosition("kupu-toolbox-divs");
     toolbox += xHeight("kupu-toolbox-divs") + spacing;
+    xTop("kupu-toolbox-flash", toolbox);
+    this.rePosition("kupu-toolbox-flash");
+    toolbox += xHeight("kupu-toolbox-flash") + spacing;
     xTop("kupu-toolbox-debug", toolbox);
     this.rePosition("kupu-toolbox-debug");
 

Deleted: /kupu/trunk/kupu/mmbase/mmbasetools.js
==============================================================================
--- /kupu/trunk/kupu/mmbase/mmbasetools.js	Fri Sep 19 17:55:36 2008
+++ (empty file)
@@ -1,150 +0,0 @@
-var divids = 0;
-
-/**
- * This tool is to create 'blocks'
- * $Id: $
- */
-
-function DivsTool() {
-    /* tool to add 'divs' */
-
-}
-DivsTool.prototype = new KupuTool;
-
-DivsTool.prototype.initialize = function(editor) {
-    /* attach the event handlers */
-    this.editor = editor;
-    this.editor.logMessage(_("Div tool initialized"));
-};
-
-DivsTool.prototype.createDiv = function(divclass) {
-    /* create a div */
-    var currnode = this.editor.getSelectedNode();
-    var currp = this.editor.getNearestParentOfType(currnode, 'p');
-
-    var doc = this.editor.getInnerDocument();
-    var div = doc.createElement('div');
-    div.id = "createddiv_" + (divids++);
-    if (divclass) {
-        div.className = divclass;
-    };
-    var selection  = this.editor.getSelection();
-    var fragment   = selection ? selection.cloneContents() : undefined;
-    if(fragment == undefined || fragment.firstChild == undefined || \
                fragment.firstChild.nodeType == Node.TEXT_NODE) {
-        var child = doc.createElement("p");
-        if (fragment != undefined) {
-            child.appendChild(selection.cloneContents());
-        }
-        div.appendChild(child);
-        if (child.childNodes.length == 0 || (child.childNodes.length == 1 && \
                (child.firstChild.nodeValue == "" || child.firstChild.nodeValue == \
                undefined))) {
-            child.appendChild(doc.createTextNode("."));
-        }
-    } else {
-        div.appendChild(fragment);
-    }
-
-    //var ser = new XMLSerializer();
-    //alert("inserting " + ser.serializeToString(div));
-
-    if (currp) {
-        this.editor.logMessage(_("Found paragraph"));
-        currp.parentNode.insertBefore(div, currp);
-        this.editor.insertNodeAtSelection(doc.createTextNode(""), 1);
-    } else {
-        this.editor.logMessage(_("Didn't find paragraph"));
-        //alert("Inserting " + div);
-        div = this.editor.insertNodeAtSelection(div, 1);
-    }
-
-    this.editor.logMessage(_("Div inserted"));
-    this.editor.updateState();
-    return div;
-};
-
-DivsTool.prototype.setDivClass = function(divclass) {
-    var currnode = this.editor.getSelectedNode();
-    var currdiv = this.editor.getNearestParentOfType(currnode, 'div');
-    if (currdiv) {
-        currdiv.className = divclass;
-    };
-};
-
-DivsTool.prototype.deleteDiv = function() {
-    /* delete the current link */
-    var currnode = this.editor.getSelectedNode();
-    var linkel = this.editor.getNearestParentOfType(currnode, 'div');
-    if (!linkel) {
-        this.editor.logMessage(_('Not inside block'));
-        return;
-    };
-    while (linkel.childNodes.length) {
-        linkel.parentNode.insertBefore(linkel.childNodes[0], linkel);
-    };
-    linkel.parentNode.removeChild(linkel);
-
-    this.editor.logMessage(_('Block removed'));
-    this.editor.updateState();
-};
-
-DivsTool.prototype.createContextMenuElements = function(selNode, event) {
-    /* create the 'Create link' or 'Remove link' menu elements */
-    var ret = [];
-    var link = this.editor.getNearestParentOfType(selNode, 'div');
-    if (link) {
-        ret.push(new ContextMenuElement(_('Delete block'), this.deleteDiv, this));
-    }
-    return ret;
-};
-
-
-function DivsToolBox(insertbuttonid, classselectid, toolboxid, plainclass, \
                activeclass) {
-    this.insertbutton = getFromSelector(insertbuttonid);
-    this.classselect  = getFromSelector(classselectid);
-    this.toolboxel    = getFromSelector(toolboxid);
-    this.plainclass   = plainclass;
-    this.activeclass  = activeclass;
-    this.classRe = new RegExp('\\bfloat\\b', 'i');
-}
-
-
-DivsToolBox.prototype.initialize = function(tool, editor) {
-    this.tool = tool;
-    this.editor = editor;
-    addEventHandler(this.classselect, "change", this.setDivClass, this);
-    addEventHandler(this.insertbutton, "click", this.addDiv, this);
-};
-
-DivsToolBox.prototype.updateState = function(selNode, event) {
-    /* update the state of the toolbox element */
-    var divel = this.editor.getNearestParentOfType(selNode, 'div');
-    if (divel && this.classRe.test(divel.className)) {
-        // check first before setting a class for backward compatibility
-        if (this.toolboxel) {
-            this.toolboxel.className = this.activeclass;
-            var divclass = divel.className ? divel.className : 'note';
-            selectSelectItem(this.classselect, divclass);
-        };
-    } else {
-        if (this.toolboxel) {
-            this.toolboxel.className = this.plainclass;
-        };
-    };
-};
-
-
-DivsToolBox.prototype.addDiv = function() {
-    /* add an div */
-    var sel_class = this.classselect.options[this.classselect.selectedIndex].value;
-    this.tool.createDiv(sel_class);
-    this.editor.focusDocument();
-};
-
-DivsToolBox.prototype.setDivClass = function() {
-    var sel_class = this.classselect.options[this.classselect.selectedIndex].value;
-    this.tool.setDivClass(sel_class);
-    this.editor.focusDocument();
-};
-
-
-
-

Modified: kupu/trunk/kupu/mmbase/node.body.jspx
==============================================================================
--- kupu/trunk/kupu/mmbase/node.body.jspx	(original)
+++ kupu/trunk/kupu/mmbase/node.body.jspx	Fri Sep 19 17:55:36 2008
@@ -1,8 +1,8 @@
-<mm:content type="text/xml"
+<mm:content type="application/xhtml+xml"
             expires="-1"
             postprocessor="none"
-            xmlns="http://www.w3.org/1999/xhtml" 
-            xmlns:jsp="http://java.sun.com/JSP/Page" 
+            xmlns="http://www.w3.org/1999/xhtml"
+            xmlns:jsp="http://java.sun.com/JSP/Page"
             xmlns:fn="http://java.sun.com/jsp/jstl/functions"
             xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0">
   <jsp:directive.page session="false" errorPage="error.jspx" />
@@ -10,7 +10,7 @@
   <mm:import id="kupu_node" from="session" externid="node" />
   <mm:import id="node" externid="kupu_node" from="parameters,this,session" />
   <mm:cloud method="asis">
-    <mm:notpresent referid="node">      
+    <mm:notpresent referid="node">
       <mm:remove referid="node" />
       <mm:node number="${param.objectnumber}" id="node" notfound="skip">
 
@@ -44,5 +44,5 @@
       <p>NODE NOT FOUND</p>
     </mm:notpresent>
 
-  </mm:cloud>  
+  </mm:cloud>
 </mm:content>

Modified: kupu/trunk/kupu/mmbase/toolboxes.kupu
==============================================================================
--- kupu/trunk/kupu/mmbase/toolboxes.kupu	(original)
+++ kupu/trunk/kupu/mmbase/toolboxes.kupu	Fri Sep 19 17:55:36 2008
@@ -77,6 +77,26 @@
     </div>
   </kupu:part>
 
+  <kupu:part name="flash">
+    <div class="kupu-toolbox" id="kupu-toolbox-flash">
+      <fmt:bundle basename="org.mmbase.kupu.Messages">
+        <h1  class="kupu-toolbox-heading"><fmt:message key="Flash" /></h1>
+        <div>
+          <div class="kupu-toolbox-label">
+            <span><fmt:message key="Flash class" /></span>
+          </div>
+          <select class="wide" id="kupu-flash-float-select">
+            <option value="image-inline"><fmt:message key="Flash inline" /></option>
+            <option value="image-left"><fmt:message key="Flash left" /></option>
+            <option value="image-right"><fmt:message key="Flash right" /></option>
+          </select>
+          <div class="flashobject">
+          </div>
+        </div>
+      </fmt:bundle>
+    </div>
+  </kupu:part>
+
   <!-- Overridden just for the jsp:text (to avoid that it collapses, which doesn't \
work in browers -->  <kupu:part name="debug">
     <div class="kupu-toolbox" id="kupu-toolbox-debug">

Modified: kupu/trunk/kupu/mmbase/wire.kupu
==============================================================================
--- kupu/trunk/kupu/mmbase/wire.kupu	(original)
+++ kupu/trunk/kupu/mmbase/wire.kupu	Fri Sep 19 17:55:36 2008
@@ -59,6 +59,7 @@
     <kupu:insert-part feature="toolboxes" part="images" />
     <kupu:insert-part feature="toolboxes" part="tables" />
     <kupu:insert-part feature="toolboxes" part="divs" />
+    <kupu:insert-part feature="toolboxes" part="flash" />
     <kupu:insert-part feature="toolboxes" part="debug" />
   </kupu:fill-slot>
 

Modified: kupu/trunk/kupu/mmbase/xmlconfig.kupu
==============================================================================
--- kupu/trunk/kupu/mmbase/xmlconfig.kupu	(original)
+++ kupu/trunk/kupu/mmbase/xmlconfig.kupu	Fri Sep 19 17:55:36 2008
@@ -16,8 +16,8 @@
       </xml>
     </div>
   </kupu:part>
-  
-  
+
+
   <kupu:part name="defaultconfig">
     <dst>receive.jspx</dst>
     <use_css>0</use_css>
@@ -36,5 +36,5 @@
       <class>data wide</class>
     </table_classes>
   </kupu:part>
- 
+
 </kupu:feature>
_______________________________________________
kupu-checkins mailing list
kupu-checkins@codespeak.net
http://codespeak.net/mailman/listinfo/kupu-checkins


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic