Add redirects, update downloads

MarlinFirmware · Dec 2, 2024 · e9e3494 · e9e3494
1 parent 3ed8900
commit e9e3494
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 69 deletions.
diff --git a/_config.yml b/_config.yml
@@ -112,6 +112,7 @@ plugins:
   - jekyll-avatar
   - jekyll-bootstrap-sass
   - jekyll-tidy
+  - jekyll-redirect-from
 
 defaults:
   - # All types

diff --git a/_data/marlin.yml b/_data/marlin.yml
@@ -23,6 +23,14 @@ downloads:
     tools: Supports Arduino 1.6.8 and up
     file: 1.0.2-3.zip
 
+betas:
+  -
+    version: 2.1.3-b1
+    description: Marlin 2.1.3 beta 1
+    extra: Major new release currently in public beta testing
+    file: 2.1.3-b1.zip
+    config: release-2.1.3-b1
+
 nightlies:
   -
     version: bugfix-2.1.x
@@ -49,11 +57,11 @@ nightlies:
 patched:
   -
     version: 2.1.x
-    description: Marlin 2.1.2.4 with bug fixes
+    description: Marlin 2.1.2.5 with bug fixes
     extra: Latest 2.1.x with Hotfixes
     tools: Supports AVR and ARM<br/>Arduino and PlatformIO
     file: 2.1.x.zip
-    config: release-2.1.2.4
+    config: release-2.1.2.5
   -
     version: 2.0.x
     description: Marlin 2.0 with bug fixes

diff --git a/_includes/download_table.html b/_includes/download_table.html
@@ -0,0 +1,20 @@
+{% if head_text %}<h2 class="ctr">{{ head_text }}</h2>{% endif %}
+<table>
+  <tr><th>Description</th><th>Version</th><th>Download</th><th>Configurations</th>
+  {% for item in download_items %}
+    <tr>
+      <td>
+        {% if item.extra %}<strong><em>{{ item.extra }}</em></strong><br/>{% endif %}
+        <strong>{{ item.description }}</strong><br/>
+        <em>{{ item.tools }}<em>
+      </td>
+      <td><code><a href="//github.com/MarlinFirmware/Marlin/tree/{{ item.version }}" title="Github Files">{{ item.version }}</a></code></td>
+      <td><a href="//github.com/MarlinFirmware/Marlin/archive/{{ item.file }}">{{ item.file }}</a></td>
+      <td>
+        {% if item.config %}
+          <a href="//github.com/MarlinFirmware/Configurations/tree/{{ item.config }}">View / Download</a>
+        {% endif %}
+      </td>
+    </tr>
+  {% endfor %}
+</table>
diff --git a/_meta/download.html b/_meta/download.html
@@ -5,82 +5,38 @@
 category:    [ default, noedit ]
 
 header: |
