X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/5c1c5e34118a3867fca9e7f0150074ea18623939..3d65beeef57b2dd7a60171c8dce05785ef1ae383:/doc/_includes/_navbar_top.liquid

diff --git a/doc/_includes/_navbar_top.liquid b/doc/_includes/_navbar_top.liquid
index e227703a5c..68bf01b4ed 100644
--- a/doc/_includes/_navbar_top.liquid
+++ b/doc/_includes/_navbar_top.liquid
@@ -28,7 +28,7 @@ SPDX-License-Identifier: CC-BY-SA-3.0
           {% 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/>
+              &nbsp;<a href="/{{ version }}{{ page.url }}" class="dropdown-item">{{ version }}</a><br/>
             {% endfor %}
             </div>
           {% endif %}
@@ -36,7 +36,7 @@ SPDX-License-Identifier: CC-BY-SA-3.0
         <li><a href="https://arvados.org" style="padding-left: 2em">arvados.org&nbsp;&raquo;</a></li>
       </ul>
 
-      <div class="pull-right" style="padding-top: 6px">
+      <div class="pull-right" style="padding-top: 6px; padding-right: 25px">
         <form method="get" action="https://www.google.com/search">
           <div class="input-group" style="width: 220px">
             <input type="text" class="form-control" name="q" placeholder="search">
@@ -48,5 +48,34 @@ SPDX-License-Identifier: CC-BY-SA-3.0
         </form>
       </div>
     </div>
+
+{% comment %}
+The div with id "old-version-warning" is automatically enabled by the Apache
+config under certain conditions, as described at
+https://dev.arvados.org/projects/ops/wiki/Docarvadosorg.  Changing the class
+should be safe, but please double check the matching and substitution that is
+done in the Apache config to be sure before you modify this div.
+{% endcomment %}
+   <div class="alert alert-block alert-info" style="display: none;" id="old-version-warning">
+     WARNING - you are viewing the documentation for an old version of Arvados. For the latest version, click <a href="/">here</a>.
+   </div>
+   <div class="alert alert-block alert-info" style="display: none;" id="annotate-notify">
+     <div style="margin-top: -26px; font-size: 12pt">Hey!  You can use the annotation sidebar from <a href="https://hypothes.is">hypothes.is</a> to make public comments and private notes
+       <span style="font-size: 32pt">&rarr;</span></div>
+      <button type="button" class="close" onclick="dismissAnnotateNotify()">Got it</button>
+   </div>
+
+   <script>
+     function dismissAnnotateNotify() {
+	 window.localStorage.setItem("dismiss-annotate-notify", "true");
+         $('#annotate-notify').attr('style', "display: none;");
+     }
+     if (window.localStorage.getItem("dismiss-annotate-notify") === "true") {
+	 dismissAnnotateNotify();
+     } else {
+         $('#annotate-notify').attr('style', "display: inline-block;");
+     }
+   </script>
+
   </div>
 </div>