Flatten downloads page

This design was intended to help users years ago to decide between
32-bit and 64-bit images for PC/Mac, amongst many other offerings.
Today, the distro is pretty much only an official desktop image.

To simplify the user experience and future maintenance, present
everything on the same page.

Drop the 'post download' page, except preserve the download tip.

Closes #77

Author: lah7

.github/workflows/main.yml

@@ -32,7 +32,7 @@ jobs:
 
     - name: Build Website
       run: |
-        scripts/build.sh --magnet-uri
+        scripts/build.sh
 
     - name: Proofing
       run: |

.gitignore

@@ -3,15 +3,13 @@ _site
 .sass-cache
 .jekyll-cache
 .jekyll-metadata
+
+# Ruby
+.bundle
 vendor/
 
-# Generated at build
+# Locale generation
 *.mo
 pages/i18n/
 _data/**/
-pages/autogen/
 _posts/*.*.md
-
-# Misc
-*.directory
-.bundle

EDITING.md

@@ -62,27 +62,7 @@ See [`_data/navigation.yml`](_data/navigation.yml) for the correct value.
 
 ## Downloads
 
-The data is stored in `_data/downloads.yml`:
-
-* The **`releases`** key lists the versions currently available.
-* The **`arch`** key is a list of architectures. When adding/removing here, make changes in `pages/download.md` too.
-* The **`downloads`** key lists the downloads (releases) for each `arch`.
-
-Architectures may include ports to other devices, such as `gpd_pocket`.
-
-The URL, torrent and magnet URI is required. To obtain the magnet
-link automagically, set the `magnet-uri` key to `autogen` like so:
-
-```
-- release: bionic
-  ~~snip~~
-  magnet-uri: autogen
-```
-
-Then pass `--magnet-uri` to the `build` or `watch` script, which will overwrite
-`autogen` with the actual URI. This requires `transmission-show` to be installed.
-
-    ./scripts/watch.sh --magnet-uri
+The metadata and links for downloads is stored in `_data/downloads.yml`.
 
 
 ## Layouts (`_layouts`)
@@ -228,12 +208,12 @@ youtube:
 
 ### Pre-determined
 
-These are pre-determined for special purposes and shouldn't be used for new pages.
+The following layouts should be ignored when creating new pages. These have
+logic for specific pages.
 
 * `blog-index`
 * `download`
 * `feature-grid`
-* `post-download`
 * `search`
 
 ## Adding Blog Posts
@@ -264,7 +244,7 @@ Usually to present call to actions, commonly used on the blog.
 {% include blog/jumbotron.html
 
     title = "Download Ubuntu MATE today"
-    text = "This new release will be first available for PC/Mac users."
+    text = "This new release is available for PC/Mac users."
     button_text = "Download"
     button_url = "/download/"
 
@@ -282,7 +262,7 @@ inside this `include` on the page:
 
 #### Other Embeds
 
-* `embed/download-tip-paypal.html` - used on post download page.
+* `embed/download-tip-paypal.html` - used on download page.
 * `embed/paypal.html` - used on funding pages.
 
 These are re-used across page layouts and shouldn't be used in Markdown files:

README.md

@@ -35,7 +35,7 @@ This has the advantage to preview your changes.
 
        sudo apt install python3-requests python3-yaml transmission-cli python3-polib translate-toolkit webp
 
-3. Watch for changes locally:
+3. To build and preview changes locally:
 
        ./scripts/watch.sh
 
@@ -45,23 +45,6 @@ This has the advantage to preview your changes.
 4. Preview the website on your computer at <http://localhost:4000>. Any changes you make will be live reloaded and include unpublished drafts.
 
 
-## Building
-
-This website has a few programmatically generated files, such as localized pages
-and automatic magnet link generation for torrents. These can be enabled by passing
-the parameters to either `build.sh` or `watch.sh`. To obtain the magnet
-link automagically, set the `magnet-uri` key to `autogen`.
-
-| Parameter     | What it does                                              |
-| ------------- | --------------------------------------------------------- |
-| --magnet-uri  | Fetch torrent files and generate magnet links.
-| --locales     | Build localized pages.
-
-For example:
-
-    ./scripts/build.sh --locales --magnet-uri
-
-
 ## Testing
 
 Continuous Integration will perform validation checks to ensure the website
@@ -91,21 +74,27 @@ the best practices.
 
 We use the [polyglot](https://github.com/untra/polyglot) gem to provide i18n support.
 
-As part of the build script, the website will generate the markdown files for other
-languages via `scripts/manage-translations.py`. This can be ran manually too:
+To add new locales, add the language code in:
+
+* `_i18n/locales.txt`
+* `_config.yml` (under `languages:`)
+* `_data/lang.yml`
+
+As part of the build process, markdown files for other languages are generated
+via `scripts/manage-translations.py`. This can be ran manually too:
 
 | Parameter             | Action                                            |
 |-----------------------|---------------------------------------------------|
-| `--generate`          | Creates POT and updates PO files from pages.
-| `--build`             | Process translated PO files for use with Jekyll.
+| `--generate`          | Will create POT files and updates PO files from pages.
+| `--build`             | Will process translated PO files into Markdown files.
 
 When pages change, run `--generate`. Before building the site, run `--build`.
 
-Language lists are to be updated in:
 
-* `_i18n/locales.txt`
-* `_config.yml` (under `languages:`)
-* `_data/lang.yml`
+If you're just testing locally and wish to preview at <http://localhost:4000>, all you need to run:
+
+    ./scripts/watch.sh --locales
+
 
 
 ## File Structure

_data/downloads.yml

@@ -1,117 +1,65 @@
-
-# If you're running ./scripts/watch.sh, you'll need to reload after editing this file.
-
-releases:
-    focal:
-        name: "20.04.6 LTS"
-        codename: "Focal Fossa"
-        mascot: "focal.svg"
-        wallpaper: "focal.jpg"
-        lts: true
-        prerelease: false
-        release_notes: "/blog/ubuntu-mate-focal-fossa-release-notes/"
-        end_of_life:
-            month: Apr
-            year: 2023
-
+codenames:
     jammy:
         name: "22.04.5 LTS"
         codename: "Jammy Jellyfish"
         mascot: "jammy.svg"
-        wallpaper: "focal.jpg"
         lts: true
-        prerelease: false
+        old_lts: true
+        beta: false
         release_notes: "/blog/ubuntu-mate-jammy-jellyfish-release-notes/"
         end_of_life:
             month: Apr
             year: 2025
-
-    lunar:
-        name: "23.04"
-        codename: "Lunar Lobster"
-        mascot: "lunar.svg"
-        wallpaper: "focal.jpg"
-        lts: false
-        prerelease: false
-        release_notes: "/blog/ubuntu-mate-lunar-lobster-release-notes/"
-        end_of_life:
-            month: Jan
-            year: 2024
-
-    mantic:
-        name: "23.10"
-        codename: "Mantic Minotaur"
-        mascot: "mantic.svg"
-        wallpaper: "focal.jpg"
-        lts: false
-        prerelease: false
-        release_notes: "/blog/ubuntu-mate-mantic-minotaur-release-notes/"
-        end_of_life:
-            month: Jul
-            year: 2024
+        releases:
+            amd64:
+                url: "https://cdimage.ubuntu.com/ubuntu-mate/releases/22.04/release/ubuntu-mate-22.04.5-desktop-amd64.iso"
+                sha256sum: "b382a3aebffc916cce71369e0c09719dd819b8b6ab308d4396ac31c1ada867c4"
+                size: "3.4 GB"
+                magnet-uri: "magnet:?xt=urn:btih:8fcb95f456700f9938c049ccb2ce60c423e2b6fa&dn=ubuntu-mate-22.04.5-desktop-amd64.iso&tr=https%3A%2F%2Ftorrent.ubuntu.com%2Fannounce"
+            armhf:
+                url: "https://releases.ubuntu-mate.org/jammy/armhf/ubuntu-mate-22.04-desktop-armhf+raspi.img.xz"
+                sha256sum: "7a60d1bf89f89bcfd121788bcfed4514fd4a63da91624c1ed4ab2a62ed78a27a"
+                size: "1.7 GB"
+                magnet-uri: "magnet:?xt=urn:btih:4016c541118c5a39b09b778ec04302e1adc32c18&dn=ubuntu-mate-22.04-desktop-armhf%2Braspi.img.xz&tr=udp%3A%2F%2Ftracker.openbittorrent.com%3A80%2Fannounce&tr=udp%3A%2F%2Ftracker.openbittorrent.com%3A80&tr=udp%3A%2F%2Fopen.demonii.com%3A1337&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&ws=https%3A%2F%2Fman.ubuntu-mate.org%2Fjammy%2Fubuntu-mate-22.04-desktop-armhf%2Braspi.img.xz&ws=https%3A%2F%2Fyor.ubuntu-mate.org%2Fjammy%2Fubuntu-mate-22.04-desktop-armhf%2Braspi.img.xz"
+            arm64:
+                url: "https://releases.ubuntu-mate.org/jammy/arm64/ubuntu-mate-22.04-desktop-arm64+raspi.img.xz"
+                sha256sum: "3b538f8462cdd957acfbab57f5d949faa607c50c3fb8e6e9d1ad13d5cd6c0c02"
+                size: "1.8 GB"
+                magnet-uri: "magnet:?xt=urn:btih:15770f5332945b5b7365460b476e4bc8e6a834ec&dn=ubuntu-mate-22.04-desktop-arm64%2Braspi.img.xz&tr=udp%3A%2F%2Ftracker.openbittorrent.com%3A80%2Fannounce&tr=udp%3A%2F%2Ftracker.openbittorrent.com%3A80&tr=udp%3A%2F%2Fopen.demonii.com%3A1337&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&ws=https%3A%2F%2Fman.ubuntu-mate.org%2Fjammy%2Fubuntu-mate-22.04-desktop-arm64%2Braspi.img.xz&ws=https%3A%2F%2Fyor.ubuntu-mate.org%2Fjammy%2Fubuntu-mate-22.04-desktop-arm64%2Braspi.img.xz"
 
     noble:
         name: "24.04.2 LTS"
         codename: "Noble Numbat"
         mascot: "noble.svg"
-        wallpaper: "focal.jpg"
         lts: true
-        prerelease: false
+        old_lts: false
+        beta: false
         release_notes: "/blog/ubuntu-mate-noble-numbat-release-notes/"
         end_of_life:
             month: Apr
             year: 2027
+        releases:
+            amd64:
+                url: "https://cdimage.ubuntu.com/ubuntu-mate/releases/noble/release/ubuntu-mate-24.04.2-desktop-amd64.iso"
+                sha256sum: "ec1399cf90678c29ee1f80055826b21a3d90f59d50d154e5ea70b1931ce909c9"
+                size: "4.1 GB"
+                magnet-uri: "magnet:?xt=urn:btih:d6663939e41a8ba70ea153a34a17f896e084fd58&dn=ubuntu-mate-24.04.2-desktop-amd64.iso&tr=https%3A%2F%2Ftorrent.ubuntu.com%2Fannounce"
 
     oracular:
         name: "24.10"
         codename: "Oracular Oriole"
         mascot: "oracular.svg"
         wallpaper: "focal.jpg"
         lts: false
-        prerelease: false
+        old_lts: false
+        beta: false
         release_notes: "/blog/ubuntu-mate-oracular-oriole-release-notes/"
         end_of_life:
             month: Jul
             year: 2025
-
-# To list new architectures on the download page, add descriptions to download.md
-arch:
-    - amd64
-    - armhf
-    - arm64
-
-downloads:
-    amd64:
-        - release: jammy
-          url: "https://cdimage.ubuntu.com/ubuntu-mate/releases/22.04/release/ubuntu-mate-22.04.5-desktop-amd64.iso"
-          sha256sum: "b382a3aebffc916cce71369e0c09719dd819b8b6ab308d4396ac31c1ada867c4"
-          size: "3.4 GB"
-          magnet-uri: "magnet:?xt=urn:btih:8fcb95f456700f9938c049ccb2ce60c423e2b6fa&dn=ubuntu-mate-22.04.5-desktop-amd64.iso&tr=https%3A%2F%2Ftorrent.ubuntu.com%2Fannounce"
-
-        - release: noble
-          url: "https://cdimage.ubuntu.com/ubuntu-mate/releases/noble/release/ubuntu-mate-24.04.2-desktop-amd64.iso"
-          sha256sum: "ec1399cf90678c29ee1f80055826b21a3d90f59d50d154e5ea70b1931ce909c9"
-          size: "4.1 GB"
-          magnet-uri: "magnet:?xt=urn:btih:d6663939e41a8ba70ea153a34a17f896e084fd58&dn=ubuntu-mate-24.04.2-desktop-amd64.iso&tr=https%3A%2F%2Ftorrent.ubuntu.com%2Fannounce"
-
-        - release: oracular
-          url: "https://cdimage.ubuntu.com/ubuntu-mate/releases/24.10/release/ubuntu-mate-24.10-desktop-amd64.iso"
-          sha256sum: "6139a5f9bd00bac15a50e013b1f80f39098c5c4290b1f052cf88bc27871b9ae7"
-          size: "3.3 GB"
-          magnet-uri: "magnet:?xt=urn:btih:bae16ce3d55349d55e41778b61c1890e21bf275b&dn=ubuntu-mate-24.10-desktop-amd64.iso&tr=https%3A%2F%2Ftorrent.ubuntu.com%2Fannounce"
-
-    armhf:
-        - release: jammy
-          url: "https://releases.ubuntu-mate.org/jammy/armhf/ubuntu-mate-22.04-desktop-armhf+raspi.img.xz"
-          sha256sum: "7a60d1bf89f89bcfd121788bcfed4514fd4a63da91624c1ed4ab2a62ed78a27a"
-          size: "1.7 GB"
-          magnet-uri: "magnet:?xt=urn:btih:4016c541118c5a39b09b778ec04302e1adc32c18&dn=ubuntu-mate-22.04-desktop-armhf%2Braspi.img.xz&tr=udp%3A%2F%2Ftracker.openbittorrent.com%3A80%2Fannounce&tr=udp%3A%2F%2Ftracker.openbittorrent.com%3A80&tr=udp%3A%2F%2Fopen.demonii.com%3A1337&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&ws=https%3A%2F%2Fman.ubuntu-mate.org%2Fjammy%2Fubuntu-mate-22.04-desktop-armhf%2Braspi.img.xz&ws=https%3A%2F%2Fyor.ubuntu-mate.org%2Fjammy%2Fubuntu-mate-22.04-desktop-armhf%2Braspi.img.xz"
-          bandwidth_costs: true
-
-    arm64:
-        - release: jammy
-          url: "https://releases.ubuntu-mate.org/jammy/arm64/ubuntu-mate-22.04-desktop-arm64+raspi.img.xz"
-          sha256sum: "3b538f8462cdd957acfbab57f5d949faa607c50c3fb8e6e9d1ad13d5cd6c0c02"
-          size: "1.8 GB"
-          magnet-uri: "magnet:?xt=urn:btih:15770f5332945b5b7365460b476e4bc8e6a834ec&dn=ubuntu-mate-22.04-desktop-arm64%2Braspi.img.xz&tr=udp%3A%2F%2Ftracker.openbittorrent.com%3A80%2Fannounce&tr=udp%3A%2F%2Ftracker.openbittorrent.com%3A80&tr=udp%3A%2F%2Fopen.demonii.com%3A1337&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&ws=https%3A%2F%2Fman.ubuntu-mate.org%2Fjammy%2Fubuntu-mate-22.04-desktop-arm64%2Braspi.img.xz&ws=https%3A%2F%2Fyor.ubuntu-mate.org%2Fjammy%2Fubuntu-mate-22.04-desktop-arm64%2Braspi.img.xz"
-          bandwidth_costs: true
+        releases:
+            amd64:
+                url: "https://cdimage.ubuntu.com/ubuntu-mate/releases/24.10/release/ubuntu-mate-24.10-desktop-amd64.iso"
+                sha256sum: "6139a5f9bd00bac15a50e013b1f80f39098c5c4290b1f052cf88bc27871b9ae7"
+                size: "3.3 GB"
+                magnet-uri: "magnet:?xt=urn:btih:bae16ce3d55349d55e41778b61c1890e21bf275b&dn=ubuntu-mate-24.10-desktop-amd64.iso&tr=https%3A%2F%2Ftorrent.ubuntu.com%2Fannounce"

_data/strings.yml

@@ -33,45 +33,24 @@ funding: "Funding"
 #######################################
 # Downloads
 #######################################
-choose_arch: "Choose an architecture"
-choose_version: "Choose a release"
-choose_download: "Choose a download"
-post_download_page_title: "Thank you for downloading [20.04] ([amd64])"
-post_download_title: "Thank you for downloading:"
-post_download_release: "[Focal] for [amd64] systems"
+label_lts: "Latest LTS Release"
+about_lts: "Recommended for stability and mission critical systems."
+
+label_old_lts: "Previous LTS Release"
+about_old_lts: "Our previous long term release, still supported."
+
+label_interim: "Interim Release"
+about_interim: "A short-term release featuring the latest features and applications."
+
+label_beta:  "Beta Testing"
+about_beta: "This release is not production-ready. It's recommended for testers to help with Ubuntu MATE Quality Assurance, or to provide feedback and file bug reports."
+
 release_notes: "Release Notes"
-download_started: "Your download has started"
-download_started_help: "Not working? Try clicking the link:"
-post_download_go_back: "Choose a different download"
-browse_downloads: "Browse Downloads"
-show_req: "System Requirements"
-download_ports: "Or.... choose a hardware port:"
-download_help: "What should I download?"
-label_LTS: "Recommended for stability and mission critical systems."
-label_nonLTS: "Interim release for users desiring the latest features and applications."
-label_prerelease:  "Development release for testing and debugging."
-prerelease: "(Pre-release)"
-file_name: "File Name"
-file_size: "File Size"
 checksum: "Checksum"
-recommended: "Recommended"
-prefer_torrent: "**Spare the bytes!** A torrent is recommended to reduce bandwidth costs. It could deliver faster download speeds too!"
-label_bittorrent: "Receive the file distributed and verified by multiple computers."
-label_magnet: "Open my BitTorrent client."
-label_direct: "Via your web browser."
 end_of_life: "Supported until"
-filename: "Filename"
-arch: "Architecture"
-server: "Hosted by"
-download_links: "Download"
-direct: "Direct Download"
-bittorrent: "BitTorrent"
-magnet: "Magnet Link"
-support_bandwidth: "Support bandwidth costs"
-prerelease_warning_title: "Bugs might bite!"
-prerelease_warning_text: "This release is not production-ready. It's recommended for testers to help with Ubuntu MATE QA, or to provide feedback and file bug reports."
-prerelease_warning_button: "Learn how to get involved →"
-
+direct: "Direct"
+bittorrent: "Torrent"
+browse_downloads: "Browse archive and previous device ports"
 
 #######################################
 # Months
@@ -239,7 +218,7 @@ no_translation_url: "Does not support translations"
 # FAQs
 #######################################
 faq: "Project FAQs"
-# download_help: <see above>
+download_help: "What should I download?"
 the_project: "The Project"
 verify_downloads_quick: "Verify for Corruption"
 verify_downloads_secure: "Verify for Tampering"
@@ -301,7 +280,6 @@ quote_youtube_title: "What the YouTubers are showcasing..."
 #######################################
 device_ports: "Device Ports"
 raspberry_pi: "Raspberry Pi"
-learn_more_rpi: "Learn more about our Raspberry Pi release"
 
 
 #######################################