left nav module links corrected to used the cleansed module name [fix…

…es #2173322].
yui · Jul 6, 2009 · f95e78e · f95e78e
1 parent c438238
commit f95e78e
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 7 deletions.
diff --git a/bin/yuidoc_generate.py b/bin/yuidoc_generate.py
@@ -89,6 +89,10 @@ def _mkdir(newdir):
         self.modules = d[MODULES]
         self.modulenames = self.modules.keys()
         self.modulenames.sort(lambda x,y: cmp(x.lower(), y.lower()))
+        self.cleansedmodulenames = {} 
+
+        for mod in self.modulenames:
+            self.cleansedmodulenames[mod] = self.cleanseStr(mod)
 
         self.cleansedmodulename = self.cleanseStr(self.modulename)
 
@@ -127,6 +131,7 @@ def assignGlobalProperties(template):
             template.version      = self.version
             template.modules      = self.modules
             template.modulenames  = self.modulenames
+            template.cleansedmodulenames  = self.cleansedmodulenames
             template.modulename   = self.modulename
             template.moduletitle = self.moduletitle
             template.cleansedmodulename = self.cleansedmodulename 

diff --git a/template/main.tmpl b/template/main.tmpl
@@ -583,7 +583,8 @@
                                 #if $moduledef == $modulename
                                     #set $css = "selected"
                                 #end if
-                                <li class="$css"><a href="module_${moduledef}.html" title="$moduledef">$moduledef</a></li>
+                                #set $cleansedname = $cleansedmodulenames[$moduledef]
+                                <li class="$css"><a href="${cleansedname}.html" title="$moduledef">$moduledef</a></li>
                             #end for
                         </ul>
                     </div>

diff --git a/test/lang.sh b/test/lang.sh
@@ -20,7 +20,8 @@ yuidoc_home=..
 #          $src/node \
 #          $src/queue \
 #          $src/yui"
-#parser_in="$src"
+
+# parser_in="lang"
 parser_in="lang/java lang/python lang/perl lang/ruby"
 
 # The location to output the parser data.  This output is a file containing a 

diff --git a/test/lang/cs/test.cs b/test/lang/cs/test.cs
@@ -1,7 +1,7 @@
 using System;
 /**
 * C# Module Description
-* @module csharp
+* @module lang.csharp
 */
 
 /**

diff --git a/test/lang/java/test.java b/test/lang/java/test.java
@@ -1,6 +1,6 @@
 /**
 * Test Java Module Description
-* @module javatest
+* @module lang.javatest
 */
 import java.util.*;
 

diff --git a/test/lang/perl/test.pl b/test/lang/perl/test.pl
@@ -2,7 +2,7 @@
 =begin
 /**
 * Test Perl File
-* @module perltest
+* @module lang.perltest
 */
 =cut
 use strict;

diff --git a/test/lang/php/test.php b/test/lang/php/test.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * General Module description for PHPTest
- * @module phptest
+ * @module lang.phptest
  */
 
 

diff --git a/test/lang/ruby/test.rb b/test/lang/ruby/test.rb
@@ -3,7 +3,7 @@
 =begin
 /**
 * Module Info for test Ruby File
-* @module rubytest
+* @module lang.rubytest
 */
 =end