You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by ro...@apache.org on 2005/02/20 17:14:39 UTC
svn commit: r154520 - in lenya/trunk/src/webapp/lenya:
pubs/default/xslt/xhtml2xhtml.xsl usecases/kupu/usecase-kupu.xmap
xslt/bxe/change-object-path-back.xsl xslt/bxe/change-object-path.xsl
Author: roku
Date: Sun Feb 20 08:14:38 2005
New Revision: 154520
URL: http://svn.apache.org/viewcvs?view=rev&rev=154520
Log:
Fixed objct conversion. See bug #33661
Modified:
lenya/trunk/src/webapp/lenya/pubs/default/xslt/xhtml2xhtml.xsl
lenya/trunk/src/webapp/lenya/usecases/kupu/usecase-kupu.xmap
lenya/trunk/src/webapp/lenya/xslt/bxe/change-object-path-back.xsl
lenya/trunk/src/webapp/lenya/xslt/bxe/change-object-path.xsl
Modified: lenya/trunk/src/webapp/lenya/pubs/default/xslt/xhtml2xhtml.xsl
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/pubs/default/xslt/xhtml2xhtml.xsl?view=diff&r1=154519&r2=154520
==============================================================================
--- lenya/trunk/src/webapp/lenya/pubs/default/xslt/xhtml2xhtml.xsl (original)
+++ lenya/trunk/src/webapp/lenya/pubs/default/xslt/xhtml2xhtml.xsl Sun Feb 20 08:14:38 2005
@@ -85,8 +85,11 @@
for more, see http://www.xml.com/pub/a/2003/07/02/dive.html -->
<xsl:template name="object2img">
<img border="0">
- <xsl:attribute name="src">
- <xsl:value-of select="$nodeid"/>/<xsl:value-of select="@data"/>
+ <xsl:attribute name="src">
+ <xsl:if test="not(starts-with(@data, '/'))">
+ <xsl:value-of select="$nodeid"/>/
+ </xsl:if>
+ <xsl:value-of select="@data"/>
</xsl:attribute>
<xsl:attribute name="alt">
<!-- the overwritten title (stored in @name) has precedence over dc:title -->
Modified: lenya/trunk/src/webapp/lenya/usecases/kupu/usecase-kupu.xmap
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/kupu/usecase-kupu.xmap?view=diff&r1=154519&r2=154520
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/kupu/usecase-kupu.xmap (original)
+++ lenya/trunk/src/webapp/lenya/usecases/kupu/usecase-kupu.xmap Sun Feb 20 08:14:38 2005
@@ -188,7 +188,7 @@
<map:generate src="fallback://content/info/assets.xsp" type="serverpages"/>
<map:transform src="fallback://resources/kupu/apache-lenya/lenya/pageassets2kupulibrary.xsl">
<map:parameter name="iconUrl" value="{page-envelope:context-prefix}/{global:resourceIconUrl}"/>
- <map:parameter name="resource-path-url" value="{page-envelope:context-prefix}/{page-envelope:publication-id}/{page-envelope:area}{page-envelope:document-id}/"/>
+ <map:parameter name="resource-path-url" value="{page-envelope:document-id}/"/>
</map:transform>
<map:serialize type="xml"/>
</map:match>
Modified: lenya/trunk/src/webapp/lenya/xslt/bxe/change-object-path-back.xsl
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/xslt/bxe/change-object-path-back.xsl?view=diff&r1=154519&r2=154520
==============================================================================
--- lenya/trunk/src/webapp/lenya/xslt/bxe/change-object-path-back.xsl (original)
+++ lenya/trunk/src/webapp/lenya/xslt/bxe/change-object-path-back.xsl Sun Feb 20 08:14:38 2005
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- $Id: change-object-path-back.xsl,v 1.2 2004/03/13 13:09:51 gregor Exp $ -->
+<!-- $Id$ -->
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -23,7 +23,7 @@
xmlns:xhtml="http://www.w3.org/1999/xhtml"
>
- <xsl:template match="xhtml:object/@data">
+ <xsl:template match="xhtml:object/@data[not(starts-with(., '/'))]">
<xsl:variable name="url">
<xsl:value-of select="." />
</xsl:variable>
Modified: lenya/trunk/src/webapp/lenya/xslt/bxe/change-object-path.xsl
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/xslt/bxe/change-object-path.xsl?view=diff&r1=154519&r2=154520
==============================================================================
--- lenya/trunk/src/webapp/lenya/xslt/bxe/change-object-path.xsl (original)
+++ lenya/trunk/src/webapp/lenya/xslt/bxe/change-object-path.xsl Sun Feb 20 08:14:38 2005
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- $Id: change-object-path.xsl,v 1.2 2004/03/13 13:09:52 gregor Exp $ -->
+<!-- $Id$ -->
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -32,7 +32,7 @@
</xsl:variable>
- <xsl:template match="xhtml:object/@data">
+ <xsl:template match="xhtml:object/@data[not(starts-with(., '/'))]">
<xsl:attribute name="data">
<xsl:value-of select="concat($nodeid, '/', .)" />
</xsl:attribute>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org