diff options
| author | David Lu <david.lu@hotmail.com> | 2016-07-14 15:57:49 -0400 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2016-07-14 11:57:49 -0800 |
| commit | bd12520b445ecf00edad139c5e78df973b0c6b06 (patch) | |
| tree | 68237c6184da594cf37c8ae7a76f2fee2689dc26 /webapp | |
| parent | 34077a407b1aeab2d1510471d59a50108f0ec699 (diff) | |
| download | chat-bd12520b445ecf00edad139c5e78df973b0c6b06.tar.gz chat-bd12520b445ecf00edad139c5e78df973b0c6b06.tar.bz2 chat-bd12520b445ecf00edad139c5e78df973b0c6b06.zip | |
added channel header to view channel info modal (#3584)
Diffstat (limited to 'webapp')
| -rw-r--r-- | webapp/components/channel_info_modal.jsx | 46 | ||||
| -rw-r--r-- | webapp/i18n/en.json | 1 |
2 files changed, 38 insertions, 9 deletions
diff --git a/webapp/components/channel_info_modal.jsx b/webapp/components/channel_info_modal.jsx index 7bd004411..b0e2c63fa 100644 --- a/webapp/components/channel_info_modal.jsx +++ b/webapp/components/channel_info_modal.jsx @@ -5,6 +5,7 @@ import * as Utils from 'utils/utils.jsx'; import {FormattedMessage} from 'react-intl'; import {Modal} from 'react-bootstrap'; +import * as TextFormatting from 'utils/text_formatting.jsx'; import React from 'react'; @@ -32,6 +33,7 @@ export default class ChannelInfoModal extends React.Component { display_name: notFound, name: notFound, purpose: notFound, + header: notFound, id: notFound }; } @@ -44,6 +46,39 @@ export default class ChannelInfoModal extends React.Component { const channelURL = Utils.getTeamURLFromAddressBar() + '/channels/' + channel.name; + let channelPurpose = null; + if (channel.purpose) { + channelPurpose = ( + <div className='form-group'> + <div className='info__label'> + <FormattedMessage + id='channel_info.purpose' + defaultMessage='Purpose:' + /> + </div> + <div className='info__value'>{channel.purpose}</div> + </div> + ); + } + + let channelHeader = null; + if (channel.header) { + channelHeader = ( + <div className='form-group'> + <div className='info__label'> + <FormattedMessage + id='channel_info.header' + defaultMessage='Header:' + /> + </div> + <div + className='info__value' + dangerouslySetInnerHTML={{__html: TextFormatting.formatText(channel.header, {singleline: false, mentionHighlight: false})}} + /> + </div> + ); + } + return ( <Modal dialogClassName='about-modal' @@ -60,15 +95,8 @@ export default class ChannelInfoModal extends React.Component { </Modal.Title> </Modal.Header> <Modal.Body ref='modalBody'> - <div className='form-group'> - <div className='info__label'> - <FormattedMessage - id='channel_info.purpose' - defaultMessage='Purpose:' - /> - </div> - <div className='info__value'>{channel.purpose}</div> - </div> + {channelPurpose} + {channelHeader} <div className='form-group'> <div className='info__label'> <FormattedMessage diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index ab3fdca20..d93ce9150 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -842,6 +842,7 @@ "channel_header.viewInfo": "View Info", "channel_info.about": "About", "channel_info.close": "Close", + "channel_info.header": "Header:", "channel_info.id": "ID: ", "channel_info.name": "Name:", "channel_info.notFound": "No Channel Found", |