Added graphical hierarchy support to template engine

7 files changed, 84 insertions, 8 deletions

diff --git a/templates/html/doxygen.css b/templates/html/doxygen.css
index a7a1e4f..1d9002f 100644
--- a/templates/html/doxygen.css
+++ b/templates/html/doxygen.css
@@ -227,7 +227,7 @@ span.lineno a:hover {
 	background-color: #C8C8C8;
 }
 
-div.ah {
+div.ah, span.ah {
 	background-color: black;
 	font-weight: bold;
 	color: #ffffff;
@@ -245,6 +245,15 @@ div.ah {
 	background-image: -moz-linear-gradient(center top, #eee 0%, #444 40%, #000);
 }
 
+div.classindex ul {
+        list-style: none;
+        padding-left: 0;
+}
+
+div.classindex span.ai {
+        display: inline-block;
+}
+
 div.groupHeader {
 	margin-left: 16px;
 	margin-top: 12px;
diff --git a/templates/html/htmlclasses.tpl b/templates/html/htmlclasses.tpl
index e932c26..803b1a9 100644
--- a/templates/html/htmlclasses.tpl
+++ b/templates/html/htmlclasses.tpl
@@ -4,18 +4,46 @@
 <div class="textblock">
 {% indexentry nav name=tr.classIndex file=page.fileName anchor='' %}
 </div>
-<div class="classindex" style="column-count:{{ config.COLS_IN_ALPHA_INDEX }};-moz-column-count:{{ config.COLS_IN_ALPHA_INDEX }};-webkit-column-count:{{ config.COLS_IN_ALPHA_INDEX}}">
-<ul>
 {% with index=classIndex.list|alphaIndex:'name' %}
+  {# quick index at top #}
+  <div class="qindex">
   {% for section in index %}
-    <div class="ah">&#160;&#160;{{ section.letter }}&#160;&#160;</div>
+    <a class="qindex" href="#letter_{{ section.label }}">{{ section.letter }}</a>
+    {% if not forloop.last %}
+    &#160;|&#160;
+    {% endif %}
+  {% endfor %}
+  </div>
+  {# multi column index #}
+  <div class="classindex" style="column-count:{{ config.COLS_IN_ALPHA_INDEX }};-moz-column-count:{{ config.COLS_IN_ALPHA_INDEX }};-webkit-column-count:{{ config.COLS_IN_ALPHA_INDEX}}">
+  {% for section in index %}
+    <ul>
     {% for cls in section.items %}
-      <li>{{ cls.name }}</li>
+      <li>
+        <span class="ai">
+        {% if forloop.first %}
+        <a name="#letter_{{ section.label }}"></a>
+        <span class="ah">&#160;&#160;{{ section.letter }}&#160;&#160;</span><br/>
+        {% endif %}
+        {% with obj=cls text=cls.name %}
+          {% include 'htmlobjlink.tpl' %}
+        {% endwith %}
+        </span>
+      </li>
     {% endfor %}
+    </ul>
+  {% endfor %}
+  </div><!-- classindex -->
+  {# quick index at bottom #}
+  <div class="qindex">
+  {% for section in index %}
+    <a class="qindex" href="#letter_{{ section.label }}">{{ section.letter }}</a>
+    {% if not forloop.last %}
+    &#160;|&#160;
+    {% endif %}
   {% endfor %}
+  </div>
 {% endwith %}
-</ul>
-</div><!-- classindex -->
 </div><!-- contents -->
 {% endblock %}
 
diff --git a/templates/html/htmlgraphhierarchy.tpl b/templates/html/htmlgraphhierarchy.tpl
new file mode 100644
index 0000000..2c2dde5
--- /dev/null
+++ b/templates/html/htmlgraphhierarchy.tpl
@@ -0,0 +1,13 @@
+{% extend 'htmlbase.tpl' %}
+{% block content %}
+<div class="contents">
+<div class="textblock">
+<p><a href="hierarchy{{ config.HTML_FILE_EXTENSION }}">{{ tr.gotoTextualHierarchy }}</a></p>
+</div>
+<table border="0" cellspacing="10" cellpadding="0">
+{% for d in classHierarchy.diagrams %}
+<tr><td>{{ d.graph }}</td></tr>
+{% endfor %}
+</table>
+</div>
+{% endblock %}
diff --git a/templates/html/htmlhierarchy.tpl b/templates/html/htmlhierarchy.tpl
new file mode 100644
index 0000000..5d03755
--- /dev/null
+++ b/templates/html/htmlhierarchy.tpl
@@ -0,0 +1,17 @@
+{% extend 'htmlbase.tpl' %}
+{% block content %}
+<div class="contents">
+<div class="textblock">
+<p>{{ tr.classHierarchyDescription }}</p>
+{% if config.HAVE_DOT and config.GRAPHICAL_HIERARCHY %}
+<p><a href="inherits{{ config.HTML_FILE_EXTENSION }}">{{ tr.gotoGraphicalHierarchy }}</a></p>
+{% endif %}
+</div>
+{% indexentry nav name=tr.classHierarchy file=page.fileName anchor='' %}
+{% opensubindex nav %}
+{% with tree=classHierarchy %}
+  {% include 'htmldirtree.tpl' %}
+{% endwith %}
+{% closesubindex nav %}
+</div>
+{% endblock %}
diff --git a/templates/html/htmllayout.tpl b/templates/html/htmllayout.tpl
index ffcd318..9b82238 100644
--- a/templates/html/htmllayout.tpl
+++ b/templates/html/htmllayout.tpl
@@ -179,7 +179,12 @@
   {# TODO: write the class inheritance hierarchy #}
   {% if classHierarchy.tree %}
     {% with page=classHierarchy %}
-  {#    {% create classHierarchy.fileName|append:config.HTML_FILE_EXTENSION from 'hierarchy.tpl' %} #}
+      {% create classHierarchy.fileName|append:config.HTML_FILE_EXTENSION from 'htmlhierarchy.tpl' %}
+    {% endwith %}
+    {% with page=classHierarchy %}
+      {% if config.HAVE_DOT and config.GRAPHICAL_HIERARCHY %}
+        {% create 'inherits'|append:config.HTML_FILE_EXTENSION from 'htmlgraphhierarchy.tpl' %}
+      {% endif %}
     {% endwith %}
   {% endif %}
 
diff --git a/templates/html/htmlpage.tpl b/templates/html/htmlpage.tpl
index e703513..3882989 100644
--- a/templates/html/htmlpage.tpl
+++ b/templates/html/htmlpage.tpl
@@ -34,7 +34,9 @@
     {% if classHierarchy.tree %}
     <li><a href="{{ page.relPath }}hierarchy{{ config.HTML_FILE_EXTENSION }}"><span>{{ tr.classHierarchy }} </span></a></li>
     {% endif %}
+    {% if classMembersIndex.all %}
     <li><a href="{{ page.relPath }}functions{{ config.HTML_FILE_EXTENSION }}"><span>{{ tr.classMembers }} </span></a></li>
+    {% endif %}
   </ul>
   </li>
 {% endif %}
diff --git a/templates/html/htmltabs.tpl b/templates/html/htmltabs.tpl
index 3119eb6..9ce8c44 100644
--- a/templates/html/htmltabs.tpl
+++ b/templates/html/htmltabs.tpl
@@ -83,7 +83,9 @@
     {% if classHierarchy.tree %}
     <li{% if page.subhighlight=='classhierarchy' %} class="current"{% endif %}><a href="{{ page.relPath }}hierarchy{{ config.HTML_FILE_EXTENSION }}"><span>{{ tr.classHierarchy|nowrap }}</span></a></li>
     {% endif %}
+    {% if classMembersIndex.all %}
     <li{% if page.subhighlight=='classmembers' %} class="current"{% endif %}><a href="{{ page.relPath }}functions{{ config.HTML_FILE_EXTENSION }}"><span>{{ tr.classMembers|nowrap }}</span></a></li>
+    {% endif %}
   {% endif %}
   {# file subtabs #}
   {% if page.highlight=='files' %}