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 2004/06/29 11:36:10 UTC
cvs commit: cocoon-lenya/src/webapp/lenya/xslt/authoring/edit form-layout.xsl
michi 2004/06/29 02:36:10
Modified: src/webapp/lenya usecase.xmap
src/webapp/lenya/xslt/authoring/edit form-layout.xsl
Log:
workflow event is not hardcoded anymore
Revision Changes Path
1.215 +4 -2 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.214
retrieving revision 1.215
diff -u -r1.214 -r1.215
--- usecase.xmap 28 Jun 2004 08:34:38 -0000 1.214
+++ usecase.xmap 29 Jun 2004 09:36:10 -0000 1.215
@@ -613,6 +613,7 @@
</map:transform>
<map:transform src="{fallback:xslt/authoring/edit/form-layout.xsl}">
<map:parameter name="contextPrefix" value="{page-envelope:context-prefix}"/>
+ <map:parameter name="wfevent" value="{request-param:lenya.event}"/>
</map:transform>
<map:call resource="style-cms-page"/>
@@ -639,6 +640,7 @@
<map:transform src="{fallback:xslt/authoring/edit/form-layout.xsl}">
<map:parameter name="contextPrefix" value="{page-envelope:context-prefix}"/>
<map:parameter name="edit" value="{editSelect}"/>
+ <map:parameter name="wfevent" value="{request-param:lenya.event}"/>
</map:transform>
<map:call resource="style-cms-page"/>
</map:act>
@@ -658,7 +660,7 @@
<map:parameter name="area" value="{page-envelope:area}"/>
<map:parameter name="document-id" value="{page-envelope:document-id}"/>
<map:parameter name="language" value="{page-envelope:document-language}"/>
- <map:parameter name="event" value="edit"/>
+ <map:parameter name="event" value="{request-param:lenya.event}"/>
</map:act>
<map:transform src="xslt/authoring/edit/redirect-to.xsl">
1.19 +21 -1 cocoon-lenya/src/webapp/lenya/xslt/authoring/edit/form-layout.xsl
Index: form-layout.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/xslt/authoring/edit/form-layout.xsl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- form-layout.xsl 27 Apr 2004 21:38:39 -0000 1.18
+++ form-layout.xsl 29 Jun 2004 09:36:10 -0000 1.19
@@ -24,6 +24,7 @@
<xsl:param name="contextPrefix" select="'/lenya'"/>
<xsl:param name="edit" select="'No node selected yet'"/>
+<xsl:param name="wfevent" select="'null'"/>
<xsl:variable name="imagesPath"><xsl:value-of select="$contextPrefix"/>/lenya/images/editor</xsl:variable>
@@ -51,6 +52,17 @@
<td class="lenya-entry-caption">Node:</td>
<td><xsl:value-of select="$edit"/></td>
</tr>
+ <tr>
+ <td class="lenya-entry-caption">Workflow Event:</td>
+ <xsl:choose>
+ <xsl:when test="$wfevent = '' or $wfevent = 'null'">
+ <td>No workflow event specified</td>
+ </xsl:when>
+ <xsl:otherwise>
+ <td><xsl:value-of select="$wfevent"/></td>
+ </xsl:otherwise>
+ </xsl:choose>
+ </tr>
<xsl:if test="message">
<tr>
@@ -71,6 +83,14 @@
</div>
<form method="post" action="?lenya.usecase=edit&lenya.step=close&form={ftype}">
+ <xsl:choose>
+ <xsl:when test="$wfevent = '' or $wfevent = 'null'">
+ <xsl:comment>No workflow event</xsl:comment>
+ </xsl:when>
+ <xsl:otherwise>
+ <input type="hidden" name="lenya.event" value="{$wfevent}"/>
+ </xsl:otherwise>
+ </xsl:choose>
<div class="lenya-box">
<div class="lenya-box-title" style="text-align: right">
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org