1 files changed, 25 insertions, 20 deletions

diff --git a/clang-tools-extra/clang-doc/assets/namespace-template.mustache b/clang-tools-extra/clang-doc/assets/namespace-template.mustache
index 1a44ed3..d96bc5c 100644
--- a/clang-tools-extra/clang-doc/assets/namespace-template.mustache
+++ b/clang-tools-extra/clang-doc/assets/namespace-template.mustache
@@ -46,56 +46,61 @@
                 <div class="sidebar">
                     <h2>{{RecordType}} {{Name}}</h2>
                     <ul>
-                        {{#Enums}}
+                        {{#HasEnums}}
                         <li class="sidebar-section">
                             <a class="sidebar-item" href="#Enums">Enums</a>
                         </li>
                         <ul>
-                            {{#Obj}}
+                            {{#Enums}}
                             <li class="sidebar-item-container">
-                                <a class="sidebar-item" href="#{{ID}}">{{EnumName}}</a>
+                                <a class="sidebar-item" href="#{{USR}}">{{Name}}</a>
                             </li>
-                            {{/Obj}}
+                            {{/Enums}}
                         </ul>
-                        {{/Enums}}
-                        {{#Record}}
+                        {{/HasEnums}}
+                        {{#HasRecords}}
                         <li class="sidebar-section">
                             <a class="sidebar-item" href="#Classes">Inner Classes</a>
                         </li>
                         <ul>
-                            {{#Links}}
+                            {{#Records}}
                             <li class="sidebar-item-container">
-                                <a class="sidebar-item" href="#{{ID}}">{{Name}}</a>
+                                <a class="sidebar-item" href="#{{USR}}">{{Name}}</a>
                             </li>
-                            {{/Links}}
+                            {{/Records}}
                         </ul>
-                        {{/Record}}
+                        {{/HasRecrods}}
                     </ul>
                 </div>
                 <div class="resizer" id="resizer"></div>
                 <div class="content">
-                    {{#Enums}}
+                    {{#HasEnums}}
                     <section id="Enums" class="section-container">
                         <h2>Enumerations</h2>
                         <div>
-                            {{#Obj}}
+                            {{#Enums}}
                             {{>EnumPartial}}
-                            {{/Obj}}
+                            {{/Enums}}
                         </div>
                     </section>
-                    {{/Enums}}
-                    {{#Record}}
+                    {{/HasEnums}}
+
+                    {{#HasRecords}}
                     <section id="Classes" class="section-container">
                         <h2>Inner Classes</h2>
                         <ul class="class-container">
-                        {{#Links}}
-                            <li id="{{ID}}" style="max-height: 40px;">
-                                <a href="{{Link}}"><pre><code class="language-cpp code-clang-doc" >class {{Name}}</code></pre></a>
+                        {{#Records}}
+                            <li id="{{USR}}" style="max-height: 40px;">
+                                <a href="{{DocumentationFileName}}.html">
+                                    <pre>
+                                        <code class="language-cpp code-clang-doc">class {{Name}}</code>
+                                    </pre>
+                                </a>
                             </li>
-                        {{/Links}}
+                        {{/Records}}
                         </ul>
+                    {{/HasRecords}}
                     </section>
-                    {{/Record}}
                 </div>
             </div>
         </main>