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 2003/09/29 17:18:02 UTC
cvs commit: cocoon-lenya/src/webapp/lenya/pubs/oscom/content/authoring index.xml matrix-envelope.xsp
michi 2003/09/29 08:18:02
Modified: src/webapp/lenya/pubs/oscom authoring-sitemap.xmap
src/webapp/lenya/pubs/oscom/config/menus matrix.xsp
src/webapp/lenya/pubs/oscom/content/authoring index.xml
matrix-envelope.xsp
Log:
XInclude fixed
Revision Changes Path
1.52 +7 -22 cocoon-lenya/src/webapp/lenya/pubs/oscom/authoring-sitemap.xmap
Index: authoring-sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/oscom/authoring-sitemap.xmap,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- authoring-sitemap.xmap 7 Aug 2003 16:29:01 -0000 1.51
+++ authoring-sitemap.xmap 29 Sep 2003 15:18:01 -0000 1.52
@@ -94,10 +94,6 @@
<map:generate type="serverpages" src="config/menus/weekly-column.xsp"/>
<map:serialize type="xml"/>
</map:match>
- <map:match pattern="authoring/menus/finalsettlement.xml">
- <map:generate type="serverpages" src="config/menus/final-settlement-values.xsp"/>
- <map:serialize type="xml"/>
- </map:match>
<map:match pattern="authoring/menus/matrix/*.xml">
<map:generate type="serverpages" src="config/menus/matrix.xsp">
<map:parameter name="projectid" value="{1}"/>
@@ -192,7 +188,12 @@
<map:part src="cocoon:/authoring/menus/matrix/{1}.xml"/>
<map:part src="cocoon:/authoring/matrix/{1}-envelope.xsp" element="cmsbody"/>
</map:aggregate>
+ <map:transform type="xlink">
+ <map:parameter name="href" value="content/authoring/dummy.xml"/>
+ </map:transform>
+<!--
<map:transform type="xinclude"/>
+-->
<map:serialize type="xml"/>
</map:match>
@@ -314,7 +315,9 @@
<map:part src="cocoon:/authoring/menus/{1}.xml"/>
<map:part src="content/authoring/{1}.xml" element="cmsbody"/>
</map:aggregate>
+<!--
<map:transform type="xinclude"/>
+-->
<map:transform type="xlink">
<map:parameter name="href" value="content/authoring/{1}.xml"/>
</map:transform>
@@ -386,15 +389,6 @@
<map:serialize type="html"/>
</map:match>
- <map:match pattern="authoring/xopus2/clearing/marketinformation/finalsettlement.html">
- <map:aggregate element="lenya">
- <map:part src="cocoon:/authoring/menus/finalsettlement.xml"/>
- <map:part src="content/authoring/clearing/marketinformation/finalsettlement.xml" element="cmsbody"/>
- </map:aggregate>
- <map:transform src="xslt/FinalSettlementValues/authoring/main_xopus2.xsl"/>
- <map:serialize type="html"/>
- </map:match>
-
<!-- Edit Editor Matrix Project with Xopus2 -->
<map:match pattern="authoring/xopus2/editor-matrix/*.html">
<map:act type="reserved-checkout">
@@ -469,15 +463,6 @@
<map:match pattern="authoring/weekly-column.html">
<map:generate src="cocoon:/authoring/weekly-column-page.xml"/>
<map:transform src="xslt/WeeklyColumn/authoring/main.xsl"/>
- <map:serialize type="html"/>
- </map:match>
-
- <map:match pattern="authoring/clearing/marketinformation/finalsettlement.html">
- <map:aggregate element="lenya">
- <map:part src="cocoon:/authoring/menus/finalsettlement.xml"/>
- <map:part src="content/authoring/clearing/marketinformation/finalsettlement.xml" element="cmsbody"/>
- </map:aggregate>
- <map:transform src="xslt/FinalSettlementValues/authoring/main.xsl"/>
<map:serialize type="html"/>
</map:match>
1.22 +3 -22 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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- matrix.xsp 11 Aug 2003 16:02:16 -0000 1.21
+++ matrix.xsp 29 Sep 2003 15:18:01 -0000 1.22
@@ -35,13 +35,13 @@
<menu name="File" label="File">
<block>
<item><xsp:attribute name="href"><xsp:expr>xsp_lenya_context_prefix+"/authoring/xopus2/matrix/"+projectid+".html"</xsp:expr>?documentid=matrix/<xsp:expr>projectid+".xml"</xsp:expr></xsp:attribute>Edit with Xopus2</item>
+<!--
+ <item href="?lenya.step=open&doctype=cmfs">Edit with Forms</item>
+-->
<item uc:usecase="edit" href="?lenya.step=open&doctype=cmfs">Edit with Forms</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>
<item><xsp:attribute name="href"><xsp:expr>xsp_lenya_context_prefix+"/authoring/lenya/publishScreen?uris=/lenya/oscom/matrix/"+projectid+".html,/lenya/oscom/matrix/index.html&sources=/matrix/"+projectid+".xml"</xsp:expr></xsp:attribute>Publish</item>
</block>
- <separator>
- <item>-----------------</item>
- </separator>
<block>
<item><xsp:attribute name="href"><xsp:expr>xsp_lenya_context_prefix</xsp:expr>/admin/passwd/index.html</xsp:attribute>Change Password</item>
<item><xsp:attribute name="href"><xsp:expr>xsp_lenya_context_prefix</xsp:expr>/logout</xsp:attribute>Logout</item>
@@ -61,9 +61,6 @@
<item><xsp:attribute name="href"><xsp:expr>xsp_lenya_context</xsp:expr>/docs/index.html#administrator-guide</xsp:attribute>Administrator's Guide</item>
<item><xsp:attribute name="href"><xsp:expr>xsp_lenya_context</xsp:expr>/docs/index.html#developer-guide</xsp:attribute>Developer's Guide</item>
</block>
- <separator>
- <item>-----------------</item>
- </separator>
<block>
<item href="http://cocoon.apache.org/lenya/">About Lenya</item>
</block>
@@ -74,25 +71,9 @@
<item><xsp:attribute name="href"><xsp:expr>projectid</xsp:expr>.xml</xsp:attribute>View Page XML</item>
<item><xsp:attribute name="href">body-<xsp:expr>projectid</xsp:expr>.xml</xsp:attribute>View Body XML</item>
</block>
- <separator>
- <item>-----------------</item>
- </separator>
<block>
<item href="../../xopus/matrix.xsl">View Xopus XSLT</item>
<item href="../../xopus/matrix.xsd">View Xopus XSD</item>
- </block>
- <separator>
- <item>-----------------</item>
- </separator>
- <block>
-<!--
- <item href="../bitflux/home.xsl">View Bitflux XSLT</item>
- <item href="../bitflux/home.xsd">View Bitflux XSD</item>
- <item href="../bitflux/home.css">View Bitflux CSS</item>
--->
- <item>View Bitflux XSLT</item>
- <item>View Bitflux XSD</item>
- <item>View Bitflux CSS</item>
</block>
</menu>
</menus>
1.8 +3 -0 cocoon-lenya/src/webapp/lenya/pubs/oscom/content/authoring/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/oscom/content/authoring/index.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- index.xml 12 Mar 2003 00:28:52 -0000 1.7
+++ index.xml 29 Sep 2003 15:18:02 -0000 1.8
@@ -2,7 +2,10 @@
<oscom xmlns:xi="http://www.w3.org/2001/XInclude">
+<navigation xlink:href="navigation.xml" xlink:show="embed" xmlns:xlink="http://www.w3c.org/2002/xmlns/xlink"/>
+<!--
<xi:include xml:base="cocoon:" href="/authoring/navigation.xml"/>
+-->
<body xlink:href="home.xml#xpointer(/home/html)" xlink:show="embed" xmlns:xlink="http://www.w3c.org/2002/xmlns/xlink"/>
<!--
1.4 +5 -0 cocoon-lenya/src/webapp/lenya/pubs/oscom/content/authoring/matrix-envelope.xsp
Index: matrix-envelope.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/oscom/content/authoring/matrix-envelope.xsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- matrix-envelope.xsp 23 Jul 2003 13:21:36 -0000 1.3
+++ matrix-envelope.xsp 29 Sep 2003 15:18:02 -0000 1.4
@@ -12,9 +12,14 @@
String projectid=parameters.getParameter("projectid","null");
</xsp:logic>
+<navigation xlink:href="navigation.xml" xlink:show="embed" xmlns:xlink="http://www.w3c.org/2002/xmlns/xlink"/>
+
+<body xlink:show="embed" xmlns:xlink="http://www.w3c.org/2002/xmlns/xlink"><xsp:attribute name="href" prefix="xlink" uri="http://www.w3.org/2002/XLink">matrix/<xsp:expr>projectid</xsp:expr>.xml</xsp:attribute></body>
+<!--
<xi:include xml:base="cocoon:" href="/authoring/navigation.xml"/>
<xi:include xml:base="cocoon:"><xsp:attribute name="href">authoring/matrix/body-<xsp:expr>projectid</xsp:expr>.xml</xsp:attribute></xi:include>
+-->
</oscom>
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org