Commit 792ba307 authored by Martin Kozub's avatar Martin Kozub
Browse files

Updated to support bug-fix point releases and differend desktop and server...

Updated to support bug-fix point releases and differend desktop and server images, moved over to URI.open to replace the now-deprecated Kernel.open, updated server page to work wih new server-specific variables and updaed release timeline on the server page to the latest, migrated over to svg and translated
parent fd523e22
Pipeline #281006971 passed with stages
in 2 minutes and 22 seconds
......@@ -23,16 +23,16 @@ layout: default
<section class="p-strip--light" id="lts">
<div class="row u-equal-height u-vertically-center">
<div class="col-6">
<h2>Ubuntu {{ site.data.ubuntu_releases.latest.lts.version }} LTS</h2>
<h2>Ubuntu {{ site.data.ubuntu_releases.latest.lts.version-server }} LTS</h2>
<p>
Ubuntu {{ site.data.ubuntu_releases.latest.lts.version }} LTS {{ site.data.ubuntu_releases.latest.lts.name }} je vydaní s dlouhodobou podporou, která činí 5 let od data vydání {{ site.data.ubuntu_releases.latest.lts.released | date: "%-d. %-m. %Y" }}.
Ubuntu {{ site.data.ubuntu_releases.latest.lts.version-server }} LTS {{ site.data.ubuntu_releases.latest.lts.name }} je vydaní s dlouhodobou podporou, která činí 5 let od data vydání {{ site.data.ubuntu_releases.latest.lts.released | date: "%-d. %-m. %Y" }}.
</p>
<p><a href="https://releases.ubuntu.com/{{ site.data.ubuntu_releases.latest.lts.version }}/ubuntu-{{ site.data.ubuntu_releases.latest.lts.version }}-live-server-amd64.iso" id="lts-download-link" class="p-button--positive">Stáhnout Ubuntu Server {{ site.data.ubuntu_releases.latest.lts.version }} LTS (64bit)</a></p>
<p><a href="https://releases.ubuntu.com/{{ site.data.ubuntu_releases.latest.lts.version-server }}/ubuntu-{{ site.data.ubuntu_releases.latest.lts.version-server }}-live-server-amd64.iso" id="lts-download-link" class="p-button--positive">Stáhnout Ubuntu Server {{ site.data.ubuntu_releases.latest.lts.version-server }} LTS (64bit)</a></p>
<p>
<small>
<a href="https://releases.ubuntu.com/{{ site.data.ubuntu_releases.latest.lts.version }}/ubuntu-{{ site.data.ubuntu_releases.latest.lts.version }}-live-server-amd64.iso.torrent">Stáhnout přes BitTorrent</a>
<a href="https://releases.ubuntu.com/{{ site.data.ubuntu_releases.latest.lts.version-server }}/ubuntu-{{ site.data.ubuntu_releases.latest.lts.version-server }}-live-server-amd64.iso.torrent">Stáhnout přes BitTorrent</a>
<br>
<a href="https://cdimage.ubuntu.com/releases/{{ site.data.ubuntu_releases.latest.lts.version }}/release">Alternativní obrazy pro další architektury</a>
<a href="https://cdimage.ubuntu.com/releases/{{ site.data.ubuntu_releases.latest.lts.version-server }}/release">Alternativní obrazy pro další architektury</a>
</small>
</p>
</div>
......@@ -42,23 +42,23 @@ layout: default
</div>
</section>
{% if site.data.ubuntu_releases.latest.lts.version != site.data.ubuntu_releases.latest.release.version %}
{% if site.data.ubuntu_releases.latest.lts.version-server != site.data.ubuntu_releases.latest.release.version-server %}
<section class="p-strip--light" id="standard">
<div class="row">
<div class="col-6">
<h2>Ubuntu {{ site.data.ubuntu_releases.latest.release.version }}</h2>
<h2>Ubuntu {{ site.data.ubuntu_releases.latest.release.version-server }}</h2>
<p>
Nejnovější vydání Ubuntu pro počítače a notebooky. Ubuntu {{ site.data.ubuntu_releases.latest.release.version }} {{ site.data.ubuntu_releases.latest.release.name }} přináší 9 měsíců bezpečnostních a údržbových aktualizací.
Nejnovější vydání Ubuntu pro počítače a notebooky. Ubuntu {{ site.data.ubuntu_releases.latest.release.version-server }} {{ site.data.ubuntu_releases.latest.release.name }} přináší 9 měsíců bezpečnostních a údržbových aktualizací.
</p>
<p>
Pro konzervativnější a déle podporované vydání stahujte <a href="#lts">Ubuntu s dlouhodobou podporou výše</a>.
</p>
<p><a href="https://releases.ubuntu.com/{{ site.data.ubuntu_releases.latest.release.version }}/ubuntu-{{ site.data.ubuntu_releases.latest.release.version }}-live-server-amd64.iso" id="standard-download-link" class="p-button--positive">Stáhnout Ubuntu Server {{ site.data.ubuntu_releases.latest.release.version }} (64bit)</a></p>
<p><a href="https://releases.ubuntu.com/{{ site.data.ubuntu_releases.latest.release.version-server }}/ubuntu-{{ site.data.ubuntu_releases.latest.release.version-server }}-live-server-amd64.iso" id="standard-download-link" class="p-button--positive">Stáhnout Ubuntu Server {{ site.data.ubuntu_releases.latest.release.version-server }} (64bit)</a></p>
<p>
<small>
<a href="https://releases.ubuntu.com/{{ site.data.ubuntu_releases.latest.release.version }}/ubuntu-{{ site.data.ubuntu_releases.latest.release.version }}-live-server-amd64.iso.torrent">Stáhnout přes BitTorrent</a>
<a href="https://releases.ubuntu.com/{{ site.data.ubuntu_releases.latest.release.version-server }}/ubuntu-{{ site.data.ubuntu_releases.latest.release.version-server }}-live-server-amd64.iso.torrent">Stáhnout přes BitTorrent</a>
<br>
<a href="http://cdimage.ubuntu.com/releases/{{ site.data.ubuntu_releases.latest.release.version }}/release">Alternativní obrazy pro další architektury</a>
<a href="http://cdimage.ubuntu.com/releases/{{ site.data.ubuntu_releases.latest.release.version-server }}/release">Alternativní obrazy pro další architektury</a>
</div>
</div>
</section>
......@@ -66,8 +66,13 @@ layout: default
<section class="p-strip">
<div class="row u-equal-height u-vertically-center">
<div class="col-6 u-align--center">
<img src="https://assets.ubuntu.com/v1/f02f0a4b-r-eol-ubuntu-full-2018-02-28.png" alt="release cycles">
<div class="col-6 u-align--left">
<object data="{{ 'images/timeline/22.04.svg' | relative_url }}" type="image/svg+xml" style="margin: 0px auto 20px 0px">
<img src="{{ 'images/timeline/22.04.svg' | relative_url }}" alt="release cycles">
</object>
<object data="{{ 'images/timeline/chart-legend.svg' | relative_url }}" type="image/svg+xml" style="margin: 0px 50% 20px 0px">
<img src="{{ 'images/timeline/chart-legend.svg' | relative_url }}" alt="Legenda grafu s jednotlivými vydáními">
</object>
</div>
<div class="col-6">
<h2>Na pravidelná vydání nových verzí systému se můžete spolehnout</h2>
......
......@@ -23,18 +23,20 @@ module Jekyll_Ubuntu_Releases
release_version = get_precise_version(site.data['ubuntu_releases']['latest']['release']['version'])
lts_version = get_precise_version(site.data['ubuntu_releases']['latest']['lts']['version'])
site.data['ubuntu_releases']['latest']['release']['version'] = release_version
site.data['ubuntu_releases']['latest']['lts']['version'] = lts_version
site.data['ubuntu_releases']['latest']['release']['version'] = release_version['desktop']
site.data['ubuntu_releases']['latest']['lts']['version'] = lts_version['desktop']
site.data['ubuntu_releases']['latest']['release']['version-server'] = release_version['server']
site.data['ubuntu_releases']['latest']['lts']['version-server'] = lts_version['server']
end
def self.get_all_releases()
all_releases_data = []
series = nil
open('https://api.launchpad.net/devel/ubuntu/series', 'r', :allow_redirections => :all) do |series_content|
URI('https://api.launchpad.net/devel/ubuntu/series').open('r', :allow_redirections => :all) do |series_content|
series = JSON.parse(series_content.read)
end
cloud_images = nil
open('https://cloud-images.ubuntu.com/releases/streams/v1/com.ubuntu.cloud:released:download.json', 'r', :allow_redirections => :all) do |cloud_images_content|
URI('https://cloud-images.ubuntu.com/releases/streams/v1/com.ubuntu.cloud:released:download.json').open('r', :allow_redirections => :all) do |cloud_images_content|
cloud_images = JSON.parse(cloud_images_content.read)
end
(series['total_size'].to_i-1).downto(0).each do |i|
......@@ -54,9 +56,12 @@ module Jekyll_Ubuntu_Releases
end
def self.get_precise_version(base_version)
url = 'https://releases.ubuntu.com/'+base_version+'/SHA256SUMS'
open(url, 'r', :allow_redirections => :all) do |remote_content|
return /[0-9]+\.[0-9]+(\.[0-9])?/.match(remote_content.read).to_s
URI('https://releases.ubuntu.com/'+base_version+'/SHA256SUMS').open('r', :allow_redirections => :all) do |remote_content|
content_string = remote_content.read
return {
'server' => /[0-9]+\.[0-9]+(\.[0-9])*-live-server/.match(content_string).to_s.gsub('-live-server', ''),
'desktop' => /[0-9]+\.[0-9]+(\.[0-9])*-desktop/.match(content_string).to_s.gsub('-desktop', '')
}
end
end
end
......
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg class="chart" viewBox="0 0 969 276" width="100%" height="100%" xmlns="http://www.w3.org/2000/svg">
<style>
text {
font-family:Ubuntu !important
}
.chart__bar--orange {
fill:#e95420;
stroke:#e95420;
stroke-width:1px
}
.chart__bar--orange-light {
fill:#fbddd2;
stroke:#e95420;
stroke-width:1px
}
.chart__bar--grey {
fill:#aea79f;
stroke:#aea79f;
stroke-width:1px
}
.chart__bar--aubergine {
fill:#772953;
stroke:#772953;
stroke-width:1px
}
.chart__bar--green {
fill:green;
stroke:green;
stroke-width:1px
}
.chart__label--bold {
font-weight:bold
}
.x.axis line {
shape-rendering:crispEdges;
stroke:#d6d3cf;
stroke-dasharray:3 2
}
.tick text {
font-size:14px
}
.chart-key text {
font-size:14px
}
.x.axis text {
font-size:12px;
text-anchor:start !important
}
.chart-key {
display:block
}
.chart-key__row {
display:block
}
</style>
<g class="gantt-chart" height="276" transform="translate(150, 0)" width="969">
<rect class="chart__bar--orange" height="26" transform="translate(38.88076028989471,206)" width="97.25516204020238" y="0"></rect>
<rect class="chart__bar--orange" height="26" transform="translate(116.74880350061535,177)" width="97.25516204020236" y="0"></rect>
<rect class="chart__bar--orange-light" height="26" transform="translate(136.1359223300971,206)" width="97.36168467113362" y="0"></rect>
<rect class="chart__bar--orange" height="26" transform="translate(194.51032408040476,148)" width="97.25516204020238" y="0"></rect>
<rect class="chart__bar--orange-light" height="26" transform="translate(214.00396554081772,177)" width="97.36168467113362" y="0"></rect>
<rect class="chart__bar--aubergine" height="26" transform="translate(233.4976070012307,206)" width="116.74880350061531" y="0"></rect>
<rect class="chart__bar--orange" height="26" transform="translate(272.37836729112536,119)" width="97.25516204020238" y="0"></rect>
<rect class="chart__bar--orange-light" height="26" transform="translate(291.76548612060714,148)" width="97.36168467113362" y="0"></rect>
<rect class="chart__bar--grey" height="26" transform="translate(291.8720087515383,90)" width="29.71981402980998" y="0"></rect>
<rect class="chart__bar--grey" height="26" transform="translate(311.2591275810201,61)" width="29.724252472765386" y="0"></rect>
<rect class="chart__bar--aubergine" height="26" transform="translate(311.36565021195133,177)" width="116.74880350061534" y="0"></rect>
<rect class="chart__bar--grey" height="26" transform="translate(330.75276904143306,32)" width="29.71981402980998" y="0"></rect>
<rect class="chart__bar--orange" height="26" transform="translate(350.1398878709148,3)" width="97.25516204020238" y="0"></rect>
<rect class="chart__bar--orange-light" height="26" transform="translate(369.63352933132774,119)" width="97.36168467113367" y="0"></rect>
<rect class="chart__bar--aubergine" height="26" transform="translate(389.12717079174075,148)" width="194.5103240804047" y="0"></rect>
<rect class="chart__bar--orange-light" height="26" transform="translate(447.39504991111716,3)" width="97.25516204020238" y="0"></rect>
<rect class="chart__bar--aubergine" height="26" transform="translate(466.9952140024614,119)" width="194.5103240804047" y="0"></rect>
<rect class="chart__bar--aubergine" height="26" transform="translate(544.6502119513195,3)" width="195.46902775878573" y="0"></rect>
<g class="x axis" fill="none" font-family="sans-serif" font-size="10" text-anchor="middle" transform="translate(0, 236)">
<g class="tick" opacity="1" transform="translate(29.79816194904052,0)">
<line stroke="currentColor" y1="-256" y2="6"></line>
<text dy="0.71em" fill="currentColor" y="9">
2014
</text>
</g>
<g class="tick" opacity="1" transform="translate(107.55968252882994,0)">
<line stroke="currentColor" y1="-256" y2="6"></line>
<text dy="0.71em" fill="currentColor" y="9">
2016
</text>
</g>
<g class="tick" opacity="1" transform="translate(185.42772573955057,0)">
<line stroke="currentColor" y1="-256" y2="6"></line>
<text dy="0.71em" fill="currentColor" y="9">
2018
</text>
</g>
<g class="tick" opacity="1" transform="translate(263.18924631934,0)">
<line stroke="currentColor" y1="-256" y2="6"></line>
<text dy="0.71em" fill="currentColor" y="9">
2020
</text>
</g>
<g class="tick" opacity="1" transform="translate(341.05728953006064,0)">
<line stroke="currentColor" y1="-256" y2="6"></line>
<text dy="0.71em" fill="currentColor" y="9">
2022
</text>
</g>
<g class="tick" opacity="1" transform="translate(418.81881010985,0)">
<line stroke="currentColor" y1="-256" y2="6"></line>
<text dy="0.71em" fill="currentColor" y="9">
2024
</text>
</g>
<g class="tick" opacity="1" transform="translate(496.68685332057066,0)">
<line stroke="currentColor" y1="-256" y2="6"></line>
<text dy="0.71em" fill="currentColor" y="9">
2026
</text>
</g>
<g class="tick" opacity="1" transform="translate(574.4483739003601,0)">
<line stroke="currentColor" y1="-256" y2="6"></line>
<text dy="0.71em" fill="currentColor" y="9">
2028
</text>
</g>
<g class="tick" opacity="1" transform="translate(652.3164171110807,0)">
<line stroke="currentColor" y1="-256" y2="6"></line>
<text dy="0.71em" fill="currentColor" y="9">
2030
</text>
</g>
<g class="tick" opacity="1" transform="translate(730.0779376908702,0)">
<line stroke="currentColor" y1="-256" y2="6"></line>
<text dy="0.71em" fill="currentColor" y="9">
2032
</text>
</g>
</g>
<g class="y axis" fill="none" font-family="sans-serif" font-size="10" text-anchor="start">
<g class="tick" opacity="1" transform="translate(0,16.5)">
<line stroke="currentColor" x2="0"></line>
<text class="chart__label--bold" dy="0.32em" fill="currentColor" x="-150">
Ubuntu 22.04 LTS
</text>
</g>
<g class="tick" opacity="1" transform="translate(0,45.5)">
<line stroke="currentColor" x2="0"></line>
<text dy="0.32em" fill="currentColor" x="-150">
Ubuntu 21.10
</text>
</g>
<g class="tick" opacity="1" transform="translate(0,74.5)">
<line stroke="currentColor" x2="0"></line>
<text dy="0.32em" fill="currentColor" x="-150">
Ubuntu 21.04
</text>
</g>
<g class="tick" opacity="1" transform="translate(0,103.5)">
<line stroke="currentColor" x2="0"></line>
<text dy="0.32em" fill="currentColor" x="-150">
Ubuntu 20.10 (v5.8)
</text>
</g>
<g class="tick" opacity="1" transform="translate(0,132.5)">
<line stroke="currentColor" x2="0"></line>
<text class="chart__label--bold" dy="0.32em" fill="currentColor" x="-150">
Ubuntu 20.04 LTS (v5.4)
</text>
</g>
<g class="tick" opacity="1" transform="translate(0,161.5)">
<line stroke="currentColor" x2="0"></line>
<text class="chart__label--bold" dy="0.32em" fill="currentColor" x="-150">
Ubuntu 18.04 LTS
</text>
</g>
<g class="tick" opacity="1" transform="translate(0,190.5)">
<line stroke="currentColor" x2="0"></line>
<text class="chart__label--bold" dy="0.32em" fill="currentColor" x="-150">
Ubuntu 16.04 LTS
</text>
</g>
<g class="tick" opacity="1" transform="translate(0,219.5)">
<line stroke="currentColor" x2="0"></line>
<text class="chart__label--bold" dy="0.32em" fill="currentColor" x="-150">
Ubuntu 14.04 LTS
</text>
</g>
</g>
</g>
</svg>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg class="chart-key" viewBox="0 0 400 96" width="100%" height="100%" xmlns="http://www.w3.org/2000/svg">
<style>
text {
font-family:Ubuntu !important
}
.chart__bar--orange {
fill:#e95420;
stroke:#e95420;
stroke-width:1px
}
.chart__bar--orange-light {
fill:#fbddd2;
stroke:#e95420;
stroke-width:1px
}
.chart__bar--grey {
fill:#aea79f;
stroke:#aea79f;
stroke-width:1px
}
.chart__bar--aubergine {
fill:#772953;
stroke:#772953;
stroke-width:1px
}
.chart__bar--green {
fill:green;
stroke:green;
stroke-width:1px
}
.chart__label--bold {
font-weight:bold
}
.x.axis line {
shape-rendering:crispEdges;
stroke:#d6d3cf;
stroke-dasharray:3 2
}
.tick text {
font-size:14px
}
.chart-key text {
font-size:14px
}
.x.axis text {
font-size:12px;
text-anchor:start !important
}
.chart-key {
display:block
}
.chart-key__row {
display:block
}
</style>
<g class="chart-key__row" height="24" transform="translate(0, 0)">
<rect class="chart__bar--orange" height="14" width="18" y="0"></rect>
<text class="chart-key__label" x="24" y="13">
Podpora hardwaru a údržbové aktualizace
</text>
</g>
<g class="chart-key__row" height="24" transform="translate(0, 21)">
<rect class="chart__bar--orange-light" height="14" width="18" y="0"></rect>
<text class="chart-key__label" x="24" y="13">
Údržbové aktualizace
</text>
</g>
<g class="chart-key__row" height="24" transform="translate(0, 42)">
<rect class="chart__bar--grey" height="14" width="18" y="0"></rect>
<text class="chart-key__label" x="24" y="13">
Mezivydání s běžnou podporou
</text>
</g>
<g class="chart-key__row" height="24" transform="translate(0, 63)">
<rect class="chart__bar--aubergine" height="14" width="18" y="0"></rect>
<text class="chart-key__label" x="24" y="13">
Prodloužená podpora zajišující bezpečnostní aktualizace (ESM)
Please register or sign in to reply
</text>
</g>
</svg>
  • Díky moc @asciiwolf. Ten overflow jsem nedávno viděl (typo jsem si nevšiml), ale mám nějaké na houby období a zapomněl jsem na to.

Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment