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/10/22 17:24:27 UTC
cvs commit: cocoon-lenya/src/webapp/lenya/pubs/oscom/xslt/home/authoring main.xsl
michi 2003/10/22 08:24:27
Modified: src/webapp/lenya/pubs/oscom authoring-sitemap.xmap
src/webapp/lenya/pubs/oscom/config/menus home.xsp
src/webapp/lenya/pubs/oscom/xslt oscom.xsl
src/webapp/lenya/pubs/oscom/xslt/home/authoring main.xsl
Added: src/webapp/lenya/pubs/oscom menus.xmap
Log:
migrated to new menu generation method
Revision Changes Path
1.53 +6 -13 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.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- authoring-sitemap.xmap 29 Sep 2003 15:18:01 -0000 1.52
+++ authoring-sitemap.xmap 22 Oct 2003 15:24:27 -0000 1.53
@@ -86,10 +86,6 @@
-->
<!-- Menus -->
- <map:match pattern="authoring/menus/index.xml">
- <map:generate type="serverpages" src="config/menus/home.xsp"/>
- <map:serialize type="xml"/>
- </map:match>
<map:match pattern="authoring/menus/weekly-column-page.xml">
<map:generate type="serverpages" src="config/menus/weekly-column.xsp"/>
<map:serialize type="xml"/>
@@ -330,15 +326,12 @@
</map:match>
<map:match pattern="authoring/index.html">
- <map:generate src="cocoon:/authoring/index.xml"/>
- <map:select>
- <map:when test="explorer">
- <map:transform src="xslt/home/authoring/main.xsl"/>
- </map:when>
- <map:otherwise>
- <map:transform src="xslt/home/authoring/main.xsl"/>
- </map:otherwise>
- </map:select>
+ <map:generate src="content/authoring/index.xml"/>
+ <map:transform type="xlink">
+ <map:parameter name="href" value="content/authoring/{1}.xml"/>
+ </map:transform>
+ <map:transform src="xslt/home/authoring/main.xsl"/>
+ <map:transform src="cocoon://lenya-page/{page-envelope:publication-id}/authoring/home.xml"/>
<map:serialize type="html"/>
</map:match>
1.1 cocoon-lenya/src/webapp/lenya/pubs/oscom/menus.xmap
Index: menus.xmap
===================================================================
<?xml version="1.0"?>
<!-- CVS: $Id: menus.xmap,v 1.1 2003/10/22 15:24:27 michi Exp $ -->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
<map:components/>
<map:pipelines>
<map:pipeline>
<!--
<map:match pattern="live/**">
<map:generate type="serverpages" src="../../content/menus/live.xsp"/>
<map:serialize type="xml"/>
</map:match>
<map:match pattern="**">
<map:generate type="serverpages" src="config/menus/generic.xsp"/>
<map:serialize type="xml"/>
</map:match>
-->
<map:match pattern="authoring/home.xml">
<map:generate type="serverpages" src="config/menus/home.xsp"/>
<map:serialize type="xml"/>
</map:match>
<!--
<map:match pattern="authoring/menus/weekly-column-page.xml">
<map:generate type="serverpages" src="config/menus/weekly-column.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}"/>
</map:generate>
<map:transform type="usecasemenu"/>
<map:serialize type="xml"/>
</map:match>
<map:match pattern="authoring/menus/editor-matrix/*.xml">
<map:generate type="serverpages" src="config/menus/editor-matrix.xsp">
<map:parameter name="projectid" value="{1}"/>
</map:generate>
<map:serialize type="xml"/>
</map:match>
<map:match pattern="authoring/menus/overview.xml">
<map:generate type="serverpages" src="config/menus/overview.xsp"/>
<map:serialize type="xml"/>
</map:match>
<map:match pattern="authoring/menus/editor-overview.xml">
<map:generate type="serverpages" src="config/menus/editor-overview.xsp"/>
<map:serialize type="xml"/>
</map:match>
<map:match pattern="authoring/menus/board.xml">
<map:generate type="serverpages" src="config/menus/board.xsp"/>
<map:serialize type="xml"/>
</map:match>
<map:match pattern="authoring/menus/news.xml">
<map:generate type="serverpages" src="config/menus/news.xsp"/>
<map:serialize type="xml"/>
</map:match>
<map:match pattern="authoring/menus/mailing-lists.xml">
<map:generate type="serverpages" src="config/menus/mailing-lists.xsp"/>
<map:serialize type="xml"/>
</map:match>
-->
<!--
<map:match pattern="authoring/menus/glossary.xml">
<map:generate type="serverpages" src="config/menus/mailing-lists.xsp"/>
<map:serialize type="xml"/>
</map:match>
-->
<map:match pattern="authoring/menus/**.xml">
<map:generate type="serverpages" src="config/menus/generic.xsp"/>
<map:serialize type="xml"/>
</map:match>
</map:pipeline>
</map:pipelines>
</map:sitemap>
1.26 +5 -0 cocoon-lenya/src/webapp/lenya/pubs/oscom/config/menus/home.xsp
Index: home.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/oscom/config/menus/home.xsp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- home.xsp 24 Jul 2003 10:23:55 -0000 1.25
+++ home.xsp 22 Oct 2003 15:24:27 -0000 1.26
@@ -2,6 +2,7 @@
<xsp:page
language="java"
+ xmlns="http://apache.org/cocoon/lenya/menubar/1.0"
xmlns:xsp="http://apache.org/xsp"
xmlns:xsp-lenya="http://apache.org/cocoon/lenya/xsp/1.0"
xmlns:xsp-request="http://apache.org/xsp/request/2.0"
@@ -25,6 +26,10 @@
</url-info>
<live_uri>/index.html</live_uri>
+
+ <tabs>
+ <tab label="info" show="false"/>
+ </tabs>
<menus>
<menu name="File" label="File">
1.7 +1 -1 cocoon-lenya/src/webapp/lenya/pubs/oscom/xslt/oscom.xsl
Index: oscom.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/oscom/xslt/oscom.xsl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- oscom.xsl 11 Apr 2003 14:25:40 -0000 1.6
+++ oscom.xsl 22 Oct 2003 15:24:27 -0000 1.7
@@ -5,7 +5,7 @@
<xsl:output version="1.0" indent="yes" encoding="ISO-8859-1"/>
<xsl:template match="oscom">
-<html>
+<html xmlns="http://www.w3.org/1999/xhtml">
<head><title>OSCOM - Open Source Content Management</title></head>
<body bgcolor="#ffffff">
<table cellpadding="0" cellspacing="0" border="0">
1.8 +14 -0 cocoon-lenya/src/webapp/lenya/pubs/oscom/xslt/home/authoring/main.xsl
Index: main.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/oscom/xslt/home/authoring/main.xsl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- main.xsl 11 Apr 2003 14:25:42 -0000 1.7
+++ main.xsl 22 Oct 2003 15:24:27 -0000 1.8
@@ -4,11 +4,25 @@
<xsl:output version="1.0" indent="yes" encoding="ISO-8859-1"/>
+<!--
+<xsl:template match="/">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<body>
+HALLO
+</body>
+</html>
+</xsl:template>
+-->
+
+<!--
<xsl:include href="../../../../../xslt/menu/root.xsl"/>
+-->
+<!--
<xsl:template match="cmsbody">
<xsl:apply-templates select="oscom"/>
</xsl:template>
+-->
<xsl:include href="../../html_authoring.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