You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2008/05/31 02:09:32 UTC

svn commit: r661919 - /jakarta/jmeter/trunk/xdocs/stylesheets/site_printable.vsl

Author: sebb
Date: Fri May 30 17:09:32 2008
New Revision: 661919

URL: http://svn.apache.org/viewvc?rev=661919&view=rev
Log:
Remove extra spacing from stylesheet, and change processing comments to Velocity commments
This saves about 10% on the larger output files.

Modified:
    jakarta/jmeter/trunk/xdocs/stylesheets/site_printable.vsl

Modified: jakarta/jmeter/trunk/xdocs/stylesheets/site_printable.vsl
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/stylesheets/site_printable.vsl?rev=661919&r1=661918&r2=661919&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/stylesheets/site_printable.vsl (original)
+++ jakarta/jmeter/trunk/xdocs/stylesheets/site_printable.vsl Fri May 30 17:09:32 2008
@@ -6,67 +6,66 @@
    The ASF licenses this file to You under the Apache License, Version 2.0
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
- 
+
        http://www.apache.org/licenses/LICENSE-2.0
- 
+
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
+##
+##  Content Stylesheet for Site
+##
+##	Java cannot currently handle HTML tags of the form <xxx />, e.g. <br/>;
+##	the trailing > characters are output to the display, which messes it up.
+##	Java does handle <br></br> OK, but as the output from this stylesheet
+##	does not have to be XHTML, for simplicity the trailing slashes have been removed.
+##
+##
+## Defined variables
+#set ($bodybg = "#ffffff")
+#set ($bodyfg = "#000000")
+#set ($bodylink = "#525D76")
+#set ($bannerbg = "#525D76")
+#set ($bannerfg = "#ffffff")
+#set ($subbannerbg = "#828DA6")
+#set ($subbannerfg = "#ffffff")
+#set ($tablethbg = "#039acc")
+#set ($tabletdbg = "#a0ddf0")
+#set ($notebackground = "#bbbb00")
+#set ($space = " ")
+#set ($space = $space.charAt(0))
+#set ($udsc = "_")
+#set ($udsc = $udsc.charAt(0))
+#set ($imgdir = "$relativePath/../docs/images")
+#set ($sshotdir = "$imgdir/screenshots")
+#set ($year = $date.getYear()+1900)
 
-<!-- Content Stylesheet for Site -->
-<!--
-	Java cannot currently handle HTML tags of the form <xxx />, e.g. <br/>;
-	the trailing > characters are output to the display, which messes it up.
-	Java does handle <br></br> OK, but as the output from this stylesheet
-	does not have to be XHTML, for simplicity the trailing slashes have been removed.
--->
-	 ## Defined variables
-	 #set ($bodybg = "#ffffff")
-	 #set ($bodyfg = "#000000")
-	 #set ($bodylink = "#525D76")
-	 #set ($bannerbg = "#525D76")
-	 #set ($bannerfg = "#ffffff")
-	 #set ($subbannerbg = "#828DA6")
-	 #set ($subbannerfg = "#ffffff")
-	 #set ($tablethbg = "#039acc")
-	 #set ($tabletdbg = "#a0ddf0")
-	 #set ($notebackground = "#bbbb00")
-	 #set ($space = " ")
-	 #set ($space = $space.charAt(0))
-	 #set ($udsc = "_")
-	 #set ($udsc = $udsc.charAt(0))	 
-	 #set ($imgdir = "$relativePath/../docs/images")
-	 #set ($sshotdir = "$imgdir/screenshots")
-	 #set ($year = $date.getYear()+1900)
-
-<!-- start the processing -->
 #document()
-<!-- end the processing -->
 
 ## This is where the macro's live
 
 #macro ( table $table)
 <table>
-	 #foreach ( $items in $table.getChildren() )
-		  #if ($items.getName().equals("tr"))
-				#tr ($items)
-		  #end
-	 #end
+#foreach ( $items in $table.getChildren() )
+#if ($items.getName().equals("tr"))
+#tr ($items)
+#end
+#end
 </table>
 #end
 
 #macro ( tr $tr)
 <tr>
