Added missing information to template version of the all members list

2 files changed, 62 insertions, 11 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>
diff --git a/templates/html/htmlmemdef.tpl b/templates/html/htmlmemdef.tpl
index c469f1f..be4d94e 100644
--- a/templates/html/htmlmemdef.tpl
+++ b/templates/html/htmlmemdef.tpl
@@ -1,6 +1,6 @@
 {# inputs: memberListInfo #}
 {% if memberListInfo %}
-  {% if memberListInfo.members|length>0 %}
+  {% if memberListInfo.members %}
     <h2 class="groupheader">{{ memberListInfo.title }}</h2>
     {% for member in memberListInfo.members %}
       {% if member.hasDetails %}  {# TODO: not the same as isDetailedSectionVisible! #}
@@ -9,7 +9,7 @@
         <div class="memitem">
         <div class="memproto">
         {# write template declarations #}
-        {% if member.language=='cpp' and member.templateDecls|length>0 %}
+        {% if member.language=='cpp' and member.templateDecls %}
           {% for targList in member.templateDecls %}
             {% spaceless %}
               <div class="memtemplate">
@@ -23,7 +23,7 @@
           {% endfor %}
         {% endif %}
         {# start of labels if present #}
-        {% if member.labels|length>0 %}
+        {% if member.labels %}
           <table class="mlabels"><tr><td class="mlabels-left">
         {% endif %}
         <table class="memname">
@@ -31,9 +31,11 @@
             {{ member.definition }}
             {# write argument list #}
             {# TODO: TCL #}
-            {% if member.hasParameterList %}
+            {% if member.hasParameters %}
               {% if member.isObjCMethod %}
+                {% if member.parameters %}
                 </td><td></td>
+                {% endif %}
                 {% for arg in member.parameters %}
                   {% if not forloop.first %}
                     <tr><td class="paramkey">{{ arg.namePart }}</td><td></td>
@@ -43,7 +45,7 @@
                     <em>{% if not arg.name %}{{ arg.type }}{% else %}{{ arg.name }}{% endif %}</em>
                   {% endif %}
 		  {% if not forloop.last %}
-                    ,</td></tr>
+                    </td></tr>
                   {% endif %}
                 {% endfor %}
               {% else %}
@@ -109,7 +111,7 @@
           </td></tr>
         </table>
         {# end of labels if present #}
-        {% if member.labels|length>0 %}
+        {% if member.labels %}
           </td><td class="mlabels-right">{% spaceless %}
           {% for label in member.labels %}
             <span class="mlabel">{{ label }}</span>