nitweb: display defs tab for mpackages and mgroups

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

diff --git a/share/nitweb/views/doc/defs.html b/share/nitweb/views/doc/defs.html
index 66cd995..7cd0ea2 100644 (file)
--- a/share/nitweb/views/doc/defs.html
+++ b/share/nitweb/views/doc/defs.html
@@ -1,4 +1,10 @@
 <div>
-       <entity-list list-title='Class definitions'
+       <entity-list list-title='Groups' ng-if='vm.mentity.class_name == "MPackage"'
+               list-entities='vm.defs' list-object-filter='{}' />
+
+       <entity-list list-title='Groups & Modules' ng-if='vm.mentity.class_name == "MGroup"'
+               list-entities='vm.defs' list-object-filter='{}' />
+
+       <entity-list list-title='Class definitions' ng-if='vm.mentity.class_name == "MModule"'
                list-entities='vm.defs' list-object-filter='{}' />
 </div>

diff --git a/share/nitweb/views/doc/doc.html b/share/nitweb/views/doc/doc.html
index 9ca2e76..1e60694 100644 (file)
--- a/share/nitweb/views/doc/doc.html
+++ b/share/nitweb/views/doc/doc.html
@@ -14,15 +14,6 @@
                        </div>
                </div>
 
-               <entity-list list-title='Groups' list-entities='vm.mentity.mgroups'
-                       list-object-filter='{}' />
-
-               <entity-list list-title='Subgroups' list-entities='vm.mentity.mgroups'
-                       list-object-filter='{}' />
-
-               <entity-list list-title='Modules' list-entities='vm.mentity.mmodules'
-                       list-object-filter='{}' />
-
                <entity-list list-title='Introduced classes' list-entities='vm.mentity.intro_mclasses'
                        list-object-filter='{}' />
 

diff --git a/share/nitweb/views/doc/entity.html b/share/nitweb/views/doc/entity.html
index 1a0dcf7..3543b9f 100644 (file)
--- a/share/nitweb/views/doc/entity.html
+++ b/share/nitweb/views/doc/entity.html
@@ -15,6 +15,19 @@
                        </a>
                </li>
 
+               <!-- definitions -->
+               <li role='presentation' ui-sref-active='active' ng-if='
+                               vm.mentity.class_name == "MPackage" ||
+                               vm.mentity.class_name == "MGroup" ||
+                               vm.mentity.class_name == "MModule"'>
+                       <a ui-sref='.defs'>
+                               <span class='glyphicon glyphicon-list'/>
+                               <span ng-if='vm.mentity.class_name == "MPackage"'>Groups</span>
+                               <span ng-if='vm.mentity.class_name == "MGroup"'>Content</span>
+                               <span ng-if='vm.mentity.class_name == "MModule"'>Classes</span>
+                       </a>
+               </li>
+
                <!-- graph -->
                <li role='presentation' ui-sref-active='active' ng-if='
                                vm.mentity.class_name == "MPackage" ||
@@ -38,14 +51,6 @@
                        </a>
                </li>
 
-               <!-- definitions -->
-               <li role='presentation' ui-sref-active='active' ng-if='
-                               vm.mentity.class_name == "MModule"'>
-                       <a ui-sref='.defs'>
-                               <span class='glyphicon glyphicon-asterisk'/> Class definitions
-                       </a>
-               </li>
-
                <!-- all -->
                <li role='presentation' ui-sref-active='active' ng-if='
                                vm.mentity.class_name == "MClass"'>