nitdoc: include the help in the menubar

Signed-off-by: Jean Privat <jean@pryen.org>

diff --git a/share/nitdoc/help.html b/share/nitdoc/help.html
index b92f4c9..b65a7b7 100644 (file)
--- a/share/nitdoc/help.html
+++ b/share/nitdoc/help.html
@@ -17,9 +17,7 @@
                        <nav class="main">\r
                                <ul>\r
                                        <li><a href="index.html">Overview</a></li>\r
-                                       <li><a href="module.html">Module</a></li>\r
-                                       <li><a href="class.html">Class</a></li>\r
-                                       <li><a href="full-index.html">Index</a></li>\r
+                                       <li><a href="full-index.html">Full Index</a></li>\r
                                        <li class="current">Help</li>\r
                                </ul>\r
                        </nav>\r
@@ -37,7 +35,7 @@
                                        <p>The menu bar allows you to navigate different views of this documentation.</p>
                                        <ul>
                                                <li>The <a href="index.html">Overview</a> is the front page of this documentation</li>
-                                               <li>The <a href="full-index.html">Index</a> lists all properties, classes and modules</li>
+                                               <li>The <a href="full-index.html">Full Index</a> lists all properties, classes and modules</li>
                                                <li>The <a href="help.html">Help</a> displays this page</li>
                                        </ul>
                                        <p>If JavaScript is enabled on your browser, a search field appears and allows you to search in all properties, classes and modules.</p>\r
@@ -66,8 +64,8 @@
                                </article>\r
                                \r
                                <article>\r
-                                       <h2>Index</h2>\r
-                                       <p>The <a href="full-index.html">Index</a> contains an alphabetic list of all modules, classes/interfaces and properties.</p>\r
+                                       <h2>Full Index</h2>\r
+                                       <p>The <a href="full-index.html">Full Index</a> contains an alphabetic list of all modules, classes/interfaces and properties.</p>\r
                                        <p>If JavaScript is enabled on your browser, lists can be filtered by name.</p>\r
                                </article>\r
                        </div>          \r

diff --git a/src/nitdoc.nit b/src/nitdoc.nit
index 7525f17..5e62de5 100644 (file)
--- a/src/nitdoc.nit
+++ b/src/nitdoc.nit
@@ -159,7 +159,7 @@ class DocContext
                        "<script type=\"text/javascript\" src=\"scripts/js-facilities.js\"></script>\n" +
                        "<link rel=\"stylesheet\" href=\"styles/main.css\" type=\"text/css\"  media=\"screen\" />"
 
-               var action_bar = "<header><nav class='main'><ul><li class=\"current\">Overview</li><li><a href='full-index.html'>Full Index</a></li></ul></nav></header>\n"
+               var action_bar = "<header><nav class='main'><ul><li class=\"current\">Overview</li><li><a href='full-index.html'>Full Index</a></li><li><a href=\"help.html\">Help</a></li></ul></nav></header>\n"
 
                # generate the index
                self.filename = "index.html"
@@ -206,7 +206,7 @@ class DocContext
                        assert mod isa MMSrcModule
                        if not mod.require_doc(self) then continue
                        self.filename = mod.html_name
-                       action_bar = "<header><nav class='main'><ul><li><a href='./index.html'>Overview</a></li><li class=\"current\">{mod.name}</li><li><a href='full-index.html'>Full Index</a></li></ul></nav></header>\n"
+                       action_bar = "<header><nav class='main'><ul><li><a href='./index.html'>Overview</a></li><li class=\"current\">{mod.name}</li><li><a href='full-index.html'>Full Index</a></li><li><a href=\"help.html\">Help</a></li></ul></nav></header>\n"
                        clear
                        add("<!DOCTYPE html>")
                        add("<html><head>{head}<title>Module {mod.name}</title></head><body>\n")
@@ -222,7 +222,7 @@ class DocContext
                for c in mainmod.local_classes do
                        if not c.require_doc(self) then continue
                        self.filename = c.html_name
-                       action_bar = "<header><nav class='main'><ul><li><a href='./index.html'>Overview</a></li><li>{c.global.intro.mmmodule.toplevel_owner.html_link(self)}</li><li class=\"current\">{c.name}</li><li><a href='full-index.html'>Full Index</a></li></ul></nav></header>\n"
+                       action_bar = "<header><nav class='main'><ul><li><a href='./index.html'>Overview</a></li><li>{c.global.intro.mmmodule.toplevel_owner.html_link(self)}</li><li class=\"current\">{c.name}</li><li><a href='full-index.html'>Full Index</a></li><li><a href=\"help.html\">Help</a></li></ul></nav></header>\n"
                        clear
                        add("<!DOCTYPE html>")
                        add("<html><head>{head}<title>Class {c.name}</title></head><body>\n")
@@ -235,7 +235,7 @@ class DocContext
                end
 
                self.filename = "fullindex"
-               action_bar = "<header><nav class='main'><ul><li><a href='./index.html'>Overview</a></li><li class=\"current\">Full Index</li></ul></nav></header>\n"
+               action_bar = "<header><nav class='main'><ul><li><a href='./index.html'>Overview</a></li><li class=\"current\">Full Index</li><li><a href=\"help.html\">Help</a></li></ul></nav></header>\n"
                clear
                add("<!DOCTYPE html>")
                add("<html><head>{head}<title>Full Index</title></head><body>\n")