%s.", "Custom_oauth_unique_name" : "Custom oauth unique name", "days" : "days", @@ -153,8 +157,8 @@ "FileUpload" : "File Upload", "FileUpload_Enabled" : "File Uploads Enabled", "FileUpload_MaxFileSize" : "Maximum File Upload Size (in bytes)", - "FileUpload_MediaTypeWhiteList" : "Accepted Media Types", "FileUpload_MediaType_NotAccepted" : "Media Types Not Accepted", + "FileUpload_MediaTypeWhiteList" : "Accepted Media Types", "FileUpload_MediaTypeWhiteListDescription" : "Comma-separated list of media types", "Follow_social_profiles" : "Follow our social profiles, fork us on github and share your thoughts about the rocket.chat app on our trello board.", "Forgot_password" : "Forgot your password", @@ -285,6 +289,7 @@ "Name" : "Name", "Name_cant_be_empty" : "Name can't be empty", "Name_optional" : "Name (optional)", + "New_integration" : "New integration", "New_messages" : "New messages", "New_password" : "New password", "No_channel_with_name_%s_was_found" : "No channel with name \"%s\" was found!", @@ -320,10 +325,8 @@ "Please_wait_activation" : "Please wait, this can take some time.", "Please_wait_statistics" : "Please wait, statistics are being generated.", "Post_as" : "Post as", - "New_integration" : "New integration", - "Post_to_s_as_s" : "Post to %s as %s", - "Created_at_s_by_s" : "Created at %s by %s", "Post_to_Channel" : "Post to Channel", + "Post_to_s_as_s" : "Post to %s as %s", "Powered_by" : "Powered by", "Preferences" : "Preferences", "Preferences_saved" : "Preferences saved", @@ -402,6 +405,7 @@ "Send_your_JSON_payloads_to_this_URL" : "Send your JSON payloads to this URL.", "Settings" : "Settings", "Settings_updated" : "Settings updated", + "Should_be_a_URL_of_an_image" : "Should be a URL of an image.", "Should_exists_a_user_with_this_username" : "Should exists a user with this username.", "Showing_online_users" : "Showing __total_online__ of __total__ users", "Showing_results" : "
Showing %s results
", @@ -481,6 +485,7 @@ "User_left_male" : "Has left the channel.", "User_logged_out" : "User is logged out", "User_not_found_or_incorrect_password" : "User not found or incorrect password", + "User_or_channel_name" : "User or channel name", "User_removed_by" : "User __user_removed__ removed by __user_by__.", "User_Settings" : "User Settings", "User_updated_successfully" : "User updated successfully", @@ -505,6 +510,7 @@ "Yes_clear_all" : "Yes, clear all!", "Yes_delete_it" : "Yes, delete it!", "you_are_in_preview_mode_of" : "You are in preview mode of channel #__room_name__", + "You_can_change_a_different_avatar_too" : "You can change a different avatar too", "You_need_confirm_email" : "You need to confirm your email to login!", "You_should_name_it_to_easily_manage_your_integrations" : "You should name it to easily manage your integrations.", "You_will_not_be_able_to_recover" : "You will not be able to recover this message!", diff --git a/packages/rocketchat-integrations/client/stylesheets/integrations.less b/packages/rocketchat-integrations/client/stylesheets/integrations.less index 129cf9e9e31f..04e51fba4147 100644 --- a/packages/rocketchat-integrations/client/stylesheets/integrations.less +++ b/packages/rocketchat-integrations/client/stylesheets/integrations.less @@ -40,3 +40,9 @@ border-bottom: none; } } + +.message-example { + li { + list-style: none; + } +} diff --git a/packages/rocketchat-integrations/client/views/integrationsIncoming.coffee b/packages/rocketchat-integrations/client/views/integrationsIncoming.coffee index 715ffb0ffbbc..28f19b530c6f 100644 --- a/packages/rocketchat-integrations/client/views/integrationsIncoming.coffee +++ b/packages/rocketchat-integrations/client/views/integrationsIncoming.coffee @@ -1,3 +1,8 @@ +Template.integrationsIncoming.onCreated -> + @record = new ReactiveVar + username: 'rocket.cat' + + Template.integrationsIncoming.helpers hasPermission: -> @@ -10,12 +15,42 @@ Template.integrationsIncoming.helpers data = ChatIntegrations.findOne({_id: params.id}) if data? data.url = Meteor.absoluteUrl("hooks/#{encodeURIComponent(data._id)}/#{encodeURIComponent(data.userId)}/#{encodeURIComponent(data.token)}") + Template.instance().record.set data return data - return {} + return Template.instance().record.curValue + + example: -> + record = Template.instance().record.get() + return {} = + _id: Random.id() + alias: record.alias + avatar: record.avatar + msg: 'Example message' + bot: + i: Random.id() + attachments: [{ + title: "Rocket.Chat" + title_link: "https://rocket.chat" + text: "Rocket.Chat, the best open source chat" + image_url: "https://rocket.chat/images/mockup.png" + color: "#764FA5" + }] + ts: new Date + u: + _id: Random.id() + username: record.username Template.integrationsIncoming.events + "blur input": (e, t) -> + t.record.set + name: $('[name=name]').val().trim() + alias: $('[name=alias]').val().trim() + avatar: $('[name=avatar]').val().trim() + channel: $('[name=channel]').val().trim() + username: $('[name=username]').val().trim() + "click .submit > .delete": -> params = Template.instance().data.params() @@ -42,6 +77,8 @@ Template.integrationsIncoming.events "click .submit > .save": -> name = $('[name=name]').val().trim() + alias = $('[name=alias]').val().trim() + avatar = $('[name=avatar]').val().trim() channel = $('[name=channel]').val().trim() username = $('[name=username]').val().trim() @@ -53,6 +90,8 @@ Template.integrationsIncoming.events integration = channel: channel + alias: alias if alias isnt '' + avatar: avatar if avatar isnt '' name: name if name isnt '' params = Template.instance().data.params?() diff --git a/packages/rocketchat-integrations/client/views/integrationsIncoming.html b/packages/rocketchat-integrations/client/views/integrationsIncoming.html index 976ad0c97e09..d17db30e5c59 100644 --- a/packages/rocketchat-integrations/client/views/integrationsIncoming.html +++ b/packages/rocketchat-integrations/client/views/integrationsIncoming.html @@ -23,7 +23,7 @@