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/01/28 22:52:39 UTC
cvs commit: cocoon-lenya/src/webapp/lenya/pubs/oscom/xslt/overview body.xsl publishScreen.xsl
michi 2004/01/28 13:52:39
Modified: src/webapp/lenya/pubs/oscom sitemap.xmap
src/webapp/lenya/pubs/oscom/config/menus matrix.xsp
src/webapp/lenya/pubs/oscom/xslt/matrix body.xsl
src/webapp/lenya/pubs/oscom/xslt/overview body.xsl
publishScreen.xsl
Log:
Publishing all fixed
Revision Changes Path
1.43 +2 -9 cocoon-lenya/src/webapp/lenya/pubs/oscom/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/oscom/sitemap.xmap,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sitemap.xmap 25 Jan 2004 12:23:16 -0000 1.42
+++ sitemap.xmap 28 Jan 2004 21:52:38 -0000 1.43
@@ -203,7 +203,7 @@
<!-- Lenya CMS -->
<map:pipeline>
- <map:match pattern="authoring/lenya/publishAllCMSProjectsScreen*">
+ <map:match pattern="authoring/lenya/publishAllCMSProjectsScreen">
<map:aggregate element="publish-all" label="xml">
<map:part src="cocoon:/authoring/matrix/index.xml"/>
</map:aggregate>
@@ -212,19 +212,12 @@
<map:serialize type="html"/>
</map:match>
- <!--
- <map:match pattern="authoring/lenya/publishScreen*">
- <map:generate type="serverpages" src="../../content/publishing/publish-screen.xsp" label="xml"/>
- <map:transform src="../../xslt/publishing/main.xsl"/>
- <map:serialize type="html"/>
- </map:match>
- <map:match pattern="authoring/lenya/publish*">
+ <map:match pattern="authoring/lenya/publish">
<map:act type="publisher">
<map:redirect-to uri="{parent_uri}" session="true"/>
</map:act>
<map:redirect-to uri="publishScreen?status=failed" session="true"/>
</map:match>
- -->
</map:pipeline>
1.36 +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.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- matrix.xsp 25 Jan 2004 16:38:06 -0000 1.35
+++ matrix.xsp 28 Jan 2004 21:52:38 -0000 1.36
@@ -38,7 +38,7 @@
<menu name="File" label="File">
<block>
<item uc:usecase="edit" href="?lenya.step=open&form=cmfs">Edit with Forms</item>
- <item uc:usecase="xopus" href="?lenya.step=open&doctype=cmfs">Edit with Xopus</item>
+ <!--<item uc:usecase="xopus" href="?lenya.step=open&doctype=cmfs">Edit with Xopus</item>-->
<!--
<item><xsp:attribute name="href"><xsp:expr>xsp_lenya_context_prefix+"/authoring/matrix/"+projectid+".html"</xsp:expr>?lenya.usecase=rollback&lenya.step=showscreen&documentid=matrix/<xsp:expr>projectid+".xml"</xsp:expr></xsp:attribute>Rollback</item>
-->
1.14 +1 -1 cocoon-lenya/src/webapp/lenya/pubs/oscom/xslt/matrix/body.xsl
Index: body.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/oscom/xslt/matrix/body.xsl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- body.xsl 25 Jan 2004 17:38:23 -0000 1.13
+++ body.xsl 28 Jan 2004 21:52:38 -0000 1.14
@@ -8,7 +8,7 @@
<xsl:template name="admin-url">
<xsl:param name="prefix"/>
-<a class="breadcrumb"><xsl:attribute name="href"><xsl:value-of select="$prefix"/>/matrix/<xsl:value-of select="/lenya/cmsbody/oscom/system/id"/>.html</xsl:attribute>Edit</a>
+<a class="breadcrumb"><xsl:attribute name="href"><xsl:value-of select="$prefix"/>/matrix/<xsl:value-of select="/lenya/cmsbody/oscom/system/id"/>.html</xsl:attribute>Edit</a> - Apache Lenya
</xsl:template>
<xsl:template name="body">
1.27 +1 -1 cocoon-lenya/src/webapp/lenya/pubs/oscom/xslt/overview/body.xsl
Index: body.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/oscom/xslt/overview/body.xsl,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- body.xsl 25 Jan 2004 17:38:23 -0000 1.26
+++ body.xsl 28 Jan 2004 21:52:39 -0000 1.27
@@ -12,7 +12,7 @@
<xsl:template name="admin-url">
<xsl:param name="prefix"/>
-<a class="breadcrumb"><xsl:attribute name="href"><xsl:value-of select="$prefix"/>/matrix/index.html</xsl:attribute>Edit</a>
+<a class="breadcrumb"><xsl:attribute name="href"><xsl:value-of select="$prefix"/>/matrix/index.html</xsl:attribute>Edit</a> - Apache Lenya
</xsl:template>
<xsl:template name="body">
1.3 +2 -1 cocoon-lenya/src/webapp/lenya/pubs/oscom/xslt/overview/publishScreen.xsl
Index: publishScreen.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/oscom/xslt/overview/publishScreen.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- publishScreen.xsl 4 Mar 2003 17:58:47 -0000 1.2
+++ publishScreen.xsl 28 Jan 2004 21:52:39 -0000 1.3
@@ -8,6 +8,7 @@
<xsl:template match="publish-all">
<publish>
+ <task-id>publish</task-id>
<referer>/lenya/oscom/authoring/matrix/index.html</referer>
<publication-id>oscom</publication-id>
<current_username/>
@@ -15,7 +16,7 @@
<prefix>/lenya/oscom</prefix>
<uris>
-/lenya/oscom/matrix/index.html<xsl:for-each select="oscom/system">,/lenya/oscom/matrix/<xsl:value-of select="id"/>.html</xsl:for-each>
+/lenya/oscom/live/matrix/index.html<xsl:for-each select="oscom/system">,/lenya/oscom/live/matrix/<xsl:value-of select="id"/>.html</xsl:for-each>
</uris>
<sources>
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org