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/23 15:29:15 UTC
cvs commit: cocoon-lenya/src/webapp/lenya/pubs/oscom/xslt/generic body.xsl
michi 2004/01/23 06:29:15
Modified: src/webapp/lenya/pubs/oscom/content/authoring index.xml
src/webapp/lenya/pubs/oscom sitemap.xmap
src/webapp/lenya/pubs/oscom/xslt/generic body.xsl
Added: src/webapp/lenya/pubs/oscom/content/authoring
index-envelope.xml
Log:
Epoz added
Revision Changes Path
1.12 +4 -3 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- index.xml 22 Jan 2004 17:07:03 -0000 1.11
+++ index.xml 23 Jan 2004 14:29:15 -0000 1.12
@@ -1,9 +1,10 @@
<?xml version="1.0"?>
-<oscom>
-<html>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:xhtml="http://www.w3.org/1999/xhtml">
+<head>
+<title>Welcome to OSCOM</title>
+</head>
<body>
<b>Welcome</b> to the OSCOM <a href="matrix/index.html">matrix</a>.
</body>
</html>
-</oscom>
1.1 cocoon-lenya/src/webapp/lenya/pubs/oscom/content/authoring/index-envelope.xml
Index: index-envelope.xml
===================================================================
<?xml version="1.0"?>
<oscom>
<navigation xlink:href="navigation.xml" xlink:show="embed" xmlns:xlink="http://www.w3c.org/2002/xmlns/xlink"/>
<body xlink:href="index.xml" xlink:show="embed" xmlns:xlink="http://www.w3c.org/2002/xmlns/xlink"/>
</oscom>
1.41 +5 -11 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.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sitemap.xmap 22 Jan 2004 17:38:47 -0000 1.40
+++ sitemap.xmap 23 Jan 2004 14:29:15 -0000 1.41
@@ -155,30 +155,24 @@
<map:pipeline>
<!-- XML -->
- <map:match pattern="authoring/**.xml">
- <map:generate src="content/authoring/{1}.xml"/>
+ <map:match pattern="*/**.xml">
+ <map:generate src="content/{1}/{2}.xml"/>
<map:transform type="xlink">
- <map:parameter name="href" value="content/authoring/{1}.xml"/>
+ <map:parameter name="href" value="content/{1}/{2}.xml"/>
</map:transform>
<map:serialize type="xml"/>
</map:match>
<!-- Home -->
<map:match pattern="*/">
- <map:redirect-to uri="matrix/index.html"/>
- <!--<map:redirect-to uri="index.html"/>-->
- </map:match>
-
- <!-- FIXME: ... -->
- <map:match pattern="*/index.html">
- <map:redirect-to uri="matrix/index.html"/>
+ <map:redirect-to uri="index.html"/>
</map:match>
<!-- /Home -->
<!-- Generic (XHTML) -->
<map:match pattern="*/**.html">
<map:aggregate element="lenya">
- <map:part src="content/{1}/{2}.xml" element="cmsbody"/>
+ <map:part src="cocoon:/{1}/{2}-envelope.xml" element="cmsbody"/>
</map:aggregate>
<map:transform src="xslt/generic/{1}/main.xsl"/>
<map:transform src="cocoon://lenya-page/{page-envelope:publication-id}/{1}/xhtml/{2}.xml"/>
1.8 +7 -4 cocoon-lenya/src/webapp/lenya/pubs/oscom/xslt/generic/body.xsl
Index: body.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/oscom/xslt/generic/body.xsl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- body.xsl 22 Jan 2004 17:07:55 -0000 1.7
+++ body.xsl 23 Jan 2004 14:29:15 -0000 1.8
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:xhtml="http://www.w3.org/1999/xhtml"
+>
<xsl:output version="1.0" indent="yes" encoding="ISO-8859-1"/>
@@ -13,11 +16,11 @@
</xsl:template>
<xsl:template name="body">
- <xsl:apply-templates select="html"/>
+ <xsl:apply-templates select="xhtml:html"/>
</xsl:template>
-<xsl:template match="html">
- <xsl:copy-of select="body/node()"/>
+<xsl:template match="xhtml:html">
+ <xsl:copy-of select="xhtml:body/node()"/>
</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