From 048fb6cc94b40096ae75ff5542c40004baf3f006 Mon Sep 17 00:00:00 2001 From: Peter Mahnke Date: Tue, 20 Apr 2021 19:09:10 +0100 Subject: [PATCH 01/14] Update releases.yaml and mascot for 21.04 --- releases.yaml | 22 +++++++++---------- templates/download/index.html | 33 ++++++++++++++-------------- templates/download/server/step2.html | 28 +++++++++++------------ 3 files changed, 41 insertions(+), 42 deletions(-) diff --git a/releases.yaml b/releases.yaml index e4bb440e1bb..4ed44904865 100644 --- a/releases.yaml +++ b/releases.yaml @@ -1,10 +1,10 @@ latest: - slug: GroovyGorilla - name: "Groovy Gorilla" - short_version: "20.10" - full_version: "20.10" - release_date: "October 2020" - eol: "July 2021" + slug: HirsuteHippo + name: "Hirsute Hippo" + short_version: "21.04" + full_version: "21.04" + release_date: "April 2021" + eol: "January 2022" past_eol_date: false lts: slug: FocalFossa @@ -29,16 +29,16 @@ previous_previous_lts: checksums: desktop: - "20.10": "3ef833828009fb69d5c584f3701d6946f89fa304757b7947e792f9491caa270e *ubuntu-20.10-desktop-amd64.iso" + "21.04": "3ef833828009fb69d5c584f3701d6946f89fa304757b7947e792f9491caa270e *ubuntu-20.10-desktop-amd64.iso" "20.04.2.0": "93bdab204067321ff131f560879db46bee3b994bf24836bb78538640f689e58f *ubuntu-20.04.2.0-desktop-amd64.iso" live-server: - "20.10": "defdc1ad3af7b661fe2b4ee861fb6fdb5f52039389ef56da6efc05e6adfe3d45 *ubuntu-20.10-live-server-amd64.iso" + "21.04": "defdc1ad3af7b661fe2b4ee861fb6fdb5f52039389ef56da6efc05e6adfe3d45 *ubuntu-20.10-live-server-amd64.iso" "20.04.2": "d1f2bf834bbe9bb43faf16f9be992a6f3935e65be0edece1dee2aa6eb1767423 *ubuntu-20.04.2-live-server-amd64.iso" desktop-arm64+raspi: - "20.10": "2fa19fb53fe0144549ff722d9cd755d9c12fb508bb890926bfe7940c0b3555e8 *ubuntu-20.10-preinstalled-desktop-arm64+raspi.img.xz" + "21.04": "2fa19fb53fe0144549ff722d9cd755d9c12fb508bb890926bfe7940c0b3555e8 *ubuntu-20.10-preinstalled-desktop-arm64+raspi.img.xz" server-arm64+raspi: - "20.10": "73a98e83fbb6398f86902c7a83c826536f1afbd0be2d80cb0d7faa94ede33137 *ubuntu-20.10-preinstalled-server-arm64+raspi.img.xz" + "21.04": "73a98e83fbb6398f86902c7a83c826536f1afbd0be2d80cb0d7faa94ede33137 *ubuntu-20.10-preinstalled-server-arm64+raspi.img.xz" "20.04.2": "31884b07837099a5e819527af66848a9f4f92c1333e3ef0693d6d77af66d6832 *ubuntu-20.04.2-preinstalled-server-arm64+raspi.img.xz" server-armhf+raspi: - "20.10": "941752f93313ba765069b48f38af18bbf961bebefcc9c4296a953cf1260f0fe1 *ubuntu-20.10-preinstalled-server-armhf+raspi.img.xz" + "21.04": "941752f93313ba765069b48f38af18bbf961bebefcc9c4296a953cf1260f0fe1 *ubuntu-20.10-preinstalled-server-armhf+raspi.img.xz" "20.04.2": "7b348d080648b8e36e1f29671afd973a0878503091b935b69828f2c7722dfb58 *ubuntu-20.04.2-preinstalled-server-armhf+raspi.img.xz" diff --git a/templates/download/index.html b/templates/download/index.html index 2e41feffe7e..fb24ca8754f 100755 --- a/templates/download/index.html +++ b/templates/download/index.html @@ -35,12 +35,11 @@

