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.

Sign up for GitHub

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

Jump to bottom

[NEW] Add information regarding Zapier and Bots to the integrations page #10574

Merged
merged 1 commit into from
Apr 25, 2018
Merged

[NEW] Add information regarding Zapier and Bots to the integrations page #10574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion packages/rocketchat-i18n/i18n/en.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,8 @@
"Adding_user": "Adding user",
"Additional_emails": "Additional Emails",
"Additional_Feedback": "Additional Feedback",
"additional_integrations_Zapier": "Are you looking to integrate other software and applications with Rocket.Chat but you don't have the time to manually do it? Then we suggest using Zapier which we fully support. Read more about it on our documentation. <a href='https://rocket.chat/docs/administrator-guides/integrations/zapier/using-zaps/' target='_blank'>https://rocket.chat/docs/administrator-guides/integrations/zapier/using-zaps/</a>",
"additional_integrations_Bots": "If you are looking for how to integrate your own bot, then look no further than our Hubot adapter. <a href='https://github.com/RocketChat/hubot-rocketchat' target='_blank'>https://github.com/RocketChat/hubot-rocketchat</a>",
"Administration": "Administration",
"Adult_images_are_not_allowed": "Adult images are not allowed",
"After_OAuth2_authentication_users_will_be_redirected_to_this_URL": "After OAuth2 authentication, users will be redirected to this URL",
Expand Down Expand Up @@ -341,6 +343,7 @@
"Body": "Body",
"bold": "bold",
"bot_request": "Bot request",
"Bots": "Bots",
"BotHelpers_userFields": "User Fields",
"BotHelpers_userFields_Description": "CSV of user fields that can be accessed by bots helper methods.",
"Branch": "Branch",
Expand Down Expand Up @@ -2343,4 +2346,4 @@
"your_message_optional": "your message (optional)",
"Your_password_is_wrong": "Your password is wrong!",
"Your_push_was_sent_to_s_devices": "Your push was sent to %s devices"
}
}
11 changes: 11 additions & 0 deletions packages/rocketchat-integrations/client/stylesheets/integrations.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,14 @@
list-style: none;
}
}

.integrate-other-ways {
& p {
font-size: 1rem;
line-height: 1.5rem;

& a {
color: #175CC4 !important;
}
}
}
8 changes: 8 additions & 0 deletions packages/rocketchat-integrations/client/views/integrations.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,14 @@
<p>{{_ "You_are_not_authorized_to_view_this_page"}}</p>
{{else}}
<div class="rocket-form">
<div class="section integrate-other-ways">
<h1>Zapier</h1>
<p>{{{_ "additional_integrations_Zapier"}}}</p>
<br>
<h1>{{_ "Bots"}}</h1>
<p>{{{_ "additional_integrations_Bots"}}}</p>
</div>

<div class="section">
<div class="admin-integrations-new-panel">
{{#each integrations}}
Expand Down