nitdoc:sanitize generated html

Fixes #669.

Remaining errors are related to duplicated html ids in comments.
Those are generated by the markdown parser and will be fixed in
a further pull request.

Signed-off-by: Alexandre Terrasa <alexandre@moz-code.org>

diff --git a/src/doc/doc_pages.nit b/src/doc/doc_pages.nit
index de035f5..9c38d44 100644 (file)
--- a/src/doc/doc_pages.nit
+++ b/src/doc/doc_pages.nit
@@ -393,7 +393,7 @@ abstract class NitdocPage
                        var intros_art = new TplArticle.with_title("{mmodule.nitdoc_id}_intros", "Introduces")
                        var intros_lst = new TplList.with_classes(["list-unstyled", "list-labeled"])
                        for mclassdef in intros do
-                               intros_lst.add_li new TplListItem.with_content(mclassdef.tpl_list_item)
+                               intros_lst.add_li mclassdef.tpl_list_item
                        end
                        if not intros_lst.is_empty then
                                intros_art.content = intros_lst
@@ -406,7 +406,7 @@ abstract class NitdocPage
                        var redefs_art = new TplArticle.with_title("{mmodule.nitdoc_id}_redefs", "Redefines")
                        var redefs_lst = new TplList.with_classes(["list-unstyled", "list-labeled"])
                        for mclassdef in redefs do
-                               redefs_lst.add_li new TplListItem.with_content(mclassdef.tpl_list_item)
+                               redefs_lst.add_li mclassdef.tpl_list_item
                        end
                        if not redefs_lst.is_empty then
                                redefs_art.content = redefs_lst
@@ -435,7 +435,7 @@ abstract class NitdocPage
                        var intros = new TplArticle.with_title("{mclassdef.nitdoc_id}_intros", "Introduces")
                        var intros_lst = new TplList.with_classes(["list-unstyled", "list-labeled"])
                        for mpropdef in mclassdef.collect_intro_mpropdefs(ctx.min_visibility) do
-                               intros_lst.add_li new TplListItem.with_content(mpropdef.tpl_list_item)
+                               intros_lst.add_li mpropdef.tpl_list_item
                        end
                        if not intros_lst.is_empty then
                                intros.content = intros_lst
@@ -444,7 +444,7 @@ abstract class NitdocPage
                        var redefs = new TplArticle.with_title("{mclassdef.nitdoc_id}_redefs", "Redefines")
                        var redefs_lst = new TplList.with_classes(["list-unstyled", "list-labeled"])
                        for mpropdef in mclassdef.collect_redef_mpropdefs(ctx.min_visibility) do
-                               redefs_lst.add_li new TplListItem.with_content(mpropdef.tpl_list_item)
+                               redefs_lst.add_li mpropdef.tpl_list_item
                        end
                        if not redefs_lst.is_empty then
                                redefs.content = redefs_lst
@@ -676,7 +676,7 @@ class NitdocGroup
                tpl_sidebar.boxes.add new TplSideBox.with_content("All classes", list)
        end
 
-       private fun tpl_sidebar_item(def: MClass): Template do
+       private fun tpl_sidebar_item(def: MClass): TplListItem do
                var classes = def.intro.tpl_css_classes.to_a
                if intros.has(def) then
                        classes.add "intro"
@@ -686,7 +686,7 @@ class NitdocGroup
                var lnk = new Template
                lnk.add new TplLabel.with_classes(classes)
                lnk.add def.tpl_link
-               return lnk
+               return new TplListItem.with_content(lnk)
        end
 
        # intro text
@@ -806,7 +806,7 @@ class NitdocModule
                tpl_sidebar.boxes.add new TplSideBox.with_content("All classes", list)
        end
 
-       private fun tpl_sidebar_item(def: MClass): Template do
+       private fun tpl_sidebar_item(def: MClass): TplListItem do
                var classes = def.intro.tpl_css_classes.to_a
                if def.intro_mmodule == mmodule then
                        classes.add "intro"
@@ -816,7 +816,7 @@ class NitdocModule
                var lnk = new Template
                lnk.add new TplLabel.with_classes(classes)
                lnk.add def.tpl_link
-               return lnk
+               return new TplListItem.with_content(lnk)
        end
 
        # intro text
@@ -1048,14 +1048,14 @@ class NitdocClass
                summary.elts.add entry
        end
 
-       private fun tpl_sidebar_item(mprop: MProperty): Template do
+       private fun tpl_sidebar_item(mprop: MProperty): TplListItem do
                var classes = mprop.intro.tpl_css_classes.to_a
                if not mprops2mdefs.has_key(mprop) then
                        classes.add "inherit"
                        var lnk = new Template
                        lnk.add new TplLabel.with_classes(classes)
                        lnk.add mprop.intro.tpl_link
-                       return lnk
+                       return new TplListItem.with_content(lnk)
                end
                var defs = mprops2mdefs[mprop]
                if defs.has(mprop.intro) then
@@ -1066,7 +1066,7 @@ class NitdocClass
                var lnk = new Template
                lnk.add new TplLabel.with_classes(classes)
                lnk.add mprop.intro.tpl_anchor
-               return lnk
+               return new TplListItem.with_content(lnk)
        end
 
        private fun tpl_intro: TplSection do

diff --git a/src/doc/doc_templates.nit b/src/doc/doc_templates.nit
index e30298f..4d3b253 100644 (file)
--- a/src/doc/doc_templates.nit
+++ b/src/doc/doc_templates.nit
@@ -108,7 +108,7 @@ class TplPage
                add "<script src='{shareurl}/vendors/jquery/jquery-1.11.1.min.js'></script>"
                add "<script src='{shareurl}/vendors/jquery/jquery-ui-1.10.4.custom.min.js'></script>"
                add "<script src='{shareurl}/vendors/bootstrap/js/bootstrap.min.js'></script>"
-               add "<script data-main='{shareurl}/js/nitdoc' src='{shareurl}/js/lib/require.js'</script>"
+               add "<script data-main='{shareurl}/js/nitdoc' src='{shareurl}/js/lib/require.js'></script>"
                for script in scripts do add script
                add """<script>
                        $(function () {
@@ -697,7 +697,7 @@ class TplList
        var css_classes = new Array[String]
 
        # Add content wrapped in a <li> element
-       fun add_li(content: Streamable) do elts.add new TplListItem.with_content(content)
+       fun add_li(item: TplListItem) do elts.add item
 
        init do end