-	 #foreach ( $items in $tr.getChildren() )
-		  #if ($items.getName().equals("td"))
-				#td ($items)
-		  #elseif ($items.getName().equals("th"))
-				#th ($items)
-		  #end
-	 #end
+#foreach ( $items in $tr.getChildren() )
+#if ($items.getName().equals("td"))
+#td ($items)
+#elseif ($items.getName().equals("th"))
+#th ($items)
+#end
+#end
 </tr>
 #end
 
@@ -78,13 +77,13 @@
 #set ($rowspan = $value.getAttributeValue("rowspan"))
 #end
 <td bgcolor="$tabletdbg" colspan="$!colspan" rowspan="$!rowspan" valign="top" align="left">
-	 <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-		  #if ($value.getText().length() != 0 || $value.hasChildren())
-		  $xmlout.outputString($value, true)
-		  #else
-		  &nbsp;
-		  #end
-	 </font>
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+ #if ($value.getText().length() != 0 || $value.hasChildren())
+$xmlout.outputString($value, true)
+#else
+&nbsp;
+#end
+</font>
 </td>
 #end
 
@@ -96,29 +95,29 @@
 #set ($rowspan = $value.getAttributeValue("rowspan"))
 #end
 <td bgcolor="$tablethbg" colspan="$!colspan" rowspan="$!rowspan" valign="top" align="left">
-	 <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-		  #if ($value.getText().length() != 0 || $value.hasChildren())
-		  $xmlout.outputString($value, true)
-		  #else
-		  &nbsp;
-		  #end
-	 </font>
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+#if ($value.getText().length() != 0 || $value.hasChildren())
+$xmlout.outputString($value, true)
+#else
+&nbsp;
+#end
+</font>
 </td>
 #end
 
 #macro ( projectanchor $name $value )
 #if ($value.startsWith("http://"))
-	 <a href="$value">$name</a>
+<a href="$value">$name</a>
 #elseif ($value.startsWith("/site"))
-	 <a href="http://jakarta.apache.org$value">$name</a>
+<a href="http://jakarta.apache.org$value">$name</a>
 #else
-	 <a href="$relativePath$value">$name</a>
+<a href="$relativePath$value">$name</a>
 #end
 #end
 
 #macro ( metaauthor $author $email )
-				<meta name="author" value="$author">
-				<meta name="email" value="$email">
+<meta name="author" value="$author">
+<meta name="email" value="$email">
 #end
 
 #macro ( image $value )
@@ -135,122 +134,122 @@
 #end
 
 #macro ( source $value)
-	 <div align="left">
-	 <table cellspacing="4" cellpadding="0" border="0">
-	 <tr>
-		<td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"></td>
-		<td bgcolor="#023264" height="1"><img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"></td>
-		<td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"></td>
-	 </tr>
-	 <tr>
-		<td bgcolor="#023264" width="1"><img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"></td>
-		<td bgcolor="#ffffff"><pre>$escape.getText($value.getText())</pre></td>
-		<td bgcolor="#023264" width="1"><img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"></td>
-	 </tr>
-	 <tr>
-		<td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"></td>
-		<td bgcolor="#023264" height="1"><img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"></td>
-		<td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"></td>
-	 </tr>
-	 </table>
-	 </div>
+<div align="left">
+<table cellspacing="4" cellpadding="0" border="0">
+<tr>
+<td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"></td>
+<td bgcolor="#023264" height="1"><img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"></td>
+<td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"></td>
+</tr>
+<tr>
+<td bgcolor="#023264" width="1"><img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"></td>
+<td bgcolor="#ffffff"><pre>$escape.getText($value.getText())</pre></td>
+<td bgcolor="#023264" width="1"><img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"></td>
+</tr>
+<tr>
+<td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"></td>
+<td bgcolor="#023264" height="1"><img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"></td>
+<td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"></td>
+</tr>
+</table>
+</div>
 #end
 
 #macro (properties $properties)
 <p>
