You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2004/01/23 09:44:12 UTC
cvs commit: cocoon-lenya/src/webapp/lenya/xslt/info deactivate.xsl
andreas 2004/01/23 00:44:12
Modified: src/webapp/lenya/xslt/publishing publish-screen.xsl
src/webapp/lenya/xslt/info deactivate.xsl
Log:
fixed publish & deactivate
Revision Changes Path
1.11 +9 -7 cocoon-lenya/src/webapp/lenya/xslt/publishing/publish-screen.xsl
Index: publish-screen.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/xslt/publishing/publish-screen.xsl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- publish-screen.xsl 17 Nov 2003 03:39:10 -0000 1.10
+++ publish-screen.xsl 23 Jan 2004 08:44:12 -0000 1.11
@@ -92,14 +92,15 @@
<form name="form_publish">
- <input type="hidden" name="lenya.event" value="{$lenya.event}"/>
<input type="hidden" name="lenya.step" value="publish"/>
<input type="hidden" name="task-id" value="{$task-id}"/>
- <input type="hidden" name="properties.publish.sources" value="{$sources}"/>
- <input type="hidden" name="properties.publish.documentid" value="{$document-id}"/>
- <input type="hidden" name="properties.export.uris" value="{$uris}"/>
- <input type="hidden" name="properties.publish.language" value="{$document-language}"/>
+ <input type="hidden" name="document-id" value="{$document-id}"/>
+ <input type="hidden" name="document-language" value="{$document-language}"/>
+ <input type="hidden" name="user-id" value="{/usecase:publish/usecase:user-id}"/>
+ <input type="hidden" name="ip-address" value="{/usecase:publish/usecase:ip-address}"/>
+ <input type="hidden" name="role-ids" value="{/usecase:publish/usecase:role-ids}"/>
+ <input type="hidden" name="workflow-event" value="publish"/>
<div class="lenya-box">
<div class="lenya-box-title">Publish</div>
@@ -128,7 +129,7 @@
<td/>
<td>
<input type="submit" name="lenya.usecase" value="publish"/>
-    
+ <xsl:text> </xsl:text>
<input type="button" onClick="location.href='{$referer}';" value="Cancel"/>
</td>
</tr>
@@ -145,7 +146,7 @@
</not:notification>
</form>
-
+ <!--
<sch:scheduler-form>
<sch:job tasklabel="Publish">
@@ -165,6 +166,7 @@
</sch:job>
</sch:scheduler-form>
+ -->
<div style="text-align: right">
<form action="{$referer}"><input type="submit" value="Back to Page"/></form>
1.16 +17 -11 cocoon-lenya/src/webapp/lenya/xslt/info/deactivate.xsl
Index: deactivate.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/xslt/info/deactivate.xsl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- deactivate.xsl 11 Nov 2003 15:10:57 -0000 1.15
+++ deactivate.xsl 23 Jan 2004 08:44:12 -0000 1.16
@@ -10,8 +10,6 @@
xmlns:sch="http://apache.org/cocoon/lenya/scheduler/1.0"
>
- <xsl:param name="lenya.event"/>
-
<xsl:output encoding="ISO-8859-1" indent="yes" version="1.0"/>
<xsl:variable name="document-id">
@@ -19,7 +17,7 @@
</xsl:variable>
<xsl:variable name="language">
- <xsl:value-of select="/page/info/language"/>
+ <xsl:value-of select="/page/info/document-language"/>
</xsl:variable>
<xsl:variable name="task-id">
@@ -52,12 +50,9 @@
<div class="lenya-box-title">Deactivate Document</div>
<div class="lenya-box-body">
- <input type="hidden" name="lenya.event" value="{$lenya.event}"/>
<input type="hidden" name="lenya.step" value="deactivate"/>
<input type="hidden" name="task-id" value="{$task-id}"/>
-
- <input type="hidden" name="properties.node.firstdocumentid" value="{$document-id}"/>
- <input type="hidden" name="properties.node.language" value="{$language}"/>
+ <xsl:call-template name="task-parameters"/>
<table class="lenya-table-noborder">
<tr>
@@ -78,21 +73,23 @@
</div>
</div>
+ <!--
<not:notification>
<not:textarea/>
</not:notification>
+ -->
</form>
+ <!--
<sch:scheduler-form>
<sch:job tasklabel="Deactivate">
- <input type="hidden" name="properties.node.firstdocumentid" value="{$document-id}"/>
- <input type="hidden" name="properties.node.language" value="{$language}"/>
- <input type="hidden" name="workflow.event" value="deactivate"/>
<input type="hidden" name="wrapper.task-id" value="deactivateDocument"/>
+ <xsl:call-template name="task-parameters"/>
</sch:job>
</sch:scheduler-form>
<form action="{$request-uri}"><input type="submit" value="Back to Page"/></form>
+ -->
</xsl:template>
@@ -138,6 +135,15 @@
<a target="_blank" href="{@href}"><xsl:value-of select="@id"/><xsl:value-of select="."/></a><br/>
</xsl:for-each>
</td>
+ </xsl:template>
+
+ <xsl:template name="task-parameters">
+ <input type="hidden" name="document-id" value="{$document-id}"/>
+ <input type="hidden" name="document-language" value="{$language}"/>
+ <input type="hidden" name="workflow-event" value="{/page/info/workflow-event}"/>
+ <input type="hidden" name="user-id" value="{/page/info/user-id}"/>
+ <input type="hidden" name="ip-address" value="{/page/info/ip-address}"/>
+ <input type="hidden" name="role-ids" value="{/page/info/role-ids}"/>
</xsl:template>
</xsl:stylesheet>
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org