Skip to content

Commit c3f51e5

Browse files
committed
Reapply "feat: switch to mkdocs-macros (#227)"
This reverts commit f9c29f6.
1 parent f9c29f6 commit c3f51e5

File tree

7 files changed

+52
-75
lines changed

7 files changed

+52
-75
lines changed

base-requirements.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,6 @@ mkdocs-git-committers-plugin-2
33

44
# https://github.com/mkdocs/mkdocs-redirects
55
mkdocs-redirects
6+
7+
# https://mkdocs-macros-plugin.readthedocs.io/en/stable/
8+
mkdocs-macros-plugin

docs/general-faq/atlas-folder-missing.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,4 @@ If you wish to have the folder on your desktop, you should right-click on the fo
1515

1616
You can download the **.zip** archive below, extract it, and place the `AtlasDesktop` folder in `C:\Windows`. The link below updates upon each new Atlas release.
1717

18-
[Download AtlasDesktop -->](https://download-directory.github.io/?url=https%3A%2F%2Fgithub.com%2FAtlas-OS%2FAtlas%2Ftree%2F
19-
--8<-- "vars.md:atlasVer"
20-
%2Fsrc%2Fplaybook%2FExecutables%2FAtlasDesktop)
18+
[Download AtlasDesktop -->](https://download-directory.github.io/?url=https%3A%2F%2Fgithub.com%2FAtlas-OS%2FAtlas%2Ftree%2F{{ atlas.release }}%2Fsrc%2Fplaybook%2FExecutables%2FAtlasDesktop)

docs/getting-started/installation.md

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,39 @@ See the alternatives below.
6161
1. Choose the **ISO file** option, then choose the download location
6262
1. After the ISO has completed downloading, click **Finish**
6363

64-
--8<-- "msdl.md"
64+
<!--
65+
The ISO downloader JavaScript is rewritten from the MSDL website by Gravesoft on GitHub.
66+
Major credit to them and MSDL's various contributors! :)
67+
68+
GNU Affero General Public License v3.0 is the license for the MSDL JavaScript included here on the
69+
Atlas docs, as per the original project: https://github.com/gravesoft/msdl/blob/main/LICENSE
70+
-->
71+
72+
<center class="noJs centerMsdl">
73+
<div class="msdl-button-container">
74+
<button markdown class="msdl-button" style="margin-right: 2px" onclick="getWindows({{ msdl.win11.pid }});">Download Windows 11 {{ msdl.win11.version }}</button>
75+
<button markdown class="msdl-button" style="margin-left: 2px" onclick="getWindows({{ msdl.win10.pid }});">Download Windows 10 {{ msdl.win10.version }}</button>
76+
</div>
77+
78+
<div id="msdl-ms-content"></div>
79+
80+
<div id="msdl-please-wait">
81+
<p>Please wait...</p>
82+
</div>
83+
84+
<div id="msdl-processing-error">
85+
<p>An error has occurred while processing your request. Try refreshing the page or using an alternative method.</p>
86+
<p id="msdl-error-code">Error: Unknown</p>
87+
</div>
88+
89+
<div id="msdl-download">
90+
<p>A download should soon be started, if not, <a id="msdl-download-link" href="about:blank">click here download the ISO</a>.</p>
91+
</div>
92+
93+
<input id="msdl-session-id" type="hidden">
94+
95+
:simple-github: **Credit to the** [Microsoft Software Download Listing](https://github.com/gravesoft/msdl) **project**
96+
</center>
6597
<!-- --8<-- [end:iso1] -->
6698

6799
<!-- --8<-- [start:drivers] -->

docs/install-faq/windows-version-support.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,8 @@ icon: material/list-status
1212
As of the latest version, Atlas only supports:
1313
{ .annotate }
1414

15-
- **Windows 11:**
16-
--8<-- "vars.md:win11"
17-
- **Windows 10:**
18-
--8<-- "vars.md:win10"
15+
- **Windows 11:** {{ msdl.win11.version }}
16+
- **Windows 10:** {{ msdl.win10.version }}
1917

2018
Only the latest [non-beta/non-Insider](https://en.wikipedia.org/wiki/Windows_Insider) versions are supported. Insider isn't for stability and privacy, as it usually has bugs we can't account for, and it requires sending extra diagnostic data to Microsoft.
2119

includes/msdl.md

Lines changed: 0 additions & 47 deletions
This file was deleted.

includes/vars.md

Lines changed: 0 additions & 20 deletions
This file was deleted.

mkdocs.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,17 @@ extra:
181181
# https://squidfunk.github.io/mkdocs-material/setup/setting-up-the-footer/#generator-notice
182182
generator: false
183183

184+
# https://mkdocs-macros-plugin.readthedocs.io/en/stable/pages/#1-variable
185+
atlas:
186+
release: 0.4.0
187+
msdl:
188+
win11:
189+
version: 23H2
190+
pid: 2935
191+
win10:
192+
version: 22H2
193+
pid: 2618
194+
184195
# https://squidfunk.github.io/mkdocs-material/setup/setting-up-site-analytics/#configuration
185196
analytics:
186197
provider: custom
@@ -223,6 +234,8 @@ plugins:
223234
- search:
224235
lang: en
225236
separator: '[\s\-,:!=\[\]()"/]+|(?!\b)(?=[A-Z][a-z])|\.(?!\d)|&[lg]t;'
237+
- macros
238+
226239

227240

228241
#

0 commit comments

Comments
 (0)