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/10/23 19:52:08 UTC
cvs commit: cocoon-lenya/src/webapp/lenya/xslt/authoring/edit form.xsl
michi 2003/10/23 10:52:08
Modified: src/webapp/lenya usecase.xmap
src/webapp/lenya/pubs/blog/config/menus entry.xsp feed.xsp
src/webapp/lenya/pubs/default/config/menus generic.xsp
src/webapp/lenya/pubs/oscom/config/menus matrix.xsp
src/webapp/lenya/xslt/authoring/edit form.xsl
Log:
request parameter renamed to form
Revision Changes Path
1.123 +4 -4 cocoon-lenya/src/webapp/lenya/usecase.xmap
Index: usecase.xmap
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/usecase.xmap,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- usecase.xmap 22 Oct 2003 19:28:38 -0000 1.122
+++ usecase.xmap 23 Oct 2003 17:52:07 -0000 1.123
@@ -333,9 +333,9 @@
<map:transform src="xslt/authoring/edit/removeSourceTags.xsl"/>
<!-- FIXME: CDATA is also being modified by replace-predifined-entities.xsl, which actually shouldn't -->
<map:transform src="xslt/authoring/edit/replace-predifined-entities.xsl"/>
- <map:transform src="pubs/{1}/lenya/xslt/formeditor/{request-param:doctype}.xsl">
+ <map:transform src="pubs/{1}/lenya/xslt/formeditor/{request-param:form}.xsl">
<map:parameter name="docid" value="{page-envelope:document-path}"/>
- <map:parameter name="doctype" value="{request-param:doctype}"/>
+ <map:parameter name="form" value="{request-param:form}"/>
</map:transform>
<map:serialize type="html" />
</map:match>
@@ -360,9 +360,9 @@
<!-- FIXME: CDATA is also being modified by replace-predifined-entities.xsl, which actually shouldn't -->
<map:transform src="xslt/authoring/edit/replace-predifined-entities.xsl"/>
- <map:transform src="pubs/{../1}/lenya/xslt/formeditor/{request-param:doctype}.xsl">
+ <map:transform src="pubs/{../1}/lenya/xslt/formeditor/{request-param:form}.xsl">
<map:parameter name="docid" value="{page-envelope:document-path}"/>
- <map:parameter name="doctype" value="{request-param:doctype}"/>
+ <map:parameter name="form" value="{request-param:form}"/>
<map:parameter name="message" value="{message}"/>
</map:transform>
<map:serialize type="html" />
1.17 +1 -1 cocoon-lenya/src/webapp/lenya/pubs/blog/config/menus/entry.xsp
Index: entry.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/blog/config/menus/entry.xsp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- entry.xsp 23 Oct 2003 17:09:36 -0000 1.16
+++ entry.xsp 23 Oct 2003 17:52:07 -0000 1.17
@@ -44,7 +44,7 @@
<menus>
<menu name="File" label="File">
<block>
- <item uc:usecase="edit" href="?lenya.step=open&doctype=entry">Edit with Forms</item>
+ <item uc:usecase="edit" href="?lenya.step=open&form=entry">Edit with Forms</item>
<item href="index-bxeng.html">Edit with BXE</item>
<!--
<item>Edit with Midas</item>
1.8 +1 -1 cocoon-lenya/src/webapp/lenya/pubs/blog/config/menus/feed.xsp
Index: feed.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/blog/config/menus/feed.xsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- feed.xsp 22 Oct 2003 19:10:31 -0000 1.7
+++ feed.xsp 23 Oct 2003 17:52:07 -0000 1.8
@@ -40,7 +40,7 @@
<item uc:usecase="create" uc:step="showscreen" href="?doctype=entry">Add new Entry</item>
</block>
<block>
- <item uc:usecase="edit" href="../../sidebar.html?lenya.step=open&doctype=sidebar">Edit Sidebar with Forms</item>
+ <item uc:usecase="edit" href="../../sidebar.html?lenya.step=open&form=sidebar">Edit Sidebar with Forms</item>
</block>
<block>
<item><xsp:attribute name="href">?lenya.usecase=logout</xsp:attribute>Logout</item>
1.43 +4 -6 cocoon-lenya/src/webapp/lenya/pubs/default/config/menus/generic.xsp
Index: generic.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/config/menus/generic.xsp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- generic.xsp 23 Oct 2003 14:04:50 -0000 1.42
+++ generic.xsp 23 Oct 2003 17:52:07 -0000 1.43
@@ -55,19 +55,17 @@
<menu label="Search" name="Edit">
<xsp:logic>
-//if (docType.equals("simple")) {
+if (docType.equals("simple")) {
<block>
- <item uc:usecase="edit" uc:step="open" wf:event="edit" href="?doctype=simple">Edit with Forms</item>
+ <item uc:usecase="edit" uc:step="open" wf:event="edit" href="?form=simple">Edit with Forms</item>
<item uc:usecase="bxe" uc:step="open" wf:event="edit" href="?">Edit with BXE</item>
</block>
-//}
-<!--
+}
else if (docType.equals("xhtml")) {
<block>
- <item href="?lenya.step=open&doctype=xhtml" uc:usecase="edit" wf:event="edit">Edit with Forms</item>
+ <item href="?lenya.step=open&form=xhtml" uc:usecase="edit" wf:event="edit">Edit with Forms</item>
</block>
}
--->
</xsp:logic>
<!--
<block>
1.25 +1 -1 cocoon-lenya/src/webapp/lenya/pubs/oscom/config/menus/matrix.xsp
Index: matrix.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/oscom/config/menus/matrix.xsp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- matrix.xsp 2 Oct 2003 22:18:35 -0000 1.24
+++ matrix.xsp 23 Oct 2003 17:52:07 -0000 1.25
@@ -34,7 +34,7 @@
<menus>
<menu name="File" label="File">
<block>
- <item uc:usecase="edit" href="?lenya.step=open&doctype=cmfs">Edit with Forms</item>
+ <item uc:usecase="edit" href="?lenya.step=open&form=cmfs">Edit with Forms</item>
<!--
<item><xsp:attribute name="href"><xsp:expr>xsp_lenya_context_prefix+"/authoring/xopus2/matrix/"+projectid+".html"</xsp:expr>?documentid=matrix/<xsp:expr>projectid+".xml"</xsp:expr></xsp:attribute>Edit with Xopus2</item>
-->
1.5 +3 -3 cocoon-lenya/src/webapp/lenya/xslt/authoring/edit/form.xsl
Index: form.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/xslt/authoring/edit/form.xsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- form.xsl 23 Sep 2003 22:14:30 -0000 1.4
+++ form.xsl 23 Oct 2003 17:52:07 -0000 1.5
@@ -5,14 +5,14 @@
>
<xsl:param name="docid"/>
-<xsl:param name="doctype"/>
+<xsl:param name="form"/>
<xsl:param name="message"/>
<xsl:template match="/">
<html>
<body>
<p>
-Edit Document <b><xsl:value-of select="$docid"/></b> (Document Type: <xsl:value-of select="$doctype"/>)
+Edit Document <b><xsl:value-of select="$docid"/></b> (Form: <xsl:value-of select="$form"/>)
</p>
<xsl:if test="$message">
@@ -23,7 +23,7 @@
</p>
</xsl:if>
-<form method="post" action="?lenya.usecase=edit&lenya.step=close&doctype={$doctype}">
+<form method="post" action="?lenya.usecase=edit&lenya.step=close&form={$form}">
<table border="1">
<tr>
<td colspan="3" align="right"><input type="submit" value="SAVE" name="save"/><input type="submit" value="CANCEL" name="cancel"/></td>
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org