chrisw 2003/02/10 00:20:19
Modified: xdocs/stylesheets project.xml site.vsl templates.vm Log: Prepared "FakeForrest" to handle "tabs" in Navigation, enabled the stylesheet to allow sub-directories, prepared everything for a "Projects" tab for Ant-subprojects like Antidote. Revision Changes Path 1.12 +52 -40 jakarta-ant/xdocs/stylesheets/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/jakarta-ant/xdocs/stylesheets/project.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- project.xml 24 Jan 2003 08:55:06 -0000 1.11 +++ project.xml 10 Feb 2003 08:20:18 -0000 1.12 @@ -3,47 +3,59 @@ <title>Apache Ant</title> <logo href="images/ant_logo_large.gif">Apache Ant</logo> - + <body> - <menu name="Apache Ant"> - <item name="Welcome" href="/index.html"/> - <item name="License" href="/license.html"/> - <item name="News" href="/antnews.html"/> - </menu> - - <menu name="Documentation"> - <item name="Manual" - href="/manual/index.html"/> - <item name="Related Projects" - href="/projects.html"/> - <item name="External Tools and Tasks" - href="/external.html"/> - <item name="Resources" - href="/resources.html"/> - <item name="Frequently Asked Questions" - href="/faq.html"/> - <item name="Having Problems?" - href="/problems.html"/> - </menu> - - <menu name="Download"> - <item name="Binary Distributions" href="http://ant.apache.org/bindownload.cgi"/> - <item name="Source Distributions" href="http://ant.apache.org/srcdownload.cgi"/> - </menu> - - <menu name="Get Involved"> - <item name="Mailing Lists" href="/mail.html"/> - <item name="CVS Repositories" href="/cvs.html"/> - <item name="Bug Database" href="http://nagoya.apache.org/bugzilla/enter_bug.cgi?product=Ant"/> - <item name="Enhancement Requests" href="http://nagoya.apache.org/bugzilla/enter_bug.cgi?product=Ant&amp;bug_severity=Enhancement"/> - </menu> - - <menu name="Project Management"> - <item name="Contributors" href="/contributors.html"/> - <item name="Apache Ant Mission" href="/mission.html"/> - <item name="Project Guidelines" href="/guidelines.html"/> - <item name="Legal" href="/legal.html"/> - </menu> +<!-- <menusection name="Home" index="0" href="/index.html"> --> + <menu name="Apache Ant"> + <item name="Welcome" href="/index.html"/> + <item name="License" href="/license.html"/> + <item name="News" href="/antnews.html"/> + </menu> + + <menu name="Documentation"> + <item name="Manual" + href="/manual/index.html"/> + <item name="Related Projects" + href="/projects.html"/> + <item name="External Tools and Tasks" + href="/external.html"/> + <item name="Resources" + href="/resources.html"/> + <item name="Frequently Asked Questions" + href="/faq.html"/> + <item name="Having Problems?" + href="/problems.html"/> + </menu> + + <menu name="Download"> + <item name="Binary Distributions" href="http://ant.apache.org/bindownload.cgi"/> + <item name="Source Distributions" href="http://ant.apache.org/srcdownload.cgi"/> + </menu> + + <menu name="Get Involved"> + <item name="Mailing Lists" href="/mail.html"/> + <item name="CVS Repositories" href="/cvs.html"/> + <item name="Bug Database" href="http://nagoya.apache.org/bugzilla/enter_bug.cgi?product=Ant"/> + <item name="Enhancement Requests" href="http://nagoya.apache.org/bugzilla/enter_bug.cgi?product=Ant&amp;bug_severity=Enhancement"/> + </menu> + + <menu name="Project Management"> + <item name="Contributors" href="/contributors.html"/> + <item name="Apache Ant Mission" href="/mission.html"/> + <item name="Project Guidelines" href="/guidelines.html"/> + <item name="Legal" href="/legal.html"/> + </menu> +<!-- </menusection> + <menusection name="Projects" index="1" href="/projects/index.html"> + <menu name="Projects"> + <item name="Welcome" href="/projects/index.html"/> + </menu> + <menu name="Antidote"> + <item name="About Antidote" href="/projects/antidote/index.html"/> + <item name="Design Overview" href="/projects/antidote/design.html"/> + <item name="Module HOW-TO" href="/projects/antidote/module.html"/> + </menu> + </menusection>--> </body> </project> 1.4 +1 -0 jakarta-ant/xdocs/stylesheets/site.vsl Index: site.vsl =================================================================== RCS file: /home/cvs/jakarta-ant/xdocs/stylesheets/site.vsl,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- site.vsl 24 Jan 2003 08:55:06 -0000 1.3 +++ site.vsl 10 Feb 2003 08:20:18 -0000 1.4 @@ -55,6 +55,7 @@ #set ($lightfg = "#ffffff") #set ($darkfg = "#000000") #set ($active = "#ffcc00") + #set ($blue4 = "#B2C4E0") #set ($blue3 = "#294563") #set ($blue2 = "#4C6C8F") #set ($blue1 = "#CFDCED") 1.18 +92 -41 jakarta-ant/xdocs/stylesheets/templates.vm Index: templates.vm =================================================================== RCS file: /home/cvs/jakarta-ant/xdocs/stylesheets/templates.vm,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- templates.vm 24 Jan 2003 08:55:06 -0000 1.17 +++ templates.vm 10 Feb 2003 08:20:18 -0000 1.18 @@ -150,8 +150,71 @@ <pre class="code">$escape.getText($value.getText())</pre> #end -#macro ( makeProject ) - #set ($menus = $project.getChild("body").getChildren("menu")) +#macro ( makeTabs ) + <div class="tab"> + <table summary="tab bar" border="0" cellpadding="0" cellspacing="0"> + <tr> + #set ( $tabs = $project.getChild("body").getChildren("menusection")) + #if ( $project.getChild("body").getChild("menusection") ) + #foreach ( $tab in $tabs ) + #set ($currentIndex = $root.getChild("properties").getChild("index").getAttributeValue("value") ) + #set ($index = $tab.getAttributeValue("index")) + #set ($name = $tab.getAttributeValue("name")) + #set ($link = $tab.getAttributeValue("href")) + #if ( ($currentIndex && $currentIndex.trim().equals( $index )) || ((!$currentIndex) && $velocityCount == 1) ) + <td width="8"><img alt="" height="5" width="8" src="images/spacer.gif"></td><td valign="bottom"> + <table summary="selected tab" style="height: 1.5em" border="0" cellpadding="0" cellspacing="0"> + <tr> + <td valign="top" width="5" bgcolor="$blue2"><img height="5" width="5" alt="" src="$relativePath/images/tabSel-left.gif"></td><td valign="middle" bgcolor="$blue2"><font color="$lightfg" size="2" face="Arial, Helvetica, Sans-serif"><b>$name</b></font></td><td valign="top" width="5" bgcolor="$blue2"><img height="5" width="5" alt="" src="$relativePath/images/tabSel-right.gif"></td> + </tr> + </table> + </td> + #else + <td width="5"><img alt="" height="8" width="8" src="$relativePath/images/spacer.gif"></td><td valign="bottom"> + <table summary="non selected tab" style="height: 1.4em" border="0" cellpadding="0" cellspacing="0"> + <tr> + <td valign="top" width="5" bgcolor="$blue4"><img height="5" width="5" alt="" src="$relativePath/images/tab-left.gif"></td><td valign="middle" bgcolor="$blue4"><a href="$relativePath$link"><font size="2" face="Arial, Helvetica, Sans-serif">$name</font></a></td><td valign="top" width="5" bgcolor="$blue4"><img height="5" width="5" alt="" src="$relativePath/images/tab-right.gif"></td> + </tr> + </table> + </td> + #end + #end + #else + <td width="8"><img alt="" height="5" width="8" src="images/spacer.gif"></td><td valign="bottom"> + <table summary="selected tab" style="height: 1.5em" border="0" cellpadding="0" cellspacing="0"> + <tr> + <td valign="top" width="5" bgcolor="$blue2"><img height="5" width="5" alt="" src="$relativePath/images/tabSel-left.gif"></td><td valign="middle" bgcolor="$blue2"><font color="$lightfg" size="2" face="Arial, Helvetica, Sans-serif"><b>Home</b></font></td><td valign="top" width="5" bgcolor="$blue2"><img height="5" width="5" alt="" src="$relativePath/images/tabSel-right.gif"></td> + </tr> + </table> + </td> + #end + </tr> + </table> + </div> +#end + + +#macro ( makeMainNavigation ) + #set ( $tabs = $project.getChild("body").getChildren("menusection")) + #if ( $project.getChild("body").getChild("menusection") ) + #set ( $currentIndex = $root.getChild("properties").getChild("index").getAttributeValue("value") ) + #if ( $currentIndex ) + #foreach ( $tab in $tabs ) + #set ($index = $tab.getAttributeValue("index")) + #if ( $currentIndex.trim().equals( $index ) ) + #set ($menus = $tab.getChildren("menu")) + #end + #end + #else + #set ($menus = $project.getChild("body").getChild("menusection").getChildren("menu")) + #end + #else + #set ($menus = $project.getChild("body").getChildren("menu")) + #end + #makeProject ( $menus ) +#end + +#macro ( makeProject $menus) <div class="menu"><ul> #foreach ( $menu in $menus ) <li><font color="$blue1">$menu.getAttributeValue("name")</font> @@ -179,7 +242,7 @@ <head> <META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> <title>$project.getChild("title").getText() - $root.getChild("properties").getChild("title").getText()</title> - <link type="text/css" href="page.css" rel="stylesheet"> + <link type="text/css" href="$relativePath/page.css" rel="stylesheet"> #set ($authors = $root.getChild("properties").getChildren("author")) #foreach ( $au in $authors ) #metaauthor ( $au.getText() $au.getAttributeValue("email") ) @@ -189,57 +252,45 @@ <body text="$darkfg" bgcolor="$lightbg"> <table summary="navigation path" width="100%" border="0" cellpadding="0" cellspacing="0"> <tr> - <td nowrap="nowrap" valign="middle" bgcolor="$blue1" height="20"><img height="1" width="5" alt="" border="0" src="images/spacer.gif"><font size="2" face="Arial, Helvetica, Sans-serif"><script src="breadcrumbs.js" language="JavaScript" type="text/javascript"></script></font></td> + <td nowrap="nowrap" valign="middle" bgcolor="$blue1" height="20"><img height="1" width="5" alt="" border="0" src="$relativePath/images/spacer.gif"><font size="2" face="Arial, Helvetica, Sans-serif"><script src="$relativePath/breadcrumbs.js" language="JavaScript" type="text/javascript"></script></font></td> </tr> <tr> - <td bgcolor="$blue2" height="2"><img height="2" width="2" alt="" border="0" src="images/spacer.gif"></td> + <td bgcolor="$blue2" height="2"><img height="2" width="2" alt="" border="0" src="$relativePath/images/spacer.gif"></td> </tr> </table> <table summary="header with logos" width="100%" border="0" cellpadding="0" cellspacing="0"> <tr> - <td bgcolor="$blue3"><a href="http://ant.apache.org/"><img border="0" alt="Apache Ant site" src="images/group-logo.gif"></a></td><td width="100%" align="center" bgcolor="$blue3"><a href="http://ant.apache.org/"><img alt="Apache Ant logo" border="0" src="images/project-logo.gif"></a></td><td valign="top" rowspan="2" bgcolor="$blue3"> + <td bgcolor="$blue3"><a href="http://ant.apache.org/"><img border="0" alt="Apache Ant site" src="$relativePath/images/group-logo.gif"></a></td><td width="100%" align="center" bgcolor="$blue3"><a href="http://ant.apache.org/"><img alt="Apache Ant logo" border="0" src="$relativePath/images/project-logo.gif"></a></td><td valign="top" rowspan="2" bgcolor="$blue3"> <form target="_blank" onsubmit="q.value = query.value + ' site:ant.apache.org'" action="http://www.google.com/search" method="get"> <table summary="search" border="0" cellspacing="0" cellpadding="0" bgcolor="$blue2"> <tr> - <td colspan="3"><img height="10" width="1" alt="" src="images/spacer.gif"></td> + <td colspan="3"><img height="10" width="1" alt="" src="$relativePath/images/spacer.gif"></td> </tr> <tr> - <td><img height="1" width="1" alt="" src="images/spacer.gif"></td><td nowrap="nowrap"><input name="q" type="hidden"><input size="15" id="query" type="text"><img height="1" width="5" alt="" src="images/spacer.gif"><input name="Search" value="Search" type="submit"> + <td><img height="1" width="1" alt="" src="$relativePath/images/spacer.gif"></td><td nowrap="nowrap"><input name="q" type="hidden"><input size="15" id="query" type="text"><img height="1" width="5" alt="" src="$relativePath/images/spacer.gif"><input name="Search" value="Search" type="submit"> <br> <font face="Arial, Helvetica, Sans-serif" size="2" color="white"> the Apache Ant site - </font></td><td><img height="1" width="1" alt="" src="images/spacer.gif"></td> + </font></td><td><img height="1" width="1" alt="" src="$relativePath/images/spacer.gif"></td> </tr> <tr> - <td><img alt="" border="0" height="10" width="9" src="images/search-left.gif"></td><td><img height="1" width="1" alt="" src="images/spacer.gif"></td><td><img alt="" border="0" height="10" width="9" src="images/search-right.gif"></td> + <td><img alt="" border="0" height="10" width="9" src="$relativePath/images/search-left.gif"></td><td><img height="1" width="1" alt="" src="$relativePath/images/spacer.gif"></td><td><img alt="" border="0" height="10" width="9" src="$relativePath/images/search-right.gif"></td> </tr> </table> </form> - </td><td bgcolor="$blue3"><img height="10" width="10" alt="" src="images/spacer.gif"></td> + </td><td bgcolor="$blue3"><img height="10" width="10" alt="" src="$relativePath/images/spacer.gif"></td> </tr> <tr> <td valign="bottom" bgcolor="$blue3" colspan="2"> - <div class="tab"> - <table summary="tab bar" border="0" cellpadding="0" cellspacing="0"> - <tr> + #makeTabs() - <td width="8"><img alt="" height="8" width="8" src="images/spacer.gif"></td><td valign="bottom"> - <table summary="selected tab" border="0" cellpadding="0" cellspacing="0"> - <tr> - <td height="30" valign="top" width="5" bgcolor="$blue2"><img height="5" width="5" alt="" src="images/tabSel-left.gif"></td><td valign="middle" bgcolor="$blue2"><font color="$lightfg" size="2" face="Arial, Helvetica, Sans-serif"><b>Home</b></font></td><td valign="top" width="5" bgcolor="$blue2"><img height="5" width="5" alt="" src="images/tabSel-right.gif"></td> - </tr> - </table> - </td> - </tr> - </table> - </div> - </td><td bgcolor="$blue3"><img alt="" width="1" height="1" src="images/spacer.gif"></td> + </td><td bgcolor="$blue3"><img alt="" width="1" height="1" src="$relativePath/images/spacer.gif"></td> </tr> <tr> - <td bgcolor="$blue2" colspan="4"><img width="1" height="10" alt="" src="images/spacer.gif"></td> + <td bgcolor="$blue2" colspan="4"><img width="1" height="10" alt="" src="$relativePath/images/spacer.gif"></td> </tr> </table> <table summary="page content" bgcolor="$lightbg" width="100%" border="0" cellpadding="0" cellspacing="0"> @@ -250,49 +301,49 @@ <td rowspan="3" valign="top"> <table summary="blue line" border="0" cellpadding="0" cellspacing="0"> <tr> - <td bgcolor="$blue3"><img width="10" height="1" alt="" src="images/spacer.gif"></td> + <td bgcolor="$blue3"><img width="10" height="1" alt="" src="$relativePath/images/spacer.gif"></td> </tr> <tr> <td bgcolor="$blue1"><font color="$blue2" size="4" face="Arial, Helvetica, Sans-serif"> </font></td> </tr> <tr> - <td bgcolor="$blue3"><img width="10" height="1" alt="" src="images/spacer.gif"></td> + <td bgcolor="$blue3"><img width="10" height="1" alt="" src="$relativePath/images/spacer.gif"></td> </tr> </table> - </td><td bgcolor="$blue3"><img width="1" height="1" alt="" src="images/spacer.gif"></td><td valign="bottom" bgcolor="$blue2"><img width="10" height="10" alt="" src="images/spacer.gif"></td><td nowrap="nowrap" valign="top" bgcolor="$blue2"> - #makeProject() - </td><td valign="bottom" bgcolor="$blue2"><img width="10" height="10" alt="" src="images/spacer.gif"></td><td bgcolor="$blue3"><img width="1" height="1" alt="" src="images/spacer.gif"></td> + </td><td bgcolor="$blue3"><img width="1" height="1" alt="" src="$relativePath/images/spacer.gif"></td><td valign="bottom" bgcolor="$blue2"><img width="10" height="10" alt="" src="$relativePath/images/spacer.gif"></td><td nowrap="nowrap" valign="top" bgcolor="$blue2"> + #makeMainNavigation() + </td><td valign="bottom" bgcolor="$blue2"><img width="10" height="10" alt="" src="$relativePath/images/spacer.gif"></td><td bgcolor="$blue3"><img width="1" height="1" alt="" src="$relativePath/images/spacer.gif"></td> </tr> <tr> - <td valign="bottom" align="left" colspan="2" rowspan="2" bgcolor="$blue2"><img height="10" width="10" border="0" alt="" src="images/menu-left.gif"></td><td bgcolor="$blue2"><img height="10" width="10" border="0" alt="" src="images/spacer.gif"></td><td valign="bottom" align="right" colspan="2" rowspan="2" bgcolor="$blue2"><img height="10" width="10" border="0" alt="" src="images/menu-right.gif"></td> + <td valign="bottom" align="left" colspan="2" rowspan="2" bgcolor="$blue2"><img height="10" width="10" border="0" alt="" src="$relativePath/images/menu-left.gif"></td><td bgcolor="$blue2"><img height="10" width="10" border="0" alt="" src="$relativePath/images/spacer.gif"></td><td valign="bottom" align="right" colspan="2" rowspan="2" bgcolor="$blue2"><img height="10" width="10" border="0" alt="" src="$relativePath/images/menu-right.gif"></td> </tr> <tr> - <td height="1" bgcolor="$blue3"><img width="1" height="1" alt="" src="images/spacer.gif"></td> + <td height="1" bgcolor="$blue3"><img width="1" height="1" alt="" src="$relativePath/images/spacer.gif"></td> </tr> </table> </td><td valign="top" width="100%"> <table summary="content" width="100%" border="0" cellpadding="0" cellspacing="0"> <tr> - <td colspan="4" bgcolor="$blue3"><img width="10" height="1" alt="" src="images/spacer.gif"></td> + <td colspan="4" bgcolor="$blue3"><img width="10" height="1" alt="" src="$relativePath/images/spacer.gif"></td> </tr> <tr> - <td align="left" width="10" bgcolor="$blue1"><img width="10" height="1" alt="" src="images/spacer.gif"></td><td align="left" width="50%" bgcolor="$blue1"><font color="$blue2" size="3" face="Arial, Helvetica, Sans-serif"> + <td align="left" width="10" bgcolor="$blue1"><img width="10" height="1" alt="" src="$relativePath/images/spacer.gif"></td><td align="left" width="50%" bgcolor="$blue1"><font color="$blue2" size="3" face="Arial, Helvetica, Sans-serif"> - </font><img width="10" height="8" alt="" src="images/spacer.gif"></td><td align="right" width="50%" bgcolor="$blue1"><font color="$blue2" size="3" face="Arial, Helvetica, Sans-serif"> + </font><img width="10" height="8" alt="" src="$relativePath/images/spacer.gif"></td><td align="right" width="50%" bgcolor="$blue1"><font color="$blue2" size="3" face="Arial, Helvetica, Sans-serif"> - </font><img width="10" height="8" alt="" src="images/spacer.gif"></td><td width="10" bgcolor="$blue1"><img width="10" height="1" alt="" src="images/spacer.gif"></td> + </font><img width="10" height="8" alt="" src="$relativePath/images/spacer.gif"></td><td width="10" bgcolor="$blue1"><img width="10" height="1" alt="" src="$relativePath/images/spacer.gif"></td> </tr> <tr> - <td colspan="4" bgcolor="$blue3"><img width="10" height="1" alt="" src="images/spacer.gif"></td> + <td colspan="4" bgcolor="$blue3"><img width="10" height="1" alt="" src="$relativePath/images/spacer.gif"></td> </tr> <tr> - <td align="left" width="10"><img width="10" height="1" alt="" src="images/spacer.gif"></td><td align="left" width="100%"> + <td align="left" width="10"><img width="10" height="1" alt="" src="$relativePath/images/spacer.gif"></td><td align="left" width="100%"> <div class="content"> #end #macro (footer) </div> - </td><td width="10"><img width="10" height="4" alt="" src="images/spacer.gif"></td> + </td><td width="10"><img width="10" height="4" alt="" src="$relativePath/images/spacer.gif"></td> </tr> </table> </td> @@ -300,7 +351,7 @@ </table> <table summary="footer" cellspacing="0" cellpadding="0" width="100%" border="0"> <tr> - <td colspan="2" height="1" bgcolor="$blue2"><img height="1" width="1" alt="" src="images/spacer.gif"><a href="images/label.gif"></a><a href="images/page.gif"></a><a href="images/chapter.gif"></a><a href="images/chapter_open.gif"></a><a href="images/current.gif"></a><a href="/favicon.ico"></a></td> + <td colspan="2" height="1" bgcolor="$blue2"><img height="1" width="1" alt="" src="$relativePath/images/spacer.gif"><a href="$relativePath/images/label.gif"></a><a href="$relativePath/images/page.gif"></a><a href="$relativePath/images/chapter.gif"></a><a href="$relativePath/images/chapter_open.gif"></a><a href="$relativePath/images/current.gif"></a><a href="/favicon.ico"></a></td> </tr> <tr> <td colspan="2" bgcolor="$blue1" class="copyright" align="center"><font size="2" face="Arial, Helvetica, Sans-Serif">Copyright © 2000-2003 The Apache Software Foundation. All rights reserved.<script type="text/javascript" language="JavaScript"><!--