Merge: Fix reading from Sockets

[nit.git] / src / doc / doc_phases / doc_structure.nit

diff --git a/src/doc/doc_phases/doc_structure.nit b/src/doc/doc_phases/doc_structure.nit
index bab950e..f9824d3 100644 (file)
--- a/src/doc/doc_phases/doc_structure.nit
+++ b/src/doc/doc_phases/doc_structure.nit
@@ -53,7 +53,7 @@ redef class OverviewPage
                var mprojects = doc.model.mprojects.to_a
                var sorter = new MConcernRankSorter
                sorter.sort mprojects
-               var section = new ProjectsSection("projects.section", "Projects")
+               var section = new DocSection("projects.section", "Projects")
                for mproject in mprojects do
                        section.add_child new DefinitionArticle("{mproject.nitdoc_id}.definition", mproject)
                end
@@ -181,8 +181,7 @@ redef class MClassPage
                mentity.intro_mmodule.mgroup.mproject.booster_rank = 0
                mentity.intro_mmodule.mgroup.booster_rank = 0
                mentity.intro_mmodule.booster_rank = 0
-               var constructors = new ConstructorsSection(
-                       "{mentity.nitdoc_id}.constructors", mentity)
+               var constructors = new DocSection("{mentity.nitdoc_id}.constructors", "Constructors")
                var minit = mentity.root_init
                if minit != null then
                        constructors.add_child new DefinitionArticle("{minit.nitdoc_id}.definition", minit)
@@ -307,17 +306,14 @@ class MEntityComposite
        var mentity: MEntity
 end
 
-# A list of constructors.
-class ConstructorsSection
-       super MEntitySection
-end
-
 # A Section about a Concern.
 #
 # Those sections are used to build the page summary.
 class ConcernSection
        super MEntityComposite
        super DocSection
+
+       redef fun is_toc_hidden do return is_hidden
 end
 
 # An article about a Mentity.
@@ -328,6 +324,17 @@ abstract class MEntityArticle
        super DocArticle
 end
 
+# An article that displays a list of mentities.
+class MEntitiesListArticle
+       super DocArticle
+
+       # MEntities to display.
+       var mentities: Array[MEntity]
+
+       redef fun is_hidden do return mentities.is_empty
+end
+
+
 # A section about a Mentity.
 #
 # Used to regroup content about a MEntity.
@@ -344,6 +351,7 @@ class IntroArticle
        super DocArticle
 
        redef var is_hidden = false
+       redef var is_toc_hidden = true
 end
 
 # An article that display a ConcernsTreee as a list.
@@ -356,7 +364,7 @@ class ConcernsArticle
        redef fun is_hidden do return concerns.is_empty
 end
 
-# An article that displaus a list of definition belonging to a MEntity.
+# An article that displays a list of definition belonging to a MEntity.
 class DefinitionListArticle
        super TabbedGroup
        super MEntityArticle
@@ -374,11 +382,6 @@ class HomeArticle
        super DocArticle
 end
 
-# The project list.
-class ProjectsSection
-       super DocArticle
-end
-
 # An article that display an index of mmodules, mclasses and mproperties.
 class IndexArticle
        super DocArticle