Skip to content

Commit d2263e2

Browse files
skjnldsvclaude
andcommitted
fix: version picker shows wrong version, missing page redirect, unclear stable label
- Use `release` instead of `version` for `current_version` so the picker button reflects the actual built version (e.g. 33) instead of always showing 'latest' - Stringify int version slugs in generateVersionsDocs so that current_version == slug comparisons work correctly - Expose `version_stable` in html_context; templates now render 'stable (33)' so users know which version stable maps to - Append `/{{ pagename }}.html` to version picker hrefs so switching versions lands on the same page, not the manual root Fixes #13821 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> Signed-off-by: skjnldsv <skjnldsv@protonmail.com>
1 parent 8d33890 commit d2263e2

4 files changed

Lines changed: 9 additions & 8 deletions

File tree

admin_manual/_templates/versions.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
<dt>☁️ {{ _('Versions') }}</dt>
1818
{% for slug, url in versions|reverse %}
1919
<dd style="width: 32%">
20-
<a href="{{ url }}"
20+
<a href="{{ url }}/{{ pagename }}.html"
2121
{% if current_version == slug %}
2222
style="color: var(--dark-link-color);"
2323
{% endif %}
2424
>
25-
{{ slug }}
25+
{{ slug if slug != 'stable' else 'stable (' ~ version_stable ~ ')' }}
2626
</a>
2727
</dd>
2828
{% endfor %}

conf.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def generateVersionsDocs(current_docs):
8282
versions_doc = []
8383
for v in range(version_start, version_stable + 1):
8484
url = 'https://docs.nextcloud.com/server/%s/%s' % (str(v), current_docs)
85-
versions_doc.append(tuple((v, url)))
85+
versions_doc.append(tuple((str(v), url)))
8686
versions_doc.append(tuple(('stable', 'https://docs.nextcloud.com/server/%s/%s' % ('stable', current_docs))))
8787
versions_doc.append(tuple(('latest', 'https://docs.nextcloud.com/server/%s/%s' % ('latest', current_docs))))
8888
return versions_doc
@@ -93,7 +93,8 @@ def generateVersionsDocs(current_docs):
9393
github_branch = 'master'
9494

9595
html_context = {
96-
'current_version': version,
96+
'current_version': release,
97+
'version_stable': str(version_stable),
9798
'READTHEDOCS': True,
9899

99100
# force github plugin

developer_manual/_templates/versions.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
<dt>☁️ {{ _('Versions') }}</dt>
1818
{% for slug, url in versions|reverse %}
1919
<dd style="width: 32%">
20-
<a href="{{ url }}"
20+
<a href="{{ url }}/{{ pagename }}.html"
2121
{% if current_version == slug %}
2222
style="color: var(--dark-link-color);"
2323
{% endif %}
2424
>
25-
{{ slug }}
25+
{{ slug if slug != 'stable' else 'stable (' ~ version_stable ~ ')' }}
2626
</a>
2727
</dd>
2828
{% endfor %}

user_manual/_templates/versions.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,12 @@
9292
<dt>☁️ {{ _('Versions') }}</dt>
9393
{% for slug, url in versions|reverse %}
9494
<dd style="width: 32%">
95-
<a href="{{ url }}"
95+
<a href="{{ url }}/{{ pagename }}.html"
9696
{% if current_version == slug %}
9797
style="color: var(--dark-link-color);"
9898
{% endif %}
9999
>
100-
{{ slug }}
100+
{{ slug if slug != 'stable' else 'stable (' ~ version_stable ~ ')' }}
101101
</a>
102102
</dd>
103103
{% endfor %}

0 commit comments

Comments
 (0)