From c8a97444fdd149f9199e4c1937912f4d81272790 Mon Sep 17 00:00:00 2001 From: Jessica Schilling Date: Tue, 19 May 2020 12:49:12 -0600 Subject: [PATCH 01/24] LH: Peers in large message --- add-on/src/landing-pages/welcome/page.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/add-on/src/landing-pages/welcome/page.js b/add-on/src/landing-pages/welcome/page.js index b846fc50c..9cb430e28 100644 --- a/add-on/src/landing-pages/welcome/page.js +++ b/add-on/src/landing-pages/welcome/page.js @@ -81,9 +81,8 @@ const renderWelcome = (i18n, peerCount, onOpenWebUi) => {
${checkmarkSvg()} -

${i18n.getMessage('page_landingWelcome_welcome_title')}

+

${renderTranslatedSpans('page_landingWelcome_welcome_peers', [peerCount], 'class="aqua fw6"')}

-

${renderTranslatedSpans('page_landingWelcome_welcome_peers', [peerCount], 'class="aqua fw6"')}

${renderTranslatedLinks('page_landingWelcome_welcome_discover', ['https://github.com/ipfs-shipyard/ipfs-companion#features'], `target="_blank" class="${anchorClass}"`)}

From d702b588915293c44cdd2f302373774a4369ff98 Mon Sep 17 00:00:00 2001 From: Jessica Schilling Date: Tue, 19 May 2020 15:23:10 -0600 Subject: [PATCH 02/24] Move discover text to right side; three action buttons in left --- add-on/src/landing-pages/welcome/page.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/add-on/src/landing-pages/welcome/page.js b/add-on/src/landing-pages/welcome/page.js index 9cb430e28..cacda8c94 100644 --- a/add-on/src/landing-pages/welcome/page.js +++ b/add-on/src/landing-pages/welcome/page.js @@ -83,9 +83,10 @@ const renderWelcome = (i18n, peerCount, onOpenWebUi) => { ${checkmarkSvg()}

${renderTranslatedSpans('page_landingWelcome_welcome_peers', [peerCount], 'class="aqua fw6"')}

-

${renderTranslatedLinks('page_landingWelcome_welcome_discover', ['https://github.com/ipfs-shipyard/ipfs-companion#features'], `target="_blank" class="${anchorClass}"`)}

- + + +
` @@ -123,6 +124,7 @@ const renderResources = (i18n) => { return html` ` } @@ -193,17 +189,17 @@ const renderProjects = (i18n) => {
Multiformats Logo -

multiformats.io

+

Multiformats

IPLD Logo -

ipld.io

+

IPLD

libp2p Logo -

libp2p.io

+

libp2p

From ca089b6bd8e535a3c0c8e8aa41ca55e429980832 Mon Sep 17 00:00:00 2001 From: Jessica Schilling Date: Tue, 19 May 2020 16:33:33 -0600 Subject: [PATCH 05/24] Change video links (but not thumbnails) --- add-on/src/landing-pages/welcome/page.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/add-on/src/landing-pages/welcome/page.js b/add-on/src/landing-pages/welcome/page.js index e1972b341..1998509f7 100644 --- a/add-on/src/landing-pages/welcome/page.js +++ b/add-on/src/landing-pages/welcome/page.js @@ -159,7 +159,7 @@ const renderVideos = (i18n) => {

${i18n.getMessage('page_landingWelcome_videos_alpha_demo')}

- + ${i18n.getMessage('page_landingWelcome_videos_alpha_demo')} ${overlayDiv()} ${playSvg()} @@ -168,7 +168,7 @@ const renderVideos = (i18n) => {

${i18n.getMessage('page_landingWelcome_videos_permanent_web')}

-
+ ${i18n.getMessage('page_landingWelcome_videos_permanent_web')} ${overlayDiv()} ${playSvg()} From 703db4b89e93397e15a2ccfb10f091f195b87c27 Mon Sep 17 00:00:00 2001 From: Jessica Schilling Date: Tue, 19 May 2020 16:49:09 -0600 Subject: [PATCH 06/24] Add video thumbnails --- add-on/src/landing-pages/welcome/page.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/add-on/src/landing-pages/welcome/page.js b/add-on/src/landing-pages/welcome/page.js index 1998509f7..57685bf29 100644 --- a/add-on/src/landing-pages/welcome/page.js +++ b/add-on/src/landing-pages/welcome/page.js @@ -160,7 +160,7 @@ const renderVideos = (i18n) => {

${i18n.getMessage('page_landingWelcome_videos_alpha_demo')}

- ${i18n.getMessage('page_landingWelcome_videos_alpha_demo')} + ${i18n.getMessage('page_landingWelcome_videos_alpha_demo')} ${overlayDiv()} ${playSvg()} @@ -169,7 +169,7 @@ const renderVideos = (i18n) => {

${i18n.getMessage('page_landingWelcome_videos_permanent_web')}

- ${i18n.getMessage('page_landingWelcome_videos_permanent_web')} + ${i18n.getMessage('page_landingWelcome_videos_permanent_web')} ${overlayDiv()} ${playSvg()} From 3abb361f716426c09aae31435de178bb92000124 Mon Sep 17 00:00:00 2001 From: Jessica Schilling Date: Tue, 19 May 2020 16:56:08 -0600 Subject: [PATCH 07/24] Test: update "node connected to" string --- add-on/_locales/en/messages.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/add-on/_locales/en/messages.json b/add-on/_locales/en/messages.json index 2bd3248f5..b46d95fb9 100644 --- a/add-on/_locales/en/messages.json +++ b/add-on/_locales/en/messages.json @@ -612,7 +612,7 @@ "description": "Ready message title (page_landingWelcome_welcome_title)" }, "page_landingWelcome_welcome_peers": { - "message": "Right now your node is connected to <0>$1 peers.", + "message": "Your node is connected to <0>$1 peers.", "description": "Ready message copy (page_landingWelcome_welcome_peers)" }, "page_landingWelcome_welcome_discover": { From 9efc9c3859673ec5145dbeecd84f3e97028dc1df Mon Sep 17 00:00:00 2001 From: Jessica Schilling Date: Tue, 19 May 2020 18:03:54 -0600 Subject: [PATCH 08/24] Button language change (some still hard-coded), margin tweak --- add-on/_locales/en/messages.json | 2 +- add-on/src/landing-pages/welcome/page.js | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/add-on/_locales/en/messages.json b/add-on/_locales/en/messages.json index b46d95fb9..419448fea 100644 --- a/add-on/_locales/en/messages.json +++ b/add-on/_locales/en/messages.json @@ -40,7 +40,7 @@ "description": "A menu item in Browser Action pop-up (panel_quickImport)" }, "panel_openWebui": { - "message": "Open Web UI", + "message": "View Node Status", "description": "A menu item in Browser Action pop-up (panel_openWebui)" }, "panel_redirectToggle": { diff --git a/add-on/src/landing-pages/welcome/page.js b/add-on/src/landing-pages/welcome/page.js index 57685bf29..feaf610a5 100644 --- a/add-on/src/landing-pages/welcome/page.js +++ b/add-on/src/landing-pages/welcome/page.js @@ -79,14 +79,14 @@ const renderWelcome = (i18n, peerCount, onOpenWebUi) => { return html`
-
+
${checkmarkSvg()}

${renderTranslatedSpans('page_landingWelcome_welcome_peers', [peerCount], 'class="aqua fw6"')}

-
- - +
+ +
` From 7c654c3a3ab3143ca3cf3208d3577f8f84858abb Mon Sep 17 00:00:00 2001 From: Jessica Schilling Date: Wed, 20 May 2020 10:24:58 -0600 Subject: [PATCH 09/24] Revert panel_openWebui language --- add-on/_locales/en/messages.json | 2 +- add-on/src/landing-pages/welcome/page.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/add-on/_locales/en/messages.json b/add-on/_locales/en/messages.json index 419448fea..b46d95fb9 100644 --- a/add-on/_locales/en/messages.json +++ b/add-on/_locales/en/messages.json @@ -40,7 +40,7 @@ "description": "A menu item in Browser Action pop-up (panel_quickImport)" }, "panel_openWebui": { - "message": "View Node Status", + "message": "Open Web UI", "description": "A menu item in Browser Action pop-up (panel_openWebui)" }, "panel_redirectToggle": { diff --git a/add-on/src/landing-pages/welcome/page.js b/add-on/src/landing-pages/welcome/page.js index feaf610a5..dad1ecedd 100644 --- a/add-on/src/landing-pages/welcome/page.js +++ b/add-on/src/landing-pages/welcome/page.js @@ -84,7 +84,7 @@ const renderWelcome = (i18n, peerCount, onOpenWebUi) => {

${renderTranslatedSpans('page_landingWelcome_welcome_peers', [peerCount], 'class="aqua fw6"')}

- +
From bc19046fc3b08e9d4195255ae3daadf40a7ac5a9 Mon Sep 17 00:00:00 2001 From: Jessica Schilling Date: Wed, 20 May 2020 10:39:05 -0600 Subject: [PATCH 10/24] Shorten button titles in LH on-state --- add-on/src/landing-pages/welcome/page.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/add-on/src/landing-pages/welcome/page.js b/add-on/src/landing-pages/welcome/page.js index dad1ecedd..566aa440c 100644 --- a/add-on/src/landing-pages/welcome/page.js +++ b/add-on/src/landing-pages/welcome/page.js @@ -84,9 +84,9 @@ const renderWelcome = (i18n, peerCount, onOpenWebUi) => {

${renderTranslatedSpans('page_landingWelcome_welcome_peers', [peerCount], 'class="aqua fw6"')}

- - - + + +
` From 72d3b4c52fed0014071660961bf7e221f8f092ab Mon Sep 17 00:00:00 2001 From: Jessica Schilling Date: Wed, 20 May 2020 11:09:38 -0600 Subject: [PATCH 11/24] Clean up English strings for LH node-off: "prefer to use command line", "get desktop", CLI install. RH: replace video titles (both string and message title) --- add-on/_locales/ca/messages.json | 8 ++++---- add-on/_locales/cs/messages.json | 8 ++++---- add-on/_locales/da/messages.json | 8 ++++---- add-on/_locales/de/messages.json | 8 ++++---- add-on/_locales/en/messages.json | 18 +++++++++--------- add-on/_locales/es/messages.json | 8 ++++---- add-on/_locales/fi/messages.json | 8 ++++---- add-on/_locales/fr/messages.json | 8 ++++---- add-on/_locales/hu/messages.json | 8 ++++---- add-on/_locales/id/messages.json | 8 ++++---- add-on/_locales/it/messages.json | 8 ++++---- add-on/_locales/ja_JP/messages.json | 8 ++++---- add-on/_locales/ko_KR/messages.json | 8 ++++---- add-on/_locales/nl/messages.json | 8 ++++---- add-on/_locales/no/messages.json | 8 ++++---- add-on/_locales/pl/messages.json | 8 ++++---- add-on/_locales/pt/messages.json | 8 ++++---- add-on/_locales/pt_BR/messages.json | 8 ++++---- add-on/_locales/ro/messages.json | 8 ++++---- add-on/_locales/ru/messages.json | 8 ++++---- add-on/_locales/sv/messages.json | 8 ++++---- add-on/_locales/tr/messages.json | 8 ++++---- add-on/_locales/zh_CN/messages.json | 8 ++++---- add-on/_locales/zh_TW/messages.json | 8 ++++---- add-on/src/landing-pages/welcome/page.js | 12 ++++++------ 25 files changed, 107 insertions(+), 107 deletions(-) diff --git a/add-on/_locales/ca/messages.json b/add-on/_locales/ca/messages.json index 71bce1dab..81f297f2e 100644 --- a/add-on/_locales/ca/messages.json +++ b/add-on/_locales/ca/messages.json @@ -663,13 +663,13 @@ "message": "Uneix-te a la <0>Comunitat IPFS! Contribueix amb <1>codi, <2>documentació,<3> traduccions o ajuda bo i donant suport a <4>altres usuaris.", "description": "Resources copy (page_landingWelcome_resources_want_to_help)" }, - "page_landingWelcome_videos_alpha_demo": { + "page_landingWelcome_videos_why_ipfs": { "message": "IPFS Demo Alfa", - "description": "Videos section title (page_landingWelcome_videos_alpha_demo)" + "description": "Videos section title (page_landingWelcome_videos_why_ipfs)" }, - "page_landingWelcome_videos_permanent_web": { + "page_landingWelcome_videos_how_ipfs_works": { "message": "La Web Permanent", - "description": "Videos section title (page_landingWelcome_videos_permanent_web)" + "description": "Videos section title (page_landingWelcome_videos_how_ipfs_works)" }, "page_landingWelcome_projects_title": { "message": "Projectes Relacionats", diff --git a/add-on/_locales/cs/messages.json b/add-on/_locales/cs/messages.json index e1ba7f760..64d32ca39 100644 --- a/add-on/_locales/cs/messages.json +++ b/add-on/_locales/cs/messages.json @@ -663,13 +663,13 @@ "message": "Přidejte se k <0>IPFS komunitě! Přispějte <1>kódem, <2>dokumentací, <3>překlady nebo pomocí <4>ostatním uživatelům.", "description": "Resources copy (page_landingWelcome_resources_want_to_help)" }, - "page_landingWelcome_videos_alpha_demo": { + "page_landingWelcome_videos_why_ipfs": { "message": "IPFS Alpha Demo", - "description": "Videos section title (page_landingWelcome_videos_alpha_demo)" + "description": "Videos section title (page_landingWelcome_videos_why_ipfs)" }, - "page_landingWelcome_videos_permanent_web": { + "page_landingWelcome_videos_how_ipfs_works": { "message": "Permanentní Web", - "description": "Videos section title (page_landingWelcome_videos_permanent_web)" + "description": "Videos section title (page_landingWelcome_videos_how_ipfs_works)" }, "page_landingWelcome_projects_title": { "message": "Související projekty", diff --git a/add-on/_locales/da/messages.json b/add-on/_locales/da/messages.json index f4725068d..7b3a23910 100644 --- a/add-on/_locales/da/messages.json +++ b/add-on/_locales/da/messages.json @@ -663,13 +663,13 @@ "message": "Tilslut dig <0>IPFS Fællesskabet! Bidrag med <1>kode, <2>dokumentation, <3>oversættelser eller hjælp vedat <4>supportere andre brugere.", "description": "Resources copy (page_landingWelcome_resources_want_to_help)" }, - "page_landingWelcome_videos_alpha_demo": { + "page_landingWelcome_videos_why_ipfs": { "message": "IPFS Alfa Demo", - "description": "Videos section title (page_landingWelcome_videos_alpha_demo)" + "description": "Videos section title (page_landingWelcome_videos_why_ipfs)" }, - "page_landingWelcome_videos_permanent_web": { + "page_landingWelcome_videos_how_ipfs_works": { "message": "Det Permanente Net", - "description": "Videos section title (page_landingWelcome_videos_permanent_web)" + "description": "Videos section title (page_landingWelcome_videos_how_ipfs_works)" }, "page_landingWelcome_projects_title": { "message": "Relaterede Projekter", diff --git a/add-on/_locales/de/messages.json b/add-on/_locales/de/messages.json index b40c34705..c723ab67e 100644 --- a/add-on/_locales/de/messages.json +++ b/add-on/_locales/de/messages.json @@ -663,13 +663,13 @@ "message": "Werde Teil der <0>IPFS-Gemeinschaft! Trage bei mit <1>Programmierung, <2>Dokumentation, <3>Übersetzungen, oder der <4>Unterstützung anderer Nutzer.", "description": "Resources copy (page_landingWelcome_resources_want_to_help)" }, - "page_landingWelcome_videos_alpha_demo": { + "page_landingWelcome_videos_why_ipfs": { "message": "IPFS-Alpha-Demo", - "description": "Videos section title (page_landingWelcome_videos_alpha_demo)" + "description": "Videos section title (page_landingWelcome_videos_why_ipfs)" }, - "page_landingWelcome_videos_permanent_web": { + "page_landingWelcome_videos_how_ipfs_works": { "message": "Das permanente Web", - "description": "Videos section title (page_landingWelcome_videos_permanent_web)" + "description": "Videos section title (page_landingWelcome_videos_how_ipfs_works)" }, "page_landingWelcome_projects_title": { "message": "Verwandte Projekte", diff --git a/add-on/_locales/en/messages.json b/add-on/_locales/en/messages.json index b46d95fb9..cfe0c3609 100644 --- a/add-on/_locales/en/messages.json +++ b/add-on/_locales/en/messages.json @@ -624,15 +624,15 @@ "description": "Install steps title (page_landingWelcome_installSteps_notRunning_title)" }, "page_landingWelcome_installSteps_desktop_install": { - "message": "Get <0>IPFS Desktop and you will be all set!", + "message": "Make sure IPFS Desktop is running. Don't have it installed? <0>Download IPFS Desktop now.", "description": "Install steps copy (page_landingWelcome_installSteps_desktop_install)" }, "page_landingWelcome_installSteps_cli_title": { - "message": "Prefer to use the command line?", + "message": "Command-line users", "description": "Install steps title (page_landingWelcome_installSteps_cli_title)" }, "page_landingWelcome_installSteps_cli_install": { - "message": "Follow <0>these instructions, then start an IPFS daemon in your terminal:", + "message": "Start IPFS by entering ipfs daemon in your terminal. If you don't have IPFS installed yet, follow the <0>CLI quick-start guide first.", "description": "Install steps copy (page_landingWelcome_installSteps_cli_install)" }, "page_landingWelcome_resources_title_new_ipfs": { @@ -667,13 +667,13 @@ "message": "Join the <0>IPFS Community! Contribute with <1>code, <2>documentation, <3>translations or help by <4>supporting other users.", "description": "Resources copy (page_landingWelcome_resources_want_to_help)" }, - "page_landingWelcome_videos_alpha_demo": { - "message": "IPFS Alpha Demo", - "description": "Videos section title (page_landingWelcome_videos_alpha_demo)" + "page_landingWelcome_videos_why_ipfs": { + "message": "Why IPFS?", + "description": "Videos section title (page_landingWelcome_videos_why_ipfs)" }, - "page_landingWelcome_videos_permanent_web": { - "message": "The Permanent Web", - "description": "Videos section title (page_landingWelcome_videos_permanent_web)" + "page_landingWelcome_videos_how_ipfs_works": { + "message": "How IPFS Works", + "description": "Videos section title (page_landingWelcome_videos_how_ipfs_works)" }, "page_landingWelcome_projects_title": { "message": "Related Projects", diff --git a/add-on/_locales/es/messages.json b/add-on/_locales/es/messages.json index e084e1d08..3aaeb4e7e 100644 --- a/add-on/_locales/es/messages.json +++ b/add-on/_locales/es/messages.json @@ -663,13 +663,13 @@ "message": "Únete a la <0>Comunidad de IPFS! Contribuye con <1>código, <2>documentación, <3>traducciones o ayuda <4>apoyando a otros usuarios.", "description": "Resources copy (page_landingWelcome_resources_want_to_help)" }, - "page_landingWelcome_videos_alpha_demo": { + "page_landingWelcome_videos_why_ipfs": { "message": "Demo Alfa de IPFS", - "description": "Videos section title (page_landingWelcome_videos_alpha_demo)" + "description": "Videos section title (page_landingWelcome_videos_why_ipfs)" }, - "page_landingWelcome_videos_permanent_web": { + "page_landingWelcome_videos_how_ipfs_works": { "message": "La Web Permanente", - "description": "Videos section title (page_landingWelcome_videos_permanent_web)" + "description": "Videos section title (page_landingWelcome_videos_how_ipfs_works)" }, "page_landingWelcome_projects_title": { "message": "Proyectos Relacionados", diff --git a/add-on/_locales/fi/messages.json b/add-on/_locales/fi/messages.json index 8b624daa0..fc1a08744 100644 --- a/add-on/_locales/fi/messages.json +++ b/add-on/_locales/fi/messages.json @@ -663,13 +663,13 @@ "message": "Join the <0>IPFS Community! Contribute with <1>code, <2>documentation, <3>translations or help by <4>supporting other users.", "description": "Resources copy (page_landingWelcome_resources_want_to_help)" }, - "page_landingWelcome_videos_alpha_demo": { + "page_landingWelcome_videos_why_ipfs": { "message": "IPFS Alpha Demo", - "description": "Videos section title (page_landingWelcome_videos_alpha_demo)" + "description": "Videos section title (page_landingWelcome_videos_why_ipfs)" }, - "page_landingWelcome_videos_permanent_web": { + "page_landingWelcome_videos_how_ipfs_works": { "message": "The Permanent Web", - "description": "Videos section title (page_landingWelcome_videos_permanent_web)" + "description": "Videos section title (page_landingWelcome_videos_how_ipfs_works)" }, "page_landingWelcome_projects_title": { "message": "Related Projects", diff --git a/add-on/_locales/fr/messages.json b/add-on/_locales/fr/messages.json index 908be6786..7b0c45fd9 100644 --- a/add-on/_locales/fr/messages.json +++ b/add-on/_locales/fr/messages.json @@ -663,13 +663,13 @@ "message": "Rejoignez la <0>communité IPFS! Contribuez au <1>code, à la <2>documentation, aux<3>tranductions ou en venant en <4>aide aux autres utilisateurs.", "description": "Resources copy (page_landingWelcome_resources_want_to_help)" }, - "page_landingWelcome_videos_alpha_demo": { + "page_landingWelcome_videos_why_ipfs": { "message": "Démo Alpha IPFS", - "description": "Videos section title (page_landingWelcome_videos_alpha_demo)" + "description": "Videos section title (page_landingWelcome_videos_why_ipfs)" }, - "page_landingWelcome_videos_permanent_web": { + "page_landingWelcome_videos_how_ipfs_works": { "message": "Le Web Permanent", - "description": "Videos section title (page_landingWelcome_videos_permanent_web)" + "description": "Videos section title (page_landingWelcome_videos_how_ipfs_works)" }, "page_landingWelcome_projects_title": { "message": "Projets en relation", diff --git a/add-on/_locales/hu/messages.json b/add-on/_locales/hu/messages.json index b9c15db5c..3385b7080 100644 --- a/add-on/_locales/hu/messages.json +++ b/add-on/_locales/hu/messages.json @@ -663,13 +663,13 @@ "message": "Join the <0>IPFS Community! Contribute with <1>code, <2>documentation, <3>translations or help by <4>supporting other users.", "description": "Resources copy (page_landingWelcome_resources_want_to_help)" }, - "page_landingWelcome_videos_alpha_demo": { + "page_landingWelcome_videos_why_ipfs": { "message": "IPFS Alpha Demo", - "description": "Videos section title (page_landingWelcome_videos_alpha_demo)" + "description": "Videos section title (page_landingWelcome_videos_why_ipfs)" }, - "page_landingWelcome_videos_permanent_web": { + "page_landingWelcome_videos_how_ipfs_works": { "message": "The Permanent Web", - "description": "Videos section title (page_landingWelcome_videos_permanent_web)" + "description": "Videos section title (page_landingWelcome_videos_how_ipfs_works)" }, "page_landingWelcome_projects_title": { "message": "Related Projects", diff --git a/add-on/_locales/id/messages.json b/add-on/_locales/id/messages.json index b409f4fd0..4baf91a14 100644 --- a/add-on/_locales/id/messages.json +++ b/add-on/_locales/id/messages.json @@ -663,13 +663,13 @@ "message": "Join the <0>IPFS Community! Contribute with <1>code, <2>documentation, <3>translations or help by <4>supporting other users.", "description": "Resources copy (page_landingWelcome_resources_want_to_help)" }, - "page_landingWelcome_videos_alpha_demo": { + "page_landingWelcome_videos_why_ipfs": { "message": "IPFS Alpha Demo", - "description": "Videos section title (page_landingWelcome_videos_alpha_demo)" + "description": "Videos section title (page_landingWelcome_videos_why_ipfs)" }, - "page_landingWelcome_videos_permanent_web": { + "page_landingWelcome_videos_how_ipfs_works": { "message": "The Permanent Web", - "description": "Videos section title (page_landingWelcome_videos_permanent_web)" + "description": "Videos section title (page_landingWelcome_videos_how_ipfs_works)" }, "page_landingWelcome_projects_title": { "message": "Related Projects", diff --git a/add-on/_locales/it/messages.json b/add-on/_locales/it/messages.json index 03895348c..10ef72e39 100644 --- a/add-on/_locales/it/messages.json +++ b/add-on/_locales/it/messages.json @@ -663,13 +663,13 @@ "message": "Unisciti alla <0>Comunitià IPFS! Contribuisci con <1>codice, <2>documentazione, <3>traduzioni o dai <4>supporto ad altri utenti.", "description": "Resources copy (page_landingWelcome_resources_want_to_help)" }, - "page_landingWelcome_videos_alpha_demo": { + "page_landingWelcome_videos_why_ipfs": { "message": "Demo Alpha di IPFS", - "description": "Videos section title (page_landingWelcome_videos_alpha_demo)" + "description": "Videos section title (page_landingWelcome_videos_why_ipfs)" }, - "page_landingWelcome_videos_permanent_web": { + "page_landingWelcome_videos_how_ipfs_works": { "message": "Il Web Permanente", - "description": "Videos section title (page_landingWelcome_videos_permanent_web)" + "description": "Videos section title (page_landingWelcome_videos_how_ipfs_works)" }, "page_landingWelcome_projects_title": { "message": "Progetti simili ", diff --git a/add-on/_locales/ja_JP/messages.json b/add-on/_locales/ja_JP/messages.json index c86f2b0d1..d793e2f46 100644 --- a/add-on/_locales/ja_JP/messages.json +++ b/add-on/_locales/ja_JP/messages.json @@ -663,13 +663,13 @@ "message": "<0> IPFSコミュニティに参加しましょう! <1>コード、<2>ドキュメント、<3>翻訳または<4>他のユーザーのサポートによる支援で貢献してください。", "description": "Resources copy (page_landingWelcome_resources_want_to_help)" }, - "page_landingWelcome_videos_alpha_demo": { + "page_landingWelcome_videos_why_ipfs": { "message": "IPFS アルファデモ", - "description": "Videos section title (page_landingWelcome_videos_alpha_demo)" + "description": "Videos section title (page_landingWelcome_videos_why_ipfs)" }, - "page_landingWelcome_videos_permanent_web": { + "page_landingWelcome_videos_how_ipfs_works": { "message": "パーマネントウェブ", - "description": "Videos section title (page_landingWelcome_videos_permanent_web)" + "description": "Videos section title (page_landingWelcome_videos_how_ipfs_works)" }, "page_landingWelcome_projects_title": { "message": "関連プロジェクト", diff --git a/add-on/_locales/ko_KR/messages.json b/add-on/_locales/ko_KR/messages.json index 56400d681..f3f545f9c 100644 --- a/add-on/_locales/ko_KR/messages.json +++ b/add-on/_locales/ko_KR/messages.json @@ -663,13 +663,13 @@ "message": "Join the <0>IPFS Community! Contribute with <1>code, <2>documentation, <3>translations or help by <4>supporting other users.", "description": "Resources copy (page_landingWelcome_resources_want_to_help)" }, - "page_landingWelcome_videos_alpha_demo": { + "page_landingWelcome_videos_why_ipfs": { "message": "IPFS 알파 데모", - "description": "Videos section title (page_landingWelcome_videos_alpha_demo)" + "description": "Videos section title (page_landingWelcome_videos_why_ipfs)" }, - "page_landingWelcome_videos_permanent_web": { + "page_landingWelcome_videos_how_ipfs_works": { "message": "영구적인 웹", - "description": "Videos section title (page_landingWelcome_videos_permanent_web)" + "description": "Videos section title (page_landingWelcome_videos_how_ipfs_works)" }, "page_landingWelcome_projects_title": { "message": "연관된 프로젝트", diff --git a/add-on/_locales/nl/messages.json b/add-on/_locales/nl/messages.json index 45ecb552a..0f426d7b3 100644 --- a/add-on/_locales/nl/messages.json +++ b/add-on/_locales/nl/messages.json @@ -663,13 +663,13 @@ "message": "Word lid van de <0>IPFS-community! Draag bij met <1>code, <2>documentatie, <3>vertalingenof help door<4>andere gebruikers te ondersteunen.", "description": "Resources copy (page_landingWelcome_resources_want_to_help)" }, - "page_landingWelcome_videos_alpha_demo": { + "page_landingWelcome_videos_why_ipfs": { "message": "IPFS Alpha demo", - "description": "Videos section title (page_landingWelcome_videos_alpha_demo)" + "description": "Videos section title (page_landingWelcome_videos_why_ipfs)" }, - "page_landingWelcome_videos_permanent_web": { + "page_landingWelcome_videos_how_ipfs_works": { "message": "Het permanente web", - "description": "Videos section title (page_landingWelcome_videos_permanent_web)" + "description": "Videos section title (page_landingWelcome_videos_how_ipfs_works)" }, "page_landingWelcome_projects_title": { "message": "Verwante projecten", diff --git a/add-on/_locales/no/messages.json b/add-on/_locales/no/messages.json index f989471de..b89a62ab7 100644 --- a/add-on/_locales/no/messages.json +++ b/add-on/_locales/no/messages.json @@ -663,13 +663,13 @@ "message": "Bli med i <0>IPFS-fellesskapet! Bidra med <1>kode, <2>dokumentasjon, <3>oversettelser eller hjelp ved å <4>støtte andre brukere.", "description": "Resources copy (page_landingWelcome_resources_want_to_help)" }, - "page_landingWelcome_videos_alpha_demo": { + "page_landingWelcome_videos_why_ipfs": { "message": "IPFS Alpha Demo", - "description": "Videos section title (page_landingWelcome_videos_alpha_demo)" + "description": "Videos section title (page_landingWelcome_videos_why_ipfs)" }, - "page_landingWelcome_videos_permanent_web": { + "page_landingWelcome_videos_how_ipfs_works": { "message": "Det permanente nettet", - "description": "Videos section title (page_landingWelcome_videos_permanent_web)" + "description": "Videos section title (page_landingWelcome_videos_how_ipfs_works)" }, "page_landingWelcome_projects_title": { "message": "Relaterte prosjekter", diff --git a/add-on/_locales/pl/messages.json b/add-on/_locales/pl/messages.json index d154e8501..72d17466f 100644 --- a/add-on/_locales/pl/messages.json +++ b/add-on/_locales/pl/messages.json @@ -663,13 +663,13 @@ "message": "Dołącz do <0>społeczności IPFS! Ulepszaj <1>kod, <2>dokumentację, <3>tłumaczenia lub pomagaj <4>odpowiadając na pytania i problemy innych użytkowników.", "description": "Resources copy (page_landingWelcome_resources_want_to_help)" }, - "page_landingWelcome_videos_alpha_demo": { + "page_landingWelcome_videos_why_ipfs": { "message": "IPFS Alpha Demo (ang.)", - "description": "Videos section title (page_landingWelcome_videos_alpha_demo)" + "description": "Videos section title (page_landingWelcome_videos_why_ipfs)" }, - "page_landingWelcome_videos_permanent_web": { + "page_landingWelcome_videos_how_ipfs_works": { "message": "The Permanent Web (ang.)", - "description": "Videos section title (page_landingWelcome_videos_permanent_web)" + "description": "Videos section title (page_landingWelcome_videos_how_ipfs_works)" }, "page_landingWelcome_projects_title": { "message": "Powiązane projekty", diff --git a/add-on/_locales/pt/messages.json b/add-on/_locales/pt/messages.json index c4222ee20..b05fe2d23 100644 --- a/add-on/_locales/pt/messages.json +++ b/add-on/_locales/pt/messages.json @@ -663,13 +663,13 @@ "message": "Junte-se à <0>comunidade IPFS! Contribua com <1>código, <2>documentação, <3>traduções ou ajude <4>outros utilizadores.", "description": "Resources copy (page_landingWelcome_resources_want_to_help)" }, - "page_landingWelcome_videos_alpha_demo": { + "page_landingWelcome_videos_why_ipfs": { "message": "IPFS Alpha Demo", - "description": "Videos section title (page_landingWelcome_videos_alpha_demo)" + "description": "Videos section title (page_landingWelcome_videos_why_ipfs)" }, - "page_landingWelcome_videos_permanent_web": { + "page_landingWelcome_videos_how_ipfs_works": { "message": "A Web Permanente", - "description": "Videos section title (page_landingWelcome_videos_permanent_web)" + "description": "Videos section title (page_landingWelcome_videos_how_ipfs_works)" }, "page_landingWelcome_projects_title": { "message": "Projetos relacionados", diff --git a/add-on/_locales/pt_BR/messages.json b/add-on/_locales/pt_BR/messages.json index c5938b912..6313bfaee 100644 --- a/add-on/_locales/pt_BR/messages.json +++ b/add-on/_locales/pt_BR/messages.json @@ -663,13 +663,13 @@ "message": "Junte-se à comunidade IPFS<0>! Contribua com <1>código, <2>documentação, <3>traduções ou ajude <4>dando apoio a outros usuários.", "description": "Resources copy (page_landingWelcome_resources_want_to_help)" }, - "page_landingWelcome_videos_alpha_demo": { + "page_landingWelcome_videos_why_ipfs": { "message": "Demo do IPFS versão alfa", - "description": "Videos section title (page_landingWelcome_videos_alpha_demo)" + "description": "Videos section title (page_landingWelcome_videos_why_ipfs)" }, - "page_landingWelcome_videos_permanent_web": { + "page_landingWelcome_videos_how_ipfs_works": { "message": "A Web Permanente", - "description": "Videos section title (page_landingWelcome_videos_permanent_web)" + "description": "Videos section title (page_landingWelcome_videos_how_ipfs_works)" }, "page_landingWelcome_projects_title": { "message": "Projetos relacionados", diff --git a/add-on/_locales/ro/messages.json b/add-on/_locales/ro/messages.json index cd697c7d5..f1da37a49 100644 --- a/add-on/_locales/ro/messages.json +++ b/add-on/_locales/ro/messages.json @@ -663,13 +663,13 @@ "message": "Join the <0>IPFS Community! Contribute with <1>code, <2>documentation, <3>translations or help by <4>supporting other users.", "description": "Resources copy (page_landingWelcome_resources_want_to_help)" }, - "page_landingWelcome_videos_alpha_demo": { + "page_landingWelcome_videos_why_ipfs": { "message": "IPFS Alpha Demo", - "description": "Videos section title (page_landingWelcome_videos_alpha_demo)" + "description": "Videos section title (page_landingWelcome_videos_why_ipfs)" }, - "page_landingWelcome_videos_permanent_web": { + "page_landingWelcome_videos_how_ipfs_works": { "message": "The Permanent Web", - "description": "Videos section title (page_landingWelcome_videos_permanent_web)" + "description": "Videos section title (page_landingWelcome_videos_how_ipfs_works)" }, "page_landingWelcome_projects_title": { "message": "Related Projects", diff --git a/add-on/_locales/ru/messages.json b/add-on/_locales/ru/messages.json index a0ac0825c..64906d78f 100644 --- a/add-on/_locales/ru/messages.json +++ b/add-on/_locales/ru/messages.json @@ -663,13 +663,13 @@ "message": "Join the <0>IPFS Community! Contribute with <1>code, <2>documentation, <3>translations or help by <4>supporting other users.", "description": "Resources copy (page_landingWelcome_resources_want_to_help)" }, - "page_landingWelcome_videos_alpha_demo": { + "page_landingWelcome_videos_why_ipfs": { "message": "IPFS Альфа версия", - "description": "Videos section title (page_landingWelcome_videos_alpha_demo)" + "description": "Videos section title (page_landingWelcome_videos_why_ipfs)" }, - "page_landingWelcome_videos_permanent_web": { + "page_landingWelcome_videos_how_ipfs_works": { "message": "The Permanent Web", - "description": "Videos section title (page_landingWelcome_videos_permanent_web)" + "description": "Videos section title (page_landingWelcome_videos_how_ipfs_works)" }, "page_landingWelcome_projects_title": { "message": "Связанные проекты", diff --git a/add-on/_locales/sv/messages.json b/add-on/_locales/sv/messages.json index f8f2db7f0..99d58ffb4 100644 --- a/add-on/_locales/sv/messages.json +++ b/add-on/_locales/sv/messages.json @@ -663,13 +663,13 @@ "message": "Gå med i <0>IPFS-gemenskapen! Bidra med <1>kod, <2>dokumentation, <3>översättningar eller hjälp genom att <4>stödja andra användare.", "description": "Resources copy (page_landingWelcome_resources_want_to_help)" }, - "page_landingWelcome_videos_alpha_demo": { + "page_landingWelcome_videos_why_ipfs": { "message": "IPFS alfa-demo", - "description": "Videos section title (page_landingWelcome_videos_alpha_demo)" + "description": "Videos section title (page_landingWelcome_videos_why_ipfs)" }, - "page_landingWelcome_videos_permanent_web": { + "page_landingWelcome_videos_how_ipfs_works": { "message": "Den permanenta webben", - "description": "Videos section title (page_landingWelcome_videos_permanent_web)" + "description": "Videos section title (page_landingWelcome_videos_how_ipfs_works)" }, "page_landingWelcome_projects_title": { "message": "Relaterade projekt", diff --git a/add-on/_locales/tr/messages.json b/add-on/_locales/tr/messages.json index 2df6c0225..20482a0ae 100644 --- a/add-on/_locales/tr/messages.json +++ b/add-on/_locales/tr/messages.json @@ -663,13 +663,13 @@ "message": "Join the <0>IPFS Community! Contribute with <1>code, <2>documentation, <3>translations or help by <4>supporting other users.", "description": "Resources copy (page_landingWelcome_resources_want_to_help)" }, - "page_landingWelcome_videos_alpha_demo": { + "page_landingWelcome_videos_why_ipfs": { "message": "IPFS Alpha Demo", - "description": "Videos section title (page_landingWelcome_videos_alpha_demo)" + "description": "Videos section title (page_landingWelcome_videos_why_ipfs)" }, - "page_landingWelcome_videos_permanent_web": { + "page_landingWelcome_videos_how_ipfs_works": { "message": "The Permanent Web", - "description": "Videos section title (page_landingWelcome_videos_permanent_web)" + "description": "Videos section title (page_landingWelcome_videos_how_ipfs_works)" }, "page_landingWelcome_projects_title": { "message": "İlişkili Projeler", diff --git a/add-on/_locales/zh_CN/messages.json b/add-on/_locales/zh_CN/messages.json index 0993f92f8..41851524f 100644 --- a/add-on/_locales/zh_CN/messages.json +++ b/add-on/_locales/zh_CN/messages.json @@ -663,13 +663,13 @@ "message": "加入<0>IPFS社区!贡献<1>代码,<2>文档,<3>翻译或通过<4>给其他用户提供支持来帮忙。", "description": "Resources copy (page_landingWelcome_resources_want_to_help)" }, - "page_landingWelcome_videos_alpha_demo": { + "page_landingWelcome_videos_why_ipfs": { "message": "IPFS Alpha 演示", - "description": "Videos section title (page_landingWelcome_videos_alpha_demo)" + "description": "Videos section title (page_landingWelcome_videos_why_ipfs)" }, - "page_landingWelcome_videos_permanent_web": { + "page_landingWelcome_videos_how_ipfs_works": { "message": "永久性网络", - "description": "Videos section title (page_landingWelcome_videos_permanent_web)" + "description": "Videos section title (page_landingWelcome_videos_how_ipfs_works)" }, "page_landingWelcome_projects_title": { "message": "相关项目", diff --git a/add-on/_locales/zh_TW/messages.json b/add-on/_locales/zh_TW/messages.json index df024fbac..24c19ffae 100644 --- a/add-on/_locales/zh_TW/messages.json +++ b/add-on/_locales/zh_TW/messages.json @@ -603,13 +603,13 @@ "message": "Join the <0>IPFS Community! Contribute with <1>code, <2>documentation, <3>translations or help by <4>supporting other users.", "description": "Resources copy (page_landingWelcome_resources_want_to_help)" }, - "page_landingWelcome_videos_alpha_demo": { + "page_landingWelcome_videos_why_ipfs": { "message": "IPFS Alpha Demo", - "description": "Videos section title (page_landingWelcome_videos_alpha_demo)" + "description": "Videos section title (page_landingWelcome_videos_why_ipfs)" }, - "page_landingWelcome_videos_permanent_web": { + "page_landingWelcome_videos_how_ipfs_works": { "message": "The Permanent Web", - "description": "Videos section title (page_landingWelcome_videos_permanent_web)" + "description": "Videos section title (page_landingWelcome_videos_how_ipfs_works)" }, "page_landingWelcome_projects_title": { "message": "Related Projects", diff --git a/add-on/src/landing-pages/welcome/page.js b/add-on/src/landing-pages/welcome/page.js index 566aa440c..641a48233 100644 --- a/add-on/src/landing-pages/welcome/page.js +++ b/add-on/src/landing-pages/welcome/page.js @@ -104,9 +104,9 @@ const renderInstallSteps = (i18n, isIpfsOnline) => {

${i18n.getMessage('page_landingWelcome_installSteps_notRunning_title')}

IPFS Desktop users

-

Make sure your copy of IPFS Desktop is running. Don't have IPFS Desktop? ${renderTranslatedLinks('page_landingWelcome_installSteps_desktop_install', ['https://github.com/ipfs-shipyard/ipfs-desktop#ipfs-desktop'], `target="_blank" class="${anchorClass}"`)}

+

${renderTranslatedLinks('page_landingWelcome_installSteps_desktop_install', ['https://github.com/ipfs-shipyard/ipfs-desktop#ipfs-desktop'], `target="_blank" class="${anchorClass}"`)}

${i18n.getMessage('page_landingWelcome_installSteps_cli_title')}

-

If you already have IPFS installed on the command line, start a daemon by entering ipfs daemon in your terminal. Don't have it installed yet? ${renderTranslatedLinks('page_landingWelcome_installSteps_cli_install', ['https://docs.ipfs.io/introduction/usage/'], `target="_blank" class="${anchorClass}"`)}

+

${renderTranslatedLinks('page_landingWelcome_installSteps_cli_install', ['https://docs.ipfs.io/introduction/usage/'], `target="_blank" class="${anchorClass}"`)}

` } @@ -158,18 +158,18 @@ const renderVideos = (i18n) => { return html`
-

${i18n.getMessage('page_landingWelcome_videos_alpha_demo')}

+

${i18n.getMessage('page_landingWelcome_videos_why_ipfs')}

- ${i18n.getMessage('page_landingWelcome_videos_alpha_demo')} + ${i18n.getMessage('page_landingWelcome_videos_why_ipfs')} ${overlayDiv()} ${playSvg()}
-

${i18n.getMessage('page_landingWelcome_videos_permanent_web')}

+

${i18n.getMessage('page_landingWelcome_videos_how_ipfs_works')}

- ${i18n.getMessage('page_landingWelcome_videos_permanent_web')} + ${i18n.getMessage('page_landingWelcome_videos_how_ipfs_works')} ${overlayDiv()} ${playSvg()} From 1555997c05655f68e3b3379e99b2f5d9d27361f5 Mon Sep 17 00:00:00 2001 From: Jessica Schilling Date: Wed, 20 May 2020 11:22:38 -0600 Subject: [PATCH 12/24] Update CLI quick-start link (note, this is broken until docs beta finished 27 May) --- add-on/src/landing-pages/welcome/page.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/add-on/src/landing-pages/welcome/page.js b/add-on/src/landing-pages/welcome/page.js index 641a48233..5f16dbffb 100644 --- a/add-on/src/landing-pages/welcome/page.js +++ b/add-on/src/landing-pages/welcome/page.js @@ -106,7 +106,7 @@ const renderInstallSteps = (i18n, isIpfsOnline) => {

IPFS Desktop users

${renderTranslatedLinks('page_landingWelcome_installSteps_desktop_install', ['https://github.com/ipfs-shipyard/ipfs-desktop#ipfs-desktop'], `target="_blank" class="${anchorClass}"`)}

${i18n.getMessage('page_landingWelcome_installSteps_cli_title')}

-

${renderTranslatedLinks('page_landingWelcome_installSteps_cli_install', ['https://docs.ipfs.io/introduction/usage/'], `target="_blank" class="${anchorClass}"`)}

+

${renderTranslatedLinks('page_landingWelcome_installSteps_cli_install', ['https://docs.ipfs.io/how-to/command-line-quick-start/'], `target="_blank" class="${anchorClass}"`)}

` } From 87ede9906e8ff9725dabbf9d3f8646560e35efb7 Mon Sep 17 00:00:00 2001 From: Jessica Schilling Date: Wed, 20 May 2020 11:24:15 -0600 Subject: [PATCH 13/24] Update string, LH: ipfs is not running --- add-on/_locales/en/messages.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/add-on/_locales/en/messages.json b/add-on/_locales/en/messages.json index cfe0c3609..bbbce67a4 100644 --- a/add-on/_locales/en/messages.json +++ b/add-on/_locales/en/messages.json @@ -620,7 +620,7 @@ "description": "Ready message copy (page_landingWelcome_welcome_discover)" }, "page_landingWelcome_installSteps_notRunning_title": { - "message": "IPFS does not seem to be running", + "message": "IPFS is not running", "description": "Install steps title (page_landingWelcome_installSteps_notRunning_title)" }, "page_landingWelcome_installSteps_desktop_install": { From aa7ee2b832c57313a41bed4d673ca826e5d73ea4 Mon Sep 17 00:00:00 2001 From: Jessica Schilling Date: Wed, 20 May 2020 11:27:22 -0600 Subject: [PATCH 14/24] Add page_landingWelcome_installSteps_desktop_title to messages.json --- add-on/_locales/en/messages.json | 4 ++++ add-on/src/landing-pages/welcome/page.js | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/add-on/_locales/en/messages.json b/add-on/_locales/en/messages.json index bbbce67a4..e5c01a53f 100644 --- a/add-on/_locales/en/messages.json +++ b/add-on/_locales/en/messages.json @@ -623,6 +623,10 @@ "message": "IPFS is not running", "description": "Install steps title (page_landingWelcome_installSteps_notRunning_title)" }, + "page_landingWelcome_installSteps_desktop_title": { + "message": "IPFS Desktop users", + "description": "Install steps title (page_landingWelcome_installSteps_desktop_title)" + }, "page_landingWelcome_installSteps_desktop_install": { "message": "Make sure IPFS Desktop is running. Don't have it installed? <0>Download IPFS Desktop now.", "description": "Install steps copy (page_landingWelcome_installSteps_desktop_install)" diff --git a/add-on/src/landing-pages/welcome/page.js b/add-on/src/landing-pages/welcome/page.js index 5f16dbffb..8a3dbc270 100644 --- a/add-on/src/landing-pages/welcome/page.js +++ b/add-on/src/landing-pages/welcome/page.js @@ -103,7 +103,7 @@ const renderInstallSteps = (i18n, isIpfsOnline) => {

${i18n.getMessage('page_landingWelcome_installSteps_notRunning_title')}

-

IPFS Desktop users

+

${i18n.getMessage('page_landingWelcome_installSteps_desktop_title')}

${renderTranslatedLinks('page_landingWelcome_installSteps_desktop_install', ['https://github.com/ipfs-shipyard/ipfs-desktop#ipfs-desktop'], `target="_blank" class="${anchorClass}"`)}

${i18n.getMessage('page_landingWelcome_installSteps_cli_title')}

${renderTranslatedLinks('page_landingWelcome_installSteps_cli_install', ['https://docs.ipfs.io/how-to/command-line-quick-start/'], `target="_blank" class="${anchorClass}"`)}

From 71ac5b4b7008f50695395f0a9ff295d67c176d1d Mon Sep 17 00:00:00 2001 From: Jessica Schilling Date: Wed, 20 May 2020 11:47:40 -0600 Subject: [PATCH 15/24] Remove unused page_landingWelcome_welcome_title; add LH on-state button titles --- add-on/_locales/en/messages.json | 14 +++++++++----- add-on/src/landing-pages/welcome/page.js | 6 +++--- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/add-on/_locales/en/messages.json b/add-on/_locales/en/messages.json index e5c01a53f..ea3580a5c 100644 --- a/add-on/_locales/en/messages.json +++ b/add-on/_locales/en/messages.json @@ -29,7 +29,7 @@ }, "panel_statusSwarmPeers": { "message": "Peers", - "description": "A label in Node status section of Browser Action pop-upi (panel_statusSwarmPeers)" + "description": "A label in Node status section of Browser Action pop-up, also used as Welcome ready message button text for opening Web UI peers page (panel_statusSwarmPeers)" }, "panel_statusSwarmPeersTitle": { "message": "The number of other IPFS nodes you can connect to", @@ -607,14 +607,18 @@ "message": "IPFS Companion", "description": "Extension name after the IPFS logo (page_landingWelcome_logo_title)" }, - "page_landingWelcome_welcome_title": { - "message": "You are all set!", - "description": "Ready message title (page_landingWelcome_welcome_title)" - }, "page_landingWelcome_welcome_peers": { "message": "Your node is connected to <0>$1 peers.", "description": "Ready message copy (page_landingWelcome_welcome_peers)" }, + "page_landingWelcome_welcome_status": { + "message": "Status", + "description": "Ready message button text for opening Web UI status page (page_landingWelcome_welcome_status)" + }, + "page_landingWelcome_welcome_files": { + "message": "Files", + "description": "Ready message button text for opening Web UI files page (page_landingWelcome_welcome_files)" + }, "page_landingWelcome_welcome_discover": { "message": "Discover what you <0>can do with Companion and dive into the distributed web with IPFS!", "description": "Ready message copy (page_landingWelcome_welcome_discover)" diff --git a/add-on/src/landing-pages/welcome/page.js b/add-on/src/landing-pages/welcome/page.js index 8a3dbc270..0427338e2 100644 --- a/add-on/src/landing-pages/welcome/page.js +++ b/add-on/src/landing-pages/welcome/page.js @@ -84,9 +84,9 @@ const renderWelcome = (i18n, peerCount, onOpenWebUi) => {

${renderTranslatedSpans('page_landingWelcome_welcome_peers', [peerCount], 'class="aqua fw6"')}

- - - + + +
` From b386b0c8d1fba631804254152df621ddd1437569 Mon Sep 17 00:00:00 2001 From: Jessica Schilling Date: Wed, 20 May 2020 12:41:50 -0600 Subject: [PATCH 16/24] Node-on and node-off icons to ipfs-css standard ones; margin tweaks; node-off icon into a const --- add-on/src/landing-pages/welcome/page.js | 41 ++++++++++++------------ 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/add-on/src/landing-pages/welcome/page.js b/add-on/src/landing-pages/welcome/page.js index 0427338e2..6d25efe43 100644 --- a/add-on/src/landing-pages/welcome/page.js +++ b/add-on/src/landing-pages/welcome/page.js @@ -12,6 +12,7 @@ const ipldLogo = '../../../images/ipld.svg' // Colors const colorIpfsLogo = '#57cbd0' const colorWhite = '#ffffff' +const colorYellow = '#f39021' function createWelcomePage (i18n) { return function welcomePage (state, emit) { @@ -49,7 +50,7 @@ const renderCompanionLogo = (i18n, isIpfsOnline) => { const stateUnknown = isIpfsOnline === null return html` -
+
${logo({ path: logoPath, size: logoSize, isIpfsOnline: isIpfsOnline })}

${i18n.getMessage('page_landingWelcome_logo_title')}

@@ -59,29 +60,20 @@ const renderCompanionLogo = (i18n, isIpfsOnline) => { const renderWelcome = (i18n, peerCount, onOpenWebUi) => { const anchorClass = 'aqua hover-white' const copyClass = 'mv0 tc lh-copy f5' - const svgWidth = 80 - - const checkmarkSvg = () => html` - - - - - - - - - - - - + const svgWidth = 130 + + const nodeOnSvg = () => html` + + + ` return html`
- ${checkmarkSvg()} -

${renderTranslatedSpans('page_landingWelcome_welcome_peers', [peerCount], 'class="aqua fw6"')}

+ ${nodeOnSvg()} +

${renderTranslatedSpans('page_landingWelcome_welcome_peers', [peerCount], 'class="aqua fw6"')}

@@ -96,12 +88,19 @@ const renderInstallSteps = (i18n, isIpfsOnline) => { const copyClass = 'mv0 white f5 lh-copy' const anchorClass = 'aqua hover-white' const stateUnknown = isIpfsOnline === null + const svgWidth = 130 + + const nodeOffSvg = () => html` + + + + ` return html` -
+
- -

${i18n.getMessage('page_landingWelcome_installSteps_notRunning_title')}

+ ${nodeOffSvg()} +

${i18n.getMessage('page_landingWelcome_installSteps_notRunning_title')}

${i18n.getMessage('page_landingWelcome_installSteps_desktop_title')}

${renderTranslatedLinks('page_landingWelcome_installSteps_desktop_install', ['https://github.com/ipfs-shipyard/ipfs-desktop#ipfs-desktop'], `target="_blank" class="${anchorClass}"`)}

From 09419dae47fbaf5e71de7ae06ee50798fbe54aaa Mon Sep 17 00:00:00 2001 From: Jessica Schilling Date: Wed, 20 May 2020 12:54:40 -0600 Subject: [PATCH 17/24] openWebUi -> openWebUiStatus (for specificity) --- add-on/src/landing-pages/welcome/page.js | 12 ++++++------ add-on/src/landing-pages/welcome/store.js | 2 +- add-on/src/popup/browser-action/page.js | 4 ++-- add-on/src/popup/browser-action/store.js | 2 +- add-on/src/popup/browser-action/tools.js | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/add-on/src/landing-pages/welcome/page.js b/add-on/src/landing-pages/welcome/page.js index 6d25efe43..651fe52c1 100644 --- a/add-on/src/landing-pages/welcome/page.js +++ b/add-on/src/landing-pages/welcome/page.js @@ -18,7 +18,7 @@ function createWelcomePage (i18n) { return function welcomePage (state, emit) { const isIpfsOnline = state.isIpfsOnline const peerCount = state.peerCount - const onOpenWebUi = () => emit('openWebUi') + const onOpenWebUiStatus = () => emit('openWebUiStatus') // Set translated title document.title = i18n.getMessage('page_landingWelcome_title') @@ -27,7 +27,7 @@ function createWelcomePage (i18n) {
${renderCompanionLogo(i18n, isIpfsOnline)} - ${isIpfsOnline ? renderWelcome(i18n, peerCount, onOpenWebUi) : renderInstallSteps(i18n, isIpfsOnline)} + ${isIpfsOnline ? renderWelcome(i18n, peerCount, onOpenWebUiStatus) : renderInstallSteps(i18n, isIpfsOnline)}
@@ -57,7 +57,7 @@ const renderCompanionLogo = (i18n, isIpfsOnline) => { ` } -const renderWelcome = (i18n, peerCount, onOpenWebUi) => { +const renderWelcome = (i18n, peerCount, onOpenWebUiStatus) => { const anchorClass = 'aqua hover-white' const copyClass = 'mv0 tc lh-copy f5' const svgWidth = 130 @@ -76,9 +76,9 @@ const renderWelcome = (i18n, peerCount, onOpenWebUi) => {

${renderTranslatedSpans('page_landingWelcome_welcome_peers', [peerCount], 'class="aqua fw6"')}

- - - + + +
` diff --git a/add-on/src/landing-pages/welcome/store.js b/add-on/src/landing-pages/welcome/store.js index b5fe89fec..c59d67ea7 100644 --- a/add-on/src/landing-pages/welcome/store.js +++ b/add-on/src/landing-pages/welcome/store.js @@ -26,7 +26,7 @@ function createWelcomePageStore (i18n, runtime) { }) }) - emitter.on('openWebUi', async () => { + emitter.on('openWebUiStatus', async () => { try { browser.tabs.create({ url: state.webuiRootUrl }) } catch (error) { diff --git a/add-on/src/popup/browser-action/page.js b/add-on/src/popup/browser-action/page.js index 81524a710..1018c36ab 100644 --- a/add-on/src/popup/browser-action/page.js +++ b/add-on/src/popup/browser-action/page.js @@ -17,7 +17,7 @@ module.exports = function browserActionPage (state, emit) { const onUnPin = () => emit('unPin') const onQuickImport = () => emit('quickImport') - const onOpenWebUi = () => emit('openWebUi') + const onOpenWebUiStatus = () => emit('openWebUiStatus') const onOpenPrefs = () => emit('openPrefs') const onToggleGlobalRedirect = () => emit('toggleGlobalRedirect') const onToggleSiteIntegrations = () => emit('toggleSiteIntegrations') @@ -25,7 +25,7 @@ module.exports = function browserActionPage (state, emit) { const headerProps = Object.assign({ onToggleActive, onOpenPrefs }, state) const activeTabActionsProps = Object.assign({ onViewOnGateway, onToggleSiteIntegrations, onCopy, onPin, onUnPin }, state) - const opsProps = Object.assign({ onQuickImport, onOpenWebUi, onToggleGlobalRedirect }, state) + const opsProps = Object.assign({ onQuickImport, onOpenWebUiStatus, onToggleGlobalRedirect }, state) return html`
diff --git a/add-on/src/popup/browser-action/store.js b/add-on/src/popup/browser-action/store.js index 9655a7e88..f44e6f12f 100644 --- a/add-on/src/popup/browser-action/store.js +++ b/add-on/src/popup/browser-action/store.js @@ -133,7 +133,7 @@ module.exports = (state, emitter) => { window.close() }) - emitter.on('openWebUi', async () => { + emitter.on('openWebUiStatus', async () => { try { browser.tabs.create({ url: state.webuiRootUrl }) window.close() diff --git a/add-on/src/popup/browser-action/tools.js b/add-on/src/popup/browser-action/tools.js index 2322a958e..12e2f8bc4 100644 --- a/add-on/src/popup/browser-action/tools.js +++ b/add-on/src/popup/browser-action/tools.js @@ -12,7 +12,7 @@ module.exports = function tools ({ isIpfsOnline, isApiAvailable, onQuickImport, - onOpenWebUi + onOpenWebUiStatus }) { const activeQuickImport = active && isIpfsOnline && isApiAvailable const activeWebUI = active && isIpfsOnline && ipfsNodeType !== 'embedded' @@ -30,7 +30,7 @@ module.exports = function tools ({ ${navItem({ text: browser.i18n.getMessage('panel_openWebui'), disabled: !activeWebUI, - onClick: onOpenWebUi + onClick: onOpenWebUiStatus })}
From 03536b471c3de5d765e6db8e282f765f27b7677c Mon Sep 17 00:00:00 2001 From: Jessica Schilling Date: Wed, 20 May 2020 13:57:42 -0600 Subject: [PATCH 18/24] RH items to bullets --- add-on/src/landing-pages/welcome/page.js | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/add-on/src/landing-pages/welcome/page.js b/add-on/src/landing-pages/welcome/page.js index 651fe52c1..6616101fc 100644 --- a/add-on/src/landing-pages/welcome/page.js +++ b/add-on/src/landing-pages/welcome/page.js @@ -120,19 +120,28 @@ const renderResources = (i18n) => { const anchorClass = 'link underline-under hover-aqua' return html` - ` } From ff4cb177b78a0a5f12b6d6977bd58155830546b7 Mon Sep 17 00:00:00 2001 From: Jessica Schilling Date: Wed, 20 May 2020 15:04:58 -0600 Subject: [PATCH 20/24] full-width RH content; margin tweak --- add-on/src/landing-pages/welcome/page.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/add-on/src/landing-pages/welcome/page.js b/add-on/src/landing-pages/welcome/page.js index bdf7f8091..a7bdfb4eb 100644 --- a/add-on/src/landing-pages/welcome/page.js +++ b/add-on/src/landing-pages/welcome/page.js @@ -30,7 +30,7 @@ function createWelcomePage (i18n) { ${isIpfsOnline ? renderWelcome(i18n, peerCount, onOpenWebUiStatus) : renderInstallSteps(i18n, isIpfsOnline)}
-
+
${renderResources(i18n)} ${renderVideos(i18n)} ${renderProjects(i18n)} @@ -120,7 +120,7 @@ const renderResources = (i18n) => { const anchorClass = 'link underline-under hover-aqua' return html` -