svn commit: r519928 - in /lenya/trunk/src/modules/bxe: sitemap.xmap xslt/link.xsl

Author: andreas
Date: Mon Mar 19 05:34:32 2007
New Revision: 519928

URL: http://svn.apache.org/viewvc?view=rev&rev=519928
Log:
Use path instead of UUID for 'insert link' sitetree language URLs

Modified:
    lenya/trunk/src/modules/bxe/sitemap.xmap
    lenya/trunk/src/modules/bxe/xslt/link.xsl

Modified: lenya/trunk/src/modules/bxe/sitemap.xmap
URL: 
http://svn.apache.org/viewvc/lenya/trunk/src/modules/bxe/sitemap.xmap?view=diff&rev=519928&r1=519927&r2=519928
==============================================================================
--- lenya/trunk/src/modules/bxe/sitemap.xmap (original)
+++ lenya/trunk/src/modules/bxe/sitemap.xmap Mon Mar 19 05:34:32 2007
@@ -111,7 +111,7 @@
           <map:parameter name="area" value="authoring"/>
           <map:parameter name="tab" value="en"/>
           <map:parameter name="chosenlanguage" 
value="{page-envelope:document-language}"/>
-          <map:parameter name="documentid" 
value="{page-envelope:document-id}"/>
+          <map:parameter name="path" value="{page-envelope:document-path}"/>
           <map:parameter name="documenturl" 
value="/{page-envelope:document-url}"/>
           <map:parameter name="documentextension" 
value="{page-envelope:document-extension}"/>
           <map:parameter name="defaultlanguage" 
value="{page-envelope:default-language}"/>

Modified: lenya/trunk/src/modules/bxe/xslt/link.xsl
URL: 
http://svn.apache.org/viewvc/lenya/trunk/src/modules/bxe/xslt/link.xsl?view=diff&rev=519928&r1=519927&r2=519928
==============================================================================
--- lenya/trunk/src/modules/bxe/xslt/link.xsl (original)
+++ lenya/trunk/src/modules/bxe/xslt/link.xsl Mon Mar 19 05:34:32 2007
@@ -33,7 +33,7 @@
   <xsl:param name="publicationid"/>
   <xsl:param name="area"/>
   <xsl:param name="tab"/>
-  <xsl:param name="documentid"/>
+  <xsl:param name="path"/>
   <xsl:param name="documentextension"/>
   <xsl:param name="documenturl"/>
   <xsl:param name="languages"/>
@@ -52,7 +52,7 @@
         <script type="text/javascript" 
src="{$contextprefix}/modules/bxe/javascript/insertLink.js">&#160;</script>
         <script type="text/javascript" >
           AREA = "<xsl:value-of select="$area"/>";
-          DOCUMENT_ID = "<xsl:value-of select="$documentid"/>";
+          DOCUMENT_ID = "<xsl:value-of select="$path"/>";
           CONTEXT_PREFIX = "<xsl:value-of select="$contextprefix"/>";
           PUBLICATION_ID = "<xsl:value-of select="$publicationid"/>";
           CHOSEN_LANGUAGE = "<xsl:value-of select="$chosenlanguage"/>";
@@ -181,7 +181,7 @@
   
   <xsl:template name="activate">
     <xsl:param name="tablanguage"/>
-    <xsl:attribute name="href"><xsl:value-of 
select="$contextprefix"/>/<xsl:value-of select="$publicationid"/>/<xsl:value-of 
select="$area"/><xsl:value-of select="$documentid"/>_<xsl:value-of 
select="$tablanguage"/><xsl:value-of 
select="$extension"/>?lenya.module=bxe&amp;lenya.step=link-show</xsl:attribute>
+    <xsl:attribute name="href"><xsl:value-of 
select="$contextprefix"/>/<xsl:value-of select="$publicationid"/>/<xsl:value-of 
select="$area"/><xsl:value-of select="$path"/>_<xsl:value-of 
select="$tablanguage"/><xsl:value-of 
select="$extension"/>?lenya.module=bxe&amp;lenya.step=link-show</xsl:attribute>
     <xsl:attribute name="class">lenya-tablink<xsl:choose><xsl:when 
test="$chosenlanguage = 
$tablanguage">-active</xsl:when><xsl:otherwise/></xsl:choose></xsl:attribute><xsl:value-of
 select="$tablanguage"/>
   </xsl:template>