Skip to content

Commit 91f0442

Browse files
committed
Merge branch 'release/v5.2.0'
# Conflicts: # _ext/redirects.py # _templates/layout.html # _templates/navigation.html # conf.py
2 parents fbd3677 + 90aa599 commit 91f0442

File tree

748 files changed

+11061
-3034
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

748 files changed

+11061
-3034
lines changed

_ext/redirects.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def build_redirect_pages(app, exception):
8686
out_dir = os.path.join(out_dir, os.path.dirname(from_path)[1:])
8787
build_redirect_page(
8888
os.path.join(out_dir, os.path.basename(from_path)),
89-
"%s/en/%s%s"
89+
"%s/en/%s/%s"
9090
% (
9191
app.config.html_baseurl,
9292
("latest" if is_latest else "stable"),

_static/css/extra.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -585,6 +585,8 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
585585
font-weight: bold;
586586
}
587587

588+
/* Banners */
589+
588590
/* TOP Banner */
589591
.top-banner {
590592
text-shadow: 0 1px 1px rgba(0, 0, 0, .12);
20.5 KB
Loading
31.6 KB
Loading
13.1 KB
Loading

_static/js/bootstrap.min.js

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

_templates/layout.html

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,15 @@
33
{% block extrahead %}
44
{{ super() }}
55
<link rel="stylesheet" href="{{ pathto('_static/css/extra.css', 1) }}" type="text/css" />
6-
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
7-
<!-- <script src="http://dl.platformio.org/misc/abplus.js"></script> -->
6+
<script src="{{ pathto('_static/js/bootstrap.min.js', 1) }}"></script>
87
{% endblock %}
98

10-
{% block footer %}
11-
{% include "pio-versions.html" %}
9+
{% block menu %}
1210
{{ super() }}
13-
{% include "navigation.html" %}
14-
{% endblock %}
11+
<ins data-rvad-zoneid="7" data-rvad-id="f837d8c96893e793fdbb230cffb628fc"></ins>
12+
{% endblock %}
13+
14+
{% block content %}
15+
<ins data-rvad-zoneid="1" data-rvad-id="f837d8c96893e793fdbb230cffb628fc"></ins>
16+
{{ super() }}
17+
{% endblock %}

_templates/navbar.html

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
<script>
2+
var navBarHTML = '\
3+
<div>\
4+
<div class="container container-fluid">\
5+
<div class="navbar-header">\
6+
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navBarCollapse" aria-expanded="false">\
7+
<span class="sr-only">Toggle navigation</span>\
8+
<span class="icon-bar"></span>\
9+
<span class="icon-bar"></span>\
10+
<span class="icon-bar"></span>\
11+
</button>\
12+
<a class="navbar-brand" href="https://platformio.org" title="PlatformIO"></a>\
13+
</div>\
14+
<nav role="navigation" class="collapse navbar-collapse" id="navBarCollapse">\
15+
<div>\
16+
<ul class="nav navbar-nav">\
17+
<li class="dropdown">\
18+
<a role="button" data-target="#" href="https://platformio.org/platformio-ide" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-rocket fa-lg"></i>Get Started<span class="caret"></span>\
19+
</a>\
20+
<ul class="dropdown-menu" role="menu">\
21+
<li role="menuitem"><a href="https://docs.platformio.org/page/what-is-platformio.html"><i class="fa fa-heart"></i>What is PlatformIO?</a></li>\
22+
<li role="separator" class="divider"></li>\
23+
<li role="menuitem"><a href="https://platformio.org/platformio-ide"><i class="fa fa-cube"></i>PlatformIO IDE</a></li>\
24+
<li role="menuitem"><a href="https://platformio.org/install/cli"><i class="fa fa-cogs"></i>PlatformIO Core (CLI)</a></li>\
25+
<li role="separator" class="divider"></li>\
26+
<li role="menuitem"><a href="https://docs.platformio.org/page/librarymanager/index.html"><i class="fa fa-code"></i>Library Management</a></li>\
27+
<li role="separator" class="divider"></li>\
28+
<li role="menuitem"><a href="https://docs.platformio.org/page/tutorials/index.html" target="_blank"><i class="fa fa-graduation-cap"></i>Tutorials</a></li>\
29+
<li role="menuitem"><a href="https://github.com/platformio/platformio-examples" target="_blank"><i class="fa fa-graduation-cap"></i>Project Examples</a></li>\
30+
</ul>\
31+
</li>\
32+
<li class="dropdown">\
33+
<a role="button" data-target="#" href="https://docs.platformio.org/page/plus/pio-remote.html" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-lightbulb-o fa-lg"></i>\
34+
Solutions<span class="caret"></span>\
35+
</a>\
36+
<ul class="dropdown-menu" role="menu">\
37+
<li role="menuitem"><a href="https://platformio.org/platformio-ide"><i class="fa fa-cube"></i>PlatformIO IDE</a></li>\
38+
<li role="menuitem"><a href="https://platformio.org/install/cli"><i class="fa fa-cogs"></i>PlatformIO Core (CLI)</a></li>\
39+
<li role="separator" class="divider"></li>\
40+
<li role="menuitem"><a href="https://docs.platformio.org/page/plus/debugging.html"><i class="fa fa-bug"></i>Debugging</a></li>\
41+
<li role="menuitem"><a href="https://docs.platformio.org/page/plus/unit-testing.html"><i class="fa fa-puzzle-piece"></i>Unit Testing</a></li>\
42+
<li role="menuitem"><a href="https://docs.platformio.org/page/plus/pio-check.html"><i class="fa fa-check-circle-o"></i>Static Code Analysis</a></li>\
43+
<li role="menuitem"><a href="https://docs.platformio.org/page/plus/pio-remote.html"><i class="fa fa-globe"></i>Remote Development</a></li>\
44+
<li role="separator" class="divider"></li>\
45+
<li role="menuitem"><a href="https://docs.platformio.org/page/librarymanager/index.html"><i class="fa fa-code"></i>Library Management</a></li>\
46+
<li role="separator" class="divider"></li>\
47+
<li role="menuitem"><a href="https://platformio.org/install/integration"><i class="fa fa-cube"></i>Desktop IDEs Integration</a></li>\
48+
<li role="menuitem"><a href="https://platformio.org/install/integration"><i class="fa fa-cloud"></i>Cloud IDEs Integration</a></li>\
49+
<li role="menuitem"><a href="https://docs.platformio.org/page/ci/index.html"><i class="fa fa-refresh"></i>Continuous Integration</a></li>\
50+
</ul>\
51+
</li>\
52+
<li class="dropdown">\
53+
<a role="button" data-target="#" href="https://platformio.org/lib" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-code fa-lg"></i>Registry<span class="caret"></span>\
54+
</a>\
55+
<ul class="dropdown-menu" role="menu">\
56+
<li role="menuitem"><a href="https://platformio.org/lib"><i class="fa fa-code"></i>Libraries</a></li>\
57+
<li role="separator" class="divider"></li>\
58+
<li role="menuitem"><a href="https://platformio.org/platforms"><i class="fa fa-laptop"></i>Platforms</a></li>\
59+
<li role="menuitem"><a href="https://platformio.org/frameworks"><i class="fa fa-cog"></i>Frameworks</a></li>\
60+
<li role="menuitem"><a href="https://platformio.org/boards"><i class="fa fa-microchip"></i>Boards</a></li>\
61+
</ul>\
62+
</li>\
63+
</ul>\
64+
<ul class="nav navbar-nav navbar-right">\
65+
<li class="active"><a href="https://docs.platformio.org"><i class="fa fa-book fa-lg"></i>Docs</a></li>\
66+
<li><a href="https://community.platformio.org/"><i class="fa fa-comments-o fa-lg"></i>Community</a></li>\
67+
<li><a href="https://platformio.org/support"><i class="fa fa-question-circle fa-lg"></i>Support</a></li>\
68+
<li class="nav-pio-tech"><a href="https://piolabs.com/"><i class="fa fa-heart-o fa-lg"></i>TECHNOLOGY</a></li>\
69+
</ul>\
70+
</div>\
71+
</nav>\
72+
</div>\
73+
</div>';
74+
75+
(function() {
76+
if (window.location.href.indexOf('http://') === 0) {
77+
location.href = 'https:' + window.location.href.substring(5);
78+
}
79+
80+
var topBanner = $('.top-banner');
81+
var navBar = document.createElement('header');
82+
navBar.className = 'navbar navbar-inverse';
83+
navBar.innerHTML = navBarHTML;
84+
if (topBanner.length) {
85+
$(navBar).insertAfter(topBanner)
86+
} else {
87+
document.body.insertBefore(navBar, document.body.firstChild);
88+
}
89+
90+
if ($(window).width() <= 768) {
91+
return;
92+
}
93+
94+
var topOffset = 50;
95+
if (topBanner.length) {
96+
topOffset += $('.navbar').offset().top;
97+
}
98+
$('.wy-nav-side').css('top', topOffset + 'px');
99+
$(window).scroll(function() {
100+
$('.wy-nav-side').css('top', $(window).scrollTop() > topOffset ? 0 : topOffset + 'px');
101+
});
102+
})();
103+
</script>

_templates/navigation.html

Lines changed: 12 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -1,103 +1,12 @@
1-
<script>
2-
var navBarHTML = '\
3-
<div>\
4-
<div class="container container-fluid">\
5-
<div class="navbar-header">\
6-
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navBarCollapse" aria-expanded="false">\
7-
<span class="sr-only">Toggle navigation</span>\
8-
<span class="icon-bar"></span>\
9-
<span class="icon-bar"></span>\
10-
<span class="icon-bar"></span>\
11-
</button>\
12-
<a class="navbar-brand" href="https://platformio.org" title="PlatformIO"></a>\
13-
</div>\
14-
<nav role="navigation" class="collapse navbar-collapse" id="navBarCollapse">\
15-
<div>\
16-
<ul class="nav navbar-nav">\
17-
<li class="dropdown">\
18-
<a role="button" data-target="#" href="https://platformio.org/platformio-ide" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-rocket fa-lg"></i>Get Started<span class="caret"></span>\
19-
</a>\
20-
<ul class="dropdown-menu" role="menu">\
21-
<li role="menuitem"><a href="https://docs.platformio.org/page/what-is-platformio.html"><i class="fa fa-heart"></i>What is PlatformIO?</a></li>\
22-
<li role="separator" class="divider"></li>\
23-
<li role="menuitem"><a href="https://platformio.org/platformio-ide"><i class="fa fa-cube"></i>PlatformIO IDE</a></li>\
24-
<li role="menuitem"><a href="https://platformio.org/install/cli"><i class="fa fa-cogs"></i>PlatformIO Core (CLI)</a></li>\
25-
<li role="separator" class="divider"></li>\
26-
<li role="menuitem"><a href="https://docs.platformio.org/page/librarymanager/index.html"><i class="fa fa-code"></i>Library Management</a></li>\
27-
<li role="separator" class="divider"></li>\
28-
<li role="menuitem"><a href="https://docs.platformio.org/page/tutorials/index.html" target="_blank"><i class="fa fa-graduation-cap"></i>Tutorials</a></li>\
29-
<li role="menuitem"><a href="https://github.com/platformio/platformio-examples" target="_blank"><i class="fa fa-graduation-cap"></i>Project Examples</a></li>\
30-
</ul>\
31-
</li>\
32-
<li class="dropdown">\
33-
<a role="button" data-target="#" href="https://docs.platformio.org/page/plus/pio-remote.html" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-lightbulb-o fa-lg"></i>\
34-
Solutions<span class="caret"></span>\
35-
</a>\
36-
<ul class="dropdown-menu" role="menu">\
37-
<li role="menuitem"><a href="https://platformio.org/platformio-ide"><i class="fa fa-cube"></i>PlatformIO IDE</a></li>\
38-
<li role="menuitem"><a href="https://platformio.org/install/cli"><i class="fa fa-cogs"></i>PlatformIO Core (CLI)</a></li>\
39-
<li role="separator" class="divider"></li>\
40-
<li role="menuitem"><a href="https://docs.platformio.org/page/plus/debugging.html"><i class="fa fa-bug"></i>Debugging</a></li>\
41-
<li role="menuitem"><a href="https://docs.platformio.org/page/plus/unit-testing.html"><i class="fa fa-puzzle-piece"></i>Unit Testing</a></li>\
42-
<li role="menuitem"><a href="https://docs.platformio.org/page/plus/pio-check.html"><i class="fa fa-check-circle-o"></i>Static Code Analysis</a></li>\
43-
<li role="menuitem"><a href="https://docs.platformio.org/page/plus/pio-remote.html"><i class="fa fa-globe"></i>Remote Development</a></li>\
44-
<li role="separator" class="divider"></li>\
45-
<li role="menuitem"><a href="https://docs.platformio.org/page/librarymanager/index.html"><i class="fa fa-code"></i>Library Management</a></li>\
46-
<li role="separator" class="divider"></li>\
47-
<li role="menuitem"><a href="https://platformio.org/install/integration"><i class="fa fa-cube"></i>Desktop IDEs Integration</a></li>\
48-
<li role="menuitem"><a href="https://platformio.org/install/integration"><i class="fa fa-cloud"></i>Cloud IDEs Integration</a></li>\
49-
<li role="menuitem"><a href="https://docs.platformio.org/page/ci/index.html"><i class="fa fa-refresh"></i>Continuous Integration</a></li>\
50-
</ul>\
51-
</li>\
52-
<li class="dropdown">\
53-
<a role="button" data-target="#" href="https://platformio.org/lib" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-code fa-lg"></i>Registry<span class="caret"></span>\
54-
</a>\
55-
<ul class="dropdown-menu" role="menu">\
56-
<li role="menuitem"><a href="https://platformio.org/lib"><i class="fa fa-code"></i>Libraries</a></li>\
57-
<li role="separator" class="divider"></li>\
58-
<li role="menuitem"><a href="https://platformio.org/platforms"><i class="fa fa-laptop"></i>Platforms</a></li>\
59-
<li role="menuitem"><a href="https://platformio.org/frameworks"><i class="fa fa-cog"></i>Frameworks</a></li>\
60-
<li role="menuitem"><a href="https://platformio.org/boards"><i class="fa fa-microchip"></i>Boards</a></li>\
61-
</ul>\
62-
</li>\
63-
</ul>\
64-
<ul class="nav navbar-nav navbar-right">\
65-
<li class="active"><a href="https://docs.platformio.org"><i class="fa fa-book fa-lg"></i>Docs</a></li>\
66-
<li><a href="https://community.platformio.org/"><i class="fa fa-comments-o fa-lg"></i>Community</a></li>\
67-
<li><a href="https://platformio.org/support"><i class="fa fa-question-circle fa-lg"></i>Support</a></li>\
68-
<li class="nav-pio-tech"><a href="https://piolabs.com/"><i class="fa fa-heart-o fa-lg"></i>TECHNOLOGY</a></li>\
69-
</ul>\
70-
</div>\
71-
</nav>\
72-
</div>\
73-
</div>';
74-
75-
(function() {
76-
if (window.location.href.indexOf('http://') === 0) {
77-
location.href = 'https:' + window.location.href.substring(5);
78-
}
79-
80-
var topBanner = $('.top-banner');
81-
var navBar = document.createElement('header');
82-
navBar.className = 'navbar navbar-inverse';
83-
navBar.innerHTML = navBarHTML;
84-
if (topBanner.length) {
85-
$(navBar).insertAfter(topBanner)
86-
} else {
87-
document.body.insertBefore(navBar, document.body.firstChild);
88-
}
89-
90-
if ($(window).width() <= 768) {
91-
return;
92-
}
93-
94-
var topOffset = 50;
95-
if (topBanner.length) {
96-
topOffset += $('.navbar').offset().top;
97-
}
98-
$('.wy-nav-side').css('top', topOffset + 'px');
99-
$(window).scroll(function() {
100-
$('.wy-nav-side').css('top', $(window).scrollTop() > topOffset ? 0 : topOffset + 'px');
101-
});
102-
})();
103-
</script>
1+
{% extends "!footer.html" %}
2+
3+
{% block contentinfo %}
4+
{{ super() }}
5+
<ins data-rvad-zoneid="8" data-rvad-id="f837d8c96893e793fdbb230cffb628fc"></ins>
6+
{% endblock %}
7+
8+
{% block extrafooter %}
9+
{{ super() }}
10+
{% include "navbar.html" %}
11+
<script async src="https://ad.platformio.org/delivery/revasyncjs.dll"></script>
12+
{% endblock %}

_templates/versions.html

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{# Keep in sync with https://github.com/readthedocs/sphinx_rtd_theme/blob/master/sphinx_rtd_theme/versions.html #}
2+
{# Add rst-badge after rst-versions for small badge style. #}
3+
<div class="rst-versions" data-toggle="rst-versions" role="note" aria-label="{{ _('Versions') }}">
4+
<span class="rst-current-version" data-toggle="rst-current-version">
5+
<span class="fa fa-book"> Documentation</span>
6+
v{{ release }} ({{ "latest" if is_latest else "stable" }})
7+
<span class="fa fa-caret-down"></span>
8+
</span>
9+
<div class="rst-other-versions">
10+
<dl>
11+
<dt>{{ _('Versions') }}</dt>
12+
{% for slug, url in versions %}
13+
<dd><a href="{{ url }}">{{ slug }}</a></dd>
14+
{% endfor %}
15+
</dl>
16+
<dl>
17+
<dt>{{ _('On Github') }}</dt>
18+
<dd><a href="https://{{ github_host|default("github.com") }}/{{ github_user }}/{{ github_repo }}/blob/{{ github_version }}{{ conf_py_path }}{{ pagename }}{{ page_source_suffix }}"> {{ _('View') }}</a></dd>
19+
<dd><a href="https://{{ github_host|default("github.com") }}/{{ github_user }}/{{ github_repo }}/edit/{{ github_version }}{{ conf_py_path }}{{ pagename }}{{ page_source_suffix }}"> {{ _('Edit') }}</a></dd>
20+
</dl>
21+
<dl>
22+
<dt>{{ _('Search') }}</dt>
23+
<dd>{% include "searchbox.html" %}</dd>
24+
</dl>
25+
</div>
26+
</div>

0 commit comments

Comments
 (0)