Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: pop-up menu and share page tweaks #907

Merged
merged 49 commits into from
Jul 8, 2020
Merged
Show file tree
Hide file tree
Changes from 44 commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
db28789
Pop-up header: Rearrange items for height/clarity, remove stars
jessicaschilling Jul 1, 2020
765df30
Toolbar: first steps
jessicaschilling Jul 2, 2020
931cd00
Two buttons: share files, go to my node
jessicaschilling Jul 2, 2020
ab39ca1
Peers to top of status list
jessicaschilling Jul 2, 2020
9b115cf
Remove tools header; "Active Tab" -> "Current Tab"
jessicaschilling Jul 2, 2020
b98265f
Global gateway toggle to appear next to gateway status
jessicaschilling Jul 2, 2020
4de72b8
Rearrange gateway toggle in prep for making an a/b switch
jessicaschilling Jul 2, 2020
53244da
Revert "Rearrange gateway toggle in prep for making an a/b switch"
jessicaschilling Jul 2, 2020
eb764d1
Revert "Global gateway toggle to appear next to gateway status"
jessicaschilling Jul 2, 2020
da2e71d
Revert "Remove tools header; "Active Tab" -> "Current Tab""
jessicaschilling Jul 2, 2020
6f0854f
Revert "Peers to top of status list"
jessicaschilling Jul 2, 2020
95c96da
Revert "Two buttons: share files, go to my node"
jessicaschilling Jul 2, 2020
95e9624
Revert "Toolbar: first steps"
jessicaschilling Jul 2, 2020
0da74d9
Peers first in status list
jessicaschilling Jul 2, 2020
4e84639
Add hover titles for all items in header area
jessicaschilling Jul 2, 2020
b1ad4eb
Restyle menu titles and change to "Current Tab"
jessicaschilling Jul 2, 2020
3975ad8
Reword Tools menu items
jessicaschilling Jul 2, 2020
3f9ff23
Remove global gateway toggle per convo with @olizilla
jessicaschilling Jul 2, 2020
ff1c7e9
Remove panel_toolsSectionHeader
jessicaschilling Jul 2, 2020
fe8cf03
Add border-top to nav-header, remove extraneous nav-header and browse…
jessicaschilling Jul 3, 2020
b8169c3
Remove extraneous browser and nav-header refs
jessicaschilling Jul 3, 2020
42d1d32
Smaller text, border between tools and contextual items
jessicaschilling Jul 3, 2020
3c347a1
Spacing cleanup in menu items
jessicaschilling Jul 3, 2020
75bb812
Uppercase/lowercase menu and notification items to match system/brows…
jessicaschilling Jul 3, 2020
a39e971
Menu item: "Share Files via IPFS..." -> "Quick Import/Share"
jessicaschilling Jul 3, 2020
ef0a59a
Sharing page: Add discrete title and clarify "share"
jessicaschilling Jul 3, 2020
57be246
Update nav-item.js
jessicaschilling Jul 3, 2020
9b3587e
Narrow subhead affordance so it doesn't run into toggles
jessicaschilling Jul 3, 2020
73e3b8d
Subhead helperText now dynamic, but no real values yet
jessicaschilling Jul 3, 2020
ed07dbf
helperText titles updated to equivalents in copier.js, but not live-l…
jessicaschilling Jul 3, 2020
99729ef
Gradient from ipfs-css, resolves https://github.com/ipfs-shipyard/ipf…
jessicaschilling Jul 3, 2020
0c1128e
Update add-on/_locales/en/messages.json
jessicaschilling Jul 3, 2020
f65c512
Update add-on/_locales/en/messages.json
jessicaschilling Jul 3, 2020
efe4298
Add hover text to IPFS version in header
jessicaschilling Jul 3, 2020
a9c0f8e
Merge branch 'feat/popup-header-tweaks' of https://github.com/ipfs-sh…
jessicaschilling Jul 3, 2020
568d24a
Remove margin repetition
jessicaschilling Jul 3, 2020
34c9b0d
refactor: wire up hints for copy actions
lidel Jul 8, 2020
626b3eb
fix: async CID resolution for main menu
lidel Jul 8, 2020
395b5bb
Tweak not-ready message
jessicaschilling Jul 8, 2020
4baea0d
nit: standardize page titles for welcome, prefs, share
jessicaschilling Jul 8, 2020
64e58c7
Tweak prefs page language related to gateways
jessicaschilling Jul 8, 2020
9648df4
Clarify "Pin IPFS Resource" tool tip
jessicaschilling Jul 8, 2020
399d658
Flipped page titles for consistency with docs.ipfs.io
jessicaschilling Jul 8, 2020
b264175
Add tooltips for all pop-up menu items
jessicaschilling Jul 8, 2020
e03ecfc
Merge branch 'master' into feat/popup-header-tweaks
lidel Jul 8, 2020
51a340f
Update add-on/_locales/en/messages.json
jessicaschilling Jul 8, 2020
0ded347
address bar text
jessicaschilling Jul 8, 2020
5997e22
Merge branch 'feat/popup-header-tweaks' of https://github.com/ipfs-sh…
jessicaschilling Jul 8, 2020
125ee93
Simply "reset everything" prefs text
jessicaschilling Jul 8, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ IPFS Companion enables you to quickly and easily access common actions from your
- See how many peers you're connected with a glance at the cube icon in your browser bar
- Check your IPFS API and gateway status by clicking the cube icon to reveal the main menu
- Right-click images and other page assets to easily add them to IPFS (including the option to preserve file names)
- Choose the _Share files via IPFS_ option in the main menu for quick drag-and-drop import from a browser tab
- Choose the _Quick Import/Share..._ option in the main menu for quick drag-and-drop import from a browser tab
- Pin or unpin IPFS resources (via API) directly from the main menu
- Copy shareable public gateway links, IPFS content paths, or CIDs of IPFS resources directly from the main menu
- Launch the [IPFS Web UI dashboard](https://github.com/ipfs-shipyard/ipfs-webui) from the main menu with a single click
Expand Down
6 changes: 3 additions & 3 deletions add-on/_locales/da/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,23 +72,23 @@
"description": "A menu item tooltip in Browser Action pop-up (panel_activeTabSiteIntegrationsToggleTooltip)"
},
"panel_pinCurrentIpfsAddress": {
"message": "Pin IPFS resource",
"message": "Pin IPFS Resource",
"description": "A menu item in Browser Action pop-up (panel_pinCurrentIpfsAddress)"
},
"panel_pinCurrentIpfsAddressTooltip": {
"message": "Fastgørelse af en CID fortæller din IPFS-klient at denne data er vigtig og ikke må fjernes.",
"description": "A menu item tooltip in Browser Action pop-up (panel_pinCurrentIpfsAddressTooltip)"
},
"panelCopy_currentIpfsAddress": {
"message": "Copy IPFS content path",
"message": "Copy IPFS Content Path",
"description": "A menu item in Browser Action pop-up and right-click context menu (panelCopy_currentIpfsAddress)"
},
"panelCopy_copyRawCid": {
"message": "Kopier CID",
"description": "A menu item in Browser Action pop-up and right-click context menu (panelCopy_copyRawCid)"
},
"panel_copyCurrentPublicGwUrl": {
"message": "Copy shareable link",
"message": "Copy Shareable Link",
"description": "A menu item in Browser Action pop-up and right-click context menu (panel_copyCurrentPublicGwUrl)"
},
"panel_contextMenuViewOnGateway": {
Expand Down
2 changes: 1 addition & 1 deletion add-on/_locales/de/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
"description": "A menu item in Browser Action pop-up and right-click context menu (panelCopy_copyRawCid)"
},
"panel_copyCurrentPublicGwUrl": {
"message": "Copy shareable link",
"message": "Copy Shareable Link",
"description": "A menu item in Browser Action pop-up and right-click context menu (panel_copyCurrentPublicGwUrl)"
},
"panel_contextMenuViewOnGateway": {
Expand Down
118 changes: 77 additions & 41 deletions add-on/_locales/en/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,26 @@
"message": "Gateway",
"description": "A label in Node status section of Browser Action pop-up (panel_statusGatewayAddress)"
},
"panel_statusGatewayAddressTitle": {
"message": "The URL of the gateway, either public or local, you are using to fetch content (change this in Preferences)",
"description": "A label in Node status section of Browser Action pop-up (panel_statusGatewayAddressTitle)"
},
"panel_statusApiAddress": {
"message": "API",
"description": "A label in Node status section of Browser Action pop-up (panel_statusApiAddress)"
},
"panel_statusApiAddressTitle": {
"message": "The URL of your local node's API",
"description": "A label in Node status section of Browser Action pop-up (panel_statusApiAddressTitle)"
},
"panel_statusGatewayVersion": {
"message": "version",
"description": "A label in Node status section of Browser Action pop-up (panel_statusGatewayVersion)"
},
"panel_statusGatewayVersionTitle": {
"message": "The version of IPFS your local node is using",
"description": "A label in Node status section of Browser Action pop-up (panel_statusGatewayVersionTitle)"
},
"panel_statusSwarmPeers": {
"message": "Peers",
"description": "A label in Node status section of Browser Action pop-up (panel_statusSwarmPeers)"
Expand All @@ -36,61 +48,73 @@
"description": "A label tooltip in Node status section of Browser Action pop-up (panel_statusSwarmPeersTitle)"
},
"panel_quickImport": {
"message": "Share files via IPFS",
"message": "Quick Import/Share…",
"description": "A menu item in Browser Action pop-up (panel_quickImport)"
},
"panel_quickImportTooltip": {
"message": "Import files to IPFS and copy a publicly shareable link to your clipboard",
"description": "A menu item tooltip in Browser Action pop-up (panel_quickImportTooltip)"
},
"panel_openWebui": {
"message": "Open Web UI",
"message": "Go to My Node…",
"description": "A menu item in Browser Action pop-up (panel_openWebui)"
},
"panel_redirectToggle": {
"message": "Redirect to Gateway",
"description": "A menu item in Browser Action pop-up (panel_redirectToggle)"
},
"panel_redirectToggleTooltip": {
"message": "Click to toggle all gateway redirects",
"description": "A menu item in Browser Action pop-up (panel_redirectToggleTooltip)"
},
"panel_toolsSectionHeader": {
"message": "Tools",
"description": "A menu item in Browser Action pop-up (panel_toolsSectionHeader)"
"panel_openWebuiTooltip": {
"message": "Open your IPFS node's controls in your browser",
"description": "A menu item in Browser Action pop-up (panel_openWebuiTooltip)"
},
"panel_openPreferences": {
"message": "Open Preferences of Browser Extension",
"message": "Open IPFS Companion preferences",
"description": "A menu item in Browser Action pop-up (panel_openPreferences)"
},
"panel_activeTabSectionHeader": {
"message": "Active Tab",
"message": "Current Tab",
"description": "A menu item in Browser Action pop-up (panel_activeTabSiteRedirectEnable)"
},
"panel_activeTabSiteIntegrationsToggle": {
"message": "Enable on $1",
"description": "A menu item in Browser Action pop-up (panel_activeTabSiteIntegrationsToggle)"
},
"panel_activeTabSiteIntegrationsToggleTooltip": {
"message": "Click to toggle all IPFS integrations on $1",
"message": "Enable/disable all IPFS integrations on $1",
"description": "A menu item tooltip in Browser Action pop-up (panel_activeTabSiteIntegrationsToggleTooltip)"
},
"panel_pinCurrentIpfsAddress": {
"message": "Pin IPFS resource",
"message": "Pin IPFS Resource",
"description": "A menu item in Browser Action pop-up (panel_pinCurrentIpfsAddress)"
},
"panel_pinCurrentIpfsAddressTooltip": {
"message": "Pinning a CID tells your IPFS node that this data is important and mustn’t be thrown away.",
"message": "Pin this page's IPFS resources to your node to have a local copy that's available offline and never thrown away.",
"description": "A menu item tooltip in Browser Action pop-up (panel_pinCurrentIpfsAddressTooltip)"
},
"panelCopy_currentIpfsAddress": {
"message": "Copy IPFS content path",
"message": "Copy IPFS Content Path",
"description": "A menu item in Browser Action pop-up and right-click context menu (panelCopy_currentIpfsAddress)"
},
"panelCopy_currentIpfsAddressTooltip": {
"message": "A pathed link that you can use with any gateway",
jessicaschilling marked this conversation as resolved.
Show resolved Hide resolved
"description": "A menu item tooltip in Browser Action pop-up (panelCopy_currentIpfsAddressTooltip)"
},
"panelCopy_copyRawCid": {
"message": "Copy CID",
"description": "A menu item in Browser Action pop-up and right-click context menu (panelCopy_copyRawCid)"
},
"panelCopy_copyRawCidTooltip": {
"message": "The unique IPFS content identifier for this page",
"description": "A menu item tooltip in Browser Action pop-up (panelCopy_copyRawCidTooltip)"
},
"panelCopy_copyRawCidNotReadyHint": {
"message": "(waiting for DAG data)",
"description": "A hint in menu item in Browser Action pop-up to indicate CID is still being resolved (panelCopy_copyRawCidNotReadyHint)"
},
"panel_copyCurrentPublicGwUrl": {
"message": "Copy shareable link",
"message": "Copy Shareable Link",
"description": "A menu item in Browser Action pop-up and right-click context menu (panel_copyCurrentPublicGwUrl)"
},
"panel_copyCurrentPublicGwUrlTooltip": {
"message": "This link works for anyone, even if they don't use IPFS",
"description": "A menu item tooltip in Browser Action pop-up (panel_copyCurrentPublicGwUrlTooltip)"
},
"panel_contextMenuViewOnGateway": {
"message": "View on Gateway",
"description": "A menu item in Browser Action pop-up and right-click context menu (panel_contextMenuViewOnGateway)"
Expand All @@ -104,7 +128,7 @@
"description": "A tooltip displayed over Page Action in location bar (pageAction_titleIpfsAtCustomGateway)"
},
"pageAction_titleNonIpfs": {
"message": "Non-IPFS resource",
"message": "Non-IPFS Resource",
"description": "Default label for icon hidden in Page Action menu (pageAction_titleNonIpfs)"
},
"contextMenu_parentImage": {
Expand Down Expand Up @@ -144,47 +168,47 @@
"description": "A title of system notification (notify_addonIssueTitle)"
},
"notify_addonIssueMsg": {
"message": "See Browser Console for more details",
"message": "See your browser's developer console for more details",
"description": "A message in system notification (notify_addonIssueMsg)"
},
"notify_copiedTitle": {
"message": "Copied",
"description": "A title of system notification (notify_copiedTitle)"
},
"notify_pinnedIpfsResourceTitle": {
"message": "IPFS Resource is now pinned",
"message": "IPFS Resource Pinned",
"description": "A title of system notification (notify_pinnedIpfsResourceTitle)"
},
"notify_unpinnedIpfsResourceTitle": {
"message": "Removed IPFS Pin",
"description": "A title of system notification (notify_unpinnedIpfsResourceTitle)"
},
"notify_pinErrorTitle": {
"message": "Error while pinning IPFS Resource",
"message": "Error Pinning IPFS Resource",
"description": "A title of system notification (notify_pinErrorTitle)"
},
"notify_unpinErrorTitle": {
"message": "Error while removing IPFS Pin",
"message": "Error Removing IPFS Pin",
"description": "A title of system notification (notify_unpinErrorTitle)"
},
"notify_apiOnlineTitle": {
"message": "IPFS API is Online",
"description": "A title of system notification (notify_apiOnlineTitle)"
},
"notify_apiOnlineAutomaticModeMsg": {
"message": "Automatic Mode: Custom Gateway Redirect is active",
"message": "Automatic Mode: Custom gateway redirect is active",
"description": "A message in system notification (notify_apiOnlineAutomaticModeMsg)"
},
"notify_apiOfflineTitle": {
"message": "IPFS API is Offline",
"description": "A title of system notification (notify_apiOfflineTitle)"
},
"notify_apiOfflineAutomaticModeMsg": {
"message": "Automatic Mode: Public Gateway will be used as a fallback",
"message": "Automatic Mode: Public gateway will be used as a fallback",
"description": "A message in system notification (notify_apiOfflineAutomaticModeMsg)"
},
"notify_importErrorTitle": {
"message": "Unable to import via IPFS API",
"message": "Unable to Import via IPFS API",
"description": "A title of system notification (notify_importErrorTitle)"
},
"notify_importTrackingProtectionErrorMsg": {
Expand All @@ -200,13 +224,17 @@
"description": "A generic placeholder for error notification (notify_inlineErrorMsg)"
},
"notify_startIpfsNodeErrorTitle": {
"message": "Failed to start IPFS node",
"message": "Failed to Start IPFS Node",
"description": "System notification title displayed when starting an IPFS node fails (notify_startIpfsNodeErrorTitle)"
},
"notify_stopIpfsNodeErrorTitle": {
"message": "Failed to stop IPFS node",
"message": "Failed to Stop IPFS Node",
"description": "System notification title displayed when stopping an IPFS node fails (notify_stopIpfsNodeErrorTitle)"
},
"option_page_title" : {
"message": "Preferences | IPFS Companion",
"description": "Title of the Preferences page (option_page_title)"
},
"option_page_header" : {
"message": "Companion Preferences",
"description": "Main header on the Preferences screen (option_page_header)"
Expand Down Expand Up @@ -264,23 +292,23 @@
"description": "A section header on the Preferences screen (option_header_gateways)"
},
"option_customGatewayUrl_title": {
"message": "Custom Local Gateway",
"message": "Local Gateway",
"description": "An option title on the Preferences screen (option_customGatewayUrl_title)"
},
"option_customGatewayUrl_description": {
"message": "URL of preferred HTTP2IPFS Gateway",
"message": "Set the URL of your local gateway.",
"description": "An option description on the Preferences screen (option_customGatewayUrl_description)"
},
"option_customGatewayUrl_warning": {
"message": "IPFS content will be blocked from loading on HTTPS websites unless your gateway URL starts with “http://127.0.0.1”, “http://[::1]” or “https://”",
"description": "A warning on the Preferences screen, displayed when URL does not belong to Secure Context (option_customGatewayUrl_warning)"
},
"option_useCustomGateway_title": {
"message": "Use Custom Gateway",
"message": "Use Local Gateway",
"description": "An option title on the Preferences screen (option_useCustomGateway_title)"
},
"option_useCustomGateway_description": {
"message": "Redirect requests for IPFS resources to the Custom gateway",
"message": "Redirect requests for IPFS resources to your local gateway.",
"description": "An option description on the Preferences screen (option_useCustomGateway_description)"
},
"option_useSubdomains_title": {
Expand Down Expand Up @@ -324,15 +352,15 @@
"description": "An option title on the Preferences screen (option_publicGatewayUrl_title)"
},
"option_publicGatewayUrl_description": {
"message": "Fallback URL used when Custom Gateway is not available and for copying shareable links",
"message": "Set the URL of a default public gateway to use in publicly shareable links and as a fallback if your local gateway is unavailable.",
"description": "An option description on the Preferences screen (option_publicGatewayUrl_description)"
},
"option_publicSubdomainGatewayUrl_title": {
"message": "Default Public Subdomain Gateway",
"description": "An option title on the Preferences screen (option_publicSubdomainGatewayUrl_title)"
},
"option_publicSubdomainGatewayUrl_description": {
"message": "Default public subdomain gateway for recovery of broken subdomain gateways",
"message": "Set the URL of a default public subdomain gateway for the recovery of broken subdomain gateways.",
"description": "An option description on the Preferences screen (option_publicSubdomainGatewayUrl_description)"
},
"option_header_api": {
Expand Down Expand Up @@ -360,7 +388,7 @@
"description": "An option title on the Preferences screen (option_automaticMode_title)"
},
"option_automaticMode_description": {
"message": "Toggle use of Custom Gateway when IPFS API availability changes",
"message": "Automatically switch from your local gateway to your default public gateway if the IPFS API is unavailable.",
"description": "An option description on the Preferences screen (option_automaticMode_description)"
},
"option_header_dnslink": {
Expand Down Expand Up @@ -511,6 +539,14 @@
"message": "Harness the power of IPFS in your browser",
"description": "Extension description in the Manifest file (manifest_extensionDescription)"
},
"quickImport_page_title": {
"message": "Import & Share Files | IPFS Companion",
"description": "Page title (quickImport_page_title)"
},
"quickImport_head_peers": {
"message": "Import & share files",
"description": "Header on the share files page (quickImport_subhead_peers)"
},
"quickImport_subhead_peers": {
"message": "Connected to $1 peers",
"description": "Partial info stats beneath the header on the share files page (quickImport_subhead_peers)"
Expand All @@ -524,8 +560,8 @@
"description": "seperates the pick a file button from the drop message (quickImport_or)"
},
"quickImport_drop_it_here": {
"message": "drop it here to share",
"description": "Partial info stats beneath the header on the share files page (quickImport_drop_it_here)"
"message": "drop it here",
"description": "Drop message on the share files page (quickImport_drop_it_here)"
},
"quickImport_state_importing": {
"message": "Import in progress..",
Expand All @@ -544,7 +580,7 @@
"description": "Textbox label on the share files page (quickImport_options_importDir)"
},
"quickImport_options_openViaWebUI": {
"message": "Open in Web UI",
"message": "Open in Files page",
"description": "Checkbox label on the share files page (quickImport_options_openViaWebUI)"
},
"page_proxyAcl_title": {
Expand Down Expand Up @@ -608,7 +644,7 @@
"description": "Button text for denying a permission (page_proxyAccessDialog_allowButton_text)"
},
"page_landingWelcome_title": {
"message": "IPFS Companion - Welcome!",
"message": "Welcome | IPFS Companion",
"description": "Page title (page_landingWelcome_title)"
},
"page_landingWelcome_logo_title": {
Expand Down
6 changes: 3 additions & 3 deletions add-on/_locales/fi/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,23 +72,23 @@
"description": "A menu item tooltip in Browser Action pop-up (panel_activeTabSiteIntegrationsToggleTooltip)"
},
"panel_pinCurrentIpfsAddress": {
"message": "Pin IPFS resource",
"message": "Pin IPFS Resource",
"description": "A menu item in Browser Action pop-up (panel_pinCurrentIpfsAddress)"
},
"panel_pinCurrentIpfsAddressTooltip": {
"message": "Sisältö-ID:n (CID) kiinnittäminen merkitsee datan tärkeäksi IPFS-solmulle ja kieltää sen pois heittämisen.",
"description": "A menu item tooltip in Browser Action pop-up (panel_pinCurrentIpfsAddressTooltip)"
},
"panelCopy_currentIpfsAddress": {
"message": "Copy IPFS content path",
"message": "Copy IPFS Content Path",
"description": "A menu item in Browser Action pop-up and right-click context menu (panelCopy_currentIpfsAddress)"
},
"panelCopy_copyRawCid": {
"message": "Kopioi sisältö-ID (CID)",
"description": "A menu item in Browser Action pop-up and right-click context menu (panelCopy_copyRawCid)"
},
"panel_copyCurrentPublicGwUrl": {
"message": "Copy shareable link",
"message": "Copy Shareable Link",
"description": "A menu item in Browser Action pop-up and right-click context menu (panel_copyCurrentPublicGwUrl)"
},
"panel_contextMenuViewOnGateway": {
Expand Down
Loading