From 17cbece6df47adf267bb71fbd653af4ea5d67d27 Mon Sep 17 00:00:00 2001 From: Alicia Cozine <879121+acozine@users.noreply.github.com> Date: Wed, 19 Jun 2019 15:51:52 -0500 Subject: [PATCH] Backport/2.7/55655 (#58097) * Add dropdown version selection to docsite (#55655) (cherry picked from commit f3720c90e06f0a0f0abc3b5407dc944253ac2e43) --- .../sphinx_rtd_theme/ansible_versions.html | 29 ++++++++++ .../_themes/sphinx_rtd_theme/layout.html | 58 +++++++++---------- .../_themes/sphinx_rtd_theme/versions.html | 1 - docs/docsite/rst/conf.py | 6 ++ 4 files changed, 61 insertions(+), 33 deletions(-) create mode 100644 docs/docsite/_themes/sphinx_rtd_theme/ansible_versions.html diff --git a/docs/docsite/_themes/sphinx_rtd_theme/ansible_versions.html b/docs/docsite/_themes/sphinx_rtd_theme/ansible_versions.html new file mode 100644 index 00000000000..06a0271eda0 --- /dev/null +++ b/docs/docsite/_themes/sphinx_rtd_theme/ansible_versions.html @@ -0,0 +1,29 @@ + +{# Creates dropdown version selection in the top-left navigation. #} +
+ {% if not READTHEDOCS %} +
+ +
+ {% else %} + {{ nav_version }} + {% endif %} +
diff --git a/docs/docsite/_themes/sphinx_rtd_theme/layout.html b/docs/docsite/_themes/sphinx_rtd_theme/layout.html index b9fd4596c85..4b4d7ebd0fe 100644 --- a/docs/docsite/_themes/sphinx_rtd_theme/layout.html +++ b/docs/docsite/_themes/sphinx_rtd_theme/layout.html @@ -17,7 +17,7 @@ - + @@ -113,7 +113,7 @@ - + @@ -131,7 +131,7 @@ - + @@ -145,32 +145,28 @@ {# SIDE NAV, TOGGLES ON MOBILE #} - +
@@ -248,7 +243,6 @@
- {% include "versions.html" %} {% if not embedded %} diff --git a/docs/docsite/_themes/sphinx_rtd_theme/versions.html b/docs/docsite/_themes/sphinx_rtd_theme/versions.html index 52e37b9e898..354cc376b87 100644 --- a/docs/docsite/_themes/sphinx_rtd_theme/versions.html +++ b/docs/docsite/_themes/sphinx_rtd_theme/versions.html @@ -34,4 +34,3 @@ {% endif %} - diff --git a/docs/docsite/rst/conf.py b/docs/docsite/rst/conf.py index de27c6d689d..7ab0a4cd1ec 100644 --- a/docs/docsite/rst/conf.py +++ b/docs/docsite/rst/conf.py @@ -244,3 +244,9 @@ autoclass_content = 'both' intersphinx_mapping = {'python': ('https://docs.python.org/2/', (None, '../python2-2.7.13.inv')), 'python3': ('https://docs.python.org/3/', (None, '../python3-3.6.2.inv')), 'jinja2': ('http://jinja.pocoo.org/docs/', (None, '../jinja2-2.9.7.inv'))} + +# list specifically out of order to make latest work +html_context = { + 'current_version': version, + 'available_versions': ('latest', '2.7', '2.6', 'devel') +}