1 files changed, 54 insertions, 5 deletions
diff --git a/templates/html/htmlallmembers.tpl b/templates/html/htmlallmembers.tpl
index e4b8460..b44110d 100644
--- a/templates/html/htmlallmembers.tpl
+++ b/templates/html/htmlallmembers.tpl
@@ -10,13 +10,62 @@
 <table class="directory">
 {% for mi in compound.allMembersList %}
   <tr class="{% cycle 'even' 'odd' %}">
-  {# TODO: objective-C #}
-  <td class="entry">{% with obj=mi.member text=mi.ambiguityScope|append:mi.member.name %}
-      {% include 'htmlobjlink.tpl' %}
+  {% spaceless %}
+  {% with member=mi.member %}
+  {% if member.language=='objc' %}
+    <td class="entry">
+    {% if member.isObjCMethod %}
+      {% if member.isStatic %}+&#160;{% else %}-&#160;{% endif %}
+    {% endif %}
+    </td>
+  {% endif %}
+  {% if member.isObjCMethod %}
+    <td class="entry">
+      {% with obj=member text=member.name %}
+        {% include 'htmlobjlink.tpl' %}
+      {% endwith %}
+    </td>
+  {%else %}
+    {# name #}
+    <td class="entry">
+      {% with obj=member text=mi.ambiguityScope|append:member.name %}
+        {% include 'htmlobjlink.tpl' %}
       {% endwith %}
-    {# TODO: add arguments #}
-    {# TODO: add column with scope #}
+      {% if member.isEnumeration %}
+      &#160;{{ tr.enumName }}
+      {% elif member.isEnumValue %}
+      &#160;{{ tr.enumValue }}
+      {% elif member.isTypedef %}
+      &#160;typedef
+      {% elif member.isFriend and member.type=='friend class' %}
+      &#160;class
+      {% elif member.isFunction or member.isSignal or member.isSlot or (member.isFriend and member.hasParameters) %}
+      {{ member.declArgs }}
+      {% endif %}
+    </td>
+  {% endif %}
+  {# class link #}
+  <td class="entry">
+  {% if member.category %}
+    {% with obj=member.category text=member.category.name %}
+      {% include 'htmlobjlink.tpl' %}
+    {% endwith %}
+  {% else %}
+    {% with obj=member.class text=member.class.name %}
+      {% include 'htmlobjlink.tpl' %}
+    {% endwith %}
+  {% endif %}
   </td>
+  {# labels #}
+  {% if member.labels %}
+     <td class="entry">
+     {% for label in member.labels %}
+     <span class="mlabel">{{ label }}</span>
+     {% endfor %}
+     </td>
+  {% endif %}
+  {% endwith %}
+  {% endspaceless %}
   </tr>
 {% endfor %}
 </table>