merge !59

resolves #66 show displayVersion instead of version for page / component
tigergraph · Dec 7, 2018 · 7f82c44 · 7f82c44
2 parents 0cf80b9 + 85bd730
commit 7f82c44
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/partials/navigation-explore.hbs b/src/partials/navigation-explore.hbs
@@ -2,7 +2,7 @@
   {{#if page.component}}
   <div class="context">
     <span class="title">{{page.component.title}}</span>
-    <span class="version">{{page.version}}</span>
+    <span class="version">{{page.componentVersion.displayVersion}}</span>
   </div>
   {{/if}}
   <ul class="components">
@@ -14,7 +14,7 @@
         <li class="version
           {{~#if (and (eq ../this @root.page.component) (eq this @root.page.componentVersion))}} is-current{{/if~}}
           {{~#if (eq this ../latestVersion)}} is-latest{{/if}}">
-          <a href="{{{relativize @root.page.url ./url}}}">{{./version}}</a>
+          <a href="{{{relativize @root.page.url ./url}}}">{{./displayVersion}}</a>
         </li>
         {{/each}}
       </ul>

diff --git a/src/partials/page-versions.hbs b/src/partials/page-versions.hbs
@@ -1,11 +1,11 @@
 {{#if page.versions}}
 <div class="page-versions">
-  <button class="versions-menu-toggle" title="Show other versions of page">{{page.version}}</button>
+  <button class="versions-menu-toggle" title="Show other versions of page">{{page.componentVersion.displayVersion}}</button>
   <div class="versions-menu">
     {{#each page.versions}}
     <a class="version
       {{~#if (eq ./version @root.page.version)}} is-current{{/if~}}
-      {{~#if ./missing}} is-missing{{/if}}" href="{{{relativize @root.page.url ./url}}}">{{./version}}</a>
+      {{~#if ./missing}} is-missing{{/if}}" href="{{{relativize @root.page.url ./url}}}">{{./displayVersion}}</a>
     {{/each}}
   </div>
 </div>