Merge: More keep going

[nit.git] / src / doc / html_templates / html_templates.nit

diff --git a/src/doc/html_templates/html_templates.nit b/src/doc/html_templates/html_templates.nit
index 1a5a17c..8849fb3 100644 (file)
--- a/src/doc/html_templates/html_templates.nit
+++ b/src/doc/html_templates/html_templates.nit
@@ -286,11 +286,6 @@ redef class DocComposite
        # Level <hX> for HTML heading.
        private fun hlvl: Int do return depth
 
-       # Is `self` not displayed in the page.
-       #
-       # By default, empty elements are hidden.
-       fun is_hidden: Bool do return is_empty
-
        # A short, undecorated title that goes in the table of contents.
        #
        # By default, returns `html_title.to_s`, subclasses should redefine it.
@@ -299,12 +294,9 @@ redef class DocComposite
                return html_title.write_to_string
        end
 
-       # Is `self` hidden in the table of content?
-       var is_toc_hidden = false is writable
-
        # Render this element in a table of contents.
        private fun render_toc_item(lst: UnorderedList) do
-               if is_toc_hidden then return
+               if is_toc_hidden or html_toc_title == null then return
 
                var content = new Template
                content.add new Link("#{html_id}", html_toc_title.to_s)
@@ -397,9 +389,6 @@ end
 
 redef class IndexArticle
        redef var html_title = "Index"
-       redef fun is_empty do
-               return mmodules.is_empty and mclasses.is_empty and mprops.is_empty
-       end
 
        redef fun render_body do
                addn "<div class='container-fluid'>"
@@ -434,10 +423,6 @@ redef class IndexArticle
        end
 end
 
-redef class ProjectsSection
-       redef var html_title = "Projects"
-end
-
 redef class MEntityComposite
        redef var html_title is lazy do return mentity.nitdoc_name
 end
@@ -447,29 +432,12 @@ redef class MEntitySection
        redef var html_subtitle is lazy do return mentity.html_declaration
 end
 
-redef class ConstructorsSection
-       redef var html_title = "Constructors"
-       redef var html_subtitle = null
-       redef fun is_toc_hidden do return is_empty
-end
-
 redef class ConcernSection
        redef var html_title is lazy do return "in {mentity.nitdoc_name}"
-       redef fun is_toc_hidden do return is_empty
-end
-
-redef class ImportationListSection
-       redef var html_title is lazy do return "Dependencies"
-end
-
-redef class InheritanceListSection
-       redef var html_title is lazy do return "Inheritance"
 end
 
 redef class IntroArticle
        redef var html_title = null
-       redef var is_hidden = false
-       redef var is_toc_hidden = true
 
        # Link to source to display if any.
        var html_source_link: nullable Writable is noinit, writable
@@ -495,7 +463,6 @@ end
 
 redef class ConcernsArticle
        redef var html_title = "Concerns"
-       redef fun is_hidden do return concerns.is_empty
        redef fun render_body do add concerns.html_list
 end
 
@@ -514,7 +481,6 @@ end
 redef class DefinitionArticle
        redef var html_title is lazy do return mentity.html_name
        redef var html_subtitle is lazy do return mentity.html_declaration
-       redef var is_hidden = false
 
        # Does `self` display only it's title and no body?
        #
@@ -555,46 +521,18 @@ redef class DefinitionArticle
        end
 end
 
-redef class HierarchyListArticle
-       redef fun is_empty do return mentities.is_empty
-       redef var is_toc_hidden = true
-
+redef class MEntitiesListArticle
        redef fun render_body do
                var lst = new UnorderedList
                lst.css_classes.add "list-unstyled list-definition"
                for mentity in mentities do
                        lst.add_li mentity.html_list_item
                end
-               addn lst
-       end
-end
-
-redef class IntrosRedefsSection
-       redef var toc_title do return "Intros / Redefs"
-       redef var html_title = null
-       redef var html_subtitle = null
-       redef var is_toc_hidden = true
-end
-
-redef class IntrosRedefsListArticle
-       redef fun is_hidden do return mentities.is_empty
-       redef var is_toc_hidden = true
-
-       redef fun render_body do
-               var lst = new UnorderedList
-               lst.css_classes.add "list-unstyled list-labeled"
-               for mentity in mentities do
-                       lst.add_li mentity.html_list_item
-               end
                add lst
        end
 end
 
 redef class DefinitionLinArticle
-       redef var html_title is lazy do return "Linearization"
-       redef fun is_hidden do return mentities.is_empty
-       redef var is_toc_hidden = true
-
        redef fun render_body do
                var lst = new UnorderedList
                lst.css_classes.add "list-unstyled list-labeled"
@@ -617,8 +555,6 @@ end
 
 redef class GraphArticle
        redef var html_title = null
-       redef var is_hidden = false
-       redef var is_toc_hidden = true
 
        # HTML map used to display link.
        #