Merge: new `with` statement

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

diff --git a/src/doc/doc_phases/doc_graphs.nit b/src/doc/doc_phases/doc_graphs.nit
index 6013088..66ef564 100644 (file)
--- a/src/doc/doc_phases/doc_graphs.nit
+++ b/src/doc/doc_phases/doc_graphs.nit
@@ -15,7 +15,9 @@
 # Adds importation and class hierarchy graphs.
 module doc_graphs
 
+import doc_structure
 import doc_poset
+import html_templates::html_model # FIXME maybe this phase should depend on `html_render`
 
 redef class ToolContext
 
@@ -39,7 +41,8 @@ class GraphPhase
                        if article == null then continue
                        # FIXME avoid diff
                        # page.root.add article
-                       page.root.children[1].children.insert(article, 0)
+                       article.parent = page.root.children.first.children[1]
+                       page.root.children.first.children[1].children.insert(article, 0)
                end
        end
 end
@@ -70,7 +73,7 @@ redef class MModulePage
                        end
                end
                op.append("\}\n")
-               return new GraphArticle(name, op)
+               return new GraphArticle(mentity, name, op)
        end
 end
 
@@ -104,7 +107,7 @@ redef class MClassPage
                        end
                end
                op.append("\}\n")
-               return new GraphArticle(name, op)
+               return new GraphArticle(mentity, name, op)
        end
 end
 
@@ -113,7 +116,7 @@ end
 # The graph is stored in dot format.
 # The final output is delayed untill rendering.
 class GraphArticle
-       super DocComposite
+       super MEntityComposite
 
        # Graph ID (used for outputing file with names).
        var id: String