You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by mi...@apache.org on 2003/12/03 23:45:47 UTC
cvs commit: cocoon-lenya/src/webapp/lenya/pubs/blog/lenya/xslt/formeditor entry.xsl
michi 2003/12/03 14:45:46
Modified: src/java/org/apache/lenya/cms/cocoon/acting
HTMLFormSaveAction.java
src/webapp/lenya/pubs/blog/config/doctypes/schemas entry.rng
src/webapp/lenya/pubs/blog/lenya/xslt/formeditor entry.xsl
Log:
insert-before and schema fixed
Revision Changes Path
1.28 +2 -2 cocoon-lenya/src/java/org/apache/lenya/cms/cocoon/acting/HTMLFormSaveAction.java
Index: HTMLFormSaveAction.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/cocoon/acting/HTMLFormSaveAction.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- HTMLFormSaveAction.java 1 Dec 2003 23:43:23 -0000 1.27
+++ HTMLFormSaveAction.java 3 Dec 2003 22:45:46 -0000 1.28
@@ -197,7 +197,7 @@
// no .x and .y from input type="image"
xupdateModifications = append(pname.substring(0, pname.length()-2));
//xupdateModifications = append(pname);
- } else if (pname.indexOf("xupdate:insert-before") > 0 && pname.endsWith(">")) {
+ } else if (pname.indexOf("xupdate:insert-before") > 0 && pname.endsWith(">.x")) {
//} else if (pname.indexOf("xupdate:insert-before") > 0 && pname.endsWith(">")) {
// no .x and .y from input type="image"
xupdateModifications = insertBefore(pname.substring(0, pname.length()-2));
1.7 +2 -0 cocoon-lenya/src/webapp/lenya/pubs/blog/config/doctypes/schemas/entry.rng
Index: entry.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/blog/config/doctypes/schemas/entry.rng,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- entry.rng 3 Dec 2003 13:10:23 -0000 1.6
+++ entry.rng 3 Dec 2003 22:45:46 -0000 1.7
@@ -33,6 +33,7 @@
<element name="echo:modified">
<text/>
</element>
+ <oneOrMore>
<element name="echo:content">
<attribute name="type"/>
<element>
@@ -57,6 +58,7 @@
</oneOrMore>
</element>
</element>
+ </oneOrMore>
</element>
</start>
</grammar>
1.13 +2 -2 cocoon-lenya/src/webapp/lenya/pubs/blog/lenya/xslt/formeditor/entry.xsl
Index: entry.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/blog/lenya/xslt/formeditor/entry.xsl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- entry.xsl 6 Nov 2003 23:13:09 -0000 1.12
+++ entry.xsl 3 Dec 2003 22:45:46 -0000 1.13
@@ -33,7 +33,7 @@
<xsl:apply-templates select="echo:content"/>
<node name="Content (text/xhtml)">
- <action><insert name="<xupdate:append select="/echo:entry"><xupdate:element name="echo:content" namespace="http://purl.org/atom/ns#"><xupdate:attribute name="type">text/xhtml</xupdate:attribute>New XHTML content</xupdate:element></xupdate:append>"/></action>
+ <action><insert name="<xupdate:append select="/echo:entry"><xupdate:element name="echo:content" namespace="http://purl.org/atom/ns#"><xupdate:attribute name="type">text/xhtml</xupdate:attribute><p>Append new content</p></xupdate:element></xupdate:append>"/></action>
</node>
<!--
<node name="Content (text/plain as CDATA)">
@@ -70,7 +70,7 @@
<xsl:template match="echo:content[@type='text/xhtml']">
<node name="Content (text/xhtml)">
- <action><insert name="<xupdate:insert-before select="/echo:entry/echo:content[@tagID='{@tagID}']"><xupdate:element name="echo:content" namespace="http://purl.org/atom/ns#"><xupdate:attribute name="type">text/xhtml</xupdate:attribute>New content</xupdate:element></xupdate:insert-before>"/></action>
+ <action><insert name="<xupdate:insert-before select="/echo:entry/echo:content[@tagID='{@tagID}']"><xupdate:element name="echo:content" namespace="http://purl.org/atom/ns#"><xupdate:attribute name="type">text/xhtml</xupdate:attribute><p>Insert before new content</p></xupdate:element></xupdate:insert-before>"/></action>
</node>
<node name="Content (text/xhtml)" select="/echo:entry/echo:content[@tagID='{@tagID}']">
<action><delete name="<xupdate:remove select="/echo:entry/echo:content[@tagID='{@tagID}']"/>"/></action>
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org