Add type parameters to entity title and render return type correctly

2 files changed, 22 insertions, 1 deletions

diff --git a/doc-tool/resources/_layouts/api-page.html b/doc-tool/resources/_layouts/api-page.html
index 49f01542e..392c0ef2d 100644
--- a/doc-tool/resources/_layouts/api-page.html
+++ b/doc-tool/resources/_layouts/api-page.html
@@ -19,6 +19,19 @@ extraCSS:
         <span id="entity-name">
             {{ entity.name }}
         </span>
+        <span id="entity-type-params">
+            <span class="no-left">[</span>
+            {% for param in entity.typeParams %}
+            <span class="no-left">
+                {% if forloop.last %}
+                    {{ param }}
+                {% else %}
+                    {{ param }},
+                {% endif %}
+            </span>
+            {% endfor %}
+            <span class="no-left">]</span>
+        </span>
     </div>
 
     {% if entity.comment.body %}
@@ -80,7 +93,7 @@ extraCSS:
                 {% endif %}
 
                 {% if member.returnValue %}
-                <span class="no-left">: {{ member.returnValue.title }}</span>
+                <span class="no-left">: {% renderRef member.returnValue %}</span>
                 {% endif %}
             </div><!-- end member-title -->
 
diff --git a/doc-tool/resources/css/api-page.css b/doc-tool/resources/css/api-page.css
index 410e9978c..9bcea9a27 100644
--- a/doc-tool/resources/css/api-page.css
+++ b/doc-tool/resources/css/api-page.css
@@ -19,6 +19,14 @@ div#entity-title > span#entity-kind {
     font-weight: 100;
 }
 
+div#entity-title span.no-left {
+    margin-left: -9px;
+}
+
+div#entity-title span.no-right {
+    margin-right: -9px;
+}
+
 div#entity-body table > tbody > tr > td {
     padding: 10px;
 }