- {{ - image( - url="https://assets.ubuntu.com/v1/817b07bd-GG-FF-download-mascots.svg", + {{ image ( + url="https://assets.ubuntu.com/v1/cae223aa-HH-FF-download-mascots.svg", alt="", - height="600", - width="1382", + width="504", + height="143", hi_def=True, loading="auto" ) | safe @@ -64,12 +63,12 @@

{{ image( - url="https://assets.ubuntu.com/v1/ea34f006-Multipass+logomark_rgb.svg", - alt="Ubuntu", - width="40", - height="40", - hi_def=True, - loading="auto", + url="https://assets.ubuntu.com/v1/ea34f006-Multipass+logomark_rgb.svg", + alt="Ubuntu", + width="40", + height="40", + hi_def=True, + loading="auto", ) | safe }}

@@ -82,12 +81,12 @@

{{ image( - url="https://assets.ubuntu.com/v1/08563efa-picto-windows.svg", - alt="Windows", - width="40", - height="40", - hi_def=True, - loading="auto", + url="https://assets.ubuntu.com/v1/08563efa-picto-windows.svg", + alt="Windows", + width="40", + height="40", + hi_def=True, + loading="auto", ) | safe }} diff --git a/templates/download/server/step2.html b/templates/download/server/step2.html index 4fd5dc7d503..78961c53b9c 100755 --- a/templates/download/server/step2.html +++ b/templates/download/server/step2.html @@ -26,12 +26,12 @@

{{ image( - url="https://assets.ubuntu.com/v1/28e0ebb7-Focal-Fossa-gradient-outline.svg", - alt="", - height="1500", - width="1922", - hi_def=True, - loading="lazy" + url="https://assets.ubuntu.com/v1/28e0ebb7-Focal-Fossa-gradient-outline.svg", + alt="", + height="1500", + width="1922", + hi_def=True, + loading="lazy" ) | safe }}
@@ -109,14 +109,14 @@

- {{ - image( - url="https://assets.ubuntu.com/v1/fe951eda-20.10_Groovy+Gorilla_RPi_Sketch.svg", - alt="", - height="237", - width="153", - hi_def=True, - loading="lazy" + + {{ image ( + url="https://assets.ubuntu.com/v1/2e66eda7-Hirsuit_Hippo_Colour.svg", + alt="", + width="300", + height="128", + hi_def=True, + loading="lazy" ) | safe }}
From 6eb73ca928e781756b3eae58aef1805bec516723 Mon Sep 17 00:00:00 2001 From: Peter Mahnke Date: Tue, 20 Apr 2021 19:47:18 +0100 Subject: [PATCH 02/14] Update 21.04 webinar and remove 20.10 webinar --- releases.yaml | 2 ++ templates/download/desktop/index.html | 4 ++-- templates/download/index.html | 8 -------- templates/download/server/step2.html | 14 +++++++++----- 4 files changed, 13 insertions(+), 15 deletions(-) diff --git a/releases.yaml b/releases.yaml index 4ed44904865..0ad5ef97652 100644 --- a/releases.yaml +++ b/releases.yaml @@ -6,6 +6,7 @@ latest: release_date: "April 2021" eol: "January 2022" past_eol_date: false + release_notes_url: "https://discourse.ubuntu.com/t/hirsute-hippo-release-notes/19221" lts: slug: FocalFossa name: "Focal Fossa" @@ -14,6 +15,7 @@ lts: full_version_desktop: "20.04.2.0" release_date: "April 2020" eol: "April 2025" + release_notes_url: "https://wiki.ubuntu.com/FocalFossa/ReleaseNotes" openstack_lts: slug: Ussuri previous_lts: diff --git a/templates/download/desktop/index.html b/templates/download/desktop/index.html index 5b0707b78bb..49c63cc7ee4 100755 --- a/templates/download/desktop/index.html +++ b/templates/download/desktop/index.html @@ -17,7 +17,7 @@

Ubuntu {{ releases.lts.full_version_desktop }} LTS

Download the latest LTS version of Ubuntu, for desktop PCs and laptops. LTS stands for long-term support — which means five years, until {{ releases.lts.eol }}, of free security and maintenance updates, guaranteed.

-

Ubuntu {{ releases.lts.short_version }} LTS release notes

+

Ubuntu {{ releases.lts.short_version }} LTS release notes

Recommended system requirements:

  • 2 GHz dual core processor or better
    • @@ -50,7 +50,7 @@

    Ubuntu {{ releases.latest.full_version }}

    The latest version of the Ubuntu operating system for desktop PCs and laptops, Ubuntu {{ releases.latest.full_version }} comes with nine months, until {{ releases.latest.eol }}, of security and maintenance updates.

    Recommended system requirements are the same as for Ubuntu {{ releases.lts.full_version }} LTS.

    -

    Ubuntu {{ releases.latest.short_version }} release notes

    +

    Ubuntu {{ releases.latest.short_version }} release notes

    diff --git a/templates/download/index.html b/templates/download/index.html index fb24ca8754f..06be9a715d8 100755 --- a/templates/download/index.html +++ b/templates/download/index.html @@ -46,14 +46,6 @@

    }}

-
-
-
- Find out what's new in Ubuntu 20.10 in our webinar -

Find out what's new in Ubuntu 20.10 in our webinar

-
-
-
diff --git a/templates/download/server/step2.html b/templates/download/server/step2.html index 78961c53b9c..adbf56f0aa7 100755 --- a/templates/download/server/step2.html +++ b/templates/download/server/step2.html @@ -39,7 +39,7 @@

-
@@ -95,15 +100,14 @@

-

- - Watch the webinar - "What's new in Ubuntu 20.10?" + + Watch the webinar - "What's new in Ubuntu Server 21.04?" ›

- + Download Ubuntu Server {{ releases.latest.short_version }} release notes

From 64112384105694b22b1936131dd03ed438875a1f Mon Sep 17 00:00:00 2001 From: Peter Mahnke Date: Tue, 20 Apr 2021 20:39:08 +0100 Subject: [PATCH 03/14] Make checksums XXXX --- releases.yaml | 10 +++++----- templates/download/server/step2.html | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/releases.yaml b/releases.yaml index 0ad5ef97652..1b52afe7a93 100644 --- a/releases.yaml +++ b/releases.yaml @@ -31,16 +31,16 @@ previous_previous_lts: checksums: desktop: - "21.04": "3ef833828009fb69d5c584f3701d6946f89fa304757b7947e792f9491caa270e *ubuntu-20.10-desktop-amd64.iso" + "21.04": "XXXXX *ubuntu-21.04-desktop-amd64.iso" "20.04.2.0": "93bdab204067321ff131f560879db46bee3b994bf24836bb78538640f689e58f *ubuntu-20.04.2.0-desktop-amd64.iso" live-server: - "21.04": "defdc1ad3af7b661fe2b4ee861fb6fdb5f52039389ef56da6efc05e6adfe3d45 *ubuntu-20.10-live-server-amd64.iso" + "21.04": "XXXXX *ubuntu-21.04-live-server-amd64.iso" "20.04.2": "d1f2bf834bbe9bb43faf16f9be992a6f3935e65be0edece1dee2aa6eb1767423 *ubuntu-20.04.2-live-server-amd64.iso" desktop-arm64+raspi: - "21.04": "2fa19fb53fe0144549ff722d9cd755d9c12fb508bb890926bfe7940c0b3555e8 *ubuntu-20.10-preinstalled-desktop-arm64+raspi.img.xz" + "21.04": "XXXXX *ubuntu-21.04-preinstalled-desktop-arm64+raspi.img.xz" server-arm64+raspi: - "21.04": "73a98e83fbb6398f86902c7a83c826536f1afbd0be2d80cb0d7faa94ede33137 *ubuntu-20.10-preinstalled-server-arm64+raspi.img.xz" + "21.04": "XXXXX *ubuntu-21.04-preinstalled-server-arm64+raspi.img.xz" "20.04.2": "31884b07837099a5e819527af66848a9f4f92c1333e3ef0693d6d77af66d6832 *ubuntu-20.04.2-preinstalled-server-arm64+raspi.img.xz" server-armhf+raspi: - "21.04": "941752f93313ba765069b48f38af18bbf961bebefcc9c4296a953cf1260f0fe1 *ubuntu-20.10-preinstalled-server-armhf+raspi.img.xz" + "21.04": "XXXXX *ubuntu-21.04-preinstalled-server-armhf+raspi.img.xz" "20.04.2": "7b348d080648b8e36e1f29671afd973a0878503091b935b69828f2c7722dfb58 *ubuntu-20.04.2-preinstalled-server-armhf+raspi.img.xz" diff --git a/templates/download/server/step2.html b/templates/download/server/step2.html index adbf56f0aa7..6c7867472c1 100755 --- a/templates/download/server/step2.html +++ b/templates/download/server/step2.html @@ -107,8 +107,8 @@

- - Download Ubuntu Server {{ releases.latest.short_version }} release notes + + Download Ubuntu Server {{ releases.latest.short_version }} release notes ›

From 89044f53d1a09ce9e3a7fac8ffbf83955ff242c0 Mon Sep 17 00:00:00 2001 From: Peter Mahnke Date: Tue, 20 Apr 2021 20:30:43 +0100 Subject: [PATCH 04/14] Update /server for 21.04 --- templates/server/index.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/templates/server/index.html b/templates/server/index.html index e309a7408d6..cd1c33cf91b 100755 --- a/templates/server/index.html +++ b/templates/server/index.html @@ -19,8 +19,8 @@

Scale out with Ubuntu Server

- - Watch the webinar - "Ubuntu 20.04 LTS: What's new in server?" + + Watch the webinar - "What's new in Ubuntu Server 21.04?" ›

@@ -46,16 +46,16 @@

  • Supported by Canonical until {{ releases.latest.eol }}
    • +
  • Ability to convert Debian Installer (DI) preseed scripts into Ubuntu Server Live Installer artifacts
    • +
  • APT phased updates for regressions monitoring and immediate elimination
    • +
  • Stability updates to the high availability (HA) stack, including pacemaker and corosync
    • +
  • The latest stable Linux 5.11 kernel for the latest hardware and security updates
  • Runs on all major architectures - x86-64, ARM v7, ARM64, POWER8, POWER9, IBM s390x (LinuxONE) and RISC-V
    • -
  • Nftables-based backend for ufw for improved performance and easier administration
    • -
  • Support for OVS schema modelling in Netplan for an advanced networking stack configuration
    • -
  • Native configuration for WireGuard VPN in Netplan
    • -
  • The latest long-term Linux 5.8 kernel for the latest hardware and security updates
    • -
  • Updates to QEMU (5.0), libvirt (6.6), PHP (7.4.9), Apache2 (2.4.46), GCC (1.189), Python (3.8.6), Bind9 (9.16.6)
    • +
  • Updates to QEMU (5.2), libvirt (7.0), PHP (7.4.9), Apache2 (2.4.46), nginx (1.18), GCC (1.189), Python (3.9.2), Bind9 (9.16.8)

+ href="https://discourse.ubuntu.com/t/hirsute-hippo-release-notes/19221"> Read more in the release notes

From cb70e52b2346b79adb87ecaa30acd254d4c0745c Mon Sep 17 00:00:00 2001 From: Peter Mahnke Date: Tue, 20 Apr 2021 20:40:03 +0100 Subject: [PATCH 05/14] Make release notes a local link --- templates/server/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/server/index.html b/templates/server/index.html index cd1c33cf91b..9d4b36e5561 100755 --- a/templates/server/index.html +++ b/templates/server/index.html @@ -54,9 +54,9 @@

  • Updates to QEMU (5.2), libvirt (7.0), PHP (7.4.9), Apache2 (2.4.46), nginx (1.18), GCC (1.189), Python (3.9.2), Bind9 (9.16.8)

    • - - Read more in the release notes + Read more in the release notes ›

    From 7fd1118e137ca6a892aeb31ed209a8bfe46f2949 Mon Sep 17 00:00:00 2001 From: Peter Mahnke Date: Tue, 20 Apr 2021 21:13:31 +0100 Subject: [PATCH 06/14] Added release notes variables --- templates/desktop/developers.html | 12 ++++++++++-- templates/server/index.html | 8 ++++---- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/templates/desktop/developers.html b/templates/desktop/developers.html index ee97ae8cbac..98f410b1486 100755 --- a/templates/desktop/developers.html +++ b/templates/desktop/developers.html @@ -85,7 +85,11 @@

    What's new in Ubuntu {{ releases.latest.short_version }}?

  • Improved settings for battery percentage and microphone mute status
  • New photographic and Raspberry Pi themed wallpapers
    • -

    Read the full release notes

    +

    + + Read the full release notes › + +

    @@ -108,7 +112,11 @@

    What's new in Ubuntu {{ releases.lts.short_version }} LTS?

  • LibreOffice 6.4
  • nVIDIA hardware is now supported out of the box
    • -

    Read the full release notes

    +

    + + Read the full release notes + +

    diff --git a/templates/server/index.html b/templates/server/index.html index 9d4b36e5561..ce66136bdb6 100755 --- a/templates/server/index.html +++ b/templates/server/index.html @@ -55,8 +55,8 @@

    - Read more in the release notes › + href="{{ releases.latest.release_notes_url }}"> + Read more in the release notes ›

    @@ -83,8 +83,8 @@

    - Read more in the release notes + href="{{ releases.lts.release_notes_url }}"> + Read more in the release notes ›

    From 59f1d2f2cf8bb5b4ae544a7a329582be16824581 Mon Sep 17 00:00:00 2001 From: Peter Mahnke Date: Wed, 21 Apr 2021 14:09:37 +0100 Subject: [PATCH 07/14] Updated /desktop/developer with what's new in 20.04 --- templates/desktop/developers.html | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/templates/desktop/developers.html b/templates/desktop/developers.html index ee97ae8cbac..76a3c3c2b73 100755 --- a/templates/desktop/developers.html +++ b/templates/desktop/developers.html @@ -76,16 +76,18 @@

    What's new in Ubuntu {{ releases.latest.short_version }}?

      -
    • Support for the Raspberry Pi 4 with 4GB and 8GB RAM
      • -
    • Linux 5.8 kernel
      • -
    • GNOME Desktop 3.38 with all the latest features
      • -
    • Uniquely generated QR codes for sharing private WiFi hotspots
      • -
    • LibreOffice 7.0
      • -
    • Thunderbird email client integrated calendar and user friendly PGP encryption
      • -
    • Improved settings for battery percentage and microphone mute status
      • -
    • New photographic and Raspberry Pi themed wallpapers
      • +
    • Redesigned Yaru dark theme is the default
      • +
    • New MIME type icons in the Yaru theme
      • +
    • Wayland is the default display server
      • +
    • Installer is now using Flutter
      • +
    • Active directory integration is included in the installer
      • +
    • New power mode option for laptops
      • +
    • Recovery key option for encrypted installs
      • +
    • Private home directory
      • +
    • Linux 5.11 kernel
      • +
    • LibreOffice 7.1.2, Python 3.9, Firefox 87, GNOME Desktop 3.38.5
    -

    Read the full release notes

    +

    Read the full release notes

    From a4b4e5192fee796a4758fd2b9a664c132501284f Mon Sep 17 00:00:00 2001 From: Peter Mahnke Date: Wed, 21 Apr 2021 19:44:53 +0100 Subject: [PATCH 08/14] Adding Holly and Ken updates --- templates/desktop/developers.html | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/templates/desktop/developers.html b/templates/desktop/developers.html index 76a3c3c2b73..1181cce8f7f 100755 --- a/templates/desktop/developers.html +++ b/templates/desktop/developers.html @@ -76,15 +76,14 @@

    What's new in Ubuntu {{ releases.latest.short_version }}?

      -
    • Redesigned Yaru dark theme is the default
      • +
    • Linux 5.11 kernel
      • +
    • Redesigned Yaru dark GNOME shell theme is the default
    • New MIME type icons in the Yaru theme
      • -
    • Wayland is the default display server
      • -
    • Installer is now using Flutter
      • +
    • Wayland is the default display server with improved security and performance
    • Active directory integration is included in the installer
      • -
    • New power mode option for laptops
      • +
    • Improved UI with new power profile modes
    • Recovery key option for encrypted installs
    • Private home directory
      • -
    • Linux 5.11 kernel
    • LibreOffice 7.1.2, Python 3.9, Firefox 87, GNOME Desktop 3.38.5

    Read the full release notes

    From 4a34407617e064bc518908a5c687c61314a258d7 Mon Sep 17 00:00:00 2001 From: Peter Mahnke Date: Thu, 22 Apr 2021 08:27:46 +0100 Subject: [PATCH 09/14] Update /download/raspberry-pi layout --- templates/download/raspberry-pi/index.html | 292 +++++++++++++-------- 1 file changed, 180 insertions(+), 112 deletions(-) diff --git a/templates/download/raspberry-pi/index.html b/templates/download/raspberry-pi/index.html index d7f33d2eedb..cb665aca915 100644 --- a/templates/download/raspberry-pi/index.html +++ b/templates/download/raspberry-pi/index.html @@ -12,9 +12,15 @@
    -

    Install Ubuntu
    on a Raspberry Pi

    -

    Running Ubuntu on your Raspberry Pi is easy. Just pick the OS image you want, flash it onto a microSD card, load it onto your Pi and away you go.

    -

    First time installing Ubuntu on Raspberry Pi?

    +

    + Install Ubuntu
    on a Raspberry Pi +

    +

    + Running Ubuntu on your Raspberry Pi is easy. Just pick the OS image you want, flash it onto a microSD card, load it onto your Pi and away you go. +

    +

    + First time installing Ubuntu on Raspberry Pi? +

    Follow our desktop or server tutorials.

    @@ -33,10 +39,83 @@

    Install Ubuntu
    on a Raspberry Pi

    -
    -
    -
    -
    + +{# server lts #} +
    +
    +
    +

    + Download Ubuntu Server +

    +

    + Recommended server +

    +
    +
    +
    +
    +

    + Ubuntu Server {{ releases.lts.full_version }} LTS +

    +

    + The version of Ubuntu with five years of long term support, until {{ releases.lts.eol }}. +

    +

    + + Download 64-bit + + + Download 32-bit + +

    +
    + + {# server latest #} + {% if releases.latest.short_version > releases.lts.short_version %} +
    +

    + Ubuntu Server {{ releases.latest.full_version }} +

    +

    + The latest development release of Ubuntu with nine months of support, until {{ releases.latest.eol }}. +

    +

    + + Download 64-bit + + + Download 32-bit + +

    +
    + {% endif %} +
    + +
    +
    +

    Works on:

    +
      +
    • Raspberry Pi 2 - 32-bit only
      • +
    • Raspberry Pi 3
      • +
    • Raspberry Pi 4
      • +
    • Raspberry Pi 400
      • +
    • Raspberry Pi CM4
      • +
    +
    +
    + +
    +

    + Works on: +

    +
    +
    +
    +

    + Raspberry Pi 2 +

    +
    +
    {{ image( url="https://assets.ubuntu.com/v1/8542c958-Raspberry+Pi+2.png", @@ -48,9 +127,18 @@

    Install Ubuntu
    on a Raspberry Pi

    ) | safe }}
    +

    + + * 32-bit only + +

    -
    +

    + Raspberry Pi 3 +

    +
    +
    {{ image( url="https://assets.ubuntu.com/v1/c4a007b6-Raspberry+Pi+3.png", @@ -64,7 +152,11 @@

    Install Ubuntu
    on a Raspberry Pi

    -
    +

    + Raspberry Pi 4 +

    +
    +
    {{ image( url="https://assets.ubuntu.com/v1/a999bb5f-Raspberry+Pi+4.png", @@ -78,143 +170,119 @@

    Install Ubuntu
    on a Raspberry Pi

    -
    - {{ - image( - url="https://assets.ubuntu.com/v1/9df28d88-RPI_400_rotated.png", +

    + Raspberry Pi 400 +

    +
    +
    + {{ image ( + url="https://assets.ubuntu.com/v1/cfdcd6c7-Raspberry-Pi-400-back--1536x1097.png", alt="", - height="92", - width="127", + width="1478", + height="760", hi_def=True, - loading="auto" + loading="lazy" ) | safe }}
    -
    +

    + Raspberry Pi CM4 +

    +
    +
    {{ image ( - url="https://assets.ubuntu.com/v1/22136bb8-pi-cm4-removebg-preview.png", + url="https://assets.ubuntu.com/v1/3be8f179-Raspberry-Pi-CM4.png", alt="", - width="344", - height="222", + width="932", + height="660", hi_def=True, - loading="auto|lazy" + loading="lazy" ) | safe }}
    -
    -
    -

    Raspberry Pi 2

    -
    -
    -

    Raspberry Pi 3

    -
    -
    -

    Raspberry Pi 4

    -
    -
    -

    Raspberry Pi 400

    -
    -
    -

    Raspberry Pi CM4

    -
    -
    -{# server lts row #} -
    -
    -

    Ubuntu Server {{ releases.lts.full_version }} LTS

    -

    Recommended server

    + +{# desktop latest #} +
    +
    +

    + Download Ubuntu Desktop +

    -
    -
    -

    The version of Ubuntu with long term support, until {{ releases.lts.eol }}.

    -

    Works on:

    -
      -
    • Raspberry Pi 2 - 32-bit only
      • -
    • Raspberry Pi 3
      • -
    • Raspberry Pi 4
      • -
    • Raspberry Pi 400
      • -
    • Raspberry Pi CM4
      • -
    -
    -
    +
    +
    +

    + Ubuntu Desktop {{ releases.latest.full_version }} +

    - Download 64-bit + The latest development release of Ubuntu with nine months of support, until {{ releases.latest.eol }}.

    - Download 32-bit -

    -
    -
    - - {# server latest row #} - - {% if releases.latest.short_version > releases.lts.short_version %} -
    -
    -
    -
    -
    - -
    -

    Ubuntu Server {{ releases.latest.full_version }}

    -
    -
    -
    -

    The latest development release of Ubuntu with nine months of support, until {{ releases.latest.eol }}.

    + + Download 64-bit + +

    +

    Works on:

      -
    • Raspberry Pi 2 - 32-bit only
      • -
    • Raspberry Pi 3
      • -
    • Raspberry Pi 4
    • Raspberry Pi 400
    • Raspberry Pi CM4
    -
    -

    - Download 64-bit -

    -

    - Download 32-bit -

    -
    - {% endif %} -
    - +
    -{# desktop latest #} -
    -
    -

    Ubuntu Desktop {{ releases.latest.full_version }}

    +
    +

    + Works on: +

    +
    +
    +
    +

    + Raspberry Pi 400 +

    +
    +
    + {{ image ( + url="https://assets.ubuntu.com/v1/cfdcd6c7-Raspberry-Pi-400-back--1536x1097.png", + alt="", + width="1478", + height="760", + hi_def=True, + loading="lazy" + ) | safe + }} +
    -
    -
    -

    The latest development release of Ubuntu with nine months of support, until {{ releases.latest.eol }}.

    -

    Works on:

    -
      -
    • Raspberry Pi 4
      • -
    • Raspberry Pi 400
      • -
    +
    +

    + Raspberry Pi CM4 +

    +
    +
    + {{ image ( + url="https://assets.ubuntu.com/v1/3be8f179-Raspberry-Pi-CM4.png", + alt="", + width="932", + height="660", + hi_def=True, + loading="lazy" + ) | safe + }}
    -
    -

    - - Download 64-bit - -

    +
    From d7c48cd3ce78c5b09b19b253fa645facbe8e0940 Mon Sep 17 00:00:00 2001 From: Peter Mahnke Date: Thu, 22 Apr 2021 08:51:33 +0100 Subject: [PATCH 10/14] Updated checksums for 21.04 --- releases.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/releases.yaml b/releases.yaml index 1b52afe7a93..ea3accc71e3 100644 --- a/releases.yaml +++ b/releases.yaml @@ -31,16 +31,16 @@ previous_previous_lts: checksums: desktop: - "21.04": "XXXXX *ubuntu-21.04-desktop-amd64.iso" + "21.04": "fa95fb748b34d470a7cfa5e3c1c8fa1163e2dc340cd5a60f7ece9dc963ecdf88 *ubuntu-21.04-desktop-amd64.iso" "20.04.2.0": "93bdab204067321ff131f560879db46bee3b994bf24836bb78538640f689e58f *ubuntu-20.04.2.0-desktop-amd64.iso" live-server: - "21.04": "XXXXX *ubuntu-21.04-live-server-amd64.iso" + "21.04": "e4089c47104375b59951bad6c7b3ee5d9f6d80bfac4597e43a716bb8f5c1f3b0 *ubuntu-21.04-live-server-amd64.iso" "20.04.2": "d1f2bf834bbe9bb43faf16f9be992a6f3935e65be0edece1dee2aa6eb1767423 *ubuntu-20.04.2-live-server-amd64.iso" desktop-arm64+raspi: - "21.04": "XXXXX *ubuntu-21.04-preinstalled-desktop-arm64+raspi.img.xz" + "21.04": "d89ee327a00b98d7166b1a8cc95d17762aaacd3b4d0fc756c5b6b65df1708f48 *ubuntu-21.04-preinstalled-desktop-arm64+raspi.img.xz" server-arm64+raspi: - "21.04": "XXXXX *ubuntu-21.04-preinstalled-server-arm64+raspi.img.xz" + "21.04": "3df85b93b66ccd2d370c844568b37888de66c362eebae5204bf017f6f5875207 *ubuntu-21.04-preinstalled-server-arm64+raspi.img.xz" "20.04.2": "31884b07837099a5e819527af66848a9f4f92c1333e3ef0693d6d77af66d6832 *ubuntu-20.04.2-preinstalled-server-arm64+raspi.img.xz" server-armhf+raspi: - "21.04": "XXXXX *ubuntu-21.04-preinstalled-server-armhf+raspi.img.xz" + "21.04": "c9a9a5177a03fcbb6203b38e5c3c4e5447fd9e8891515da4146f319f04eb3495 *ubuntu-21.04-preinstalled-server-armhf+raspi.img.xz" "20.04.2": "7b348d080648b8e36e1f29671afd973a0878503091b935b69828f2c7722dfb58 *ubuntu-20.04.2-preinstalled-server-armhf+raspi.img.xz" From 95f8b031280cd7aafd16afdb9aa98dcddd3877d0 Mon Sep 17 00:00:00 2001 From: Peter Mahnke Date: Thu, 22 Apr 2021 11:15:55 +0100 Subject: [PATCH 11/14] Remove double close section tag --- templates/download/raspberry-pi/index.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/templates/download/raspberry-pi/index.html b/templates/download/raspberry-pi/index.html index cb665aca915..4ac054c03a2 100644 --- a/templates/download/raspberry-pi/index.html +++ b/templates/download/raspberry-pi/index.html @@ -282,8 +282,6 @@

    - -
    From 9a9397491d064ce06444fc9caa8a2e9fae03ab60 Mon Sep 17 00:00:00 2001 From: Peter Mahnke Date: Thu, 22 Apr 2021 12:55:45 +0100 Subject: [PATCH 12/14] Updating design --- .../shared/_featured_appliances.html | 58 +++++++-------- templates/download/raspberry-pi/index.html | 70 +++++++++---------- 2 files changed, 61 insertions(+), 67 deletions(-) diff --git a/templates/appliance/shared/_featured_appliances.html b/templates/appliance/shared/_featured_appliances.html index 348b690b53c..6d8e411a4e9 100644 --- a/templates/appliance/shared/_featured_appliances.html +++ b/templates/appliance/shared/_featured_appliances.html @@ -6,18 +6,17 @@

    {{ heading }}

    {% endif %}
    -

    OpenHAB

    -
    +

    OpenHAB

    +
    {{ image( url="https://assets.ubuntu.com/v1/fa5dd451-OpenHAB.png", alt="", - height="32", - width="146", + height="48", + width="219", hi_def=True, loading="lazy", - attrs={"style": "margin-top: 2rem;"} ) | safe }}
    @@ -25,18 +24,17 @@

    OpenHAB

    -

    Plex Media Server

    -
    +

    Plex Media Server

    +
    {{ image( url="https://assets.ubuntu.com/v1/3cd85693-Plex.png", alt="", - height="32", - width="99", + height="48", + width="149", hi_def=True, loading="lazy", - attrs={"style": "margin-top: 2rem;"} ) | safe }}
    @@ -44,18 +42,17 @@

    Plex

    -

    Nextcloud

    -
    +

    Nextcloud

    +
    {{ image( url="https://assets.ubuntu.com/v1/d3a211c9-Nextcloud.png", alt="", - height="62", - width="87", + height="48", + width="67", hi_def=True, loading="lazy", - attrs={"style": "margin-top: 1.25rem;"} ) | safe }}
    @@ -63,18 +60,17 @@

    Nextcloud

    -

    AdGuard

    -
    +

    AdGuard

    +
    {{ image( - url="https://assets.ubuntu.com/v1/1ec45573-AdGuard.png", + url="https://assets.ubuntu.com/v1/b430a72e-adguard_logo.svg", alt="", - height="62", - width="62", + height="48", + width="219", hi_def=True, loading="lazy", - attrs={"style": "margin-top: 1.25rem;"} ) | safe }}
    @@ -83,18 +79,17 @@

    AdGuard

    {% if request.path == "/appliance/vm" %}
    -

    Mosquitto

    -
    +

    Mosquitto

    +
    {{ image( url="https://assets.ubuntu.com/v1/c2c39a7a-mosquitto-logo.png", alt="", - height="72", - width="72", + height="48", + width="48", hi_def=True, loading="lazy", - attrs={"style": "margin-top: 1rem;"} ) | safe }}
    @@ -103,18 +98,17 @@

    Mosquitto

    {% else %}
    -

    LXD

    -
    +

    LXD

    +
    {{ image( - url="https://assets.ubuntu.com/v1/3a24a2f9-lxd.png", + url="https://assets.ubuntu.com/v1/ac9a0e00-lxd_primary.svg", alt="", - height="72", - width="72", + height="48", + width="146", hi_def=True, loading="lazy", - attrs={"style": "margin-top: 1rem;"} ) | safe }}
    diff --git a/templates/download/raspberry-pi/index.html b/templates/download/raspberry-pi/index.html index 4ac054c03a2..98a15203b5b 100644 --- a/templates/download/raspberry-pi/index.html +++ b/templates/download/raspberry-pi/index.html @@ -44,7 +44,7 @@

    -

    +

    Download Ubuntu Server

    @@ -105,46 +105,46 @@

    -

    +

    Works on: -

    +

    -

    +

    Raspberry Pi 2 -

    +

    {{ image( url="https://assets.ubuntu.com/v1/8542c958-Raspberry+Pi+2.png", alt="", - height="156", - width="236", + height="48", + width="72", hi_def=True, loading="auto" ) | safe }}
    -

    +

    * 32-bit only -

    +
    -

    +

    Raspberry Pi 3 -

    +

    {{ image( url="https://assets.ubuntu.com/v1/c4a007b6-Raspberry+Pi+3.png", alt="", - height="151", - width="236", + height="48", + width="75", hi_def=True, loading="auto" ) | safe @@ -152,17 +152,17 @@

    -

    +

    Raspberry Pi 4 -

    +

    {{ image( url="https://assets.ubuntu.com/v1/a999bb5f-Raspberry+Pi+4.png", alt="", - height="151", - width="236", + height="48", + width="75", hi_def=True, loading="auto" ) | safe @@ -170,16 +170,16 @@

    -

    +

    Raspberry Pi 400 -

    +

    {{ image ( url="https://assets.ubuntu.com/v1/cfdcd6c7-Raspberry-Pi-400-back--1536x1097.png", alt="", - width="1478", - height="760", + height="48", + width="93", hi_def=True, loading="lazy" ) | safe @@ -187,16 +187,16 @@

    -

    +

    Raspberry Pi CM4 -

    +

    {{ image ( url="https://assets.ubuntu.com/v1/3be8f179-Raspberry-Pi-CM4.png", alt="", - width="932", - height="660", + height="48", + width="68", hi_def=True, loading="lazy" ) | safe @@ -241,22 +241,22 @@

    -

    +

    Works on: -

    +

    -

    +

    Raspberry Pi 400 -

    +

    {{ image ( url="https://assets.ubuntu.com/v1/cfdcd6c7-Raspberry-Pi-400-back--1536x1097.png", alt="", - width="1478", - height="760", + height="48", + width="93", hi_def=True, loading="lazy" ) | safe @@ -264,16 +264,16 @@

    -

    +

    Raspberry Pi CM4 -

    +

    {{ image ( url="https://assets.ubuntu.com/v1/3be8f179-Raspberry-Pi-CM4.png", alt="", - width="932", - height="660", + height="48", + width="68", hi_def=True, loading="lazy" ) | safe From 29efc48773388776b37bba8b3e1d71512e6a131c Mon Sep 17 00:00:00 2001 From: Peter Mahnke Date: Thu, 22 Apr 2021 14:07:22 +0100 Subject: [PATCH 13/14] Align images --- .../shared/_featured_appliances.html | 50 +++++++++++-------- templates/download/raspberry-pi/index.html | 35 +++++++------ 2 files changed, 49 insertions(+), 36 deletions(-) diff --git a/templates/appliance/shared/_featured_appliances.html b/templates/appliance/shared/_featured_appliances.html index 6d8e411a4e9..fffb1dfe17e 100644 --- a/templates/appliance/shared/_featured_appliances.html +++ b/templates/appliance/shared/_featured_appliances.html @@ -6,17 +6,18 @@

    {{ heading }}

    {% endif %}
    -

    OpenHAB

    +

    OpenHAB

    -
    +
    {{ image( url="https://assets.ubuntu.com/v1/fa5dd451-OpenHAB.png", alt="", - height="48", - width="219", + height="32", + width="148", hi_def=True, loading="lazy", + attrs={"class": "u-align--left", "style": "margin-top: 1rem;"}, ) | safe }}
    @@ -24,17 +25,18 @@

    {{ heading }}

    -

    Plex Media Server

    +

    Plex Media Server

    -
    +
    {{ image( url="https://assets.ubuntu.com/v1/3cd85693-Plex.png", alt="", - height="48", - width="149", + height="27", + width="84", hi_def=True, loading="lazy", + attrs={"class": "u-align--left", "style": "margin-top: 1rem;"}, ) | safe }}
    @@ -42,17 +44,18 @@

    {{ heading }}

    -

    Nextcloud

    +

    Nextcloud

    -
    +
    {{ image( - url="https://assets.ubuntu.com/v1/d3a211c9-Nextcloud.png", + url="https://assets.ubuntu.com/v1/99a0b969-Nextcloud_Logo.svg", alt="", height="48", - width="67", + width="73", hi_def=True, loading="lazy", + attrs={"class": "u-align--left", "style": "margin-top: 1rem;"}, ) | safe }}
    @@ -60,17 +63,18 @@

    {{ heading }}

    -

    AdGuard

    +

    AdGuard

    -
    +
    {{ image( url="https://assets.ubuntu.com/v1/b430a72e-adguard_logo.svg", alt="", - height="48", - width="219", + height="32", + width="145", hi_def=True, loading="lazy", + attrs={"class": "u-align--left", "style": "margin-top: 1rem;"}, ) | safe }}
    @@ -79,9 +83,9 @@

    {{ heading }}

    {% if request.path == "/appliance/vm" %}
    -

    Mosquitto

    +

    Mosquitto

    -
    +
    {{ image( url="https://assets.ubuntu.com/v1/c2c39a7a-mosquitto-logo.png", @@ -90,6 +94,7 @@

    {{ heading }}

    width="48", hi_def=True, loading="lazy", + attrs={"class": "u-align--left", "style": "margin-top: 1rem;"}, ) | safe }}
    @@ -98,17 +103,18 @@

    {{ heading }}

    {% else %}
    -

    LXD

    +

    LXD

    -
    +
    {{ image( url="https://assets.ubuntu.com/v1/ac9a0e00-lxd_primary.svg", alt="", - height="48", - width="146", + height="32", + width="97", hi_def=True, loading="lazy", + attrs={"class": "u-align--left", "style": "margin-top: 1rem;"}, ) | safe }}
    diff --git a/templates/download/raspberry-pi/index.html b/templates/download/raspberry-pi/index.html index 98a15203b5b..3ac714fa88e 100644 --- a/templates/download/raspberry-pi/index.html +++ b/templates/download/raspberry-pi/index.html @@ -111,11 +111,11 @@

    -

    +

    Raspberry Pi 2

    -
    +
    {{ image( url="https://assets.ubuntu.com/v1/8542c958-Raspberry+Pi+2.png", @@ -123,6 +123,7 @@

    height="48", width="72", hi_def=True, + attrs={"class": "u-align--left", "style": "margin-top: 1rem;"}, loading="auto" ) | safe }} @@ -134,11 +135,11 @@

    -

    +

    Raspberry Pi 3

    -
    +
    {{ image( url="https://assets.ubuntu.com/v1/c4a007b6-Raspberry+Pi+3.png", @@ -146,17 +147,18 @@
    height="48", width="75", hi_def=True, + attrs={"class": "u-align--left", "style": "margin-top: 1rem;"}, loading="auto" ) | safe }}
    -

    +

    Raspberry Pi 4

    -
    +
    {{ image( url="https://assets.ubuntu.com/v1/a999bb5f-Raspberry+Pi+4.png", @@ -164,40 +166,43 @@
    height="48", width="75", hi_def=True, + attrs={"class": "u-align--left", "style": "margin-top: 1rem;"}, loading="auto" ) | safe }}
    -

    +

    Raspberry Pi 400

    -
    +
    {{ image ( url="https://assets.ubuntu.com/v1/cfdcd6c7-Raspberry-Pi-400-back--1536x1097.png", alt="", height="48", width="93", hi_def=True, + attrs={"class": "u-align--left", "style": "margin-top: 1rem;"}, loading="lazy" ) | safe }}
    -

    +

    Raspberry Pi CM4

    -
    +
    {{ image ( url="https://assets.ubuntu.com/v1/3be8f179-Raspberry-Pi-CM4.png", alt="", height="48", width="68", hi_def=True, + attrs={"class": "u-align--left", "style": "margin-top: 1rem;"}, loading="lazy" ) | safe }} @@ -247,34 +252,36 @@

    -

    +

    Raspberry Pi 400

    -
    +
    {{ image ( url="https://assets.ubuntu.com/v1/cfdcd6c7-Raspberry-Pi-400-back--1536x1097.png", alt="", height="48", width="93", hi_def=True, + attrs={"class": "u-align--left", "style": "margin-top: 1rem;"}, loading="lazy" ) | safe }}
    -

    +

    Raspberry Pi CM4

    -
    +
    {{ image ( url="https://assets.ubuntu.com/v1/3be8f179-Raspberry-Pi-CM4.png", alt="", height="48", width="68", hi_def=True, + attrs={"class": "u-align--left", "style": "margin-top: 1rem;"}, loading="lazy" ) | safe }} From 5878674bf7283d3aaf8b5f19ddb4fb61a8af27a1 Mon Sep 17 00:00:00 2001 From: Peter Mahnke Date: Thu, 22 Apr 2021 14:29:35 +0100 Subject: [PATCH 14/14] Remove logos on small --- .../shared/_featured_appliances.html | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/templates/appliance/shared/_featured_appliances.html b/templates/appliance/shared/_featured_appliances.html index fffb1dfe17e..2594ef2f2bd 100644 --- a/templates/appliance/shared/_featured_appliances.html +++ b/templates/appliance/shared/_featured_appliances.html @@ -5,10 +5,10 @@

    {{ heading }}

    {% endif %}
    - +

    OpenHAB

    -