diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-03-30 15:06:47 -0400 |
---|---|---|
committer | Harrison Healey <harrisonmhealey@gmail.com> | 2016-04-04 09:47:43 -0400 |
commit | 9fd7802af1a0f73039a66feaed30d8d230b065b6 (patch) | |
tree | 9a3308345afa463e6783846c0ecfdda7db3beb53 | |
parent | 441156b91e9f9bac6b5592616551e2920c4cb33b (diff) | |
download | chat-9fd7802af1a0f73039a66feaed30d8d230b065b6.tar.gz chat-9fd7802af1a0f73039a66feaed30d8d230b065b6.tar.bz2 chat-9fd7802af1a0f73039a66feaed30d8d230b065b6.zip |
Added 'Created by...' line in integration list
-rw-r--r-- | webapp/components/backstage/installed_incoming_webhook.jsx | 13 | ||||
-rw-r--r-- | webapp/components/backstage/installed_outgoing_webhook.jsx | 15 | ||||
-rw-r--r-- | webapp/i18n/en.json | 1 | ||||
-rw-r--r-- | webapp/sass/routes/_backstage.scss | 5 |
4 files changed, 32 insertions, 2 deletions
diff --git a/webapp/components/backstage/installed_incoming_webhook.jsx b/webapp/components/backstage/installed_incoming_webhook.jsx index 262bfe21d..95a303edc 100644 --- a/webapp/components/backstage/installed_incoming_webhook.jsx +++ b/webapp/components/backstage/installed_incoming_webhook.jsx @@ -4,6 +4,7 @@ import React from 'react'; import ChannelStore from 'stores/channel_store.jsx'; +import * as Utils from 'utils/utils.jsx'; import {FormattedMessage} from 'react-intl'; @@ -52,6 +53,18 @@ export default class InstalledIncomingWebhook extends React.Component { {incomingWebhook.description} </span> </div> + <div className='tem-details__row'> + <span className='item-details__creation'> + <FormattedMessage + id='installed_integrations.creation' + defaultMessage='Created by {creator} on {createAt, date, full}' + values={{ + creator: Utils.displayUsername(incomingWebhook.user_id), + createAt: incomingWebhook.create_at + }} + /> + </span> + </div> </div> <div className='item-actions'> <a diff --git a/webapp/components/backstage/installed_outgoing_webhook.jsx b/webapp/components/backstage/installed_outgoing_webhook.jsx index 4482029bf..530474dc3 100644 --- a/webapp/components/backstage/installed_outgoing_webhook.jsx +++ b/webapp/components/backstage/installed_outgoing_webhook.jsx @@ -4,6 +4,7 @@ import React from 'react'; import ChannelStore from 'stores/channel_store.jsx'; +import * as Utils from 'utils/utils.jsx'; import {FormattedMessage} from 'react-intl'; @@ -58,8 +59,18 @@ export default class InstalledOutgoingWebhook extends React.Component { <div className='item-details__row'> <span className='item-details__description'> {outgoingWebhook.description} - {' - '} - {outgoingWebhook.token} + </span> + </div> + <div className='item-details__row'> + <span className='item-details__creation'> + <FormattedMessage + id='installed_integrations.creation' + defaultMessage='Created by {creator} on {createAt, date, full}' + values={{ + creator: Utils.displayUsername(outgoingWebhook.creator_id), + createAt: outgoingWebhook.create_at + }} + /> </span> </div> </div> diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 7dc6486ab..8fdb42b4c 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -814,6 +814,7 @@ "get_team_invite_link_modal.title": "Team Invite Link", "installed_integrations.add": "Add Integration", "installed_integrations.allFilter": "All ({count})", + "installed_integrations.creation": "Created by {creator} on {createAt, date, full}", "installed_integrations.delete": "Delete", "installed_integrations.header": "Installed Integrations", "installed_integrations.incomingWebhookType": "(Incoming Webhook)", diff --git a/webapp/sass/routes/_backstage.scss b/webapp/sass/routes/_backstage.scss index 729c8c912..e7e8c1e01 100644 --- a/webapp/sass/routes/_backstage.scss +++ b/webapp/sass/routes/_backstage.scss @@ -196,6 +196,11 @@ margin-bottom: 1em; } + .item-details__creation { + color: $dark-gray; + margin-bottom: 1em; + } + .list-item__actions { flex-grow: 0; flex-shrink: 0; |