From 151cc9aa1803d6107c2a2252916da218f678f5ba Mon Sep 17 00:00:00 2001
From: Bradley Hilton <graywolf336@craftyn.com>
Date: Tue, 24 Apr 2018 14:03:26 -0500
Subject: [PATCH] Add some information regarding Zapier and Bots to the
 integrations page

---
 packages/rocketchat-i18n/i18n/en.i18n.json            |  5 ++++-
 .../client/stylesheets/integrations.css               | 11 +++++++++++
 .../client/views/integrations.html                    |  8 ++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 54741e75e949..016fd0af1a4e 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -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",
@@ -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",
@@ -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"
-}
\ No newline at end of file
+}
diff --git a/packages/rocketchat-integrations/client/stylesheets/integrations.css b/packages/rocketchat-integrations/client/stylesheets/integrations.css
index 624db824ba58..a83ac5889984 100644
--- a/packages/rocketchat-integrations/client/stylesheets/integrations.css
+++ b/packages/rocketchat-integrations/client/stylesheets/integrations.css
@@ -52,3 +52,14 @@
 		list-style: none;
 	}
 }
+
+.integrate-other-ways {
+	& p {
+		font-size: 1rem;
+		line-height: 1.5rem;
+
+		& a {
+			color: #175CC4 !important;
+		}
+	}
+}
diff --git a/packages/rocketchat-integrations/client/views/integrations.html b/packages/rocketchat-integrations/client/views/integrations.html
index ef160b20d44a..03115afaccdf 100644
--- a/packages/rocketchat-integrations/client/views/integrations.html
+++ b/packages/rocketchat-integrations/client/views/integrations.html
@@ -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}}