diff options
author | Corey Hulen <corey@hulen.com> | 2015-06-29 21:16:07 -0800 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2015-06-29 21:16:07 -0800 |
commit | 4d2ca8881bf1aac6bc393988901b4ef523a5ef14 (patch) | |
tree | ba2e8ac114866477d53060d67913e5ca9dfec64d /web/react | |
parent | e6b5bdef82b23d61286ff455ee245a26a40d195f (diff) | |
parent | ba998db0998e7782842e4f86a242edd1e52b5e97 (diff) | |
download | chat-4d2ca8881bf1aac6bc393988901b4ef523a5ef14.tar.gz chat-4d2ca8881bf1aac6bc393988901b4ef523a5ef14.tar.bz2 chat-4d2ca8881bf1aac6bc393988901b4ef523a5ef14.zip |
Merge pull request #98 from mattermost/mm-1199
fixes mm-1199 adds off-topic as a default channel
Diffstat (limited to 'web/react')
-rw-r--r-- | web/react/components/post_list.jsx | 13 | ||||
-rw-r--r-- | web/react/utils/constants.jsx | 1 |
2 files changed, 13 insertions, 1 deletions
diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx index 37e3faef2..e37de8d88 100644 --- a/web/react/components/post_list.jsx +++ b/web/react/components/post_list.jsx @@ -356,6 +356,7 @@ module.exports = React.createClass({ var ui_name = channel.display_name var members = ChannelStore.getCurrentExtraInfo().members; var creator_name = ""; + var userStyle = { color: UserStore.getCurrentUser().props.theme } for (var i = 0; i < members.length; i++) { if (members[i].roles.indexOf('admin') > -1) { @@ -382,8 +383,18 @@ module.exports = React.createClass({ </p> </div> ); + } else if (channel.name === Constants.OFFTOPIC_CHANNEL) { + more_messages = ( + <div className="channel-intro"> + <h4 className="channel-intro-title">Welcome</h4> + <p> + {"This is the start of " + ui_name + ", a channel for conversations you’d prefer out of more focused channels."} + <br/> + <a className="intro-links" href="#" style={userStyle} data-toggle="modal" data-target="#edit_channel" data-desc={channel.description} data-title={ui_name} data-channelid={channel.id}><i className="fa fa-pencil"></i>Set a description</a> + </p> + </div> + ); } else { - var userStyle = { color: UserStore.getCurrentUser().props.theme } var ui_type = channel.type === 'P' ? "private group" : "channel"; more_messages = ( <div className="channel-intro"> diff --git a/web/react/utils/constants.jsx b/web/react/utils/constants.jsx index e5f42c8a0..a5124afe2 100644 --- a/web/react/utils/constants.jsx +++ b/web/react/utils/constants.jsx @@ -51,6 +51,7 @@ module.exports = { MAX_UPLOAD_FILES: 5, MAX_FILE_SIZE: 50000000, // 50 MB DEFAULT_CHANNEL: 'town-square', + OFFTOPIC_CHANNEL: 'off-topic', POST_CHUNK_SIZE: 60, RESERVED_DOMAINS: [ "www", |