Skip to content

Commit

Permalink
Merge pull request #9594 from canonical-web-and-design/21.04-release
Browse files Browse the repository at this point in the history
  • Loading branch information
Peter Mahnke committed Apr 22, 2021
2 parents df94fab + c5d4d4b commit e962767
Show file tree
Hide file tree
Showing 8 changed files with 317 additions and 238 deletions.
24 changes: 13 additions & 11 deletions releases.yaml
View file
@@ -1,11 +1,12 @@
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
release_notes_url: "https://discourse.ubuntu.com/t/hirsute-hippo-release-notes/19221"
lts:
slug: FocalFossa
name: "Focal Fossa"
Expand All @@ -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:
Expand All @@ -29,16 +31,16 @@ previous_previous_lts:

checksums:
desktop:
"20.10": "3ef833828009fb69d5c584f3701d6946f89fa304757b7947e792f9491caa270e *ubuntu-20.10-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:
"20.10": "defdc1ad3af7b661fe2b4ee861fb6fdb5f52039389ef56da6efc05e6adfe3d45 *ubuntu-20.10-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:
"20.10": "2fa19fb53fe0144549ff722d9cd755d9c12fb508bb890926bfe7940c0b3555e8 *ubuntu-20.10-preinstalled-desktop-arm64+raspi.img.xz"
"21.04": "d89ee327a00b98d7166b1a8cc95d17762aaacd3b4d0fc756c5b6b65df1708f48 *ubuntu-21.04-preinstalled-desktop-arm64+raspi.img.xz"
server-arm64+raspi:
"20.10": "73a98e83fbb6398f86902c7a83c826536f1afbd0be2d80cb0d7faa94ede33137 *ubuntu-20.10-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:
"20.10": "941752f93313ba765069b48f38af18bbf961bebefcc9c4296a953cf1260f0fe1 *ubuntu-20.10-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"
88 changes: 44 additions & 44 deletions templates/appliance/shared/_featured_appliances.html
View file
Expand Up @@ -5,116 +5,116 @@ <h2 class="p-muted-heading">{{ heading }}</h2>
</div>
{% endif %}
<div class="col-2">
<a href="/appliance/openhab" class="p-link--soft">
<h3 class="p-heading--five u-no-padding--top">OpenHAB</h3>
<hr />
<div class="u-align--center">
<a href="/appliance/openhab">
<p class="u-no-padding--top" style="margin-bottom: .5rem;">OpenHAB</p>
<hr>
<div class="u-hide--small">
{{
image(
url="https://assets.ubuntu.com/v1/fa5dd451-OpenHAB.png",
alt="",
height="32",
width="146",
width="148",
hi_def=True,
loading="lazy",
attrs={"style": "margin-top: 2rem;"}
attrs={"class": "u-align--left", "style": "margin-top: 1rem;"},
) | safe
}}
</div>
</a>
</div>
<div class="col-2">
<a href="/appliance/plex" class="p-link--soft">
<h3 class="p-heading--five u-no-padding--top">Plex<span class="u-hide--medium"> Media Server</span></h3>
<hr />
<div class="u-align--center">
<a href="/appliance/plex">
<p class="u-no-padding--top" style="margin-bottom: .5rem;">Plex<span class="u-hide--medium"> Media Server</span></p>
<hr>
<div class="u-hide--small">
{{
image(
url="https://assets.ubuntu.com/v1/3cd85693-Plex.png",
alt="",
height="32",
width="99",
height="27",
width="84",
hi_def=True,
loading="lazy",
attrs={"style": "margin-top: 2rem;"}
attrs={"class": "u-align--left", "style": "margin-top: 1rem;"},
) | safe
}}
</div>
</a>
</div>
<div class="col-2">
<a href="/appliance/nextcloud" class="p-link--soft">
<h3 class="p-heading--five u-no-padding--top">Nextcloud</h3>
<hr />
<div class="u-align--center">
<a href="/appliance/nextcloud">
<p class="u-no-padding--top" style="margin-bottom: .5rem;">Nextcloud</p>
<hr>
<div class="u-hide--small">
{{
image(
url="https://assets.ubuntu.com/v1/d3a211c9-Nextcloud.png",
url="https://assets.ubuntu.com/v1/99a0b969-Nextcloud_Logo.svg",
alt="",
height="62",
width="87",
height="48",
width="73",
hi_def=True,
loading="lazy",
attrs={"style": "margin-top: 1.25rem;"}
attrs={"class": "u-align--left", "style": "margin-top: 1rem;"},
) | safe
}}
</div>
</a>
</div>
<div class="col-2">
<a href="/appliance/adguard" class="p-link--soft">
<h3 class="p-heading--five u-no-padding--top">AdGuard</h3>
<hr />
<div class="u-align--center">
<a href="/appliance/adguard">
<p class="u-no-padding--top" style="margin-bottom: .5rem;">AdGuard</p>
<hr>
<div class="u-hide--small">
{{
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="32",
width="145",
hi_def=True,
loading="lazy",
attrs={"style": "margin-top: 1.25rem;"}
attrs={"class": "u-align--left", "style": "margin-top: 1rem;"},
) | safe
}}
</div>
</a>
</div>
{% if request.path == "/appliance/vm" %}
<div class="col-2">
<a href="/appliance/mosquitto" class="p-link--soft">
<h3 class="p-heading--five u-no-padding--top">Mosquitto</h3>
<hr />
<div class="u-align--center">
<a href="/appliance/mosquitto">
<p class="u-no-padding--top" style="margin-bottom: .5rem;">Mosquitto</p>
<hr>
<div class="u-hide--small">
{{
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;"}
attrs={"class": "u-align--left", "style": "margin-top: 1rem;"},
) | safe
}}
</div>
</a>
</div>
{% else %}
<div class="col-2">
<a href="/appliance/lxd" class="p-link--soft">
<h3 class="p-heading--five u-no-padding--top">LXD</h3>
<hr />
<div class="u-align--center">
<a href="/appliance/lxd">
<p class="u-no-padding--top" style="margin-bottom: .5rem;">LXD</p>
<hr>
<div class="u-hide--small">
{{
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="32",
width="97",
hi_def=True,
loading="lazy",
attrs={"style": "margin-top: 1rem;"}
attrs={"class": "u-align--left", "style": "margin-top: 1rem;"},
) | safe
}}
</div>
Expand Down
29 changes: 19 additions & 10 deletions templates/desktop/developers.html
View file
Expand Up @@ -76,16 +76,21 @@ <h2>What's new in Ubuntu {{ releases.latest.short_version }}?</h2>
</div>
<div class="u-fixed-width">
<ul class="p-list is-split">
<li class="p-list__item is-ticked">Support for the Raspberry Pi 4 with 4GB and 8GB RAM</li>
<li class="p-list__item is-ticked">Linux 5.8 kernel</li>
<li class="p-list__item is-ticked">GNOME Desktop 3.38 with all the latest features</li>
<li class="p-list__item is-ticked">Uniquely generated QR codes for sharing private WiFi hotspots</li>
<li class="p-list__item is-ticked">LibreOffice 7.0</li>
<li class="p-list__item is-ticked">Thunderbird email client integrated calendar and user friendly PGP encryption</li>
<li class="p-list__item is-ticked">Improved settings for battery percentage and microphone mute status</li>
<li class="p-list__item is-ticked">New photographic and Raspberry Pi themed wallpapers</li>
<li class="p-list__item is-ticked">Linux 5.11 kernel</li>
<li class="p-list__item is-ticked">Redesigned Yaru dark GNOME shell theme is the default</li>
<li class="p-list__item is-ticked">New MIME type icons in the Yaru theme</li>
<li class="p-list__item is-ticked">Wayland is the default display server with improved security and performance</li>
<li class="p-list__item is-ticked">Active directory integration is included in the installer</li>
<li class="p-list__item is-ticked">Improved UI with new power profile modes</li>
<li class="p-list__item is-ticked">Recovery key option for encrypted installs</li>
<li class="p-list__item is-ticked">Private home directory</li>
<li class="p-list__item is-ticked">LibreOffice 7.1.2, Python 3.9, Firefox 87, GNOME Desktop 3.38.5</li>
</ul>
<p><a class="p-link--external" href="https://discourse.ubuntu.com/t/groovy-gorilla-release-notes/15533">Read the full release notes</a></p>
<p>
<a href="{{ releases.latest.release_notes_url }}">
Read the full release notes&nbsp;&rsaquo;
</a>
</p>
</div>
</section>

