You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by eg...@apache.org on 2003/09/12 20:28:00 UTC
cvs commit: cocoon-lenya/src/webapp/lenya/xslt/authoring removelabel.xsl
egli 2003/09/12 11:28:00
Modified: src/webapp/lenya/xslt/publishing publish-screen.xsl
src/webapp/lenya/xslt/authoring removelabel.xsl
Log:
Fixed the Cancel button.
Revision Changes Path
1.4 +86 -85 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- publish-screen.xsl 1 Sep 2003 15:24:58 -0000 1.3
+++ publish-screen.xsl 12 Sep 2003 18:28:00 -0000 1.4
@@ -1,91 +1,92 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<xsl:stylesheet version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:page="http://apache.org/cocoon/lenya/cms-page/1.0"
- xmlns:usecase="http://apache.org/cocoon/lenya/usecase/1.0"
- xmlns:not="http://apache.org/cocoon/lenya/notification/1.0"
- xmlns:sch="http://apache.org/cocoon/lenya/scheduler/1.0"
- >
-
-<xsl:import href="../util/page-util.xsl"/>
-<xsl:import href="../scheduler/joblist.xsl"/>
-
-<xsl:output version="1.0" indent="yes" encoding="ISO-8859-1"/>
-
-<xsl:param name="action" select="'publish'"/>
-<xsl:param name="lenya.event"/>
-
-<xsl:variable name="separator" select="','"/>
-
-<xsl:variable name="uris"><xsl:value-of select="/usecase:publish/usecase:uris"/></xsl:variable>
-<xsl:variable name="sources"><xsl:value-of select="/usecase:publish/usecase:sources"/></xsl:variable>
-<xsl:variable name="document-id"><xsl:value-of select="/usecase:publish/usecase:document-id"/></xsl:variable>
-<xsl:variable name="document-language"><xsl:value-of select="/usecase:publish/usecase:language"/></xsl:variable>
-<xsl:variable name="task-id"><xsl:value-of select="/usecase:publish/usecase:task-id"/></xsl:variable>
-
-<xsl:template match="/usecase:publish">
-
- <page:page>
- <page:title>Publish</page:title>
- <page:body>
- <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}"/>
-
- <div class="lenya-box">
- <div class="lenya-box-title">Publish</div>
- <div class="lenya-box-body">
- <table class="lenya-table-noborder">
- <tr>
- <td class="lenya-entry-caption">Source File(s):</td>
- <td>
- <xsl:call-template name="print-list-simple">
- <xsl:with-param name="list-string" select="$sources"/>
- </xsl:call-template>
- </td>
- </tr>
- <tr>
- <td class="lenya-entry-caption">URI(s):</td>
- <td>
- <xsl:call-template name="print-list-simple">
- <xsl:with-param name="list-string" select="$uris"/>
- </xsl:call-template>
- </td>
- </tr>
- <tr>
- <td/>
- <td>
- <input type="submit" name="lenya.usecase" value="publish"/>
-    
- <input type="button" onClick="location.href='';" value="Cancel"/>
- </td>
- </tr>
- </table>
-
- </div>
- </div>
-
- <not:notification>
- <not:preset>
- <xsl:apply-templates select="not:users/not:user"/>
- </not:preset>
- <not:textarea/>
- </not:notification>
-
- <sch:scheduler-form/>
-
- </form>
- </page:body>
- </page:page>
-</xsl:template>
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:page="http://apache.org/cocoon/lenya/cms-page/1.0"
+ xmlns:usecase="http://apache.org/cocoon/lenya/usecase/1.0"
+ xmlns:not="http://apache.org/cocoon/lenya/notification/1.0"
+ xmlns:sch="http://apache.org/cocoon/lenya/scheduler/1.0"
+ >
+
+ <xsl:import href="../util/page-util.xsl"/>
+ <xsl:import href="../scheduler/joblist.xsl"/>
+
+ <xsl:output version="1.0" indent="yes" encoding="ISO-8859-1"/>
+
+ <xsl:param name="action" select="'publish'"/>
+ <xsl:param name="lenya.event"/>
+
+ <xsl:variable name="separator" select="','"/>
+
+ <xsl:variable name="uris"><xsl:value-of select="/usecase:publish/usecase:uris"/></xsl:variable>
+ <xsl:variable name="sources"><xsl:value-of select="/usecase:publish/usecase:sources"/></xsl:variable>
+ <xsl:variable name="document-id"><xsl:value-of select="/usecase:publish/usecase:document-id"/></xsl:variable>
+ <xsl:variable name="document-language"><xsl:value-of select="/usecase:publish/usecase:language"/></xsl:variable>
+ <xsl:variable name="task-id"><xsl:value-of select="/usecase:publish/usecase:task-id"/></xsl:variable>
+ <xsl:variable name="referer"><xsl:value-of select="/usecase:publish/usecase:referer"/></xsl:variable>
+
+ <xsl:template match="/usecase:publish">
+
+ <page:page>
+ <page:title>Publish</page:title>
+ <page:body>
+ <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}"/>
+
+ <div class="lenya-box">
+ <div class="lenya-box-title">Publish</div>
+ <div class="lenya-box-body">
+ <table class="lenya-table-noborder">
+ <tr>
+ <td class="lenya-entry-caption">Source File(s):</td>
+ <td>
+ <xsl:call-template name="print-list-simple">
+ <xsl:with-param name="list-string" select="$sources"/>
+ </xsl:call-template>
+ </td>
+ </tr>
+ <tr>
+ <td class="lenya-entry-caption">URI(s):</td>
+ <td>
+ <xsl:call-template name="print-list-simple">
+ <xsl:with-param name="list-string" select="$uris"/>
+ </xsl:call-template>
+ </td>
+ </tr>
+ <tr>
+ <td/>
+ <td>
+ <input type="submit" name="lenya.usecase" value="publish"/>
+    
+ <input type="button" onClick="location.href='{$referer}';" value="Cancel"/>
+ </td>
+ </tr>
+ </table>
+
+ </div>
+ </div>
+
+ <not:notification>
+ <not:preset>
+ <xsl:apply-templates select="not:users/not:user"/>
+ </not:preset>
+ <not:textarea/>
+ </not:notification>
+
+ <sch:scheduler-form/>
+
+ </form>
+ </page:body>
+ </page:page>
+ </xsl:template>
</xsl:stylesheet>
1.4 +2 -1 cocoon-lenya/src/webapp/lenya/xslt/authoring/removelabel.xsl
Index: removelabel.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/xslt/authoring/removelabel.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- removelabel.xsl 21 Aug 2003 13:55:16 -0000 1.3
+++ removelabel.xsl 12 Sep 2003 18:28:00 -0000 1.4
@@ -12,6 +12,7 @@
<xsl:variable name="language"><xsl:value-of select="/usecase:removelabel/usecase:language"/></xsl:variable>
<xsl:variable name="label"><xsl:value-of select="/usecase:removelabel/usecase:label"/></xsl:variable>
<xsl:variable name="task-id"><xsl:value-of select="/usecase:removelabel/usecase:task-id"/></xsl:variable>
+ <xsl:variable name="referer"><xsl:value-of select="/usecase:removelabel/usecase:referer"/></xsl:variable>
<xsl:template match="/usecase:removelabel">
@@ -31,7 +32,7 @@
<div class="menu">Do you really want to remove the "<xsl:value-of select="$language"/>" language version from document '<xsl:value-of select="$document-id"/>' (cannot be undone)?</div>
<input type="submit" value="YES, remove label"/>
-    <input type="button" onClick="location.href='{referer}';" value="Cancel"/>
+    <input type="button" onClick="location.href='{$referer}';" value="Cancel"/>
</form>
</p>
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org