From ccdcf26f1205e09220ad1a71167c8f6f45db85ae Mon Sep 17 00:00:00 2001 From: skjnldsv Date: Tue, 19 May 2026 11:48:45 +0200 Subject: [PATCH 1/3] fix: version picker shows wrong version and 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 Fixes #13821 Co-Authored-By: Claude Sonnet 4.6 Signed-off-by: skjnldsv --- admin_manual/_templates/versions.html | 2 +- conf.py | 5 +++-- developer_manual/_templates/versions.html | 2 +- user_manual/_templates/versions.html | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/admin_manual/_templates/versions.html b/admin_manual/_templates/versions.html index 6c037362d64..ab3fffaacdb 100644 --- a/admin_manual/_templates/versions.html +++ b/admin_manual/_templates/versions.html @@ -22,7 +22,7 @@ style="color: var(--dark-link-color);" {% endif %} > - {{ slug }} + {{ slug if slug != 'stable' else 'stable (' ~ version_stable ~ ')' }} {% endfor %} diff --git a/conf.py b/conf.py index 7b05a687c30..e84025bf8c5 100644 --- a/conf.py +++ b/conf.py @@ -82,7 +82,7 @@ def generateVersionsDocs(current_docs): versions_doc = [] for v in range(version_start, version_stable + 1): url = 'https://docs.nextcloud.com/server/%s/%s' % (str(v), current_docs) - versions_doc.append(tuple((v, url))) + versions_doc.append(tuple((str(v), url))) versions_doc.append(tuple(('stable', 'https://docs.nextcloud.com/server/%s/%s' % ('stable', current_docs)))) versions_doc.append(tuple(('latest', 'https://docs.nextcloud.com/server/%s/%s' % ('latest', current_docs)))) return versions_doc @@ -93,7 +93,8 @@ def generateVersionsDocs(current_docs): github_branch = 'master' html_context = { - 'current_version': version, + 'current_version': release, + 'version_stable': str(version_stable), 'READTHEDOCS': True, # force github plugin diff --git a/developer_manual/_templates/versions.html b/developer_manual/_templates/versions.html index ea5cd040551..c5b0830cfb0 100644 --- a/developer_manual/_templates/versions.html +++ b/developer_manual/_templates/versions.html @@ -22,7 +22,7 @@ style="color: var(--dark-link-color);" {% endif %} > - {{ slug }} + {{ slug if slug != 'stable' else 'stable (' ~ version_stable ~ ')' }} {% endfor %} diff --git a/user_manual/_templates/versions.html b/user_manual/_templates/versions.html index d5ab32f072c..34fba152d92 100644 --- a/user_manual/_templates/versions.html +++ b/user_manual/_templates/versions.html @@ -97,7 +97,7 @@ style="color: var(--dark-link-color);" {% endif %} > - {{ slug }} + {{ slug if slug != 'stable' else 'stable (' ~ version_stable ~ ')' }} {% endfor %} From 5e69b4c4accd00fa1cdd0c7694a76c7100fe4527 Mon Sep 17 00:00:00 2001 From: skjnldsv Date: Tue, 19 May 2026 12:37:02 +0200 Subject: [PATCH 2/3] fix: remove duplicate stable version from version picker MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit version_stable was included in the numeric range AND appended as 'stable', causing e.g. '33' and 'stable (33)' to both appear. Exclude version_stable from the numeric loop — it is already shown via the explicit stable entry. Signed-off-by: skjnldsv --- conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.py b/conf.py index e84025bf8c5..12dbc0be6d4 100644 --- a/conf.py +++ b/conf.py @@ -80,7 +80,7 @@ def setup(app): def generateVersionsDocs(current_docs): versions_doc = [] - for v in range(version_start, version_stable + 1): + for v in range(version_start, version_stable): url = 'https://docs.nextcloud.com/server/%s/%s' % (str(v), current_docs) versions_doc.append(tuple((str(v), url))) versions_doc.append(tuple(('stable', 'https://docs.nextcloud.com/server/%s/%s' % ('stable', current_docs)))) From 949d78bf08d72549ec34cc31d0728683735fa3c1 Mon Sep 17 00:00:00 2001 From: skjnldsv Date: Tue, 19 May 2026 14:08:58 +0200 Subject: [PATCH 3/3] fix(versions): show version numbers for latest and stable in brackets Use brackets instead of parentheses and italic for version numbers. latest shows stable+1, stable shows stable version number. Co-Authored-By: Claude Sonnet 4.6 Signed-off-by: skjnldsv --- admin_manual/_templates/versions.html | 4 ++-- developer_manual/_templates/versions.html | 4 ++-- user_manual/_templates/versions.html | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/admin_manual/_templates/versions.html b/admin_manual/_templates/versions.html index ab3fffaacdb..d5efa3f05e4 100644 --- a/admin_manual/_templates/versions.html +++ b/admin_manual/_templates/versions.html @@ -9,7 +9,7 @@ data-toggle="rst-current-version" aria-expanded="false" aria-controls="rst-other-versions-admin"> - ☁️ {{ current_version }} + ☁️ {% if current_version == 'stable' %}{{ version_stable }} (stable){% elif current_version == 'latest' %}{{ version_stable|int + 1 }} (latest){% else %}{{ current_version }}{% endif %}
@@ -22,7 +22,7 @@ style="color: var(--dark-link-color);" {% endif %} > - {{ slug if slug != 'stable' else 'stable (' ~ version_stable ~ ')' }} + {% if slug == 'stable' %}{{ version_stable }} (stable){% elif slug == 'latest' %}{{ version_stable|int + 1 }} (latest){% else %}{{ slug }}{% endif %} {% endfor %} diff --git a/developer_manual/_templates/versions.html b/developer_manual/_templates/versions.html index c5b0830cfb0..277005def4e 100644 --- a/developer_manual/_templates/versions.html +++ b/developer_manual/_templates/versions.html @@ -9,7 +9,7 @@ data-toggle="rst-current-version" aria-expanded="false" aria-controls="rst-other-versions-dev"> - ☁️ {{ current_version }} + ☁️ {% if current_version == 'stable' %}{{ version_stable }} (stable){% elif current_version == 'latest' %}{{ version_stable|int + 1 }} (latest){% else %}{{ current_version }}{% endif %}
@@ -22,7 +22,7 @@ style="color: var(--dark-link-color);" {% endif %} > - {{ slug if slug != 'stable' else 'stable (' ~ version_stable ~ ')' }} + {% if slug == 'stable' %}{{ version_stable }} (stable){% elif slug == 'latest' %}{{ version_stable|int + 1 }} (latest){% else %}{{ slug }}{% endif %} {% endfor %} diff --git a/user_manual/_templates/versions.html b/user_manual/_templates/versions.html index 34fba152d92..97ec246987a 100644 --- a/user_manual/_templates/versions.html +++ b/user_manual/_templates/versions.html @@ -68,7 +68,7 @@ aria-controls="rst-other-versions-user"> 🌐 {{ language_names.get(language, language) }} - ☁️ {{ current_version }} + ☁️ {% if current_version == 'stable' %}{{ version_stable }} (stable){% elif current_version == 'latest' %}{{ version_stable|int + 1 }} (latest){% else %}{{ current_version }}{% endif %}
@@ -97,7 +97,7 @@ style="color: var(--dark-link-color);" {% endif %} > - {{ slug if slug != 'stable' else 'stable (' ~ version_stable ~ ')' }} + {% if slug == 'stable' %}{{ version_stable }} (stable){% elif slug == 'latest' %}{{ version_stable|int + 1 }} (latest){% else %}{{ slug }}{% endif %} {% endfor %}