From f617f4e2de5279369636fa2bad374fca1e0d356d Mon Sep 17 00:00:00 2001 From: Pascal Chevrel Date: Wed, 11 Sep 2024 13:55:24 +0200 Subject: [PATCH] Visual changes, mostly CSS, to make tables more legible --- app/views/templates/base.html.twig | 2 +- app/views/templates/calendar.html.twig | 36 ++++---- app/views/templates/esr_release.html.twig | 32 +++---- app/views/templates/future_release.html.twig | 90 ++++++++++---------- app/views/templates/past_release.html.twig | 72 ++++++++-------- public/style/base.css | 5 ++ 6 files changed, 123 insertions(+), 114 deletions(-) diff --git a/app/views/templates/base.html.twig b/app/views/templates/base.html.twig index d8eb72c..eb7c86a 100644 --- a/app/views/templates/base.html.twig +++ b/app/views/templates/base.html.twig @@ -6,7 +6,7 @@ - + diff --git a/app/views/templates/calendar.html.twig b/app/views/templates/calendar.html.twig index e48cbbb..e92b155 100644 --- a/app/views/templates/calendar.html.twig +++ b/app/views/templates/calendar.html.twig @@ -15,21 +15,23 @@ {% block main %} {% set year = 'now'|date('Y') %} - +{% set table_header = 'text-secondary-emphasis fw-semibold' %} + +
- - - - - - - - + + + + + + + + @@ -46,7 +48,7 @@ {% if check != values.quarter %} {% set rowspan = upcoming_quarters[values.quarter] %} - + {% set check = values.quarter %} {% endif %} @@ -94,16 +96,16 @@ {% set date_pattern = 'YYYY-MM-dd' %}
Click to toggle past releases table data -
Upcoming releases
{{ year }}
QuarterVersionMatching ESRRelease OwnerNightly startsSoft code freezeBeta startsRelease dayQuarterVersionMatching ESRRelease OwnerNightly startsSoft code freezeBeta startsRelease day
{{ values.quarter | split('-', 2)[1] }}{{ values.quarter | split('-', 2)[1] }}{{ values.version }}
+
- - - - - - + + + + + + diff --git a/app/views/templates/esr_release.html.twig b/app/views/templates/esr_release.html.twig index 988e4bd..1e7702f 100644 --- a/app/views/templates/esr_release.html.twig +++ b/app/views/templates/esr_release.html.twig @@ -15,27 +15,29 @@ {% endif %} -
Past releases
VersionMatching ESRRelease ownerNightly startsBeta startsRelease dayVersionMatching ESRRelease ownerNightly startsBeta startsRelease day
+ + {% set table_header = 'text-secondary-emphasis fw-semibold' %} + +
+ + + + {% if constant('ESR_NEXT') != "" %} - - + + - + - {% else %} - + - {% endif %} - - -
Last release{{ release_date|format_date('long', locale='en') }}
Latest version (old branch)
Latest version (old branch) {{ current_ESR }}
Latest version (new branch)Latest version (new branch) {{ next_ESR }}
Latest versionLatest version {{ current_ESR }}
Release Date{{ release_date|format_date('long', locale='en') }}
{% if current_ESR|number_format == 115 %} @@ -61,15 +63,15 @@ - +
- - - - + + + + {% for key, values in esr_calendar %} diff --git a/app/views/templates/future_release.html.twig b/app/views/templates/future_release.html.twig index 8aa6d66..be88123 100644 --- a/app/views/templates/future_release.html.twig +++ b/app/views/templates/future_release.html.twig @@ -126,28 +126,41 @@ {% endif %} {% endif %} - -
Releases calendar
FirefoxESROld ESRDateFirefoxESROld ESRDate
- - + {% set table_header = 'text-secondary-emphasis fw-semibold' %} +
Release Date{{ release_date|format_date('long', locale='en') }}
+ + - + + {% if OLDER_ESR %} - + + {% if OLDER_ESR|number_format == 115 %} + + {% else %} + + {% endif %} + + {% else %} - + + + {% endif %} {% if channel == 'beta' %} - - - - - + + + + + {% endif %} + + + + + + {% if release == '140' %} @@ -167,40 +190,17 @@ {% endif %} - {% if OLDER_ESR %} - - - {% if OLDER_ESR|number_format == 115 %} - - {% else %} - - {% endif %} - - - {% else %} - - - - {% endif %} - {% if channel == 'nightly' %} - + {% endif %} {% if channel == 'beta' %} - + {% endif %} @@ -296,32 +296,32 @@ {% set next_milestone = true %} -
Release Date{{ release_date|format_date('long', locale='en') }}
Release Owner{{ release_owner }}Release Owner{{ release_owner }}
Nightly cycle length{{ nightly_cycle_length|number_format }} weeksCorresponding ESR releases{{ ESR }} · + + {{ OLDER_ESR }}? + + {{ ESR }} · {{ OLDER_ESR }}
Beta cycle length{{ beta_cycle_length|number_format }} weeksCorresponding ESR release{{ ESR }}
Bugs fixed in Nightly{{ nightly_fixes.bug_fixes|length }}
Current BetaCurrent Beta {% if date() > date(cycle_dates.rc_gtb) %} {{ constant('FIREFOX_BETA')|number_format(1) }} Release Candidate @@ -159,7 +172,17 @@ {% endif %}
Bugs fixed in Nightly{{ nightly_fixes.bug_fixes|length }}
Nightly cycle length{{ nightly_cycle_length|number_format }} weeks
Beta cycle length{{ beta_cycle_length|number_format }} weeks
Corresponding ESR releases{{ ESR }} · - - {{ OLDER_ESR }}? - - {{ ESR }} · {{ OLDER_ESR }}
Corresponding ESR release{{ ESR }}
Release notesRelease notes Nightly notes
Release notesRelease notes Beta notes
+
- + {% for key, value in cycle_dates %} {% if key != 'version' %} {% set extra = '' %} {% if key == 'soft_code_freeze' %} - {% set extra = ' Draft beta release notes' %} + {% set extra = ' Draft beta release notes' %} {% endif %} {% if release == 116 and key == 'beta_5' %} - {% set extra = ' Last early beta' %} + {% set extra = ' Last early beta' %} {% endif %} {% if key == 'beta_6' and release != 116 %} - {% set extra = ' Last early beta' %} + {% set extra = ' Last early beta' %} {% endif %} {% if key == 'beta_9' %} - {% set extra = ' Last beta uplifts (sec-approval request deadline)' %} + {% set extra = ' Last beta uplifts (sec-approval request deadline)' %} {% endif %} {% if key == 'rc' %} - {% set extra = ' Release notes finalized' %} + {% set extra = ' Release notes finalized' %} {% endif %} @@ -351,7 +351,7 @@ {% endif %} {% else %} -
Milestones
Desktop, Android & iOS		Milestones
Desktop, Android & iOS
+ {{ cycle_labels[key]|raw }}{{ extra|raw }}

