merge PR #75

mojavelinux · web-flow · commit bad3c799edb3 · 2020-10-02T03:33:14.000-06:00
update UI to leverage features in Antora 3
diff --git a/src/helpers/canonical-url.js b/src/helpers/canonical-url.js
diff --git a/src/helpers/latest-page-url.js b/src/helpers/latest-page-url.js
diff --git a/src/layouts/default.hbs b/src/layouts/default.hbs
@@ -3,7 +3,7 @@
 <head>
 {{> head-first}}
 <title>{{{detag (or page.title 'Untitled')}}}{{#with site.title}} | {{this}}{{/with}}</title>
-{{#with (canonical-url)}}
+{{#with page.canonicalUrl}}
 <link rel="canonical" href="{{this}}">
 {{/with}}
 {{> head-last}}
diff --git a/src/layouts/tutorials.hbs b/src/layouts/tutorials.hbs
@@ -3,7 +3,7 @@
 <head>
 {{> head-first}}
 <title>Tutorials{{#with site.title}} | {{this}}{{/with}}</title>
-{{#with (canonical-url)}}
+{{#with page.canonicalUrl}}
 <link rel="canonical" href="{{this}}">
 {{/with}}
 {{> head-last}}
diff --git a/src/partials/main.hbs b/src/partials/main.hbs
@@ -1,18 +1,22 @@
 <main class="article" data-ceiling="topbar">
 {{#unless (or (ne page.attributes.hide-view-latest undefined) (eq page.componentVersion page.component.latest))}}
-{{#with (latest-page-url)}}
+{{#with page.latest}}
+{{#if ./missing}}
+{{#if (and @root.page.componentVersion.prerelease (not ./prerelease))}}
 <div class="article-banner">
-{{#if (and @root.page.componentVersion.prerelease (not @root.page.latest.prerelease))}}
-<i class="fas fa-file-alt"></i> <p>  You are viewing the documentation for a prerelease version.</p>
-{{else}}
-<i class="fas fa-file-alt"></i> <p> A newer version of this documentation is available.</p>
-{{/if}}
-<a class="btn" href="{{relativize this}}">View Latest</a>
+<i class="fas fa-file-alt"></i> <p>You are viewing the documentation for a prerelease version.</p>
 </div>
-{{else if (and page.componentVersion.prerelease (not page.latest.prerelease))}}
+{{/if}}
+{{else}}
 <div class="article-banner">
+{{#if (and @root.page.componentVersion.prerelease (not ./prerelease))}}
 <i class="fas fa-file-alt"></i> <p>You are viewing the documentation for a prerelease version.</p>
+{{else}}
+<i class="fas fa-file-alt"></i> <p>A newer version of this documentation is available.</p>
+{{/if}}
+<a class="btn" href="{{relativize ./url}}">View Latest</a>
 </div>
+{{/if}}
 {{/with}}
 {{/unless}}
 <div class="article-header">
diff --git a/src/partials/nav-version-control.hbs b/src/partials/nav-version-control.hbs
@@ -19,9 +19,7 @@
 <ul class="frame-dropdown-list">
 {{#each page.versions}}
 {{#unless (eq ./version @root.page.version)}}
-<li><a class="frame-item" href="{{relativize ./url}}">
-{{!-- {{{@root.page.component.title}}} --}}
-{{./displayVersion}}</a></li>
+<li><a class="frame-item" href="{{relativize ./url}}">{{./displayVersion}}</a></li>
 {{/unless}}
 {{/each}}
 </ul>
