kaz         02/03/17 20:34:42

  Modified:    src/dvsl/xdocs site.dvsl
  Log:
  - Place the relative path of the current file being processed into the
    context so it can be used in a similiar fashion as Anakia's
    $relativePath (used when creating links).
  
  - Fixed annoying "RHS null assignment" error message.  Just surrounded
    the offending #set statements with #if statements.
  
  Revision  Changes    Path
  1.5       +28 -15    jakarta-turbine-maven/src/dvsl/xdocs/site.dvsl
  
  Index: site.dvsl
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/dvsl/xdocs/site.dvsl,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- site.dvsl 17 Mar 2002 19:18:51 -0000      1.4
  +++ site.dvsl 18 Mar 2002 04:34:42 -0000      1.5
  @@ -15,6 +15,11 @@
   
   #match( "document" )
   
  +  ## Setup the relativePath using the toolbox.
  +
  +  #set( $filename = $context.getAppValue("infilename"))
  +  #set( $relativePath = $context.toolbox.pathtool.getRelativePath($filename))
  +
     ## Check to see if an xdocs/projects.xml file exists, if so, use that
     ## as the navigation file; otherwise, check to see if someone is using
     ## Anakia and has the file in xdocs/stylesheets directory.
  @@ -70,7 +75,7 @@
             #if ( $src.startsWith("http") )
               <img src="$src" align="right" alt="$alt" border="0"/>
             #else
  -            <img src="${relative-path}$src" align="right" alt="$alt" border="0"/>
  +            <img src="$relativePath$src" align="right" alt="$alt" border="0"/>
             #end
             </a>
           #end
  @@ -95,15 +100,15 @@
             ## Standard Maven Navigation 
             <p><strong>Maven Generated Docs</strong></p>
             <ul>
  -            <li><a href="${relative-path}/index.html">Front Page</a></li>
  -            <li><a href="${relative-path}/mail-lists.html">Mailing Lists</a></li>
  -            <li><a href="${relative-path}/developer-list.html">Developers</a></li>
  -            <li><a href="${relative-path}/dependencies.html">Dependencies</a></li>
  -            <li><a href="${relative-path}/changelog.html">Change Log</a></li>
  -            <li><a href="${relative-path}/jdepend-report.html">Metric 
Results</a></li>
  -            <li><a href="${relative-path}/junit-report.html">Unit Tests</a></li>
  -            <li><a href="${relative-path}/apidocs">JavaDocs</a></li>
  -            <li><a href="${relative-path}/xref">Source XReference</a></li>
  +            <li><a href="$relativePath/index.html">Front Page</a></li>
  +            <li><a href="$relativePath/mail-lists.html">Mailing Lists</a></li>
  +            <li><a href="$relativePath/developer-list.html">Developers</a></li>
  +            <li><a href="$relativePath/dependencies.html">Dependencies</a></li>
  +            <li><a href="$relativePath/changelog.html">Change Log</a></li>
  +            <li><a href="$relativePath/jdepend-report.html">Metric Results</a></li>
  +            <li><a href="$relativePath/junit-report.html">Unit Tests</a></li>
  +            <li><a href="$relativePath/apidocs">JavaDocs</a></li>
  +            <li><a href="$relativePath/xref">Source XReference</a></li>
             </ul>
           </td>
   
  @@ -156,7 +161,7 @@
       #if( $attrib.href.startsWith("http") )
           <li><a href="$attrib.href">$attrib.name</a></li>
       #else
  -        <li><a href="${relative-path}$attrib.href">$attrib.name</a></li>
  +        <li><a href="$relativePath$attrib.href">$attrib.name</a></li>
       #end
   #end
   
  @@ -240,8 +245,12 @@
   
   #match( "td" )
   
  -#set ($colspan = $attrib.colspan)
  -#set ($rowspan = $attrib.rowspan)
  +#if ($attrib.colspan)
  +    #set ($colspan = $attrib.colspan)
  +#end
  +#if ($attrib.rowspan)
  +    #set ($rowspan = $attrib.rowspan)
  +#end
   
   <td 
     bgcolor="$table-td-bg" 
  @@ -262,8 +271,12 @@
   
   #match( "th" )
   
  -#set ($colspan = $attrib.colspan )
  -#set ($rowspan = $attrib.rowspan )
  +#if ($attrib.colspan)
  +    #set ($colspan = $attrib.colspan )
  +#end
  +#if ($attrib.rowspan)
  +    #set ($rowspan = $attrib.rowspan )
  +#end
   
   <td 
     bgcolor="$table-th-bg" 
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to