Expand All @@ -108,7 +113,11 @@ <h2>What's new in Ubuntu {{ releases.lts.short_version }} LTS?</h2>
<li class="p-list__item is-ticked">LibreOffice 6.4</li>
<li class="p-list__item is-ticked">nVIDIA hardware is now supported out of the box</li>
</ul>
<p><a class="p-link--external" href="https://wiki.ubuntu.com/{{ releases.lts.slug }}/ReleaseNotes">Read the full release notes</a></p>
<p>
<a class="p-link--external" href="{{ releases.lts.release_notes_url }}">
Read the full release notes
</a>
</p>
</div>
</section>

Expand Down
4 changes: 2 additions & 2 deletions templates/download/desktop/index.html
View file
Expand Up @@ -17,7 +17,7 @@ <h2>Ubuntu {{ releases.lts.full_version_desktop }} LTS</h2>
<div class="row u-equal-height p-divider u-no-padding--left u-no-padding--right">
<div class="col-8 p-divider__block">
<p class="u-no-padding--top">Download the latest <abbr title="Long-term support">LTS</abbr> version of Ubuntu, for desktop PCs and laptops. LTS stands for long-term support &mdash; which means five years, until {{ releases.lts.eol }}, of free security and maintenance updates, guaranteed.</p>
<p><a href="https://wiki.ubuntu.com/{{ releases.lts.slug }}/ReleaseNotes" class="p-link--external">Ubuntu {{ releases.lts.short_version }} LTS release notes</a></p>
<p><a href="{{ releases.lts.release_notes_url }}" class="p-link--external">Ubuntu {{ releases.lts.short_version }} LTS release notes</a></p>
<p>Recommended system requirements:</p>
<ul class="p-list is-split">
<li class="p-list__item is-ticked">2 GHz dual core processor or better</li>
Expand Down Expand Up @@ -50,7 +50,7 @@ <h2>Ubuntu {{ releases.latest.full_version }}</h2>
<div class="col-8 p-divider__block">
<p class="u-no-padding--top">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.</p>
<p>Recommended system requirements are the same as for Ubuntu {{ releases.lts.full_version }} <abbr title="Long-term support">LTS</abbr>.</p>
<p><a href="https://wiki.ubuntu.com/{{ releases.latest.slug }}/ReleaseNotes" class="p-link--external">Ubuntu {{ releases.latest.short_version }} release notes</a></p>
<p><a href="{{ releases.latest.release_notes_url }}" class="p-link--external">Ubuntu {{ releases.latest.short_version }} release notes</a></p>
</div>
<div class="col-4">
<p>
Expand Down
41 changes: 16 additions & 25 deletions templates/download/index.html
View file
Expand Up @@ -35,26 +35,17 @@ <h2>
</p>
</div>
<div class="col-6 u-align--center u-hide--small">
{{
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
}}
</div>
</div>
<div class="row">
<div class="p-heading-icon">
<div class="p-heading-icon__header">
<img src="https://assets.ubuntu.com/v1/58442bcb-business-promo-webinar.png" alt="Find out what's new in Ubuntu 20.10 in our webinar" class="p-heading-icon__img" style="width:64px;">
<h4 class="p-heading-icon__title" style="padding-top:0.4rem"><a href="/engage/ubuntu-20.10?utm_source=Download&amp;utm_medium=Download&amp;utm_campaign=7013z000001WldOAAS">Find out what's new in Ubuntu 20.10 in our webinar</a></h4>
</div>
</div>
</div>
<div class="row">
<div class="col-12">
<hr style="margin: 0 0 3rem 0;">
Expand All @@ -64,12 +55,12 @@ <h4 class="p-heading-icon__title" style="padding-top:0.4rem"><a href="/engage/ub
<div class="col-1 u-hide--small u-vertically-center u-align--center">
{{
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
}}
</div>
Expand All @@ -82,12 +73,12 @@ <h4 class="p-heading-icon__title" style="padding-top:0.4rem"><a href="/engage/ub
<div class="col-1 u-hide--small u-vertically-center u-align--center">
{{
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
}}
</div>
Expand Down

0 comments on commit e962767

Please sign in to comment.