From 0e1a9b7ebfd879359d9dfdcdf46b1919007b7b91 Mon Sep 17 00:00:00 2001 From: Jason Blais Date: Wed, 5 Jul 2017 09:03:49 -0400 Subject: Add App Directory link to Integrations pages (#6731) * Update installed_commands.jsx * Update installed_incoming_webhooks.jsx * Update installed_oauth_apps.jsx * Update installed_outgoing_webhooks.jsx * Update integrations.jsx * Update quick_switch_modal.jsx * Update en.json * Decrease help text size in Integrations page * Fix syntax error * Tweak help text size based on Asaad's feedback * Fix indentation * Update help text classname to backstage-list__help * Update _backstage.scss * Remove the horizontal line in integrations page * Renamed template strings for integrations help links --- .../installed_commands/installed_commands.jsx | 20 ++++++++++++--- .../components/installed_incoming_webhooks.jsx | 20 ++++++++++++--- .../components/installed_oauth_apps.jsx | 20 ++++++++++++--- .../components/installed_outgoing_webhooks.jsx | 20 ++++++++++++--- .../integrations/components/integrations.jsx | 20 +++++++++++++++ .../quick_switch_modal/quick_switch_modal.jsx | 7 +++++- webapp/i18n/en.json | 29 ++++++++++++++-------- webapp/sass/routes/_backstage.scss | 2 +- 8 files changed, 109 insertions(+), 29 deletions(-) diff --git a/webapp/components/integrations/components/installed_commands/installed_commands.jsx b/webapp/components/integrations/components/installed_commands/installed_commands.jsx index c84af77eb..379ade8a1 100644 --- a/webapp/components/integrations/components/installed_commands/installed_commands.jsx +++ b/webapp/components/integrations/components/installed_commands/installed_commands.jsx @@ -121,17 +121,29 @@ export default class InstalledCommands extends React.PureComponent { helpText={ + + ), + appDirectory: ( + + ) diff --git a/webapp/components/integrations/components/installed_incoming_webhooks.jsx b/webapp/components/integrations/components/installed_incoming_webhooks.jsx index 80f887d1b..2b46dbd40 100644 --- a/webapp/components/integrations/components/installed_incoming_webhooks.jsx +++ b/webapp/components/integrations/components/installed_incoming_webhooks.jsx @@ -139,17 +139,29 @@ export default class InstalledIncomingWebhooks extends React.Component { helpText={ + + ), + appDirectory: ( + + ) diff --git a/webapp/components/integrations/components/installed_oauth_apps.jsx b/webapp/components/integrations/components/installed_oauth_apps.jsx index 36d9c8dfa..3f3ff4c11 100644 --- a/webapp/components/integrations/components/installed_oauth_apps.jsx +++ b/webapp/components/integrations/components/installed_oauth_apps.jsx @@ -102,17 +102,29 @@ export default class InstalledOAuthApps extends React.Component { helpText={ + + ), + appDirectory: ( + + ) diff --git a/webapp/components/integrations/components/installed_outgoing_webhooks.jsx b/webapp/components/integrations/components/installed_outgoing_webhooks.jsx index 2a0f1c59f..4f39b0f05 100644 --- a/webapp/components/integrations/components/installed_outgoing_webhooks.jsx +++ b/webapp/components/integrations/components/installed_outgoing_webhooks.jsx @@ -143,17 +143,29 @@ export default class InstalledOutgoingWebhooks extends React.Component { helpText={ + + ), + appDirectory: ( + + ) diff --git a/webapp/components/integrations/components/integrations.jsx b/webapp/components/integrations/components/integrations.jsx index 6fe809086..7de8810a0 100644 --- a/webapp/components/integrations/components/integrations.jsx +++ b/webapp/components/integrations/components/integrations.jsx @@ -145,6 +145,26 @@ export default class Integrations extends React.Component { /> +
+ + + + ) + }} + /> +
{options}
diff --git a/webapp/components/quick_switch_modal/quick_switch_modal.jsx b/webapp/components/quick_switch_modal/quick_switch_modal.jsx index aed274510..2fbfdb2bd 100644 --- a/webapp/components/quick_switch_modal/quick_switch_modal.jsx +++ b/webapp/components/quick_switch_modal/quick_switch_modal.jsx @@ -272,7 +272,12 @@ export default class QuickSwitchModal extends React.PureComponent { let help; if (Utils.isMobile()) { - help = null; + help = ( + + ); } else if (this.props.showTeamSwitcher) { help = ( {isTrusted}", @@ -1540,8 +1543,9 @@ "installed_outgoing_webhooks.delete.confirm": "This action permanently deletes the outgoing webhook and breaks any integrations using it. Are you sure you want to delete it?", "installed_outgoing_webhooks.empty": "No outgoing webhooks found", "installed_outgoing_webhooks.header": "Outgoing Webhooks", - "installed_outgoing_webhooks.help": "Create outgoing webhook URLs for use in external integrations. Please see the {link} to learn more.", - "installed_outgoing_webhooks.helpLink": "documentation", + "installed_outgoing_webhooks.help": "Use outgoing webhooks to connect external tools to Mattermost. {buildYourOwn} or visit the {appDirectory} to find self-hosted, third-party apps and integrations.", + "installed_outgoing_webhooks.help.buildYourOwn": "Build your own", + "installed_outgoing_webhooks.help.appDirectory": "App Directory", "installed_outgoing_webhooks.search": "Search Outgoing Webhooks", "installed_outgoing_webhooks.unknown_channel": "A Private Webhook", "integrations.add": "Add", @@ -1552,6 +1556,8 @@ "integrations.done": "Done", "integrations.edit": "Edit", "integrations.header": "Integrations", + "integrations.help": "Visit the {appDirectory} to find self-hosted, third-party apps and integrations for Mattermost.", + "integrations.help.appDirectory": "App Directory", "integrations.incomingWebhook.description": "Incoming webhooks allow external integrations to send messages", "integrations.incomingWebhook.title": "Incoming Webhook", "integrations.oauthApps.description": "OAuth 2.0 allows external applications to make authorized requests to the Mattermost API.", @@ -1877,14 +1883,15 @@ "posts_view.loadingMore": "Loading more messages...", "posts_view.newMsg": "New Messages", "posts_view.newMsgBelow": "New {count, plural, one {message} other {messages}} below", - "quick_switch_modal.channels": "Channels", - "quick_switch_modal.channelsShortcut.mac": "- ⌘K", - "quick_switch_modal.channelsShortcut.windows": "- CTRL+K", "quick_switch_modal.help": "Start typing then use TAB to toggle channels/teams, ↑↓ to browse, ↵ to select, and ESC to dismiss.", + "quick_switch_modal.help_mobile": "Type to find a channel.", "quick_switch_modal.help_no_team": "Type to find a channel. Use ↑↓ to browse, ↵ to select, ESC to dismiss.", + "quick_switch_modal.channels": "Channels", "quick_switch_modal.teams": "Teams", "quick_switch_modal.teamsShortcut.mac": "- ⌘⌥K", "quick_switch_modal.teamsShortcut.windows": "- CTRL+ALT+K", + "quick_switch_modal.channelsShortcut.mac": "- ⌘K", + "quick_switch_modal.channelsShortcut.windows": "- CTRL+K", "reaction.clickToAdd": "(click to add)", "reaction.clickToRemove": "(click to remove)", "reaction.othersReacted": "{otherUsers, number} {otherUsers, plural, one {user} other {users}}", diff --git a/webapp/sass/routes/_backstage.scss b/webapp/sass/routes/_backstage.scss index 5274a583e..9785dcca9 100644 --- a/webapp/sass/routes/_backstage.scss +++ b/webapp/sass/routes/_backstage.scss @@ -209,7 +209,7 @@ .backstage-list__help { display: block; - padding: 1em 0; + margin: 1em 0; } .backstage-list__item { -- cgit v1.2.3-1-g7c22