fix other versions sidebar links

Make the first one link to the current docs and the others
link with the appropriate prefix.

Filtered out previous versions that include "rc".

The number of versions is kept at 5 (current + 4 recent).

Closes-Bug: #1589731
Change-Id: I3a2e219913fc2c89634bcc2a757ccb4d3510883a
This commit is contained in:
John Dickinson 2016-06-01 09:57:57 -07:00 committed by Joel Wright
parent d901a7bd61
commit 3fc15a50f6
2 changed files with 10 additions and 5 deletions

View File

@ -56,8 +56,12 @@ def _html_page_context(app, pagename, templatename, context, doctree):
# grab last five that start with a number and reverse the order
if six.PY3:
raw_version_list = raw_version_list.decode("utf8")
other_versions = [t for t in raw_version_list.split('\n')
if t and t[0] in string.digits][:-6:-1]
_tags = [t.strip("'") for t in raw_version_list.split('\n')]
other_versions = [
t for t in _tags if t and t[0] in string.digits
# Don't show alpha, beta or release candidate tags
and 'rc' not in t and 'a' not in t and 'b' not in t
][:-5:-1]
context['other_versions'] = other_versions
return None

View File

@ -34,9 +34,10 @@
{%- if other_versions %}
<h3>{{ _('Other Versions') }}</h3>
<ul class="this-page-menu">
{%- for ver in other_versions: %}
<li><a href="/{{ver}}" rel="nofollow">{{ ver }}</a></li>
{%- endfor %}
<li><a href="{{ pathto(master_doc) }}" rel="nofollow">Current</a></li>
{%- for ver in other_versions: %}
<li><a href="{{ pathto(ver, 1) }}" rel="nofollow">{{ ver }}</a></li>
{%- endfor %}
</ul>
{%- endif %}
{%- endblock %}