-	<b>Parameters</b>
-	<table border="1" cellspacing="0" cellpadding="2">
-	<tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
-	#foreach ($items in $properties.getChildren("property"))
-		<tr>
-			<td>$items.getAttributeValue("name")</td>
-			<td>#runloop($items)</td>
-			<td>
-					#if($items.getAttributeValue("required") != "")
-						$items.getAttributeValue("required")
-					#else
-						No
-					#end
-			</td>
-		</tr>
-	#end
-	</table>
-	</p>
+<b>Parameters</b>
+<table border="1" cellspacing="0" cellpadding="2">
+<tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
+#foreach ($items in $properties.getChildren("property"))
+<tr>
+<td>$items.getAttributeValue("name")</td>
+<td>#runloop($items)</td>
+<td>
+#if($items.getAttributeValue("required") != "")
+$items.getAttributeValue("required")
+#else
+No
+#end
+</td>
+</tr>
+#end
+</table>
+</p>
 #end
 
 #macro (seeAlso $seeAlso)
-	<p><b>See Also:</b>
-	<ul>
-	#foreach ($items in $seeAlso.getChildren())
-		#if($items.getName() == "link")
-			<li><a href="$items.getAttributeValue("href")">$xmlout.outputString($items,true)</a></li>
-		#elseif($items.getName() == "complink")
-			<li>#complink($items)</li>
-		#end
-	#end
-	</ul>
-	</p>
+<p><b>See Also:</b>
+<ul>
+#foreach ($items in $seeAlso.getChildren())
+#if($items.getName() == "link")
+<li><a href="$items.getAttributeValue("href")">$xmlout.outputString($items,true)</a></li>
+#elseif($items.getName() == "complink")
+<li>#complink($items)</li>
+#end
+#end
+</ul>
+</p>
 #end
 
 #macro (figure $figure)
-	#set ($width = "")
-	#set ($width = $component.getAttributeValue('width') )
-	#set ($height = "")
-	#set ($height = $component.getAttributeValue('height') )
-	#set ($dim= "")
-	#if  ($width != "")
-	    #set ($dim = "width='$width' height='$height'")
-	#end
-	<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img $dim src="$sshotdir/$figure.getAttributeValue("image")"><br>
-	<font size="-1">#runloop($figure)</font></td></tr></table></p>
+#set ($width = "")
+#set ($width = $component.getAttributeValue('width') )
+#set ($height = "")
+#set ($height = $component.getAttributeValue('height') )
+#set ($dim= "")
+#if  ($width != "")
+#set ($dim = "width='$width' height='$height'")
+#end
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img $dim src="$sshotdir/$figure.getAttributeValue("image")"><br>
+<font size="-1">#runloop($figure)</font></td></tr></table></p>
 #end
 
 #macro (example $example)
-	<a name="$example.getAttributeValue("anchor")">
-	<p><b>$example.getAttributeValue("title")</b></p>
-	#runloop($example)
+<a name="$example.getAttributeValue("anchor")">
+<p><b>$example.getAttributeValue("title")</b></p>
+#runloop($example)
 #end
 
 #macro (note $note)
-	<p><table border="1" bgcolor="$notebackground" width="50%" cellspacing="0" cellpadding="2">
-		<tr><td>#runloop($note)</td></tr>
-	</table></p>
+<p><table border="1" bgcolor="$notebackground" width="50%" cellspacing="0" cellpadding="2">
+<tr><td>#runloop($note)</td></tr>
+</table></p>
 #end
 
 #macro (unknown $node)
-	#if($node.getName() == "note")
-		#note($node)
-	#elseif($node.getName() == "complink")
-		#complink($node)
-	#elseif($node.getName() == "figure")
-		#figure($node)
-	#elseif ($node.getName() == "links")
-		 #seeAlso ($node)
-	#elseif ($node.getName() == "properties")
-		 #properties ($node)
-	#elseif ($node.getName() == "example")
-		#example ($node)
-	#elseif ($node.getName().equals("source"))
-		 #source ($node)
-	#elseif ($node.getName().equals("table"))
-		 #table ($node)
-	#elseif ($node.getName().equals("component"))
-		#component($node)
-	#elseif ($node.getName().equals("subsection"))
-		 #subsection ($node)
-	#else
-		#outputTag($node)
-		#runloop($node)
-		#outputEndTag($node)
-	#end
+#if($node.getName() == "note")
+#note($node)
+#elseif($node.getName() == "complink")
+#complink($node)
+#elseif($node.getName() == "figure")
+#figure($node)
+#elseif ($node.getName() == "links")
+#seeAlso ($node)
+#elseif ($node.getName() == "properties")
+#properties ($node)
+#elseif ($node.getName() == "example")
+#example ($node)
+#elseif ($node.getName().equals("source"))
+#source ($node)
+#elseif ($node.getName().equals("table"))
+#table ($node)
+#elseif ($node.getName().equals("component"))
+#component($node)
+#elseif ($node.getName().equals("subsection"))
+#subsection ($node)
+#else
+#outputTag($node)
+#runloop($node)
+#outputEndTag($node)
+#end
 #end
 
 #macro (complink $complink)
