From cca29cf6237d9a00c44011929cc51bbf4ba66bff Mon Sep 17 00:00:00 2001
From: "David B. Kinder" <david.b.kinder@intel.com>
Date: Thu, 4 Apr 2019 14:32:53 -0700
Subject: [PATCH] doc: make doc version selector more obvious

Move the doc version selector menu higher on the left nav to make it
more visible (from its prior bottom of the nav menu)

Signed-off-by: David B. Kinder <david.b.kinder@intel.com>
---
 doc/_templates/aversions.html | 25 +++++++++++++++++++++++++
 doc/_templates/layout.html    | 14 ++++++++++++++
 doc/_templates/versions.html  | 26 +-------------------------
 doc/static/acrn-custom.css    |  5 +----
 4 files changed, 41 insertions(+), 29 deletions(-)
 create mode 100644 doc/_templates/aversions.html
 create mode 100644 doc/_templates/layout.html

diff --git a/doc/_templates/aversions.html b/doc/_templates/aversions.html
new file mode 100644
index 0000000000..ce088c4912
--- /dev/null
+++ b/doc/_templates/aversions.html
@@ -0,0 +1,25 @@
+{# Add rst-badge after rst-versions for small badge style. #}
+  <div class="rst-versions" data-toggle="rst-versions" role="note" aria-label="versions">
+    <span class="rst-current-version" data-toggle="rst-current-version">
+      <span class="fa fa-book"> Project ACRN</span>
+      v: {{ current_version }}
+      <span class="fa fa-caret-down"></span>
+    </span>
+    <div class="rst-other-versions">
+      <dl>
+        <dt>{{ _('Document Versions') }}</dt>
+        {% for slug, url in versions %}
+          <dd><a href="{{ url }}">{{ slug }}</a></dd>
+        {% endfor %}
+      </dl>
+      <dl>
+        <dt>{{ _('projectacrn.org links') }}</dt>
+          <dd>
+            <a href="https://www.projectacrn.org/">Project Home</a>
+          </dd>
+          <dd>
+            <a href="https://github.com/projectacrn/acrn-hypervisor/wiki">Wiki</a>
+          </dd>
+      </dl>
+    </div>
+  </div>
diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
new file mode 100644
index 0000000000..f893294cd2
--- /dev/null
+++ b/doc/_templates/layout.html
@@ -0,0 +1,14 @@
+{% extends "!layout.html" %}
+{% block document %}
+  {% if is_release %}
+    <div class="wy-alert wy-alert-danger">
+      The <a href="/{{ pagename }}.html">latest development version</a>
+      of this page may be more current than this released {{ version }} version.
+    </div>
+  {% endif %}
+  {{ super() }}
+{% endblock %}
+{% block menu %}
+  {% include "aversions.html" %}
+  {{ super() }}
+{% endblock %}
diff --git a/doc/_templates/versions.html b/doc/_templates/versions.html
index 2fd8271b9c..cd602720c2 100644
--- a/doc/_templates/versions.html
+++ b/doc/_templates/versions.html
@@ -1,25 +1 @@
-{# Add rst-badge after rst-versions for small badge style. #}
-  <div class="rst-versions" data-toggle="rst-versions" role="note" aria-label="versions">
-    <span class="rst-current-version" data-toggle="rst-current-version">
-      <span class="fa fa-book"> Project ACRN</span>
-      v: {{ current_version }}
-      <span class="fa fa-caret-down"></span>
-    </span>
-    <div class="rst-other-versions">
-      <dl>
-        <dt>{{ _('Versions') }}</dt>
-        {% for slug, url in versions %}
-          <dd><a href="{{ url }}">{{ slug }}</a></dd>
-        {% endfor %}
-      </dl>
-      <dl>
-        <dt>{{ _('On projectacrn.org') }}</dt>
-          <dd>
-            <a href="https://www.projectacrn.org/">Project Home</a>
-          </dd>
-          <dd>
-            <a href="https://github.com/projectacrn/acrn-hypervisor/wiki">Wiki</a>
-          </dd>
-      </dl>
-    </div>
-  </div>
+{# wipe out the versions.html from the rtd theme #}
diff --git a/doc/static/acrn-custom.css b/doc/static/acrn-custom.css
index f1c100bb14..5c84ac84ac 100644
--- a/doc/static/acrn-custom.css
+++ b/doc/static/acrn-custom.css
@@ -30,13 +30,10 @@
    font-weight: bold;
 }
 
-/* tweak doc version selection
+/* tweak doc version selection */
 .rst-versions {
    position: static;
-   border-top: none;
-   padding: 0px;
 }
-*/
 
 .rst-versions .rst-current-version {
    padding: 5px;