Skip to content

Commit 970dc06

Browse files
Ast3risk-opshe3als
andauthored
feat: switch to mkdocs-macros (#227)
Co-authored-by: he3als <65787561+he3als@users.noreply.github.com>
1 parent c527e29 commit 970dc06

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
@@ -55,7 +55,39 @@ See the alternatives below.
5555
1. Choose the **ISO file** option, then choose the download location
5656
1. After the ISO has completed downloading, click **Finish**
5757

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

6193
<!-- --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
@@ -182,6 +182,17 @@ extra:
182182
# https://squidfunk.github.io/mkdocs-material/setup/setting-up-the-footer/#generator-notice
183183
generator: false
184184

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

228241

229242
#

0 commit comments

Comments
 (0)