diff options
author | Asaad Mahmood <asaadmahmood@users.noreply.github.com> | 2016-11-03 02:33:39 +0500 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2016-11-02 14:33:39 -0700 |
commit | cd687aa3df9d2fd37da1cc176c9673b908705ab7 (patch) | |
tree | 74b401b6390cd0429ec6cd28d43672a424b8ae34 /webapp/components/channel_header.jsx | |
parent | 137ade29d061e158543da814ecd0d06d7e992c1f (diff) | |
download | chat-cd687aa3df9d2fd37da1cc176c9673b908705ab7.tar.gz chat-cd687aa3df9d2fd37da1cc176c9673b908705ab7.tar.bz2 chat-cd687aa3df9d2fd37da1cc176c9673b908705ab7.zip |
Minor UI improvements (#4431)
Diffstat (limited to 'webapp/components/channel_header.jsx')
-rw-r--r-- | webapp/components/channel_header.jsx | 60 |
1 files changed, 36 insertions, 24 deletions
diff --git a/webapp/components/channel_header.jsx b/webapp/components/channel_header.jsx index 98c6f7947..c7842aaa3 100644 --- a/webapp/components/channel_header.jsx +++ b/webapp/components/channel_header.jsx @@ -393,7 +393,7 @@ export default class ChannelHeader extends React.Component { > <FormattedMessage id='channel_header.channelHeader' - defaultMessage='Set Channel Header...' + defaultMessage='Edit Channel Header' /> </ToggleModalButton> </li> @@ -417,6 +417,32 @@ export default class ChannelHeader extends React.Component { </li> ); + dropdownContents.push( + <li + key='notification_preferences' + role='presentation' + > + <ToggleModalButton + role='menuitem' + dialogType={ChannelNotificationsModal} + dialogProps={{ + channel, + channelMember: this.state.memberChannel, + currentUser: this.state.currentUser + }} + > + <FormattedMessage + id='channel_header.notificationPreferences' + defaultMessage='Notification Preferences' + /> + </ToggleModalButton> + </li> + ); + + dropdownContents.push( + <li className='divider'/> + ); + if (!ChannelStore.isDefault(channel)) { dropdownContents.push( <li @@ -476,25 +502,7 @@ export default class ChannelHeader extends React.Component { } dropdownContents.push( - <li - key='notification_preferences' - role='presentation' - > - <ToggleModalButton - role='menuitem' - dialogType={ChannelNotificationsModal} - dialogProps={{ - channel, - channelMember: this.state.memberChannel, - currentUser: this.state.currentUser - }} - > - <FormattedMessage - id='channel_header.notificationPreferences' - defaultMessage='Notification Preferences' - /> - </ToggleModalButton> - </li> + <li className='divider'/> ); const deleteOption = ( @@ -509,7 +517,7 @@ export default class ChannelHeader extends React.Component { > <FormattedMessage id='channel_header.delete' - defaultMessage='Delete {term}...' + defaultMessage='Delete {term}' values={{ term: (channelTerm) }} @@ -531,7 +539,7 @@ export default class ChannelHeader extends React.Component { > <FormattedMessage id='channel_header.setHeader' - defaultMessage='Set {term} Header...' + defaultMessage='Edit {term} Header' values={{ term: (channelTerm) }} @@ -552,7 +560,7 @@ export default class ChannelHeader extends React.Component { > <FormattedMessage id='channel_header.setPurpose' - defaultMessage='Set {term} Purpose...' + defaultMessage='Edit {term} Purpose' values={{ term: (channelTerm) }} @@ -573,7 +581,7 @@ export default class ChannelHeader extends React.Component { > <FormattedMessage id='channel_header.rename' - defaultMessage='Rename {term}...' + defaultMessage='Rename {term}' values={{ term: (channelTerm) }} @@ -589,6 +597,10 @@ export default class ChannelHeader extends React.Component { dropdownContents.push(deleteOption); } + dropdownContents.push( + <li className='divider'/> + ); + const canLeave = channel.type === Constants.PRIVATE_CHANNEL ? this.state.userCount > 1 : true; if (!ChannelStore.isDefault(channel) && canLeave) { dropdownContents.push( |