Author: sebb
Date: Tue May 26 02:36:07 2009
New Revision: 778553
URL: http://svn.apache.org/viewvc?rev=778553&view=rev
Log:
Fix code to retrieve height and width from figure, rather than component.
This caused wrong sizes to be applied to site docs, and sizes to be omitted
from printable docs (so display was not affected)
Modified:
jakarta/jmeter/branches/doc-v2_3_3/docs/usermanual/component_reference.html
jakarta/jmeter/branches/doc-v2_3_3/docs/usermanual/functions.html
jakarta/jmeter/branches/doc-v2_3_3/docs/usermanual/remote-test.html
jakarta/jmeter/branches/doc-v2_3_3/xdocs/stylesheets/site.vsl
jakarta/jmeter/branches/doc-v2_3_3/xdocs/stylesheets/site_printable.vsl
Modified:
jakarta/jmeter/branches/doc-v2_3_3/docs/usermanual/component_reference.html
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/doc-v2_3_3/docs/usermanual/component_reference.html?rev=778553&r1=778552&r2=778553&view=diff
==============================================================================
--- jakarta/jmeter/branches/doc-v2_3_3/docs/usermanual/component_reference.html
(original)
+++ jakarta/jmeter/branches/doc-v2_3_3/docs/usermanual/component_reference.html
Tue May 26 02:36:07 2009
@@ -4506,7 +4506,7 @@
</p>
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='390'
height='62' src="../images/screenshots/logic-controller/simple-example.gif"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='337'
height='233'
src="../images/screenshots/logic-controller/simple-example.gif"><br>
<font size="-1">Figure 6 Simple Controller Example
</font></td></tr></table></p>
@@ -4586,7 +4586,7 @@
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='397'
height='111' src="../images/screenshots/logic-controller/loop-example.gif"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='362'
height='178' src="../images/screenshots/logic-controller/loop-example.gif"><br>
<font size="-1">Figure 4 - Loop Controller Example
</font></td></tr></table></p>
@@ -4673,7 +4673,7 @@
</p>
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='390'
height='62'
src="../images/screenshots/logic-controller/once-only-example.png"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='348'
height='131'
src="../images/screenshots/logic-controller/once-only-example.png"><br>
<font size="-1">Figure 5. Once Only Controller Example
</font></td></tr></table></p>
@@ -4749,7 +4749,7 @@
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='219'
height='90' src="../images/screenshots/logic-controller/interleave.png"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='336'
height='153' src="../images/screenshots/logic-controller/interleave.png"><br>
<font size="-1">Figure 1 - Interleave Controller Example 1
</font></td></tr></table></p>
@@ -4910,7 +4910,7 @@
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='219'
height='90' src="../images/screenshots/logic-controller/interleave2.png"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='207'
height='249' src="../images/screenshots/logic-controller/interleave2.png"><br>
<font size="-1">
Figure 2 - Interleave Controller Example 2
@@ -4927,7 +4927,7 @@
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='219'
height='90' src="../images/screenshots/logic-controller/interleave3.png"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='204'
height='247' src="../images/screenshots/logic-controller/interleave3.png"><br>
<font size="-1">
Figure 3 - Interleave Controller Example 3
@@ -5631,7 +5631,7 @@
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='399'
height='176'
src="../images/screenshots/logic-controller/foreach-example.png"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='246'
height='154'
src="../images/screenshots/logic-controller/foreach-example.png"><br>
<font size="-1">Figure 7 - ForEach Controller Example
</font></td></tr></table></p>
@@ -5670,7 +5670,7 @@
</p>
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='399'
height='176'
src="../images/screenshots/logic-controller/foreach-example2.png"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='198'
height='253'
src="../images/screenshots/logic-controller/foreach-example2.png"><br>
<font size="-1">Figure 8 - ForEach Controller Example 2
</font></td></tr></table></p>
@@ -6255,7 +6255,7 @@
The figure below shows an example of the result file configuration panel
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img
src="../images/screenshots/simpledatawriter.png"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='786'
height='145' src="../images/screenshots/simpledatawriter.png"><br>
<font size="-1">Result file configuration panel
</font></td></tr></table></p>
@@ -6618,7 +6618,7 @@
The Control Panel (above) shows an example of an HTML display.
Figure 9 (below) shows an example of an XML display.
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='791'
height='506' src="../images/screenshots/view_results_tree_xml.png"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='751'
height='461' src="../images/screenshots/view_results_tree_xml.png"><br>
<font size="-1">Figure 9 Sample XML display
</font></td></tr></table></p>
@@ -8173,12 +8173,12 @@
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='490'
height='253'
src="../images/screenshots/http-config/auth-manager-example1a.gif"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='289'
height='201'
src="../images/screenshots/http-config/auth-manager-example1a.gif"><br>
<font size="-1">Figure 10 - Test Plan
</font></td></tr></table></p>
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='490'
height='253'
src="../images/screenshots/http-config/auth-manager-example1b.png"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='553'
height='243'
src="../images/screenshots/http-config/auth-manager-example1b.png"><br>
<font size="-1">Figure 11 - Authorization Manager Control Panel
</font></td></tr></table></p>
@@ -8667,12 +8667,12 @@
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img
src="../images/screenshots/http-config/header-manager-example1a.gif"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='203'
height='141'
src="../images/screenshots/http-config/header-manager-example1a.gif"><br>
<font size="-1">Figure 12 - Test Plan
</font></td></tr></table></p>
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img
src="../images/screenshots/http-config/header-manager-example1b.gif"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='573'
height='334'
src="../images/screenshots/http-config/header-manager-example1b.gif"><br>
<font size="-1">Figure 13 - Header Manager Control Panel
</font></td></tr></table></p>
@@ -9645,7 +9645,7 @@
The default is to apply the assertion to the main sample only.
If the Assertion supports this option, then there will be an entry on the
GUI which looks like the following:
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img
src="../images/screenshots/assertion/assertionscope.png"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='533'
height='55' src="../images/screenshots/assertion/assertionscope.png"><br>
<font size="-1">Assertion Scope
</font></td></tr></table></p>
@@ -9952,22 +9952,22 @@
<p><b>Assertion Examples</b></p>
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='761'
height='422' src="../images/screenshots/assertion/example1a.png"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='187'
height='94' src="../images/screenshots/assertion/example1a.png"><br>
<font size="-1">Figure 14 - Test Plan
</font></td></tr></table></p>
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='761'
height='422' src="../images/screenshots/assertion/example1b.png"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='629'
height='333' src="../images/screenshots/assertion/example1b.png"><br>
<font size="-1">Figure 15 - Assertion Control Panel with Pattern
</font></td></tr></table></p>
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='761'
height='422' src="../images/screenshots/assertion/example1c-pass.gif"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='474'
height='265' src="../images/screenshots/assertion/example1c-pass.gif"><br>
<font size="-1">Figure 16 - Assertion Listener Results (Pass)
</font></td></tr></table></p>
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='761'
height='422' src="../images/screenshots/assertion/example1c-fail.gif"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='474'
height='265' src="../images/screenshots/assertion/example1c-fail.gif"><br>
<font size="-1">Figure 17 - Assertion Listener Results (Fail)
</font></td></tr></table></p>
@@ -11438,7 +11438,7 @@
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='239'
height='113' src="../images/screenshots/modification.png"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='755'
height='325' src="../images/screenshots/modification.png"><br>
<font size="-1">Figure 18 - Online Poll Example
</font></td></tr></table></p>
Modified: jakarta/jmeter/branches/doc-v2_3_3/docs/usermanual/functions.html
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/doc-v2_3_3/docs/usermanual/functions.html?rev=778553&r1=778552&r2=778553&view=diff
==============================================================================
--- jakarta/jmeter/branches/doc-v2_3_3/docs/usermanual/functions.html (original)
+++ jakarta/jmeter/branches/doc-v2_3_3/docs/usermanual/functions.html Tue May
26 02:36:07 2009
@@ -996,7 +996,7 @@
<p>
The Function Helper dialog is available from JMeter's Tools menu.
</p>
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img
src="../images/screenshots/function_helper_dialog.png"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='667'
height='326' src="../images/screenshots/function_helper_dialog.png"><br>
<font size="-1">Function Helper Dialog
</font></td></tr></table></p>
<p>
Modified: jakarta/jmeter/branches/doc-v2_3_3/docs/usermanual/remote-test.html
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/doc-v2_3_3/docs/usermanual/remote-test.html?rev=778553&r1=778552&r2=778553&view=diff
==============================================================================
--- jakarta/jmeter/branches/doc-v2_3_3/docs/usermanual/remote-test.html
(original)
+++ jakarta/jmeter/branches/doc-v2_3_3/docs/usermanual/remote-test.html Tue May
26 02:36:07 2009
@@ -255,7 +255,7 @@
(see figure 1). These menus contain the client that you set in the properties
file. Use the remote start and stop instead of the
normal JMeter start and stop menu items.
</p>
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img
src="../images/screenshots/remote/run-menu00.gif"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='232'
height='156' src="../images/screenshots/remote/run-menu00.gif"><br>
<font size="-1">Figure 1 - Run Menu
</font></td></tr></table></p>
<p>
Modified: jakarta/jmeter/branches/doc-v2_3_3/xdocs/stylesheets/site.vsl
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/doc-v2_3_3/xdocs/stylesheets/site.vsl?rev=778553&r1=778552&r2=778553&view=diff
==============================================================================
--- jakarta/jmeter/branches/doc-v2_3_3/xdocs/stylesheets/site.vsl (original)
+++ jakarta/jmeter/branches/doc-v2_3_3/xdocs/stylesheets/site.vsl Tue May 26
02:36:07 2009
@@ -189,9 +189,9 @@
#macro (figure $figure)
#set ($width = "")
-#set ($width = $component.getAttributeValue('width') )
+#set ($width = $figure.getAttributeValue('width') )
#set ($height = "")
-#set ($height = $component.getAttributeValue('height') )
+#set ($height = $figure.getAttributeValue('height') )
#set ($dim= "")
#if ($width != "")
#set ($dim = "width='$width' height='$height'")
Modified:
jakarta/jmeter/branches/doc-v2_3_3/xdocs/stylesheets/site_printable.vsl
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/doc-v2_3_3/xdocs/stylesheets/site_printable.vsl?rev=778553&r1=778552&r2=778553&view=diff
==============================================================================
--- jakarta/jmeter/branches/doc-v2_3_3/xdocs/stylesheets/site_printable.vsl
(original)
+++ jakarta/jmeter/branches/doc-v2_3_3/xdocs/stylesheets/site_printable.vsl Tue
May 26 02:36:07 2009
@@ -193,9 +193,9 @@
#macro (figure $figure)
#set ($width = "")
-#set ($width = $component.getAttributeValue('width') )
+#set ($width = $figure.getAttributeValue('width') )
#set ($height = "")
-#set ($height = $component.getAttributeValue('height') )
+#set ($height = $figure.getAttributeValue('height') )
#set ($dim= "")
#if ($width != "")
#set ($dim = "width='$width' height='$height'")
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
