Skip to content

Commit 053f5ea

Browse files
authored
Merge branch '6-dev' into bump-plone-6.0.0.2
2 parents ebfd9c0 + d81fe8f commit 053f5ea

File tree

5 files changed

+47
-2
lines changed

5 files changed

+47
-2
lines changed

.github/workflows/test.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,14 @@ jobs:
2020
run: |
2121
python -m pip install --upgrade pip
2222
pip install -q -r requirements.txt
23+
sudo snap install --edge vale
2324
2425
- name: Run tests with make test
2526
run: make test
27+
28+
- name: Run vale
29+
run: |
30+
git clone https://github.com/errata-ai/Microsoft.git
31+
cp -r ./Microsoft/Microsoft ./styles
32+
VALEFILES=$(find -L ./docs/ -type d \( -path "./docs/plone.restapi/lib/*" -o -path "./docs/plone.restapi/performance/*" \) -prune -false -o -type f -name "*.md" -print)
33+
vale --no-exit $VALEFILES

docs/_static/switcher.json

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
[
2+
{
3+
"name": "6 (stable)",
4+
"version": "6.0",
5+
"url": "https://6.docs.plone.org/"
6+
},
7+
{
8+
"version": "5",
9+
"url": "https://5.docs.plone.org/"
10+
},
11+
{
12+
"version": "4",
13+
"url": "https://4.docs.plone.org/"
14+
},
15+
{
16+
"version": "3",
17+
"url": "https://3.docs.plone.org/"
18+
}
19+
]

docs/_templates/page.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@
44
<title>{{ title|striptags|e }}{%- for parent in parents %} – {{ parent.title }}{%- endfor %}{{ titlesuffix }}</title>
55
{%- endblock %}
66

7+
78
{% block footer %}
89
<script type="text/javascript">
910
$(document).ready(function() {
1011
// Hide empty sub menu.
11-
if ($.trim($(".topbar-contents .bd-toc").html()) === "") {
12-
$(".topbar-contents .bd-toc").css("visibility", "hidden");
12+
if ($.trim($(".sticky-top .bd-toc").html()) === "") {
13+
$(".sticky-top .bd-toc").css("visibility", "hidden");
1314
}
1415
});
1516
</script>
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{%- for sidebartemplate in sidebars %}
2+
{%- include sidebartemplate %}
3+
{%- endfor %}
4+
{%- include 'version-switcher.html' -%}

docs/conf.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@
123123
"plone.restapi/news",
124124
"plone.restapi/performance",
125125
"plone.restapi/src",
126+
"volto/developer-guidelines/branch-policy.md",
126127
]
127128

128129
html_js_files = [
@@ -224,13 +225,25 @@
224225
# https://www.sphinx-doc.org/en/master/usage/configuration.html#confval-html_use_opensearch
225226
html_use_opensearch = "https://6.docs.plone.org"
226227

228+
html_sidebars = {
229+
"**": [
230+
"sidebar-logo.html",
231+
"search-field.html",
232+
"sbt-sidebar-nav.html",
233+
]
234+
}
235+
227236
html_theme_options = {
228237
"path_to_docs": "docs",
229238
"repository_url": "https://github.com/plone/documentation",
230239
"repository_branch": "main",
231240
"use_repository_button": True,
232241
"use_issues_button": True,
233242
"use_edit_page_button": True,
243+
"switcher": {
244+
"json_url": "/_static/switcher.json",
245+
"version_match": version,
246+
},
234247
"extra_navbar": """
235248
<p class="ploneorglink">
236249
<a href="https://plone.org">

0 commit comments

Comments
 (0)