...

[helm.git] / helm / on-line / xslt / ls2html.xsl

diff --git a/helm/on-line/xslt/ls2html.xsl b/helm/on-line/xslt/ls2html.xsl
index 105c9ed3f06ad47856b7a5765539015117c33e28..a99a98f23f7c3de1192334a59a6a541608379b9d 100644 (file)
--- a/helm/on-line/xslt/ls2html.xsl
+++ b/helm/on-line/xslt/ls2html.xsl
@@ -3,6 +3,8 @@
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
+<xsl:import href="utils.xsl"/>
+
 <xsl:output method="html" encoding="iso-8859-1"/>
 
 <!-- uri must end with '/' -->
@@ -43,36 +45,28 @@
    <img border="0" src="{concat($interfaceURL,'/icons/',$icon)}" alt="[{$alt}]"/>
   </td>
   <td>
-<!-- Substituted with next lines to avoid Mozilla 0.8 bug setting this.search
-    <a
-      onClick=
-       "top.{$target}uri='{$uri}';
-        refresh{$target}Header('{$interfaceURL}/html/library/header.html');
-        this.search='?keys={$keys}' +
-         '&amp;xmluri=' + escape('{$getterURL}ls?format=xml'+'&amp;baseuri={$uri}')+
-         '&amp;param.uri={$uri}' +
-         '&amp;param.keys={$keys}' +
-         '&amp;param.getterURL={$getterURL}' +
-         '&amp;param.target={$target}' +
-         '&amp;param.interfaceURL={$interfaceURL}';"
-      onMouseOver="window.status='{$uri}'; return true"
-      href="apply"
-   ><xsl:value-of select="$basename"/></a>
--->
+    <xsl:variable name="quoteduri">
+     <xsl:call-template name="jsquote">
+      <xsl:with-param name="s" select="$uri"/>
+     </xsl:call-template>
+    </xsl:variable>
     <a
       onClick=
-       "top.{$target}uri='{$uri}';
+       "top.{$target}uri='{$quoteduri}';
         refresh{$target}Header('{$interfaceURL}/html/library/header.html');
         var search='?keys={$keys}' +
-         '&amp;xmluri=' + escape('{$getterURL}ls?format=xml'+'&amp;baseuri={$uri}')+
-         '&amp;param.uri={$uri}' +
+         '&amp;xmluri=' + escape('{$getterURL}ls?format=xml'+'&amp;baseuri={$quoteduri}')+
+         '&amp;param.uri={$quoteduri}' +
          '&amp;param.keys={$keys}' +
          '&amp;param.getterURL={$getterURL}' +
          '&amp;param.target={$target}' +
          '&amp;param.interfaceURL={$interfaceURL}';
+        var pathname = this.pathname;
+        if (pathname.charAt(0) != '/')
+         pathname = '/' + pathname;
         this.href=
-         this.protocol + '//' + this.host + this.pathname + search + this.hash;"
-      onMouseOver="window.status='{$uri}'; return true"
+         this.protocol + '//' + this.host + pathname + search + this.hash;"
+      onMouseOver="window.status='{$quoteduri}'; return true"
       href="apply"
    ><xsl:value-of select="$basename"/></a>
   </td>
@@ -130,9 +124,19 @@
    <img border="0" src="{concat($interfaceURL,'/icons/',$icon)}" alt="[{@name}]"/>
   </td>
   <td>
+   <xsl:variable name="quoteduri">
+    <xsl:call-template name="jsquote">
+     <xsl:with-param name="s" select="$uri"/>
+    </xsl:call-template>
+   </xsl:variable>
+   <xsl:variable name="quotedname">
+    <xsl:call-template name="jsquote">
+     <xsl:with-param name="s" select="$name"/>
+    </xsl:call-template>
+   </xsl:variable>
    <a href="" target="{$target}"
-      onClick="this.href=makeURL('{$target}','{concat($uri,$name)}','{$ann}','{$types}')"
-      onMouseOver="window.status='{concat($uri,$name)}'; return true"
+      onClick="this.href=makeURL('{$target}','{concat($quoteduri,$quotedname)}','{$ann}','{$types}')"
+      onMouseOver="window.status='{concat($quoteduri,$quotedname)}'; return true"
    ><xsl:value-of select="$name"/></a>
   </td>
  </tr>