-        Previous releases can be downloaded directly from the [Marlin Github page](//github.com/MarlinFirmware/Marlin/releases).
-        <br/>(For more about releases see [this page](/meta/releases).)
+  Previous releases can be downloaded directly from the [Marlin Github page](//github.com/MarlinFirmware/Marlin/releases).
+  <br/>(For more about releases see [this page](/meta/releases).)
 
 footer: |
-        Also find on the project page...
+  Also find on the project page...
 
-        - Detailed [release notes](//github.com/MarlinFirmware/Marlin/releases),
-        - Resources for [reporting issues](//github.com/MarlinFirmware/Marlin/issues), and
-        - The tools needed to [join the project](//guides.github.com/activities/contributing-to-open-source/).
+  - Detailed [release notes](//github.com/MarlinFirmware/Marlin/releases),
+  - Resources for [reporting issues](//github.com/MarlinFirmware/Marlin/issues), and
+  - The tools needed to [join the project](//guides.github.com/activities/contributing-to-open-source/).
 
 ---
 
 <!-- Jumbotron  -->
 <div class="jumbotron custom-no-margin"><div class="container">
   <h1><i class="fa fa-download" aria-hidden="true"></i> Download <strong>Marlin</strong></h1>
   {{ page.header | markdownify }}
-  <table>
-    <tr><th>Description</th><th>Version</th><th>Download</th><th>Configurations</th>
-    {% for release in site.data.marlin.downloads %}
-      <tr>
-        <td>
-          {% if release.extra %}<strong><em>{{ release.extra }}</em></strong><br/>{% endif %}
-          <strong>{{ release.description }}</strong><br/>
-          <em>{{ release.tools }}<em>
-        </td>
-        <td><a href="//github.com/MarlinFirmware/Marlin/tree/{{ release.version }}" title="Github Files"><code>{{ release.version }}</code></a></td>
-        <td><a href="//github.com/MarlinFirmware/Marlin/archive/{{ release.file }}" title="Download {{ release.file }}">{{ release.file }}</a></td>
-        <td>
-          {% if release.config %}
-            <a href="//github.com/MarlinFirmware/Configurations/tree/{{ release.config }}">View / Download</a>
-          {% else %}
-            (included)
-          {% endif %}
-        </td>
-      </tr>
-    {% endfor %}
-  </table>
-  <h2 class="ctr">Marlin "Nightly" Source</h2>
-  <table>
-    <tr><th>Description</th><th>Version</th><th>Download</th><th>Configurations</th>
-    {% for nightly in site.data.marlin.nightlies %}
-      <tr>
-        <td>
-          {% if nightly.extra %}<strong><em>{{ nightly.extra }}</em></strong><br/>{% endif %}
-          <strong>{{ nightly.description }}</strong><br/>
-          <em>{{ nightly.tools }}<em>
-        </td>
-        <td><code><a href="//github.com/MarlinFirmware/Marlin/tree/{{ nightly.version }}" title="Github Files">{{ nightly.version }}</a></code></td>
-        <td><a href="//github.com/MarlinFirmware/Marlin/archive/{{ nightly.file }}">{{ nightly.file }}</a></td>
-        <td>
-          {% if nightly.config %}
-            <a href="//github.com/MarlinFirmware/Configurations/tree/{{ nightly.config }}">View / Download</a>
-          {% endif %}
-        </td>
-      </tr>
-    {% endfor %}
-  </table>
-  <h2 class="ctr">Marlin Patched Source</h2>
-  <table>
-    <tr><th>Description</th><th>Version</th><th>Download</th><th>Configurations</th>
-    {% for patched in site.data.marlin.patched %}
-      <tr>
-        <td>
-          {% if patched.extra %}<strong><em>{{ patched.extra }}</em></strong><br/>{% endif %}
-          <strong>{{ patched.description }}</strong><br/>
-          <em>{{ patched.tools }}<em>
-        </td>
-        <td><code><a href="//github.com/MarlinFirmware/Marlin/tree/{{ patched.version }}" title="Github Files">{{ patched.version }}</a></code></td>
-        <td><a href="//github.com/MarlinFirmware/Marlin/archive/{{ patched.file }}">{{ patched.file }}</a></td>
-        <td>
-          {% if patched.config %}
-            <a href="//github.com/MarlinFirmware/Configurations/tree/{{ patched.config }}">View / Download</a>
-          {% endif %}
-        </td>
-      </tr>
-    {% endfor %}
-  </table>
+
+  {% assign head_text='Beta Release!' %}
+  {% assign download_items=site.data.marlin.betas %}
+  {% include download_table.html %}
+
+  {% assign head_text='Latest Releases' %}
+  {% assign download_items=site.data.marlin.downloads %}
+  {% include download_table.html %}
+
+  {% assign head_text='"Nightly" Source' %}
+  {% assign download_items=site.data.marlin.nightlies %}
+  {% include download_table.html %}
+
+  {% assign head_text='Patched Source' %}
+  {% assign download_items=site.data.marlin.patched %}
+  {% include download_table.html %}
+
   {{ page.footer | markdownify }}
 </div></div>
diff --git a/donate.md b/donate.md
@@ -0,0 +1,3 @@
+---
+redirect_to: "/docs/development/contributing.html#donate"
+---
diff --git a/download.md b/download.md
@@ -0,0 +1,3 @@
+---
+redirect_to: /meta/download/
+---