You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2004/02/08 14:40:32 UTC
cvs commit: cocoon-lenya/src/webapp/lenya/pubs/oscom/xslt html_authoring.xsl
andreas 2004/02/08 05:40:32
Modified: src/webapp/lenya/pubs/oscom sitemap.xmap
src/webapp/lenya/pubs/oscom/xslt/matrix/authoring main.xsl
src/webapp/lenya/pubs/oscom/xslt/generic/live main.xsl
src/webapp/lenya/pubs/oscom/xslt/search/live main.xsl
src/webapp/lenya/pubs/oscom/xslt/overview/authoring main.xsl
src/webapp/lenya/pubs/oscom/xslt/home/live main.xsl
src/webapp/lenya/pubs/oscom/xslt/home/authoring main.xsl
src/webapp/lenya/pubs/oscom/xslt/matrix/live main.xsl
src/webapp/lenya/pubs/oscom/xslt/overview/live main.xsl
src/webapp/lenya/pubs/oscom/xslt/search body.xsl
src/webapp/lenya/pubs/oscom/xslt/generic/authoring main.xsl
src/webapp/lenya/pubs/oscom/xslt html_authoring.xsl
Log:
fixed hard-coded context prefix
Revision Changes Path
1.47 +5 -1 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.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sitemap.xmap 6 Feb 2004 19:15:09 -0000 1.46
+++ sitemap.xmap 8 Feb 2004 13:40:32 -0000 1.47
@@ -74,6 +74,7 @@
<map:generate src="cocoon:/{1}/matrix/overview.xml"/>
<map:transform src="xslt/overview/{1}/main.xsl">
<map:parameter name="relativePrefix" value="../"/>
+ <map:parameter name="contextprefix" value="{request:contextPath}"/>
</map:transform>
<map:transform src="cocoon://lenya-page/{page-envelope:publication-id}/{1}/matrix/overview.xml"/>
<map:serialize type="html"/>
@@ -102,6 +103,7 @@
<map:generate src="cocoon:/{1}/matrix/{2}.xml"/>
<map:transform src="xslt/matrix/{1}/main.xsl">
<map:parameter name="relativePrefix" value="../"/>
+ <map:parameter name="contextprefix" value="{request:contextPath}"/>
</map:transform>
<map:transform src="cocoon://lenya-page/{page-envelope:publication-id}/{1}/matrix/{2}.xml"/>
<map:serialize type="html"/>
@@ -178,7 +180,9 @@
<map:aggregate element="lenya">
<map:part src="cocoon:/{1}/{2}-envelope.xml" element="cmsbody"/>
</map:aggregate>
- <map:transform src="xslt/generic/{1}/main.xsl"/>
+ <map:transform src="xslt/generic/{1}/main.xsl">
+ <map:parameter name="contextprefix" value="{request:contextPath}"/>
+ </map:transform>
<map:transform src="cocoon://lenya-page/{page-envelope:publication-id}/{1}/xhtml/{2}.xml"/>
<map:serialize type="html"/>
</map:match>
1.8 +2 -0 cocoon-lenya/src/webapp/lenya/pubs/oscom/xslt/matrix/authoring/main.xsl
Index: main.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/oscom/xslt/matrix/authoring/main.xsl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- main.xsl 5 Dec 2003 22:58:05 -0000 1.7
+++ main.xsl 8 Feb 2004 13:40:32 -0000 1.8
@@ -2,6 +2,8 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<xsl:param name="contextprefix"/>
+
<xsl:output version="1.0" indent="yes" encoding="ISO-8859-1"/>
<xsl:include href="../../html_authoring.xsl"/>
<xsl:include href="../body.xsl"/>
1.4 +2 -0 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- main.xsl 22 Jan 2004 17:07:55 -0000 1.3
+++ main.xsl 8 Feb 2004 13:40:32 -0000 1.4
@@ -2,6 +2,8 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<xsl:param name="contextprefix"/>
+
<xsl:include href="../../root.xsl"/>
<xsl:include href="../body.xsl"/>
1.3 +2 -0 cocoon-lenya/src/webapp/lenya/pubs/oscom/xslt/search/live/main.xsl
Index: main.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/oscom/xslt/search/live/main.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- main.xsl 14 Mar 2003 10:31:39 -0000 1.2
+++ main.xsl 8 Feb 2004 13:40:32 -0000 1.3
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+<xsl:param name="contextprefix"/>
<xsl:output version="1.0" indent="yes" encoding="ISO-8859-1"/>
1.9 +2 -0 cocoon-lenya/src/webapp/lenya/pubs/oscom/xslt/overview/authoring/main.xsl
Index: main.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/oscom/xslt/overview/authoring/main.xsl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- main.xsl 5 Dec 2003 22:58:05 -0000 1.8
+++ main.xsl 8 Feb 2004 13:40:32 -0000 1.9
@@ -2,6 +2,8 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<xsl:param name="contextprefix"/>
+
<xsl:output version="1.0" indent="yes" encoding="ISO-8859-1"/>
<xsl:include href="../../html_authoring.xsl"/>
<xsl:include href="../body.xsl"/>
1.4 +2 -0 cocoon-lenya/src/webapp/lenya/pubs/oscom/xslt/home/live/main.xsl
Index: main.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/oscom/xslt/home/live/main.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- main.xsl 2 Apr 2003 12:44:49 -0000 1.3
+++ main.xsl 8 Feb 2004 13:40:32 -0000 1.4
@@ -2,6 +2,8 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<xsl:param name="contextprefix"/>
+
<xsl:output version="1.0" indent="yes" encoding="ISO-8859-1"/>
<xsl:include href="../body.xsl"/>
1.10 +2 -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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- main.xsl 9 Dec 2003 05:58:23 -0000 1.9
+++ main.xsl 8 Feb 2004 13:40:32 -0000 1.10
@@ -2,6 +2,8 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<xsl:param name="contextprefix"/>
+
<xsl:output version="1.0" indent="yes" encoding="ISO-8859-1"/>
<xsl:include href="../../html_authoring.xsl"/>
1.3 +2 -0 cocoon-lenya/src/webapp/lenya/pubs/oscom/xslt/matrix/live/main.xsl
Index: main.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/oscom/xslt/matrix/live/main.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- main.xsl 12 Mar 2003 00:28:08 -0000 1.2
+++ main.xsl 8 Feb 2004 13:40:32 -0000 1.3
@@ -2,6 +2,8 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<xsl:param name="contextprefix"/>
+
<xsl:include href="../../root.xsl"/>
<xsl:include href="../body.xsl"/>
1.3 +3 -1 cocoon-lenya/src/webapp/lenya/pubs/oscom/xslt/overview/live/main.xsl
Index: main.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/oscom/xslt/overview/live/main.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- main.xsl 12 Mar 2003 00:20:08 -0000 1.2
+++ main.xsl 8 Feb 2004 13:40:32 -0000 1.3
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
+
+<xsl:param name="contextprefix"/>
+
<xsl:include href="../../root.xsl"/>
<xsl:include href="../body.xsl"/>
1.18 +2 -0 cocoon-lenya/src/webapp/lenya/pubs/oscom/xslt/search/body.xsl
Index: body.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/oscom/xslt/search/body.xsl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- body.xsl 26 Nov 2003 00:30:18 -0000 1.17
+++ body.xsl 8 Feb 2004 13:40:32 -0000 1.18
@@ -4,6 +4,8 @@
<xsl:import href="../../../../xslt/search/search-and-results.xsl"/>
+<xsl:param name="contextprefix"/>
+
<xsl:template name="html-title">
Search
</xsl:template>
1.6 +2 -0 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- main.xsl 22 Jan 2004 17:07:55 -0000 1.5
+++ main.xsl 8 Feb 2004 13:40:32 -0000 1.6
@@ -2,6 +2,8 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<xsl:param name="contextprefix"/>
+
<xsl:output version="1.0" indent="yes" encoding="ISO-8859-1"/>
<xsl:include href="../../html_authoring.xsl"/>
1.8 +1 -1 cocoon-lenya/src/webapp/lenya/pubs/oscom/xslt/html_authoring.xsl
Index: html_authoring.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/oscom/xslt/html_authoring.xsl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- html_authoring.xsl 19 Jan 2004 13:36:43 -0000 1.7
+++ html_authoring.xsl 8 Feb 2004 13:40:32 -0000 1.8
@@ -6,7 +6,7 @@
<xsl:variable name="tablecolor">orange</xsl:variable>
<!-- context_prefix is just a temporary setting, will be given by general logicsheet -->
-<xsl:variable name="CONTEXT_PREFIX">/lenya/oscom</xsl:variable>
+<xsl:variable name="CONTEXT_PREFIX"><xsl:value-of select="$contextprefix"/>/oscom</xsl:variable>
<xsl:variable name="images">oscom-proposals_files</xsl:variable>
<xsl:include href="navigation_authoring.xsl"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org