{{ cycle_descriptions[key]|raw }}

diff --git a/app/views/templates/past_release.html.twig b/app/views/templates/past_release.html.twig index 2cbb0e6..b823452 100644 --- a/app/views/templates/past_release.html.twig +++ b/app/views/templates/past_release.html.twig @@ -30,22 +30,36 @@ {% endif %} - + {% set table_header = 'text-secondary-emphasis fw-semibold' %} +
+ + + - + + {% if OLDER_ESR %} - + + + + {% else %} - + + + {% endif %} + - + + + + {% if release > 57 %} - + @@ -54,37 +68,37 @@ {% if beta_uplifts %} - + {% else %} - + {% endif %} {% if rc_uplifts %} - + {% else %} - + {% endif %} - + - + - + - + - + - - {% if OLDER_ESR %} - - - - - - {% else %} - - - - - {% endif %} -
Release Date{{ release_date|format_date('long', locale='en') }}
Release Date{{ release_date|format_date('long', locale='en') }}Release Owner{{ release_owner }}
Release Owner{{ release_owner }}Corresponding ESR releases{{ ESR }} ⁘ {{ OLDER_ESR }}
Nightly cycle length{{ nightly_cycle_length|number_format }} weeksCorresponding ESR release{{ ESR }}
Beta cycle length{{ beta_cycle_length|number_format }} weeksNightly cycle length{{ nightly_cycle_length|number_format }} weeks
Beta cycle length{{ beta_cycle_length|number_format }} weeks
Bugs fixed in nightlyBugs fixed in nightly {{ nightly_fixes.bug_fixes|length }}
Uplifts in Beta{{ beta_uplifts.total|length }} ({{ beta_uplifts.backouts|length }} backout{{ beta_uplifts.backouts|length != 1 ? 's' }})Uplifts in Beta{{ beta_uplifts.total|length }} ({{ beta_uplifts.backouts|length }} backout{{ beta_uplifts.backouts|length != 1 ? 's' }})
Uplifts in BetaData cannot be extracted from mercurial (missing HG tags)Uplifts in BetaData cannot be extracted from mercurial (missing HG tags)
Uplifts in RC{{ rc_uplifts.total|length }} ({{ rc_uplifts.backouts|length }} backout{{ rc_uplifts.backouts|length != 1 ? 's' }})Uplifts in RC{{ rc_uplifts.total|length }} ({{ rc_uplifts.backouts|length }} backout{{ rc_uplifts.backouts|length != 1 ? 's' }})
Uplifts in RCData cannot be extracted from mercurial (missing HG tags)Uplifts in RCData cannot be extracted from mercurial (missing HG tags)
Total number of uplifts{{ beta_uplifts.total|length + rc_uplifts.total|length}}Total number of uplifts{{ beta_uplifts.total|length + rc_uplifts.total|length}}
Betas{{ beta_count }}Betas{{ beta_count }}
Release Candidates{{ rc_count }}Release Candidates{{ rc_count }}
Dot releases{{ dot_release_count }}Dot releases{{ dot_release_count }}
Release notesRelease notes {% set link_fix = '' %} {% if release == 125 or release == 14 %} @@ -94,35 +108,21 @@ Developer notes
Corresponding ESR releases{{ ESR }} ⁘ {{ OLDER_ESR }}
Corresponding ESR release{{ ESR }}
- +
- + - + - + - - - + {% endif %} diff --git a/public/style/base.css b/public/style/base.css index ade1e09..1588342 100644 --- a/public/style/base.css +++ b/public/style/base.css @@ -109,6 +109,11 @@ h1, h2, h3 { text-align: center; } +.table-fxt-clean, +.table-fxt-clean th, +.table-fxt-clean td { + border-color: lavender; +} #release_esr .table + .table td { width: 6em;
Key MilestonesKey Milestones
Nightly startNightly start {{ nightly_start_date|format_date(pattern='MMMM d', locale='en') }}
Beta startBeta start {{ beta_start_date|format_date(pattern='MMMM d', locale='en') }}
+ {{ release }}.0 {% if dot_release_count == 0 %} {{ rollout|raw }} @@ -169,7 +169,7 @@ {% endif %}
+ {{ release }}.0.{{ dot_release }} {% if release > 125 %} {% if dot_releases[release ~ '.0.' ~ dot_release]['platform'] == 'android' %} @@ -191,7 +191,7 @@ {% if release ~ '.0' not in no_planned_dot_releases %} {% if "now"|date('Y-m-d') < release_date|date_modify("+2 weeks")|date('Y-m-d') %}
Planned {{ release }}.0.xPlanned {{ release }}.0.x {{ release_date|date_modify("+" ~ ( release == 121 ? '3' : '2' ) ~ " weeks")|format_date(pattern='MMMM d', locale='en') }}