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/22 18:07:55 UTC
cvs commit: cocoon-lenya/src/webapp/lenya/pubs/oscom/xslt/generic/live main.xsl
michi 2004/01/22 09:07:55
Modified: src/webapp/lenya/pubs/oscom menus.xmap sitemap.xmap
src/webapp/lenya/pubs/oscom/xslt/generic body.xsl
src/webapp/lenya/pubs/oscom/xslt/generic/authoring main.xsl
src/webapp/lenya/pubs/oscom/xslt/generic/live main.xsl
Log:
XHTML and Epoz readded
Revision Changes Path
1.7 +5 -3 cocoon-lenya/src/webapp/lenya/pubs/oscom/menus.xmap
Index: menus.xmap
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/oscom/menus.xmap,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- menus.xmap 17 Dec 2003 23:04:58 -0000 1.6
+++ menus.xmap 22 Jan 2004 17:07:55 -0000 1.7
@@ -22,8 +22,10 @@
<map:serialize type="xml"/>
</map:match>
- <map:match pattern="authoring/menus/**.xml">
- <map:generate type="serverpages" src="config/menus/generic.xsp"/>
+ <map:match pattern="authoring/xhtml/**.xml">
+ <map:generate type="serverpages" src="config/menus/xhtml.xsp">
+ <map:parameter name="projectid" value="{1}"/>
+ </map:generate>
<map:serialize type="xml"/>
</map:match>
1.39 +9 -38 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.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sitemap.xmap 17 Dec 2003 23:39:57 -0000 1.38
+++ sitemap.xmap 22 Jan 2004 17:07:55 -0000 1.39
@@ -62,17 +62,6 @@
</map:pipeline>
<!-- /Images -->
-<!-- XML Home -->
- <map:pipeline>
- <map:match pattern="authoring/home.xml">
- <map:generate src="content/authoring/home.xml"/>
- <map:serialize type="xml"/>
- </map:match>
- </map:pipeline>
-<!-- /XML Home -->
-
-
-
<!-- Matrix Overview (sorted by frameworks and cms) -->
<map:pipeline>
<map:match pattern="*/matrix/">
@@ -167,11 +156,7 @@
<map:pipeline>
<!-- XML -->
<map:match pattern="authoring/**.xml">
- <map:aggregate element="lenya">
- <map:part src="cocoon:/authoring/menus/{1}.xml"/>
- <map:part src="content/authoring/{1}.xml" element="cmsbody"/>
- </map:aggregate>
- <!--<map:transform type="xinclude"/>-->
+ <map:generate src="content/authoring/{1}.xml"/>
<map:transform type="xlink">
<map:parameter name="href" value="content/authoring/{1}.xml"/>
</map:transform>
@@ -179,32 +164,18 @@
</map:match>
<!-- Home -->
- <map:match pattern="authoring/">
- <map:redirect-to uri="matrix/index.html"/>
- </map:match>
-
- <map:match pattern="authoring/index.html">
- <map:redirect-to uri="matrix/index.html"/>
+ <map:match pattern="*/">
+ <map:redirect-to uri="index.html"/>
</map:match>
-
<!-- Generic (XHTML) -->
- <map:match pattern="authoring/**.html">
- <map:generate src="cocoon:/authoring/{1}.xml"/>
- <map:select>
- <map:when test="explorer">
- <map:transform src="xslt/generic/authoring/main.xsl"/>
- </map:when>
- <map:otherwise>
- <map:transform src="xslt/generic/authoring/main.xsl"/>
- </map:otherwise>
- </map:select>
+ <map:match pattern="*/**.html">
+ <map:aggregate element="lenya">
+ <map:part src="content/{1}/{2}.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"/>
<map:serialize type="html"/>
- </map:match>
- <map:match pattern="authoring/**.xhtml">
- <!--<map:read src="content/authoring/{1}" mime-type="text/xml"/>-->
- <map:generate src="content/authoring/{1}.xhtml"/>
- <map:serialize type="xml"/>
</map:match>
</map:pipeline>
1.7 +9 -1 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- body.xsl 22 Jan 2004 15:45:42 -0000 1.6
+++ body.xsl 22 Jan 2004 17:07:55 -0000 1.7
@@ -4,12 +4,20 @@
<xsl:output version="1.0" indent="yes" encoding="ISO-8859-1"/>
+<xsl:template name="html-title">
+XHTML
+</xsl:template>
+
+<xsl:template name="admin-url">
+Introspection to the rescue
+</xsl:template>
+
<xsl:template name="body">
<xsl:apply-templates select="html"/>
</xsl:template>
<xsl:template match="html">
- <xsl:copy-of select="body/*"/>
+ <xsl:copy-of select="body/node()"/>
</xsl:template>
</xsl:stylesheet>
1.5 +1 -1 cocoon-lenya/src/webapp/lenya/pubs/oscom/xslt/generic/authoring/main.xsl
Index: main.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/oscom/xslt/generic/authoring/main.xsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- main.xsl 22 Jan 2004 15:45:42 -0000 1.4
+++ main.xsl 22 Jan 2004 17:07:55 -0000 1.5
@@ -7,4 +7,4 @@
<xsl:include href="../../html_authoring.xsl"/>
<xsl:include href="../body.xsl"/>
-</xsl:stylesheet>
+</xsl:stylesheet>
1.3 +0 -2 cocoon-lenya/src/webapp/lenya/pubs/oscom/xslt/generic/live/main.xsl
Index: main.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/oscom/xslt/generic/live/main.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- main.xsl 11 Apr 2003 14:25:41 -0000 1.2
+++ main.xsl 22 Jan 2004 17:07:55 -0000 1.3
@@ -2,8 +2,6 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-<xsl:output version="1.0" indent="yes" encoding="ISO-8859-1"/>
-
<xsl:include href="../../root.xsl"/>
<xsl:include href="../body.xsl"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org