Author: sebb
Date: Sat Jun 13 16:53:28 2009
New Revision: 784433
URL: http://svn.apache.org/viewvc?rev=784433&view=rev
Log:
Add CSS to HEAD section
Add Trademark section to footer
Tidy up handling of default/missing attributes
Modified:
jakarta/jmeter/trunk/xdocs/stylesheets/site.vsl
jakarta/jmeter/trunk/xdocs/stylesheets/site_printable.vsl
Modified: jakarta/jmeter/trunk/xdocs/stylesheets/site.vsl
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/stylesheets/site.vsl?rev=784433&r1=784432&r2=784433&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/stylesheets/site.vsl (original)
+++ jakarta/jmeter/trunk/xdocs/stylesheets/site.vsl Sat Jun 13 16:53:28 2009
@@ -35,6 +35,7 @@
#set ($udsc = $udsc.charAt(0))
#set ($imgdir = "$relativePath/images")
#set ($sshotdir = "$imgdir/screenshots" )
+#set ($cssdir = "$relativePath/css")
#set ($year = $date.getYear()+1900)
<!-- start the processing -->
@@ -72,9 +73,9 @@
#if ($value.getAttributeValue("rowspan"))
#set ($rowspan = $value.getAttributeValue("rowspan"))
#end
-<td bgcolor="$tabletdbg" colspan="$!colspan" rowspan="$!rowspan" valign="top"
align="left">
+<td bgcolor="$tabletdbg" #if ($colspan)colspan="$colspan"#end #if
($rowspan)rowspan="$rowspan"#end valign="top" align="left">
<font color="#000000" size="-1" face="arial,helvetica,sanserif">
-#if ($value.getText().length() != 0 || $value.hasChildren())
+#if ($value.getText().length() != 0)
$xmlout.outputString($value, true)
#else
@@ -90,7 +91,7 @@
#if ($value.getAttributeValue("rowspan"))
#set ($rowspan = $value.getAttributeValue("rowspan"))
#end
-<td bgcolor="$tablethbg" colspan="$!colspan" rowspan="$!rowspan" valign="top"
align="left">
+<td bgcolor="$tablethbg" #if ($colspan)colspan="$colspan"#end #if
($rowspan)rowspan="$rowspan"#end valign="top" align="left">
<font color="#000000" size="-1" face="arial,helvetica,sanserif">
#if ($value.getText().length() != 0 || $value.hasChildren())
$xmlout.outputString($value, true)
@@ -161,7 +162,7 @@
<td>$items.getAttributeValue("name")</td>
<td>#runloop($items)</td>
<td>
-#if($items.getAttributeValue("required") != "")
+#if("$!items.getAttributeValue('required')" != "")
$items.getAttributeValue("required")
#else
No
@@ -370,7 +371,8 @@
<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>
+#set ($anchor = $section.getAttributeValue("anchor"))
+#if($anchor)<a
name="$anchor">#end<strong>$section.getAttributeValue("name")</strong>#if($anchor)</a>#end
</font>
</td></tr>
<tr><td>
@@ -451,9 +453,12 @@
<!-- ====================================================================== -->
<html>
<head>
+<link rel="stylesheet" type="text/css" href="$cssdir/style.css"/>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
+#set ($next = "")
#set ($next = $root.getAttributeValue("next"))
+#set ($prev = "")
#set ($prev = $root.getAttributeValue("prev"))
#set ($authors = $root.getChild("properties").getChildren("author"))
@@ -502,6 +507,13 @@
Copyright © 1999-$year, Apache Software Foundation
</em></font></div>
</td></tr>
+<tr><td colspan="2">
+<div align="center"><font color="$bodylink" size="-1">
+"Apache", the Apache feather, and the Apache JMeter logo are
+trademarks of the Apache Software Foundation for our open source software.
+</font>
+</div>
+</td></tr>
</table>
</body>
</html>
Modified: jakarta/jmeter/trunk/xdocs/stylesheets/site_printable.vsl
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/stylesheets/site_printable.vsl?rev=784433&r1=784432&r2=784433&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/stylesheets/site_printable.vsl (original)
+++ jakarta/jmeter/trunk/xdocs/stylesheets/site_printable.vsl Sat Jun 13
16:53:28 2009
@@ -40,6 +40,7 @@
#set ($udsc = "_")
#set ($udsc = $udsc.charAt(0))
#set ($imgdir = "$relativePath/../docs/images")
+#set ($cssdir = "$relativePath/../docs/css")
#set ($sshotdir = "$imgdir/screenshots")
#set ($year = $date.getYear()+1900)
@@ -76,9 +77,9 @@
#if ($value.getAttributeValue("rowspan"))
#set ($rowspan = $value.getAttributeValue("rowspan"))
#end
-<td bgcolor="$tabletdbg" colspan="$!colspan" rowspan="$!rowspan" valign="top"
align="left">
+<td bgcolor="$tabletdbg" #if ($colspan)colspan="$colspan"#end #if
($rowspan)rowspan="$rowspan"#end valign="top" align="left">
<font color="#000000" size="-1" face="arial,helvetica,sanserif">
-#if ($value.getText().length() != 0 || $value.hasChildren())
+#if ($value.getText().length() != 0)
$xmlout.outputString($value, true)
#else
@@ -88,13 +89,9 @@
#end
#macro ( th $value)
-#if ($value.getAttributeValue("colspan"))
#set ($colspan = $value.getAttributeValue("colspan"))
-#end
-#if ($value.getAttributeValue("rowspan"))
#set ($rowspan = $value.getAttributeValue("rowspan"))
-#end
-<td bgcolor="$tablethbg" colspan="$!colspan" rowspan="$!rowspan" valign="top"
align="left">
+<td bgcolor="$tablethbg" #if ($colspan)colspan="$colspan"#end #if
($rowspan)rowspan="$rowspan"#end valign="top" align="left">
<font color="#000000" size="-1" face="arial,helvetica,sanserif">
#if ($value.getText().length() != 0 || $value.hasChildren())
$xmlout.outputString($value, true)
@@ -165,7 +162,7 @@
<td>$items.getAttributeValue("name")</td>
<td>#runloop($items)</td>
<td>
-#if($items.getAttributeValue("required") != "")
+#if("$!items.getAttributeValue('required')" != "")
$items.getAttributeValue("required")
#else
No
@@ -249,8 +246,8 @@
#component($node)
#elseif ($node.getName().equals("subsection"))
#subsection ($node)
-#elseif ($u_node.getName().equals("scope"))
-#scope ($u_node)
+#elseif ($node.getName().equals("scope"))
+#scope ($node)
#elseif ($node.getName().equals("bugzilla"))
#bugzilla ($node)
#else
@@ -377,7 +374,8 @@
<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>
+#set ($anchor = $section.getAttributeValue("anchor"))
+#if($anchor)<a
name="$anchor">#end<strong>$section.getAttributeValue("name")</strong>#if($anchor)</a>#end
</font>
</td></tr>
<tr><td>
@@ -471,13 +469,17 @@
## ======================================================================
<html>
<head>
+<link rel="stylesheet" type="text/css" href="$cssdir/style.css"/>
<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 = "")
#set ($next = $root.getAttributeValue("next"))
+#set ($prev = "")
#set ($prev = $root.getAttributeValue("prev"))
+#set ($updated = "")
#set ($updated = $root.getAttributeValue("date"))
<title>$project.getChild("title").getText() -
$root.getChild("properties").getChild("title").getText()</title>
</head>
@@ -531,6 +533,13 @@
</td>
#end
</tr>
+<tr><td colspan="2">
+<div align="center"><font color="$bodylink" size="-1">
+"Apache", the Apache feather, and the Apache JMeter logo are
+trademarks of the Apache Software Foundation for our open source software.
+</font>
+</div>
+</td></tr>
</table>
</td>
</tr>
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
