Skip to content

Commit f9c29f6

Browse files
he3alshe3als
committed
Revert "feat: switch to mkdocs-macros (#227)"
This reverts commit 970dc06.
1 parent 1f7d563 commit f9c29f6

File tree

7 files changed

+75
-52
lines changed

7 files changed

+75
-52
lines changed

‎base-requirements.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,3 @@ 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: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,6 @@ 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{{ atlas.release }}%2Fsrc%2Fplaybook%2FExecutables%2FAtlasDesktop)
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)

‎docs/getting-started/installation.md

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -61,39 +61,7 @@ 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-
<!--
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>
64+
--8<-- "msdl.md"
9765
<!-- --8<-- [end:iso1] -->
9866

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

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

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

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

1820
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.
1921

‎includes/msdl.md

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<!--
2+
The ISO downloader JavaScript is rewritten from the MSDL website by Gravesoft on GitHub.
3+
Major credit to them and MSDL's various contributors! :)
4+
5+
GNU Affero General Public License v3.0 is the license for the MSDL JavaScript included here on the
6+
Atlas docs, as per the original project: https://github.com/gravesoft/msdl/blob/main/LICENSE
7+
-->
8+
9+
<center class="noJs centerMsdl">
10+
<div class="msdl-button-container">
11+
<button markdown class="msdl-button" style="margin-right: 2px" onclick="
12+
getWindows(
13+
--8<-- "vars.md:win11productId"
14+
);
15+
">
16+
Download Windows 11
17+
--8<-- "vars.md:win11"
18+
</button>
19+
<button class="msdl-button" style="margin-left: 2px" onclick="
20+
getWindows(
21+
--8<-- "vars.md:win10productId"
22+
);
23+
">
24+
Download Windows 10
25+
--8<-- "vars.md:win10"
26+
</button>
27+
</div>
28+
29+
<div id="msdl-ms-content"></div>
30+
31+
<div id="msdl-please-wait">
32+
<p>Please wait...</p>
33+
</div>
34+
35+
<div id="msdl-processing-error">
36+
<p>An error has occurred while processing your request. Try refreshing the page or using an alternative method.</p>
37+
<p id="msdl-error-code">Error: Unknown</p>
38+
</div>
39+
40+
<div id="msdl-download">
41+
<p>A download should soon be started, if not, <a id="msdl-download-link" href="about:blank">click here download the ISO</a>.</p>
42+
</div>
43+
44+
<input id="msdl-session-id" type="hidden">
45+
46+
:simple-github: **Credit to the** [Microsoft Software Download Listing](https://github.com/gravesoft/msdl) **project**
47+
</center>

‎includes/vars.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# ATLAS
2+
<!-- --8<-- [start:atlasVer] -->
3+
0.4.0
4+
<!-- --8<-- [end:atlasVer] -->
5+
6+
7+
# MSDL
8+
<!-- --8<-- [start:win11] -->
9+
23H2
10+
<!-- --8<-- [end:win11] -->
11+
<!-- --8<-- [start:win11productId] -->
12+
2935
13+
<!-- --8<-- [end:win11productId] -->
14+
15+
<!-- --8<-- [start:win10] -->
16+
22H2
17+
<!-- --8<-- [end:win10] -->
18+
<!-- --8<-- [start:win10productId] -->
19+
2618
20+
<!-- --8<-- [end:win10productId] -->

‎mkdocs.yml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -181,17 +181,6 @@ 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-
195184
# https://squidfunk.github.io/mkdocs-material/setup/setting-up-site-analytics/#configuration
196185
analytics:
197186
provider: custom
@@ -234,8 +223,6 @@ plugins:
234223
- search:
235224
lang: en
236225
separator: '[\s\-,:!=\[\]()"/]+|(?!\b)(?=[A-Z][a-z])|\.(?!\d)|&[lg]t;'
237-
- macros
238-
239226

240227

241228
#

0 commit comments

Comments
 (0)