-	<a href="$relativePath/usermanual/component_reference.html#$complink.getAttributeValue("name").replace($space,$udsc)">$complink.getAttributeValue("name")</a>
+<a href="$relativePath/usermanual/component_reference.html#$complink.getAttributeValue("name").replace($space,$udsc)">$complink.getAttributeValue("name")</a>
 #end
 
 #macro (outputTag $tag)
-	<$tag.getName()#getAtts($tag)>
+<$tag.getName()#getAtts($tag)>
 #end
 
 #macro (getAtts $tag)
@@ -258,172 +257,172 @@
 #end
 
 #macro (outputEndTag $tag)
-	</$tag.getName()>
+</$tag.getName()>
 #end
 
 #macro (runloop $itemToLoop)
-	#foreach ($node in $itemToLoop.getContent())
-		#if($node.getClass().getName().indexOf("Element") > -1)
-			#unknown($node)
-		#else
-			$node.getText()
-		#end
-	#end
+#foreach ($node in $itemToLoop.getContent())
+#if($node.getClass().getName().indexOf("Element") > -1)
+#unknown($node)
+#else
+$node.getText()
+#end
+#end
 #end
 
 #macro ( component $component)
-	#set ($width = "")
-	#set ($width = $component.getAttributeValue('width') )
-	#set ($height = "")
-	#set ($height = $component.getAttributeValue('height') )
-	#set ($dim= "")
-	#if  ($width != "")
-	    #set ($dim = "width='$width' height='$height'")
-	#end
-	#set ($screenshot = "")
-	#set ($screenshot = $component.getAttributeValue('screenshot') )
-	<table border="0" cellspacing="0" cellpadding="2">
-		<tr><td>
-		  <font face="arial,helvetica,sanserif">
-		     #set ($tag = "")
-		     #set ($tag = $component.getAttributeValue("tag"))
-		     #if ($tag != "")
-		     <a name="$tag"></a>
-		     #end
-			 <h3><a name="$component.getAttributeValue("name").replace($space,$udsc)">$!component.getAttributeValue("index") $component.getAttributeValue("name")</h3></a>
-		  </font>
-		</td></tr>
-		#if($component.getAttribute("useinstead"))
-			<tr><td bgcolor="#bbbb00"><div align="center"><b>*** This element is deprecated.  Use <a href="$relativePath/usermanual/component_reference.html#$component.getAttributeValue("useinstead").replace($space,$udsc)">$component.getAttributeValue("useinstead")</a> instead ***</b></div></td></tr>
-		#end
-		<tr><td>
-		  #foreach ( $items in $component.getChildren() )
-				#if ($items.getName().equals("description"))
-					#runloop($items)
-					#if ($screenshot != "")
-					<p><b>Control Panel</b></p>
-						<div align="center"><img $dim src="$sshotdir/$screenshot"></div>
-					#end
-				#else
-					 #unknown($items)
-				#end
-		  #end
-		</td></tr>
-		<tr><td><br></td></tr>
-	 </table>
-	<hr>
+#set ($width = "")
+#set ($width = $component.getAttributeValue('width') )
+#set ($height = "")
+#set ($height = $component.getAttributeValue('height') )
+#set ($dim= "")
+#if  ($width != "")
+#set ($dim = "width='$width' height='$height'")
+#end
+#set ($screenshot = "")
+#set ($screenshot = $component.getAttributeValue('screenshot') )
+<table border="0" cellspacing="0" cellpadding="2">
+<tr><td>
+<font face="arial,helvetica,sanserif">
+#set ($tag = "")
+#set ($tag = $component.getAttributeValue("tag"))
+#if ($tag != "")
+<a name="$tag"></a>
+#end
+<h3><a name="$component.getAttributeValue("name").replace($space,$udsc)">$!component.getAttributeValue("index") $component.getAttributeValue("name")</h3></a>
+</font>
+</td></tr>
+#if($component.getAttribute("useinstead"))
+<tr><td bgcolor="#bbbb00"><div align="center"><b>*** This element is deprecated.  Use <a href="$relativePath/usermanual/component_reference.html#$component.getAttributeValue("useinstead").replace($space,$udsc)">$component.getAttributeValue("useinstead")</a> instead ***</b></div></td></tr>
+#end
+<tr><td>
+#foreach ( $items in $component.getChildren() )
+#if ($items.getName().equals("description"))
+#runloop($items)
+#if ($screenshot != "")
+<p><b>Control Panel</b></p>
+<div align="center"><img $dim src="$sshotdir/$screenshot"></div>
+#end
+#else
+#unknown($items)
+#end
+#end
+</td></tr>
+<tr><td><br></td></tr>
+</table>
+<hr>
 #end
 
 #macro ( subsection $subsection)
