From 2afcdaca1b7778b70bc1f500fabff8c9ecc7ef13 Mon Sep 17 00:00:00 2001 From: Rick Viscomi Date: Fri, 3 Jul 2020 16:21:57 -0400 Subject: [PATCH 1/6] 2020 landing page (coming soon) --- src/config/2020.json | 2 +- src/templates/base/2020/index.html | 41 +++++++++++++++++++++++++++++- src/templates/en/2020/index.html | 14 +++++++--- 3 files changed, 52 insertions(+), 5 deletions(-) diff --git a/src/config/2020.json b/src/config/2020.json index 45755a20513..b754db46ea0 100644 --- a/src/config/2020.json +++ b/src/config/2020.json @@ -1,7 +1,7 @@ { "settings": [ { - "is_live": false, + "is_live": true, "supported_languages": ["en","es","fr","ja"], "ebook_languages": [] } diff --git a/src/templates/base/2020/index.html b/src/templates/base/2020/index.html index 3f41ad5bda7..2cba9e2b29c 100644 --- a/src/templates/base/2020/index.html +++ b/src/templates/base/2020/index.html @@ -22,6 +22,40 @@ {% block styles %} {{ super() }} + + {% endblock %} {# Hide the TOC, Contributors and Methodology for now #} @@ -35,7 +69,7 @@
{{ year }}

{{ self.intro_title() }}

{{ self.intro_sub_title() }}

-

{{ self.mission() }}

+
{{ self.mission() }}
@@ -44,5 +78,10 @@

{{ self.intro_sub_title() }}

+
+
+ +
+
{% endblock %} diff --git a/src/templates/en/2020/index.html b/src/templates/en/2020/index.html index b2f487db9a4..d640d649a4b 100644 --- a/src/templates/en/2020/index.html +++ b/src/templates/en/2020/index.html @@ -8,9 +8,17 @@ {% block date_published %}2019-11-04T12:00:00.000Z{% endblock %} {% block date_modified %}2020-06-27T00:00:00.000Z{% endblock %} -{% block intro_title %}Web Almanac{% endblock %} -{% block intro_sub_title %}HTTP Archive's annual
state of the web report{% endblock %} +{% block intro_title %}Coming soon!{% endblock %} +{% block intro_sub_title %}The 2020 state of the web report{% endblock %} {% block mission %} -Coming Soon... +

+ Experts from around the web community are currently hard at work planning, analyzing, and writing content for the 2020 edition of the Web Almanac, which is on track to be published at the end of the year. +

+ +

+ There are many opportunities available for new contributors to join the project, including: authors, reviewers, analysts, editors, translators, and developers. If you're interested in contributing to the 2020 edition, we'd love to have you! +

+ +Join us {% endblock %} From 3a1c3a2047bae026b463b47bbb64d6771ae9920c Mon Sep 17 00:00:00 2001 From: Rick Viscomi Date: Fri, 3 Jul 2020 16:28:29 -0400 Subject: [PATCH 2/6] TODO: translate landing pages --- src/templates/en/2020/index.html | 2 +- src/templates/es/2020/index.html | 16 ++++++++++++---- src/templates/fr/2020/index.html | 16 ++++++++++++---- src/templates/ja/2020/index.html | 16 ++++++++++++---- 4 files changed, 37 insertions(+), 13 deletions(-) diff --git a/src/templates/en/2020/index.html b/src/templates/en/2020/index.html index d640d649a4b..bfd75c884ed 100644 --- a/src/templates/en/2020/index.html +++ b/src/templates/en/2020/index.html @@ -6,7 +6,7 @@ {% block twitter_image_alt %}The {{ year }} Web Almanac{% endblock %} {% block date_published %}2019-11-04T12:00:00.000Z{% endblock %} -{% block date_modified %}2020-06-27T00:00:00.000Z{% endblock %} +{% block date_modified %}2020-07-03T00:00:00.000Z{% endblock %} {% block intro_title %}Coming soon!{% endblock %} {% block intro_sub_title %}The 2020 state of the web report{% endblock %} diff --git a/src/templates/es/2020/index.html b/src/templates/es/2020/index.html index e8c3a66715a..20c6b46cbb8 100644 --- a/src/templates/es/2020/index.html +++ b/src/templates/es/2020/index.html @@ -6,11 +6,19 @@ {% block twitter_image_alt %}Web Almanac {{ year }}{% endblock %} {% block date_published %}2019-11-04T12:00:00.000Z{% endblock %} -{% block date_modified %}2020-06-27T00:00:00.000Z{% endblock %} +{% block date_modified %}2020-07-03T00:00:00.000Z{% endblock %} -{% block intro_title %}Web Almanac{% endblock %} -{% block intro_sub_title %}HTTP Archive informe del
estado de la web anual{% endblock %} +{% block intro_title %}Coming soon!{% endblock %} +{% block intro_sub_title %}The 2020 state of the web report{% endblock %} {% block mission %} -Próximamente... +

+ Experts from around the web community are currently hard at work planning, analyzing, and writing content for the 2020 edition of the Web Almanac, which is on track to be published at the end of the year. +

+ +

+ There are many opportunities available for new contributors to join the project, including: authors, reviewers, analysts, editors, translators, and developers. If you're interested in contributing to the 2020 edition, we'd love to have you! +

+ +Join us {% endblock %} diff --git a/src/templates/fr/2020/index.html b/src/templates/fr/2020/index.html index d277eb3ad49..3e438755156 100644 --- a/src/templates/fr/2020/index.html +++ b/src/templates/fr/2020/index.html @@ -6,11 +6,19 @@ {% block twitter_image_alt %}Web Almanac {{ year }}{% endblock %} {% block date_published %}2019-11-04T12:00:00.000Z{% endblock %} -{% block date_modified %}2020-06-27T00:00:00.000Z{% endblock %} +{% block date_modified %}2020-07-03T00:00:00.000Z{% endblock %} -{% block intro_title %}Web Almanac{% endblock %} -{% block intro_sub_title %}Rapport annuel
de HTTP Archive sur
l’état du Web{% endblock %} +{% block intro_title %}Coming soon!{% endblock %} +{% block intro_sub_title %}The 2020 state of the web report{% endblock %} {% block mission %} -Bientôt disponible... +

+ Experts from around the web community are currently hard at work planning, analyzing, and writing content for the 2020 edition of the Web Almanac, which is on track to be published at the end of the year. +

+ +

+ There are many opportunities available for new contributors to join the project, including: authors, reviewers, analysts, editors, translators, and developers. If you're interested in contributing to the 2020 edition, we'd love to have you! +

+ +Join us {% endblock %} diff --git a/src/templates/ja/2020/index.html b/src/templates/ja/2020/index.html index 1e0fa5f3606..36dfa01b5f6 100644 --- a/src/templates/ja/2020/index.html +++ b/src/templates/ja/2020/index.html @@ -6,11 +6,19 @@ {% block twitter_image_alt %}The {{ year }} Web Almanac{% endblock %} {% block date_published %}2019-11-04T12:00:00.000Z{% endblock %} -{% block date_modified %}2020-06-27T00:00:00.000Z{% endblock %} +{% block date_modified %}2020-07-03T00:00:00.000Z{% endblock %} -{% block intro_title %}Web Almanac{% endblock %} -{% block intro_sub_title %}HTTP Archiveの年次報告書
ウェブの状態レポート{% endblock %} +{% block intro_title %}Coming soon!{% endblock %} +{% block intro_sub_title %}The 2020 state of the web report{% endblock %} {% block mission %} -近日公開 +

+ Experts from around the web community are currently hard at work planning, analyzing, and writing content for the 2020 edition of the Web Almanac, which is on track to be published at the end of the year. +

+ +

+ There are many opportunities available for new contributors to join the project, including: authors, reviewers, analysts, editors, translators, and developers. If you're interested in contributing to the 2020 edition, we'd love to have you! +

+ +Join us {% endblock %} From 6b77eccc1a513a78c0904317102637dc6e759aa8 Mon Sep 17 00:00:00 2001 From: Rick Viscomi Date: Fri, 3 Jul 2020 17:57:57 -0400 Subject: [PATCH 3/6] "Join the team" --- src/templates/en/2020/index.html | 2 +- src/templates/es/2020/index.html | 2 +- src/templates/fr/2020/index.html | 2 +- src/templates/ja/2020/index.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/templates/en/2020/index.html b/src/templates/en/2020/index.html index bfd75c884ed..256b409c497 100644 --- a/src/templates/en/2020/index.html +++ b/src/templates/en/2020/index.html @@ -20,5 +20,5 @@ There are many opportunities available for new contributors to join the project, including: authors, reviewers, analysts, editors, translators, and developers. If you're interested in contributing to the 2020 edition, we'd love to have you!

-Join us +Join the team {% endblock %} diff --git a/src/templates/es/2020/index.html b/src/templates/es/2020/index.html index 20c6b46cbb8..1cd15925696 100644 --- a/src/templates/es/2020/index.html +++ b/src/templates/es/2020/index.html @@ -20,5 +20,5 @@ There are many opportunities available for new contributors to join the project, including: authors, reviewers, analysts, editors, translators, and developers. If you're interested in contributing to the 2020 edition, we'd love to have you!

-Join us +Join the team {% endblock %} diff --git a/src/templates/fr/2020/index.html b/src/templates/fr/2020/index.html index 3e438755156..2123e9c4291 100644 --- a/src/templates/fr/2020/index.html +++ b/src/templates/fr/2020/index.html @@ -20,5 +20,5 @@ There are many opportunities available for new contributors to join the project, including: authors, reviewers, analysts, editors, translators, and developers. If you're interested in contributing to the 2020 edition, we'd love to have you!

-Join us +Join the team {% endblock %} diff --git a/src/templates/ja/2020/index.html b/src/templates/ja/2020/index.html index 36dfa01b5f6..28ab5d72180 100644 --- a/src/templates/ja/2020/index.html +++ b/src/templates/ja/2020/index.html @@ -20,5 +20,5 @@ There are many opportunities available for new contributors to join the project, including: authors, reviewers, analysts, editors, translators, and developers. If you're interested in contributing to the 2020 edition, we'd love to have you!

-Join us +Join the team {% endblock %} From a04c6e4fab916b0e5c781101f24ba234d44f7495 Mon Sep 17 00:00:00 2001 From: Rick Viscomi Date: Mon, 6 Jul 2020 15:34:38 -0400 Subject: [PATCH 4/6] reuse existing translations --- src/templates/es/2020/index.html | 2 +- src/templates/fr/2020/index.html | 2 +- src/templates/ja/2020/index.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/templates/es/2020/index.html b/src/templates/es/2020/index.html index 1cd15925696..c058253e85c 100644 --- a/src/templates/es/2020/index.html +++ b/src/templates/es/2020/index.html @@ -20,5 +20,5 @@ There are many opportunities available for new contributors to join the project, including: authors, reviewers, analysts, editors, translators, and developers. If you're interested in contributing to the 2020 edition, we'd love to have you!

-Join the team +¡Únete al equipo! {% endblock %} diff --git a/src/templates/fr/2020/index.html b/src/templates/fr/2020/index.html index 2123e9c4291..bea2e4a1167 100644 --- a/src/templates/fr/2020/index.html +++ b/src/templates/fr/2020/index.html @@ -20,5 +20,5 @@ There are many opportunities available for new contributors to join the project, including: authors, reviewers, analysts, editors, translators, and developers. If you're interested in contributing to the 2020 edition, we'd love to have you!

-Join the team +Rejoignez les équipe! {% endblock %} diff --git a/src/templates/ja/2020/index.html b/src/templates/ja/2020/index.html index 28ab5d72180..27e1c83a65f 100644 --- a/src/templates/ja/2020/index.html +++ b/src/templates/ja/2020/index.html @@ -20,5 +20,5 @@ There are many opportunities available for new contributors to join the project, including: authors, reviewers, analysts, editors, translators, and developers. If you're interested in contributing to the 2020 edition, we'd love to have you!

-Join the team +チームに参加しよう！ {% endblock %} From ae3522ad10dd827d94b69b23a16571d7e8f6ca7a Mon Sep 17 00:00:00 2001 From: Rick Viscomi Date: Mon, 6 Jul 2020 15:35:45 -0400 Subject: [PATCH 5/6] disable 2020 --- src/config/2020.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/2020.json b/src/config/2020.json index b754db46ea0..45755a20513 100644 --- a/src/config/2020.json +++ b/src/config/2020.json @@ -1,7 +1,7 @@ { "settings": [ { - "is_live": true, + "is_live": false, "supported_languages": ["en","es","fr","ja"], "ebook_languages": [] } From 4dc39ef2f21f3095649841373dd3f7e67eb5652d Mon Sep 17 00:00:00 2001 From: Rick Viscomi Date: Mon, 6 Jul 2020 15:47:03 -0400 Subject: [PATCH 6/6] re-enable 2020 --- src/config/2020.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/2020.json b/src/config/2020.json index 45755a20513..b754db46ea0 100644 --- a/src/config/2020.json +++ b/src/config/2020.json @@ -1,7 +1,7 @@ { "settings": [ { - "is_live": false, + "is_live": true, "supported_languages": ["en","es","fr","ja"], "ebook_languages": [] }