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/30 16:24:57 UTC
cvs commit: cocoon-lenya/src/webapp/lenya/xslt/info delete.xsl archive.xsl
egli 2003/09/30 07:24:57
Modified: src/webapp/lenya/xslt/info delete.xsl archive.xsl
Log:
Added the display of a warning if there are references to the document
which is being archived/deleted.
Revision Changes Path
1.10 +32 -18 cocoon-lenya/src/webapp/lenya/xslt/info/delete.xsl
Index: delete.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/xslt/info/delete.xsl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- delete.xsl 5 Sep 2003 14:42:59 -0000 1.9
+++ delete.xsl 30 Sep 2003 14:24:57 -0000 1.10
@@ -10,8 +10,8 @@
xmlns:session="http://www.apache.org/xsp/session/2.0"
xmlns:page="http://apache.org/cocoon/lenya/cms-page/1.0"
>
-
-<xsl:param name="lenya.event"/>
+
+ <xsl:param name="lenya.event"/>
<xsl:output version="1.0" indent="yes" encoding="ISO-8859-1"/>
@@ -29,7 +29,7 @@
<page:title>Delete Document</page:title>
<page:body>
<xsl:apply-templates select="body"/>
- <xsl:apply-templates select="info"/>
+ <xsl:apply-templates select="info"/>
</page:body>
</page:page>
</xsl:template>
@@ -51,26 +51,40 @@
<input type="hidden" name="properties.secarea" value="trash"/>
<table class="lenya-table-noborder">
- <tr>
- <td/>
- <td>Do you really want to delete all language versions of this document?<br/><br/></td>
- </tr>
- <tr>
- <td class="lenya-entry-caption">Document:</td>
- <td><xsl:value-of select="document-id"/></td>
- </tr>
- <tr>
- <td/>
- <td>
- <br/>
+ <tr>
+ <td/>
+ <td>Do you really want to delete all language versions of this document?<br/><br/></td>
+ </tr>
+ <tr>
+ <td class="lenya-entry-caption">Document:</td>
+ <td><xsl:value-of select="document-id"/></td>
+ </tr>
+ <tr>
+ <xsl:apply-templates select="inconsistent-documents"/>
+ </tr>
+ <tr>
+ <td/>
+ <td>
+ <br/>
<input type="submit" value="Delete"/> 
<input type="button" onClick="location.href='{$request-uri}';" value="Cancel"/>
- </td>
- </tr>
+ </td>
+ </tr>
</table>
</form>
</div>
</div>
</xsl:template>
+ <xsl:template match="inconsistent-documents">
+ <td class="lenya-entry-caption">
+ <span class="lenya-form-message-error">The following documents<br/> have links to this document:</span>
+ </td>
+ <td valign="top">
+ <xsl:for-each select="inconsistent-document">
+ <a target="_blank" href="{@href}"><xsl:value-of select="@id"/><xsl:value-of select="."/></a><br/>
+ </xsl:for-each>
+ </td>
+ </xsl:template>
+
</xsl:stylesheet>
1.10 +36 -22 cocoon-lenya/src/webapp/lenya/xslt/info/archive.xsl
Index: archive.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/xslt/info/archive.xsl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- archive.xsl 5 Sep 2003 14:42:59 -0000 1.9
+++ archive.xsl 30 Sep 2003 14:24:57 -0000 1.10
@@ -12,7 +12,7 @@
xmlns:wf="http://apache.org/cocoon/lenya/workflow/1.0"
>
-<xsl:param name="lenya.event"/>
+ <xsl:param name="lenya.event"/>
<xsl:output version="1.0" indent="yes" encoding="ISO-8859-1"/>
@@ -30,7 +30,7 @@
<page:title>Archive Document</page:title>
<page:body>
<xsl:apply-templates select="body"/>
- <xsl:apply-templates select="info"/>
+ <xsl:apply-templates select="info"/>
</page:body>
</page:page>
</xsl:template>
@@ -40,37 +40,51 @@
<div class="lenya-box-title">Archive Document</div>
<div class="lenya-box-body">
<form method="get">
-
+
<input type="hidden" name="lenya.event" value="{$lenya.event}"/>
<input type="hidden" name="lenya.usecase" value="archive"/>
<input type="hidden" name="lenya.step" value="archive"/>
<input type="hidden" name="task-id" value="{$task-id}"/>
- <input type="hidden" name="properties.node.firstdocumentid" value="{$document-id}"/>
- <input type="hidden" name="properties.firstarea" value="{$area}"/>
- <input type="hidden" name="properties.secarea" value="archive"/>
-
+ <input type="hidden" name="properties.node.firstdocumentid" value="{$document-id}"/>
+ <input type="hidden" name="properties.firstarea" value="{$area}"/>
+ <input type="hidden" name="properties.secarea" value="archive"/>
+
<table class="lenya-table-noborder">
- <tr>
- <td/>
- <td>Do you really want to archive this document?<br/><br/></td>
- </tr>
- <tr>
- <td class="lenya-entry-caption">Document:</td>
- <td><xsl:value-of select="document-id"/></td>
- </tr>
- <tr>
- <td/>
- <td>
- <br/>
+ <tr>
+ <td/>
+ <td>Do you really want to archive this document?<br/><br/></td>
+ </tr>
+ <tr>
+ <td class="lenya-entry-caption">Document:</td>
+ <td><xsl:value-of select="document-id"/></td>
+ </tr>
+ <tr>
+ <xsl:apply-templates select="inconsistent-documents"/>
+ </tr>
+ <tr>
+ <td/>
+ <td>
+ <br/>
<input type="submit" value="Archive"/> 
<input type="button" onClick="location.href='{$request-uri}';" value="Cancel"/>
- </td>
- </tr>
+ </td>
+ </tr>
</table>
</form>
</div>
</div>
+ </xsl:template>
+
+ <xsl:template match="inconsistent-documents">
+ <td class="lenya-entry-caption">
+ <span class="lenya-form-message-error">The following documents<br/> have links to this document:</span>
+ </td>
+ <td valign="top">
+ <xsl:for-each select="inconsistent-document">
+ <a target="_blank" href="{@href}"><xsl:value-of select="@id"/><xsl:value-of select="."/></a><br/>
+ </xsl:for-each>
+ </td>
</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