-	 <table border="0" cellspacing="0" cellpadding="2" width="100%">
-		<tr><td bgcolor="$subbannerbg">
-		  <font color="$subbannerfg" face="arial,helvetica,sanserif">
-			 <a name="$subsection.getAttributeValue("anchor")"><strong>$subsection.getAttributeValue("name")</strong></a>
-		  </font>
-		</td></tr>
-		<tr><td>
-		  <blockquote>
-		  #foreach ( $items in $subsection.getChildren() )
-				#if ($items.getName().equals("img"))
-					 #image ($items)
-				#else
-					 #unknown($items)
-				#end
-		  #end
-		  </blockquote>
-		</td></tr>
-		<tr><td><br></td></tr>
-	 </table>
+<table border="0" cellspacing="0" cellpadding="2" width="100%">
+<tr><td bgcolor="$subbannerbg">
+<font color="$subbannerfg" face="arial,helvetica,sanserif">
+<a name="$subsection.getAttributeValue("anchor")"><strong>$subsection.getAttributeValue("name")</strong></a>
+</font>
+</td></tr>
+<tr><td>
+<blockquote>
+#foreach ( $items in $subsection.getChildren() )
+#if ($items.getName().equals("img"))
+#image ($items)
+#else
+#unknown($items)
+#end
+#end
+</blockquote>
+</td></tr>
+<tr><td><br></td></tr>
+</table>
 #end
 
 #macro (pagelinks)
-  #if (($next != "") || ($prev != ""))
-		<table>
-		<tr>
-		<td bgcolor="$bannerbg">
-        <div align="right"><a href="index.html"><font size=-1 color="$bannerfg" face="arial,helvetica,sanserif">Index</font></a></div>
-        </td>
-		#if ($next != "")
-		<td bgcolor="$bannerbg">
-        <div align="right"><a href="$next"><font size=-1 color="$bannerfg" face="arial,helvetica,sanserif">Next</font></a></div>
-        </td>
-        #end
-		#if ($prev != "")
-		<td bgcolor="$bannerbg">
-        <div align="right"><a href="$prev"><font size=-1 color="$bannerfg" face="arial,helvetica,sanserif">Prev</font></a></div>
-        </td>
-        #end
-        </tr>
-         </table>
-      #end
+#if (($next != "") || ($prev != ""))
+<table>
+<tr>
+<td bgcolor="$bannerbg">
+<div align="right"><a href="index.html"><font size=-1 color="$bannerfg" face="arial,helvetica,sanserif">Index</font></a></div>
+</td>
+#if ($next != "")
+<td bgcolor="$bannerbg">
+<div align="right"><a href="$next"><font size=-1 color="$bannerfg" face="arial,helvetica,sanserif">Next</font></a></div>
+</td>
+#end
+#if ($prev != "")
+<td bgcolor="$bannerbg">
+<div align="right"><a href="$prev"><font size=-1 color="$bannerfg" face="arial,helvetica,sanserif">Prev</font></a></div>
+</td>
+#end
+</tr>
+</table>
+#end
 #end
 
 #macro ( section $section)
