You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by fs...@apache.org on 2017/07/26 18:22:00 UTC
svn commit: r1803090 - in /jmeter/trunk/xdocs:
stylesheets/site_printable.vsl stylesheets/website-style.xsl
usermanual/component_reference.xml
Author: fschumacher
Date: Wed Jul 26 18:22:00 2017
New Revision: 1803090
URL: http://svn.apache.org/viewvc?rev=1803090&view=rev
Log:
Add a 'funclink' macro to the stylesheets to make it possible to easily link to functions.
Modified:
jmeter/trunk/xdocs/stylesheets/site_printable.vsl
jmeter/trunk/xdocs/stylesheets/website-style.xsl
jmeter/trunk/xdocs/usermanual/component_reference.xml
Modified: jmeter/trunk/xdocs/stylesheets/site_printable.vsl
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/stylesheets/site_printable.vsl?rev=1803090&r1=1803089&r2=1803090&view=diff
==============================================================================
--- jmeter/trunk/xdocs/stylesheets/site_printable.vsl (original)
+++ jmeter/trunk/xdocs/stylesheets/site_printable.vsl Wed Jul 26 18:22:00 2017
@@ -188,6 +188,8 @@ No
<li><a href="$items.getAttributeValue("href")">$xmlout.outputString($items,true)</a></li>
#elseif($items.getName() == "complink")
<li>#complink($items)</li>
+#elseif($items.getName() == "funclink")
+<li>#funclink($items)</li>
#end
#end
</ul>
@@ -269,6 +271,8 @@ Contributed by $id.getAttributeValue("na
#note($node)
#elseif($node.getName() == "complink")
#complink($node)
+#elseif($node.getName() == "funclink")
+#funclink($node)
#elseif($node.getName() == "figure")
#figure($node)
#elseif ($node.getName() == "links")
@@ -326,6 +330,10 @@ Contributed by $id.getAttributeValue("na
<a href="$relativePath/usermanual/component_reference.html#$complink.getAttributeValue("name").replace($space,$udsc)">$complink.getAttributeValue("name")</a>##
#end
+#macro (funclink $funclink)
+<a href="$relativePath/usermanual/functions.html#$funclink.getAttributeValue("name").replace($space,$udsc)">$funclink.getAttributeValue("name")</a>##
+#end
+
#macro (outputTag $tag)
<$tag.getName()#getAtts($tag)>##
#end
Modified: jmeter/trunk/xdocs/stylesheets/website-style.xsl
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/stylesheets/website-style.xsl?rev=1803090&r1=1803089&r2=1803090&view=diff
==============================================================================
--- jmeter/trunk/xdocs/stylesheets/website-style.xsl (original)
+++ jmeter/trunk/xdocs/stylesheets/website-style.xsl Wed Jul 26 18:22:00 2017
@@ -479,6 +479,21 @@
</xsl:call-template>
</xsl:template>
+ <xsl:template name="funclink">
+ <xsl:param name="name" />
+ <a
+ href="{concat($relative-path, '/usermanual/functions.html#', translate(@name, ' ', '_'))}"
+ >
+ <xsl:value-of select="@name" />
+ </a>
+ </xsl:template>
+
+ <xsl:template match="funclink">
+ <xsl:call-template name="funclink">
+ <xsl:with-param name="name" select="@name" />
+ </xsl:call-template>
+ </xsl:template>
+
<xsl:template match="figure">
<figure>
<xsl:call-template name="image">
Modified: jmeter/trunk/xdocs/usermanual/component_reference.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=1803090&r1=1803089&r2=1803090&view=diff
==============================================================================
--- jmeter/trunk/xdocs/usermanual/component_reference.xml (original)
+++ jmeter/trunk/xdocs/usermanual/component_reference.xml Wed Jul 26 18:22:00 2017
@@ -49,7 +49,7 @@
<note>
Several test elements use JMeter properties to control their behaviour.
These properties are normally resolved when the class is loaded.
- This generally occurs before the test plan starts, so it's not possible to change the settings by using the <code>__setProperty()</code> function.
+ This generally occurs before the test plan starts, so it's not possible to change the settings by using the <code><funclink name="__setProperty">__setProperty()</funclink></code> function.
</note>
<p>
</p>