[kupu-checkins] r34609 - in kupu/trunk/kupu/mmbase: . drawers i18n
mihxil at codespeak.net
mihxil at codespeak.net
Tue Nov 14 19:07:23 CET 2006
Author: mihxil
Date: Tue Nov 14 19:07:19 2006
New Revision: 34609
Modified:
kupu/trunk/kupu/mmbase/Makefile
kupu/trunk/kupu/mmbase/drawers/drawer.jspx
kupu/trunk/kupu/mmbase/drawers/libraries.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/layout.js
kupu/trunk/kupu/mmbase/mmbase.css
kupu/trunk/kupu/mmbase/mmbase.js
kupu/trunk/kupu/mmbase/mmbasetools.js
kupu/trunk/kupu/mmbase/node.body.jspx
kupu/trunk/kupu/mmbase/preview.jspx
kupu/trunk/kupu/mmbase/toolboxes.kupu
kupu/trunk/kupu/mmbase/wire.kupu
Log:
several bugfixes, and small improvements
Modified: kupu/trunk/kupu/mmbase/Makefile
==============================================================================
--- kupu/trunk/kupu/mmbase/Makefile (original)
+++ kupu/trunk/kupu/mmbase/Makefile Tue Nov 14 19:07:19 2006
@@ -14,12 +14,18 @@
#type in i18n: msginit -l <locale> -i messages.po
-all: index.jspx
+all: index.jspx body.jspx head.jspx
-index.jspx: mmbase-kupu-i18n.jar *.kupu
+index.jspx: mmbase-kupu-i18n.jar *.kupu Makefile
$(XSLTPROC) $(XSLTPROC_PARAMS) -o $@ $(XSLJSPX_FILE) dist-mmbase.kupu
+body.jspx: mmbase-kupu-i18n.jar *.kupu Makefile
+ $(XSLTPROC) $(XSLTPROC_PARAMS) -o $@ $(XSLJSPX_FILE) body-mmbase.kupu
+
+head.jspx: mmbase-kupu-i18n.jar *.kupu Makefile
+ $(XSLTPROC) $(XSLTPROC_PARAMS) -o $@ $(XSLJSPX_FILE) head-mmbase.kupu
+
$(I18N):
@$(MAKE) -C $(KUPU_HOME) kupu-i18n.jar
Modified: kupu/trunk/kupu/mmbase/drawers/drawer.jspx
==============================================================================
--- kupu/trunk/kupu/mmbase/drawers/drawer.jspx (original)
+++ kupu/trunk/kupu/mmbase/drawers/drawer.jspx Tue Nov 14 19:07:19 2006
@@ -6,8 +6,11 @@
<jsp:output omit-xml-declaration="true" />
<mm:cloud method="asis">
<mm:import id="nodetypes">images</mm:import>
- <mm:formatter xslt="drawer.xsl" escape="none">
+ <mm:formatter escape="none">
<mm:include referids="nodetypes" page="libraries.jspx" escape="none" />
+ <mm:xslt>
+ <mm:include page="drawer.xsl.jspx" />
+ </mm:xslt>
</mm:formatter>
</mm:cloud>
</mm:content>
Modified: kupu/trunk/kupu/mmbase/drawers/libraries.jspx
==============================================================================
--- kupu/trunk/kupu/mmbase/drawers/libraries.jspx (original)
+++ kupu/trunk/kupu/mmbase/drawers/libraries.jspx Tue Nov 14 19:07:19 2006
@@ -13,7 +13,7 @@
<libraries>
<param name="showupload">yes</param>
<param name="drawertype">image</param>
- <mm:url absolute="server" id="kupubasedir" page="../.." write="false" />
+ <mm:import id="kupubasedir"><mm:url absolute="server" page="../.." /></mm:import>
<mm:stringlist referid="nodetypes" id="nodetype">
<mm:hasnodemanager name="$_">
<mm:hasrelationmanager sourcemanager="$s" destinationmanager="$_" role="idrel">
Modified: kupu/trunk/kupu/mmbase/head.kupu
==============================================================================
--- kupu/trunk/kupu/mmbase/head.kupu (original)
+++ kupu/trunk/kupu/mmbase/head.kupu Tue Nov 14 19:07:19 2006
@@ -16,6 +16,7 @@
<jsp:text>: ${param.objectnumber}</jsp:text>
</title>
</fmt:bundle>
+ <kupu:id> saved from url=(0013)about:internet </kupu:id>
<mm:link page="/mmbase/style/images/edit.ico">
<link rel="icon" href="${_}" type="image/x-icon" />
<link rel="shortcut icon" href="${_}" type="image/x-icon" />
Modified: kupu/trunk/kupu/mmbase/i18n/de.po
==============================================================================
--- kupu/trunk/kupu/mmbase/i18n/de.po (original)
+++ kupu/trunk/kupu/mmbase/i18n/de.po Tue Nov 14 19:07:19 2006
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: mmbase 18\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-28 18:04+0100\n"
+"POT-Creation-Date: 2006-09-19 17:56+0200\n"
"PO-Revision-Date: 2005-06-09 00:42+0200\n"
"Last-Translator: Michiel Meeuwissen <EMAIL at ADDRESS>\n"
"Language-Team: German <de at 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:141 mmbase.js:158
msgid "Saving body (kupu)"
msgstr ""
-#: mmbase.js:144
+#: mmbase.js:144 mmbase.js:161
msgid "Saving fields (form)"
msgstr ""
-#: mmbase.js:173
+#: mmbase.js:173 mmbase.js:191
msgid "saved"
msgstr ""
-#: mmbase.js:202
+#: mmbase.js:202 mmbase.js:242
msgid "RELOAD"
msgstr ""
-#: mmbase.js:223
+#: mmbase.js:223 mmbase.js:264
msgid "Getting node fields for "
msgstr ""
-#: mmbase.js:231
+#: mmbase.js:231 mmbase.js:275
msgid "Loading node fields for "
msgstr ""
-#: mmbase.js:243
+#: mmbase.js:243 mmbase.js:289
msgid "Getting node body "
msgstr ""
-#: mmbase.js:250
+#: mmbase.js:250 mmbase.js:300
msgid "Loading node body "
msgstr ""
-#: mmbasetools.js:13
+#: mmbasetools.js:13 mmbasetools.js:14
msgid "Div tool initialized"
msgstr ""
-#: mmbasetools.js:39
+#: mmbasetools.js:39 mmbasetools.js:40
msgid "Found paragraph"
msgstr ""
-#: mmbasetools.js:43
+#: mmbasetools.js:43 mmbasetools.js:44
msgid "Didn't find paragraph"
msgstr ""
-#: mmbasetools.js:48
+#: mmbasetools.js:48 mmbasetools.js:50
msgid "Div inserted"
msgstr ""
@@ -72,7 +72,7 @@
msgid "Normal"
msgstr ""
-#: phony.js:3 phony.js:5
+#: phony.js:3 phony.js:5 phony.js:2
msgid "Richtext editor"
msgstr ""
@@ -80,27 +80,27 @@
msgid "Heading 1"
msgstr ""
-#: phony.js:6
+#: phony.js:6 phony.js:3
msgid "default"
msgstr ""
-#: phony.js:7
+#: phony.js:7 phony.js:4 phony.js:6
msgid "Block"
msgstr ""
-#: phony.js:8
+#: phony.js:8 phony.js:5 phony.js:7
msgid "Block class"
msgstr ""
-#: phony.js:9
+#: phony.js:9 phony.js:6 phony.js:8
msgid "Note left"
msgstr ""
-#: phony.js:10
+#: phony.js:10 phony.js:7 phony.js:9
msgid "Note right"
msgstr ""
-#: phony.js:11
+#: phony.js:11 phony.js:8 phony.js:10
msgid "Insert block"
msgstr ""
@@ -111,3 +111,19 @@
#: override.js:3
msgid "emphasis: alt-i"
msgstr ""
+
+#: mmbase.js:197
+msgid "Not saved"
+msgstr ""
+
+#: mmbase.js:215
+msgid "Reinited "
+msgstr ""
+
+#: phony.js:4
+msgid "Left (Big)"
+msgstr ""
+
+#: phony.js:5
+msgid "Right (Big)"
+msgstr ""
Modified: kupu/trunk/kupu/mmbase/i18n/en.po
==============================================================================
--- kupu/trunk/kupu/mmbase/i18n/en.po (original)
+++ kupu/trunk/kupu/mmbase/i18n/en.po Tue Nov 14 19:07:19 2006
@@ -8,59 +8,59 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-28 18:04+0100\n"
-"PO-Revision-Date: 2005-11-28 18:05+0100\n"
+"POT-Creation-Date: 2006-09-19 17:56+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at 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:141 mmbase.js:158
msgid "Saving body (kupu)"
msgstr "Saving body (kupu)"
-#: mmbase.js:144
+#: mmbase.js:144 mmbase.js:161
msgid "Saving fields (form)"
msgstr "Saving fields (form)"
-#: mmbase.js:173
+#: mmbase.js:173 mmbase.js:191
msgid "saved"
msgstr "saved"
-#: mmbase.js:202
+#: mmbase.js:202 mmbase.js:242
msgid "RELOAD"
msgstr "RELOAD"
-#: mmbase.js:223
+#: mmbase.js:223 mmbase.js:264
msgid "Getting node fields for "
msgstr "Getting node fields for "
-#: mmbase.js:231
+#: mmbase.js:231 mmbase.js:275
msgid "Loading node fields for "
msgstr "Loading node fields for "
-#: mmbase.js:243
+#: mmbase.js:243 mmbase.js:289
msgid "Getting node body "
msgstr "Getting node body "
-#: mmbase.js:250
+#: mmbase.js:250 mmbase.js:300
msgid "Loading node body "
msgstr "Loading node body "
-#: mmbasetools.js:13
+#: mmbasetools.js:13 mmbasetools.js:14
msgid "Div tool initialized"
msgstr "Div tool initialized"
-#: mmbasetools.js:39
+#: mmbasetools.js:39 mmbasetools.js:40
msgid "Found paragraph"
msgstr "Found paragraph"
-#: mmbasetools.js:43
+#: mmbasetools.js:43 mmbasetools.js:44
msgid "Didn't find paragraph"
msgstr "Didn't find paragraph"
-#: mmbasetools.js:48
+#: mmbasetools.js:48 mmbasetools.js:50
msgid "Div inserted"
msgstr "Div inserted"
@@ -72,7 +72,7 @@
msgid "Normal"
msgstr "Normal"
-#: phony.js:3 phony.js:5
+#: phony.js:3 phony.js:5 phony.js:2
msgid "Richtext editor"
msgstr "Richtext editor"
@@ -80,27 +80,27 @@
msgid "Heading 1"
msgstr "Heading 1"
-#: phony.js:6
+#: phony.js:6 phony.js:3
msgid "default"
msgstr "default"
-#: phony.js:7
+#: phony.js:7 phony.js:4 phony.js:6
msgid "Block"
msgstr "Block"
-#: phony.js:8
+#: phony.js:8 phony.js:5 phony.js:7
msgid "Block class"
msgstr "Block class"
-#: phony.js:9
+#: phony.js:9 phony.js:6 phony.js:8
msgid "Note left"
msgstr "Note left"
-#: phony.js:10
+#: phony.js:10 phony.js:7 phony.js:9
msgid "Note right"
msgstr "Note right"
-#: phony.js:11
+#: phony.js:11 phony.js:8 phony.js:10
msgid "Insert block"
msgstr "Insert block"
@@ -111,3 +111,19 @@
#: override.js:3
msgid "emphasis: alt-i"
msgstr "emphasis: alt-i"
+
+#: mmbase.js:197
+msgid "Not saved"
+msgstr ""
+
+#: mmbase.js:215
+msgid "Reinited "
+msgstr ""
+
+#: phony.js:4
+msgid "Left (Big)"
+msgstr ""
+
+#: phony.js:5
+msgid "Right (Big)"
+msgstr ""
Modified: kupu/trunk/kupu/mmbase/i18n/eo.po
==============================================================================
--- kupu/trunk/kupu/mmbase/i18n/eo.po (original)
+++ kupu/trunk/kupu/mmbase/i18n/eo.po Tue Nov 14 19:07:19 2006
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: mmbase 18\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-28 18:04+0100\n"
+"POT-Creation-Date: 2006-09-19 17:56+0200\n"
"PO-Revision-Date: 2005-11-28 18:06+0100\n"
"Last-Translator: Michiel Meeuwissen <mihxil at xs4all.nl>\n"
"Language-Team: Esperanto <translation-team-eo at lists.sourceforge.net>\n"
@@ -16,51 +16,51 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: mmbase.js:141
+#: mmbase.js:141 mmbase.js:158
msgid "Saving body (kupu)"
msgstr "Savante tekston (kupan)"
-#: mmbase.js:144
+#: mmbase.js:144 mmbase.js:161
msgid "Saving fields (form)"
msgstr "Savante kampojn (formularajn)"
-#: mmbase.js:173
+#: mmbase.js:173 mmbase.js:191
msgid "saved"
msgstr "Savita"
-#: mmbase.js:202
+#: mmbase.js:202 mmbase.js:242
msgid "RELOAD"
msgstr "RETIRAS"
-#: mmbase.js:223
+#: mmbase.js:223 mmbase.js:264
msgid "Getting node fields for "
msgstr "Tirante kampojn"
-#: mmbase.js:231
+#: mmbase.js:231 mmbase.js:275
msgid "Loading node fields for "
msgstr "Enŝutante kampojn por "
-#: mmbase.js:243
+#: mmbase.js:243 mmbase.js:289
msgid "Getting node body "
msgstr "Tirante nodan korpon "
-#: mmbase.js:250
+#: mmbase.js:250 mmbase.js:300
msgid "Loading node body "
msgstr "Enŝutante objekton"
-#: mmbasetools.js:13
+#: mmbasetools.js:13 mmbasetools.js:14
msgid "Div tool initialized"
msgstr ""
-#: mmbasetools.js:39
+#: mmbasetools.js:39 mmbasetools.js:40
msgid "Found paragraph"
msgstr ""
-#: mmbasetools.js:43
+#: mmbasetools.js:43 mmbasetools.js:44
msgid "Didn't find paragraph"
msgstr ""
-#: mmbasetools.js:48
+#: mmbasetools.js:48 mmbasetools.js:50
msgid "Div inserted"
msgstr ""
@@ -72,7 +72,7 @@
msgid "Normal"
msgstr ""
-#: phony.js:3 phony.js:5
+#: phony.js:3 phony.js:5 phony.js:2
msgid "Richtext editor"
msgstr "Riĉa redaktilo"
@@ -80,27 +80,27 @@
msgid "Heading 1"
msgstr ""
-#: phony.js:6
+#: phony.js:6 phony.js:3
msgid "default"
msgstr "defaŭlto"
-#: phony.js:7
+#: phony.js:7 phony.js:4 phony.js:6
msgid "Block"
msgstr ""
-#: phony.js:8
+#: phony.js:8 phony.js:5 phony.js:7
msgid "Block class"
msgstr ""
-#: phony.js:9
+#: phony.js:9 phony.js:6 phony.js:8
msgid "Note left"
msgstr ""
-#: phony.js:10
+#: phony.js:10 phony.js:7 phony.js:9
msgid "Note right"
msgstr ""
-#: phony.js:11
+#: phony.js:11 phony.js:8 phony.js:10
msgid "Insert block"
msgstr ""
@@ -111,3 +111,20 @@
#: override.js:3
msgid "emphasis: alt-i"
msgstr "emfaze: alt-e"
+
+#: mmbase.js:197
+#, fuzzy
+msgid "Not saved"
+msgstr "Savita"
+
+#: mmbase.js:215
+msgid "Reinited "
+msgstr ""
+
+#: phony.js:4
+msgid "Left (Big)"
+msgstr ""
+
+#: phony.js:5
+msgid "Right (Big)"
+msgstr ""
Modified: kupu/trunk/kupu/mmbase/i18n/fr.po
==============================================================================
--- kupu/trunk/kupu/mmbase/i18n/fr.po (original)
+++ kupu/trunk/kupu/mmbase/i18n/fr.po Tue Nov 14 19:07:19 2006
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: mmbase 18\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-28 18:04+0100\n"
+"POT-Creation-Date: 2006-09-19 17:56+0200\n"
"PO-Revision-Date: 2005-06-09 00:42+0200\n"
"Last-Translator: Michiel Meeuwissen <EMAIL at ADDRESS>\n"
"Language-Team: French <traduc at 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:141 mmbase.js:158
msgid "Saving body (kupu)"
msgstr ""
-#: mmbase.js:144
+#: mmbase.js:144 mmbase.js:161
msgid "Saving fields (form)"
msgstr ""
-#: mmbase.js:173
+#: mmbase.js:173 mmbase.js:191
msgid "saved"
msgstr ""
-#: mmbase.js:202
+#: mmbase.js:202 mmbase.js:242
msgid "RELOAD"
msgstr ""
-#: mmbase.js:223
+#: mmbase.js:223 mmbase.js:264
msgid "Getting node fields for "
msgstr ""
-#: mmbase.js:231
+#: mmbase.js:231 mmbase.js:275
msgid "Loading node fields for "
msgstr ""
-#: mmbase.js:243
+#: mmbase.js:243 mmbase.js:289
msgid "Getting node body "
msgstr ""
-#: mmbase.js:250
+#: mmbase.js:250 mmbase.js:300
msgid "Loading node body "
msgstr ""
-#: mmbasetools.js:13
+#: mmbasetools.js:13 mmbasetools.js:14
msgid "Div tool initialized"
msgstr ""
-#: mmbasetools.js:39
+#: mmbasetools.js:39 mmbasetools.js:40
msgid "Found paragraph"
msgstr ""
-#: mmbasetools.js:43
+#: mmbasetools.js:43 mmbasetools.js:44
msgid "Didn't find paragraph"
msgstr ""
-#: mmbasetools.js:48
+#: mmbasetools.js:48 mmbasetools.js:50
msgid "Div inserted"
msgstr ""
@@ -72,7 +72,7 @@
msgid "Normal"
msgstr ""
-#: phony.js:3 phony.js:5
+#: phony.js:3 phony.js:5 phony.js:2
msgid "Richtext editor"
msgstr ""
@@ -80,27 +80,27 @@
msgid "Heading 1"
msgstr ""
-#: phony.js:6
+#: phony.js:6 phony.js:3
msgid "default"
msgstr ""
-#: phony.js:7
+#: phony.js:7 phony.js:4 phony.js:6
msgid "Block"
msgstr ""
-#: phony.js:8
+#: phony.js:8 phony.js:5 phony.js:7
msgid "Block class"
msgstr ""
-#: phony.js:9
+#: phony.js:9 phony.js:6 phony.js:8
msgid "Note left"
msgstr ""
-#: phony.js:10
+#: phony.js:10 phony.js:7 phony.js:9
msgid "Note right"
msgstr ""
-#: phony.js:11
+#: phony.js:11 phony.js:8 phony.js:10
msgid "Insert block"
msgstr ""
@@ -111,3 +111,19 @@
#: override.js:3
msgid "emphasis: alt-i"
msgstr ""
+
+#: mmbase.js:197
+msgid "Not saved"
+msgstr ""
+
+#: mmbase.js:215
+msgid "Reinited "
+msgstr ""
+
+#: phony.js:4
+msgid "Left (Big)"
+msgstr ""
+
+#: phony.js:5
+msgid "Right (Big)"
+msgstr ""
Modified: kupu/trunk/kupu/mmbase/i18n/it.po
==============================================================================
--- kupu/trunk/kupu/mmbase/i18n/it.po (original)
+++ kupu/trunk/kupu/mmbase/i18n/it.po Tue Nov 14 19:07:19 2006
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: mmbase 18\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-28 18:04+0100\n"
+"POT-Creation-Date: 2006-09-19 17:56+0200\n"
"PO-Revision-Date: 2005-06-09 00:45+0200\n"
"Last-Translator: Michiel Meeuwissen <EMAIL at ADDRESS>\n"
"Language-Team: Italian <tp at 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:141 mmbase.js:158
msgid "Saving body (kupu)"
msgstr ""
-#: mmbase.js:144
+#: mmbase.js:144 mmbase.js:161
msgid "Saving fields (form)"
msgstr ""
-#: mmbase.js:173
+#: mmbase.js:173 mmbase.js:191
msgid "saved"
msgstr ""
-#: mmbase.js:202
+#: mmbase.js:202 mmbase.js:242
msgid "RELOAD"
msgstr ""
-#: mmbase.js:223
+#: mmbase.js:223 mmbase.js:264
msgid "Getting node fields for "
msgstr ""
-#: mmbase.js:231
+#: mmbase.js:231 mmbase.js:275
msgid "Loading node fields for "
msgstr ""
-#: mmbase.js:243
+#: mmbase.js:243 mmbase.js:289
msgid "Getting node body "
msgstr ""
-#: mmbase.js:250
+#: mmbase.js:250 mmbase.js:300
msgid "Loading node body "
msgstr ""
-#: mmbasetools.js:13
+#: mmbasetools.js:13 mmbasetools.js:14
msgid "Div tool initialized"
msgstr ""
-#: mmbasetools.js:39
+#: mmbasetools.js:39 mmbasetools.js:40
msgid "Found paragraph"
msgstr ""
-#: mmbasetools.js:43
+#: mmbasetools.js:43 mmbasetools.js:44
msgid "Didn't find paragraph"
msgstr ""
-#: mmbasetools.js:48
+#: mmbasetools.js:48 mmbasetools.js:50
msgid "Div inserted"
msgstr ""
@@ -72,7 +72,7 @@
msgid "Normal"
msgstr ""
-#: phony.js:3 phony.js:5
+#: phony.js:3 phony.js:5 phony.js:2
msgid "Richtext editor"
msgstr ""
@@ -80,27 +80,27 @@
msgid "Heading 1"
msgstr ""
-#: phony.js:6
+#: phony.js:6 phony.js:3
msgid "default"
msgstr ""
-#: phony.js:7
+#: phony.js:7 phony.js:4 phony.js:6
msgid "Block"
msgstr ""
-#: phony.js:8
+#: phony.js:8 phony.js:5 phony.js:7
msgid "Block class"
msgstr ""
-#: phony.js:9
+#: phony.js:9 phony.js:6 phony.js:8
msgid "Note left"
msgstr ""
-#: phony.js:10
+#: phony.js:10 phony.js:7 phony.js:9
msgid "Note right"
msgstr ""
-#: phony.js:11
+#: phony.js:11 phony.js:8 phony.js:10
msgid "Insert block"
msgstr ""
@@ -111,3 +111,19 @@
#: override.js:3
msgid "emphasis: alt-i"
msgstr ""
+
+#: mmbase.js:197
+msgid "Not saved"
+msgstr ""
+
+#: mmbase.js:215
+msgid "Reinited "
+msgstr ""
+
+#: phony.js:4
+msgid "Left (Big)"
+msgstr ""
+
+#: phony.js:5
+msgid "Right (Big)"
+msgstr ""
Modified: kupu/trunk/kupu/mmbase/i18n/nl.po
==============================================================================
--- kupu/trunk/kupu/mmbase/i18n/nl.po (original)
+++ kupu/trunk/kupu/mmbase/i18n/nl.po Tue Nov 14 19:07:19 2006
@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: mmbase 18\n"
+"Project-Id-Version: mmbase 19\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-28 18:04+0100\n"
-"PO-Revision-Date: 2005-11-28 18:05+0100\n"
+"POT-Creation-Date: 2006-09-19 17:56+0200\n"
+"PO-Revision-Date: 2006-09-19 18:00+0200\n"
"Last-Translator: Michiel Meeuwissen <mihxil at xs4all.nl>\n"
"Language-Team: Dutch <vertaling at vrijschrift.org>\n"
"MIME-Version: 1.0\n"
@@ -16,53 +16,53 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: mmbase.js:141
+#: mmbase.js:141 mmbase.js:158
msgid "Saving body (kupu)"
msgstr "Schrijft tekst weg (kupu)"
-#: mmbase.js:144
+#: mmbase.js:144 mmbase.js:161
msgid "Saving fields (form)"
msgstr "Schrijft velden weg (formulier)"
-#: mmbase.js:173
+#: mmbase.js:173 mmbase.js:191
msgid "saved"
msgstr "opgeslagen"
-#: mmbase.js:202
+#: mmbase.js:202 mmbase.js:242
msgid "RELOAD"
-msgstr ""
+msgstr "Herladen"
-#: mmbase.js:223
+#: mmbase.js:223 mmbase.js:264
msgid "Getting node fields for "
msgstr "Haalt velden (formulier) voor"
-#: mmbase.js:231
+#: mmbase.js:231 mmbase.js:275
msgid "Loading node fields for "
msgstr "Schrijft velden weg (formulier)"
-#: mmbase.js:243
+#: mmbase.js:243 mmbase.js:289
msgid "Getting node body "
msgstr "Haalt node text"
-#: mmbase.js:250
+#: mmbase.js:250 mmbase.js:300
msgid "Loading node body "
msgstr "Haalt node op"
-#: mmbasetools.js:13
+#: mmbasetools.js:13 mmbasetools.js:14
msgid "Div tool initialized"
-msgstr ""
+msgstr "Blok-tool geinitialiseerd"
-#: mmbasetools.js:39
+#: mmbasetools.js:39 mmbasetools.js:40
msgid "Found paragraph"
-msgstr ""
+msgstr "Alinea gevonden"
-#: mmbasetools.js:43
+#: mmbasetools.js:43 mmbasetools.js:44
msgid "Didn't find paragraph"
-msgstr ""
+msgstr "Geen alinea gevonden"
-#: mmbasetools.js:48
+#: mmbasetools.js:48 mmbasetools.js:50
msgid "Div inserted"
-msgstr ""
+msgstr "Blok ingevoegd"
#: phony.js:1
msgid "No node"
@@ -70,9 +70,9 @@
#: phony.js:2
msgid "Normal"
-msgstr ""
+msgstr "Normaal"
-#: phony.js:3 phony.js:5
+#: phony.js:3 phony.js:5 phony.js:2
msgid "Richtext editor"
msgstr "Richtext editor"
@@ -80,27 +80,27 @@
msgid "Heading 1"
msgstr ""
-#: phony.js:6
+#: phony.js:6 phony.js:3
msgid "default"
msgstr "default"
-#: phony.js:7
+#: phony.js:7 phony.js:4 phony.js:6
msgid "Block"
msgstr "Blok"
-#: phony.js:8
+#: phony.js:8 phony.js:5 phony.js:7
msgid "Block class"
msgstr "Blok-soort"
-#: phony.js:9
+#: phony.js:9 phony.js:6 phony.js:8
msgid "Note left"
msgstr "Noot (links)"
-#: phony.js:10
+#: phony.js:10 phony.js:7 phony.js:9
msgid "Note right"
msgstr "Noot (rechts)"
-#: phony.js:11
+#: phony.js:11 phony.js:8 phony.js:10
msgid "Insert block"
msgstr "Voeg blok in"
@@ -111,3 +111,19 @@
#: override.js:3
msgid "emphasis: alt-i"
msgstr "benadrukt: alt-i"
+
+#: mmbase.js:197
+msgid "Not saved"
+msgstr "Niet opgeslagen"
+
+#: mmbase.js:215
+msgid "Reinited "
+msgstr "Herladen "
+
+#: phony.js:4
+msgid "Left (Big)"
+msgstr "Links (Groot)"
+
+#: phony.js:5
+msgid "Right (Big)"
+msgstr "Rechts (Groot)"
Modified: kupu/trunk/kupu/mmbase/layout.js
==============================================================================
--- kupu/trunk/kupu/mmbase/layout.js (original)
+++ kupu/trunk/kupu/mmbase/layout.js Tue Nov 14 19:07:19 2006
@@ -7,7 +7,7 @@
function winOnLoad() {
var ele = document.getElementById('leftColumn');
if (ele && xDef(ele.style, ele.offsetHeight)) { // another compatibility check
- //adjustLayout();
+ adjustLayout();
addEventHandler(window, 'resize', winOnResize, window);
}
}
Modified: kupu/trunk/kupu/mmbase/mmbase.css
==============================================================================
--- kupu/trunk/kupu/mmbase/mmbase.css (original)
+++ kupu/trunk/kupu/mmbase/mmbase.css Tue Nov 14 19:07:19 2006
@@ -29,6 +29,12 @@
}
+#nodefields p {
+ font-size: smaller;
+}
+#nodefields span.mm_datetime {
+
+}
#nodefields a:hover {
background-color: #527d94;
}
@@ -163,7 +169,6 @@
}
div#kupu-toolbox-debug {
-/* display: none; */
top: 750px;
}
Modified: kupu/trunk/kupu/mmbase/mmbase.js
==============================================================================
--- kupu/trunk/kupu/mmbase/mmbase.js (original)
+++ kupu/trunk/kupu/mmbase/mmbase.js Tue Nov 14 19:07:19 2006
@@ -78,8 +78,8 @@
kupu.initialize();
if (window.kuputoolcollapser) {
var collapser = new window.kuputoolcollapser.Collapser('kupu-toolboxes');
- if (kupu.getBrowserName() != 'IE') {
- collapser.initialize();
+ if (kupu.getBrowserName() != 'IE') {
+ collapser.initialize();
}
var toolboxes = document.getElementById('kupu-toolboxes');
for (var i=0; i < toolboxes.childNodes.length; i++) {
@@ -89,11 +89,11 @@
addEventHandler(heading, 'click', adjustToolBoxesLayout);
};
};
- if (kupu.getBrowserName() == 'IE') {
- collapser.initialize();
+ if (kupu.getBrowserName() == 'IE') {
+ collapser.initialize();
}
};
-
+ //alert(" kupu " + kupu.getBrowserName());
return kupu;
};
@@ -124,7 +124,7 @@
var sh = screen.height;
var left = sw / 2 - width / 2;
var top = sh / 2 - height / 2;
- var win = window.open(absoluteUrl + "../common/" + url, 'someWindow',
+ var win = window.open(absoluteUrl + "../common/" + url, 'someWindow',
'width=' + width + ',height=' + height + ',left=' + left + ',top=' + top);
return win;
};
@@ -137,7 +137,8 @@
function serialize(request) {
//return request.responseXML.xml;
// new sarissa:
- return Sarissa.serialize(request.responseXML);
+ var ser = new XMLSerializer();
+ return ser.serializeToString(request.responseXML);
}
var boundary = "----------mmbase-kupu-node-fields----1234567890";
@@ -160,7 +161,7 @@
var content = "";
kupu.logMessage(_("Saving fields (form)") + " " + currentNode);
-
+
var a = document.getElementsByTagName('input', document.getElementById('nodefields'));
for (i=0; i < a.length; i++) {
content = addMultiPart(content, a[i]);
@@ -257,7 +258,6 @@
}
}
-
var success;
var nodeXml = loadedNodes.get(nodeNumber);
if (nodeXml == null) {
@@ -266,7 +266,7 @@
request.open("GET", 'node.jspx?objectnumber=' + nodeNumber, false);
request.send('');
var dom = request.responseXML;
- nodeXml = Sarissa.serialize(dom);
+ nodeXml = serialize(request);
success = request.status == 200;
if (success) {
loadedNodes.add(nodeNumber, nodeXml);
@@ -278,12 +278,12 @@
request.send('');
success = request.status == 200;
}
-
// request to node.jspx, should have put the node in the session
if (success) {
nodeDiv.innerHTML = nodeXml;
}
+
var nodeBodyXml = loadedNodeBodies.get(nodeNumber);
if (nodeBodyXml == null) {
kupu.logMessage(_("Getting node body ") + " " + nodeNumber);
@@ -292,13 +292,13 @@
request.send('');
success = success && request.status == 200;
if (request.status == 200) {
- var dom = request.responseXML;
- nodeBodyXml = Sarissa.serialize(dom);
+ nodeBodyXml = serialize(request);
loadedNodeBodies.add(nodeNumber, nodeBodyXml);
}
} else {
kupu.logMessage(_("Loading node body ") + " " + nodeNumber);
}
+
if (success) {
kupu.setHTMLBody(nodeBodyXml);
}
@@ -420,11 +420,11 @@
// ================================================================================
/**
- * our own version to also save the other fields
+ * our own version to also save the other fields
*/
function saveOnPart() {
/* ask the user if (s)he wants to save the document before leaving */
- if (kupu.content_changed &&
+ if (kupu.content_changed &&
confirm(_('You have unsaved changes. Do you want to save before leaving the page?'))) {
kupu.config.reload_src = 0;
saveNode(null, kupu);
Modified: kupu/trunk/kupu/mmbase/mmbasetools.js
==============================================================================
--- kupu/trunk/kupu/mmbase/mmbasetools.js (original)
+++ kupu/trunk/kupu/mmbase/mmbasetools.js Tue Nov 14 19:07:19 2006
@@ -18,6 +18,7 @@
this.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');
@@ -25,17 +26,24 @@
if (divclass) {
div.className = divclass;
};
- var text = this.editor.getSelection();
- var child;
- if (! text || text == '') {
- child = doc.createElement("p");
- child.appendChild(doc.createTextNode(".")); // should not be empty, otherwise doesn't work well in firefox
+ 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 {
- child = doc.createTextNode(text);
+ div.appendChild(fragment);
}
- var marker = doc.createTextNode("");
- div.appendChild(child);
- var currp = this.editor.getNearestParentOfType(currnode, 'p');
+
+ //var ser = new XMLSerializer();
+ //alert("inserting " + ser.serializeToString(div));
+
if (currp) {
this.editor.logMessage(_("Found paragraph"));
currp.parentNode.insertBefore(div, currp);
@@ -45,7 +53,6 @@
//alert("Inserting " + div);
div = this.editor.insertNodeAtSelection(div, 1);
}
- this.editor.insertNodeAtSelection(marker, 1);
this.editor.logMessage(_("Div inserted"));
this.editor.updateState();
@@ -99,7 +106,7 @@
this.toolboxel = getFromSelector(toolboxid);
this.plainclass = plainclass;
this.activeclass = activeclass;
-
+ this.classRe = new RegExp('\\bfloat\\b', 'i');
this.initialize = function(tool, editor) {
this.tool = tool;
this.editor = editor;
@@ -110,7 +117,7 @@
this.updateState = function(selNode, event) {
/* update the state of the toolbox element */
var divel = this.editor.getNearestParentOfType(selNode, 'div');
- if (divel) {
+ if (divel && this.classRe.test(divel.className)) {
// check first before setting a class for backward compatibility
if (this.toolboxel) {
this.toolboxel.className = this.activeclass;
Modified: kupu/trunk/kupu/mmbase/node.body.jspx
==============================================================================
--- kupu/trunk/kupu/mmbase/node.body.jspx (original)
+++ kupu/trunk/kupu/mmbase/node.body.jspx Tue Nov 14 19:07:19 2006
@@ -1,5 +1,6 @@
<mm:content type="text/xml"
expires="-1"
+ postprocessor="none"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:jsp="http://java.sun.com/JSP/Page"
xmlns:fn="http://java.sun.com/jsp/jstl/functions"
@@ -11,7 +12,9 @@
<mm:cloud method="asis">
<mm:notpresent referid="node">
<mm:remove referid="node" />
- <mm:node number="${param.objectnumber}" id="node" notfound="skip" />
+ <mm:node number="${param.objectnumber}" id="node" notfound="skip">
+
+ </mm:node>
</mm:notpresent>
<mm:present referid="node">
Modified: kupu/trunk/kupu/mmbase/preview.jspx
==============================================================================
--- kupu/trunk/kupu/mmbase/preview.jspx (original)
+++ kupu/trunk/kupu/mmbase/preview.jspx Tue Nov 14 19:07:19 2006
@@ -9,6 +9,7 @@
<mm:import externid="objectnumber" />
<mm:cloud method="asis">
<mm:node referid="objectnumber">
+ <!--
<mm:formatter format="xhtml">
<mm:field name="body" />
<mm:listrelations type="object" role="idrel" searchdir="destination">
@@ -23,6 +24,7 @@
</mm:relatednode>
</mm:listrelations>
</mm:formatter>
+ -->
</mm:node>
</mm:cloud>
</mm:content>
Modified: kupu/trunk/kupu/mmbase/toolboxes.kupu
==============================================================================
--- kupu/trunk/kupu/mmbase/toolboxes.kupu (original)
+++ kupu/trunk/kupu/mmbase/toolboxes.kupu Tue Nov 14 19:07:19 2006
@@ -23,8 +23,10 @@
<option value="image-inline" i18n:translate="">Inline</option>
<option value="image-left" i18n:translate="">Left</option>
<option value="image-right" i18n:translate="">Right</option>
- <option value="image-left big" i18n:translate="">Left (Big)</option>
- <option value="image-right big" i18n:translate="">Right (Big)</option>
+ <fmt:bundle basename="org.mmbase.kupu.Messages">
+ <option value="image-left big" ><fmt:message key="Left (Big)" /></option>
+ <option value="image-right big"><fmt:message key="Right (Big)" /></option>
+ </fmt:bundle>
<!--
<option value="paragraph" i18n:translate="">Paragraph</option>
<option value="section" i18n:translate="">Section</option>
Modified: kupu/trunk/kupu/mmbase/wire.kupu
==============================================================================
--- kupu/trunk/kupu/mmbase/wire.kupu (original)
+++ kupu/trunk/kupu/mmbase/wire.kupu Tue Nov 14 19:07:19 2006
@@ -54,13 +54,11 @@
<kupu:insert-part feature="toolbar" part="select-styles" />
<kupu:insert-part feature="save" part="buttons" />
<kupu:insert-part feature="toolbar" part="buttongroup-basicmarkup" />
-
- <!-- let's not do subsuper for the moment, though this is actually sensible -->
<kupu:insert-part feature="toolbar" part="buttongroup-subsuper" />
<!--
- kupu:insert-part feature="colorchooser" part="buttons"
- <kupu:insert-part feature="toolbar" part="buttongroup-justify" />
+ kupu:insert-part feature="colorchooser" part="buttons"
+ <kupu:insert-part feature="toolbar" part="buttongroup-justify" />
-->
<kupu:insert-part feature="toolbar" part="buttongroup-list" />
More information about the kupu-checkins
mailing list