svn commit: r1848972 - /tomcat/jk/trunk/xdocs/tomcat-docs.xsl

[csutherl]

Author: csutherl
Date: Sat Dec 15 00:42:32 2018
New Revision: 1848972

URL: http://svn.apache.org/viewvc?rev=1848972&view=rev
Log:
Temporary fix for links in nav pane. For some reason the update I made doesn't 
correctly utilize the project.xml from each subdirectory and only uses the top 
level one which caused problems. Adding the context root for the webapp to the 
link resolves this, but a better fix is to resolve whatever is causing the xsl 
not to work.

Modified:
    tomcat/jk/trunk/xdocs/tomcat-docs.xsl

Modified: tomcat/jk/trunk/xdocs/tomcat-docs.xsl
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/tomcat-docs.xsl?rev=1848972&r1=1848971&r2=1848972&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/tomcat-docs.xsl (original)
+++ tomcat/jk/trunk/xdocs/tomcat-docs.xsl Sat Dec 15 00:42:32 2018
@@ -46,6 +46,7 @@
   <xsl:param    name="buglink"             
select="'https://bz.apache.org/bugzilla/show_bug.cgi?id='"/>
   <xsl:param    name="revlink"             
select="'https://svn.apache.org/viewvc?view=rev&amp;rev='"/>
   <xsl:param    name="doclink"             
select="'https://tomcat.apache.org/connectors-doc'"/>
+  <xsl:param    name="contextroot"         select="'/connectors-doc'"/>
   <xsl:param    name="sylink"              
select="'https://tomcat.apache.org/security-jk.html'"/>
   <xsl:param    name="dllink"              
select="'https://tomcat.apache.org/download-connectors.cgi'"/>
   <xsl:param    name="sitedir"             select="''"/>
@@ -246,7 +247,14 @@
     <xsl:variable name="href">
       <xsl:value-of select="@href"/>
     </xsl:variable>
-    <li><a href="{$href}"><xsl:value-of select="@name"/></a></li>
+    <xsl:choose>
+      <xsl:when test="starts-with(@href,'http') or starts-with(@href,'https')">
+        <li><a href="{$href}"><xsl:value-of select="@name"/></a></li>
+      </xsl:when>
+      <xsl:otherwise>
+        <li><a href="{$contextroot}/{$href}"><xsl:value-of 
select="@name"/></a></li>
+      </xsl:otherwise>
+    </xsl:choose>
   </xsl:template>
 
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org