From 53a15bb9503962381a162b3fb320546e16c718be Mon Sep 17 00:00:00 2001 From: Elod Illes Date: Mon, 20 Apr 2020 15:03:26 +0200 Subject: [PATCH] Add Extended Maintenance badge Ocata, Pike, Queens and Rocky branches are in Extended Maintenance already but they are still referred as 'maintained' in the docs. This patch replaces 'maintained' to 'in Extended Maintenance' for those branches. Change-Id: I2aea17466ff3da652ba01d98def635d744e67fbb --- tools/www-generator.py | 8 ++++---- www/templates/deprecated_badge.tmpl | 3 +++ www/templates/project_deprecated_badge.tmpl | 5 +++++ www/templates/series_status.tmpl | 4 ++++ 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/tools/www-generator.py b/tools/www-generator.py index 2d66304d24..d53ba8287d 100755 --- a/tools/www-generator.py +++ b/tools/www-generator.py @@ -58,10 +58,10 @@ SERIES_INFO = { 'liberty': SeriesInfo(date='October 2015', status='EOL'), 'mitaka': SeriesInfo(date='April 2016', status='EOL'), 'newton': SeriesInfo(date='October 2016', status='EOL'), - 'ocata': SeriesInfo(date='February 2017', status='maintained'), - 'pike': SeriesInfo(date='August 2017', status='maintained'), - 'queens': SeriesInfo(date='March 2018', status='maintained'), - 'rocky': SeriesInfo(date='August 2018', status='maintained'), + 'ocata': SeriesInfo(date='February 2017', status='extended-maintenance'), + 'pike': SeriesInfo(date='August 2017', status='extended-maintenance'), + 'queens': SeriesInfo(date='March 2018', status='extended-maintenance'), + 'rocky': SeriesInfo(date='August 2018', status='extended-maintenance'), 'stein': SeriesInfo(date='April 2019', status='maintained'), 'train': SeriesInfo(date='October 2019', status='maintained'), 'ussuri': SeriesInfo(date='May 2020', status='development'), diff --git a/www/templates/deprecated_badge.tmpl b/www/templates/deprecated_badge.tmpl index c6cc75ad92..7f248c95dc 100644 --- a/www/templates/deprecated_badge.tmpl +++ b/www/templates/deprecated_badge.tmpl @@ -26,6 +26,9 @@ which is no longer supported by the community. The current supported release is {{RELEASED_SERIES.capitalize()}}. {% elif SERIES == RELEASED_SERIES %} which is the current supported release. + {% elif SERIES_INFO.status == 'extended-maintenance' %} + which is in extended maintenance, but old. The current supported + release is {{RELEASED_SERIES.capitalize()}}. {% elif SERIES_INFO.status == 'maintained' %} which is maintained, but old. The current supported release is {{RELEASED_SERIES.capitalize()}}. diff --git a/www/templates/project_deprecated_badge.tmpl b/www/templates/project_deprecated_badge.tmpl index a28ce17b48..74aff77ec8 100644 --- a/www/templates/project_deprecated_badge.tmpl +++ b/www/templates/project_deprecated_badge.tmpl @@ -31,6 +31,11 @@ This is maintained, but not the current release. The current supported release is {{RELEASED_SERIES.capitalize()}}.

+ {% elif SERIES_INFO.status == 'extended-maintenance' %} +

+ This is in extended maintenance and not the current release. The current supported + release is {{RELEASED_SERIES.capitalize()}}. +

{% elif SERIES_INFO.status == 'development' %}

This release is under development. The current supported release is {{RELEASED_SERIES.capitalize()}}. diff --git a/www/templates/series_status.tmpl b/www/templates/series_status.tmpl index d923bf435d..79cde8cb18 100644 --- a/www/templates/series_status.tmpl +++ b/www/templates/series_status.tmpl @@ -33,6 +33,10 @@

This is the latest release. Use the top menu to select a prior release if needed.

+{% elif SERIES_INFO.status == 'extended-maintenance' %} +

This is an old release in extended maintenance. Use the top menu to + select a different release if needed.

+ {% elif SERIES_INFO.status == 'maintained' %}

This is not the latest release. Use the top menu to select a different release if needed.