-	 <table border="0" cellspacing="0" cellpadding="2" width="100%">
-		<tr><td bgcolor="$bannerbg">
-		  <font color="$bannerfg" face="arial,helvetica,sanserif">
-			 <a name="$section.getAttributeValue("anchor")"><strong>$section.getAttributeValue("name")</strong></a>
-		  </font>
-		</td></tr>
-		<tr><td>
-		  <blockquote>
-		  #foreach ( $items in $section.getChildren() )
-				#if ($items.getName().equals("img"))
-					 #image ($items)
-				#else
-					 #unknown($items)
-				#end
-		  #end
-		  </blockquote>
-		  </p>
-		</td></tr>
-		<tr><td><br></td></tr>
-	 </table>
+<table border="0" cellspacing="0" cellpadding="2" width="100%">
+<tr><td bgcolor="$bannerbg">
+<font color="$bannerfg" face="arial,helvetica,sanserif">
+<a name="$section.getAttributeValue("anchor")"><strong>$section.getAttributeValue("name")</strong></a>
+</font>
+</td></tr>
+<tr><td>
+<blockquote>
+#foreach ( $items in $section.getChildren() )
+#if ($items.getName().equals("img"))
+#image ($items)
+#else
+#unknown($items)
+#end
+#end
+</blockquote>
+</p>
+</td></tr>
+<tr><td><br></td></tr>
+</table>
 #end
 
 #macro ( makeProject )
-	 #set ($menus = $project.getChild("body").getChildren("menu"))
-	 #foreach ( $menu in $menus )
-		  <p><strong>$menu.getAttributeValue("name")</strong></p>
-		  <ul>
-		  #foreach ( $item in $menu.getChildren() )
-				#set ($name = $item.getAttributeValue("name"))
-				<li>#projectanchor($name $item.getAttributeValue("href"))</li>
-		  #end
-		  </ul>
-	 #end
+#set ($menus = $project.getChild("body").getChildren("menu"))
+#foreach ( $menu in $menus )
+<p><strong>$menu.getAttributeValue("name")</strong></p>
+<ul>
+#foreach ( $item in $menu.getChildren() )
+#set ($name = $item.getAttributeValue("name"))
+<li>#projectanchor($name $item.getAttributeValue("href"))</li>
+#end
+</ul>
+#end
 #end
 
 #macro (makeIndex $subsections)
 #set ($level2 = $root.getAttributeValue("index-level-2"))
-<!-- Show we display numbers for index level 2 ? (useful for checking numbering) -->
+##  Should we display numbers for index level 2 ? (useful for checking numbering)
 #set ($index2 = $root.getAttributeValue("index-numbers"))
 #set ($colbreak = $root.getAttributeValue("colbreak"))
 #if  ("$!colbreak" != "")
 <table width="100%">
 <tr><td valign="top">
 #end
-	<ul>
-	#foreach ($sect in $subsections)
-	#if (("$!colbreak" != "") && ($sect.getAttributeValue("name").startsWith("$colbreak")))
-	</ul></td><td valign="top"><ul>
-	#end
-		<li><a href="#$sect.getAttributeValue("anchor")">$sect.getAttributeValue("name")</a></li>
-		#if ("$!level2" != "no")
-		<ul>
-		#foreach ($comp in $sect.getChildren("component"))
-			<li>
-			#if ("$!index2" == "yes")
-			$comp.getAttributeValue("index")
-			#end
-			<a href="#$comp.getAttributeValue("name").replace($space,$udsc)">$comp.getAttributeValue("name")</a></li>
-		#end
-		</ul>
-		#end
-	#end
-	</ul>
+<ul>
+#foreach ($sect in $subsections)
+#if (("$!colbreak" != "") && ($sect.getAttributeValue("name").startsWith("$colbreak")))
+</ul></td><td valign="top"><ul>
+#end
+<li><a href="#$sect.getAttributeValue("anchor")">$sect.getAttributeValue("name")</a></li>
+#if ("$!level2" != "no")
+<ul>
+#foreach ($comp in $sect.getChildren("component"))
+<li>
+#if ("$!index2" == "yes")
+$comp.getAttributeValue("index")
+#end
+<a href="#$comp.getAttributeValue("name").replace($space,$udsc)">$comp.getAttributeValue("name")</a></li>
+#end
+</ul>
+#end
+#end
+</ul>
 #if ("$!colbreak" != "")
-	</td></tr>
+</td></tr>
 </table>
 #end
 #end
@@ -451,81 +450,75 @@
 #end
 
 #macro (document)
-	 <!-- ====================================================================== -->
-	 <!-- Main Page Section -->
-	 <!-- ====================================================================== -->
-	 <html>
-		  <head>
-				<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-				#set ($authors = $root.getChild("properties").getChildren("author"))
-				#foreach ( $au in $authors )
-					 #metaauthor ( $au.getText() $au.getAttributeValue("email") )
-				#end
-				#set ($next = $root.getAttributeValue("next"))
-				#set ($prev = $root.getAttributeValue("prev"))
-				#set ($updated = $root.getAttributeValue("date"))
-
-				<title>$project.getChild("title").getText() - $root.getChild("properties").getChild("title").getText()</title>
-		  </head>
-
-		  <body bgcolor="$bodybg" text="$bodyfg" link="$bodylink">
-				<table border="0" cellspacing="0">
-					 <!-- TOP IMAGE -->
-					 <tr>
-						  #getProjectImage()
-					 </tr>
-				</table>
-				<table border="0" cellspacing="4">
-					 <tr><td>
-						  <hr noshade size="1">
-					 </td></tr>
-
-					 <tr>
-						  <td align="left" valign="top">
-						  #pagelinks()
-						  <br>
-						  #if ($root.getAttributeValue("index") == "yes")
-							#makeIndex($root.getChild("body").getChildren("section"))
-						  #end
-						  #set ($allSections = $root.getChild("body").getChildren("section"))
-						  #foreach ( $section in $allSections )
-								#section ($section)
-						  #end
-						  <br>
-						  #pagelinks()
-						  </td>
-					 </tr>
-
-					 <tr><td>
-						  <hr noshade size="1">
-					 </td></tr>
-					 <tr>
-					 <td>
-					   <table width=100%>
-					     <tr>
-					     #if ($updated != "")
-					      <td>
-					     #else
-					      <td align="center">
-					     #end
-						    <font color="$bodylink" size="-1"><em>
-						    Copyright &copy; 1999-$year, Apache Software Foundation
-						    </em></font>
-					      </td>
-					       #if ($updated != "")
-					       <td align="right">
-					       <font color="$bodylink" size="-1"><em>
-							 Updated: $updated
-					 		</em></font>
-					       </td>
-					       #end
-					     </tr>
-					   </table>
-					  </td>
-					 </tr>
-				</table>
-		  </body>
-	 </html>
+## ======================================================================
+## Main Page Section -->
+## ======================================================================
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+#set ($authors = $root.getChild("properties").getChildren("author"))
+#foreach ( $au in $authors )
+#metaauthor ( $au.getText() $au.getAttributeValue("email") )
+#end
+#set ($next = $root.getAttributeValue("next"))
+#set ($prev = $root.getAttributeValue("prev"))
+#set ($updated = $root.getAttributeValue("date"))
+<title>$project.getChild("title").getText() - $root.getChild("properties").getChild("title").getText()</title>
+</head>
+<body bgcolor="$bodybg" text="$bodyfg" link="$bodylink">
+<table border="0" cellspacing="0">
+##<!-- TOP IMAGE -->
+<tr>
+#getProjectImage()
+</tr>
+</table>
+<table border="0" cellspacing="4">
+<tr><td>
+<hr noshade size="1">
+</td></tr>
+<tr>
+<td align="left" valign="top">
+#pagelinks()
+<br>
+#if ($root.getAttributeValue("index") == "yes")
+#makeIndex($root.getChild("body").getChildren("section"))
+#end
+#set ($allSections = $root.getChild("body").getChildren("section"))
+#foreach ( $section in $allSections )
+#section ($section)
 #end
-
+<br>
+#pagelinks()
+</td>
+</tr>
+<tr><td>
+<hr noshade size="1">
+</td></tr>
+<tr>
+<td>
+<table width=100%>
+<tr>
+#if ($updated != "")
+<td>
+#else
+<td align="center">
+#end
+<font color="$bodylink" size="-1"><em>
+Copyright &copy; 1999-$year, Apache Software Foundation
+</em></font>
+</td>
+#if ($updated != "")
+<td align="right">
+<font color="$bodylink" size="-1"><em>
+Updated: $updated
+</em></font>
+</td>
+#end
+</tr>
+</table>
+</td>
+</tr>
+</table>
+</body>
+</html>
+#end
\ No newline at end of file



---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org