Merge branch '15138-version-our-documentation'

refs #15138

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <wvandewege@veritasgenetics.com>

diff --git a/doc/_config.yml b/doc/_config.yml
index cfae671929c0c69a7f63672ee584348d751a3975..21c4257a90cd9915aa27ec09aff912c9587e5690 100644 (file)
--- a/doc/_config.yml
+++ b/doc/_config.yml
@@ -11,6 +11,8 @@
 # $ rake generate baseurl=/example arvados_api_host=example.com
 
 baseurl:
+current_version:
+all_versions:
 arvados_api_host: localhost
 arvados_cluster_uuid: local
 arvados_workbench_host: http://localhost

diff --git a/doc/_includes/_navbar_top.liquid b/doc/_includes/_navbar_top.liquid
index 7d96ea011a60103ab54bd39f2c6610ec165d4397..e227703a5c35e4786fda2cbd37c2bd695904d613 100644 (file)
--- a/doc/_includes/_navbar_top.liquid
+++ b/doc/_includes/_navbar_top.liquid
@@ -13,7 +13,7 @@ SPDX-License-Identifier: CC-BY-SA-3.0
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-      <a class="navbar-brand" href="{{ site.baseurl }}/">Arvados&trade; Docs</a>
+      <a class="navbar-brand" href="{{ site.baseurl }}/">Arvados<sup>&trade;</sup> Docs</a>
     </div>
     <div class="collapse navbar-collapse" id="bs-navbar-collapse">
       <ul class="nav navbar-nav">
@@ -24,6 +24,15 @@ SPDX-License-Identifier: CC-BY-SA-3.0
         <li {% if page.navsection == 'api' %} class="active" {% endif %}><a href="{{ site.baseurl }}/api/index.html">API</a></li>
         <li {% if page.navsection == 'admin' %} class="active" {% endif %}><a href="{{ site.baseurl }}/admin/index.html">Admin</a></li>
         <li {% if page.navsection == 'installguide' %} class="active" {% endif %}><a href="{{ site.baseurl }}/install/index.html">Install</a></li>
+        <li><a href="#" class="dropdown-toggle" role="button" id="versionMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">{{ site.current_version }}{% if site.all_versions != [] %}&nbsp;&#9662;{% endif %}</a>
+          {% if site.all_versions != [] %}
+            <div class="dropdown-menu" aria-labelledby="versionMenuLink">
+            {% for version in site.all_versions %}
+              &nbsp;<a href="/{{ version }}/" class="dropdown-item">{{ version }}</a><br/>
+            {% endfor %}
+            </div>
+          {% endif %}
+        </li>
         <li><a href="https://arvados.org" style="padding-left: 2em">arvados.org&nbsp;&raquo;</a></li>
       </ul>
 

diff --git a/doc/user/index.html.textile.liquid b/doc/user/index.html.textile.liquid
index 202e297a20f38f2e171b644a8f95a5f4965f1c55..909394ef47a1cd6a9798881cfd81854073d7ab8c 100644 (file)
--- a/doc/user/index.html.textile.liquid
+++ b/doc/user/index.html.textile.liquid
@@ -1,7 +1,7 @@
 ---
 layout: default
 navsection: userguide
-title: Welcome to Arvados™!
+title: Welcome to Arvados<sup>&trade;</sup>!
 ...
 {% comment %}
 Copyright (C) The Arvados Authors. All rights reserved.