made channel header in mobile view correct (#3418)
Этот коммит содержится в:
коммит произвёл
Joram Wilander
родитель
3cfc369ce9
Коммит
4e67d0777f
@@ -69,6 +69,7 @@ export default class Navbar extends React.Component {
|
|||||||
channel: ChannelStore.getCurrent(),
|
channel: ChannelStore.getCurrent(),
|
||||||
member: ChannelStore.getCurrentMember(),
|
member: ChannelStore.getCurrentMember(),
|
||||||
users: ChannelStore.getCurrentExtraInfo().members,
|
users: ChannelStore.getCurrentExtraInfo().members,
|
||||||
|
userCount: ChannelStore.getCurrentExtraInfo().member_count,
|
||||||
currentUser: UserStore.getCurrentUser()
|
currentUser: UserStore.getCurrentUser()
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -176,6 +177,21 @@ export default class Navbar extends React.Component {
|
|||||||
}
|
}
|
||||||
createDropdown(channel, channelTitle, isAdmin, isDirect, popoverContent) {
|
createDropdown(channel, channelTitle, isAdmin, isDirect, popoverContent) {
|
||||||
if (channel) {
|
if (channel) {
|
||||||
|
let channelTerm = (
|
||||||
|
<FormattedMessage
|
||||||
|
id='channel_header.channel'
|
||||||
|
defaultMessage='Channel'
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
if (channel.type === Constants.PRIVATE_CHANNEL) {
|
||||||
|
channelTerm = (
|
||||||
|
<FormattedMessage
|
||||||
|
id='channel_header.group'
|
||||||
|
defaultMessage='Group'
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
var viewInfoOption = (
|
var viewInfoOption = (
|
||||||
<li role='presentation'>
|
<li role='presentation'>
|
||||||
<ToggleModalButton
|
<ToggleModalButton
|
||||||
@@ -199,8 +215,11 @@ export default class Navbar extends React.Component {
|
|||||||
onClick={this.showEditChannelHeaderModal}
|
onClick={this.showEditChannelHeaderModal}
|
||||||
>
|
>
|
||||||
<FormattedMessage
|
<FormattedMessage
|
||||||
id='navbar.setHeader'
|
id='channel_header.setHeader'
|
||||||
defaultMessage='Set Channel Header...'
|
defaultMessage='Set {term} Header...'
|
||||||
|
values={{
|
||||||
|
term: (channelTerm)
|
||||||
|
}}
|
||||||
/>
|
/>
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
@@ -216,8 +235,11 @@ export default class Navbar extends React.Component {
|
|||||||
onClick={() => this.setState({showEditChannelPurposeModal: true})}
|
onClick={() => this.setState({showEditChannelPurposeModal: true})}
|
||||||
>
|
>
|
||||||
<FormattedMessage
|
<FormattedMessage
|
||||||
id='navbar.setPurpose'
|
id='channel_header.setPurpose'
|
||||||
defaultMessage='Set Channel Purpose...'
|
defaultMessage='Set {term} Purpose...'
|
||||||
|
values={{
|
||||||
|
term: (channelTerm)
|
||||||
|
}}
|
||||||
/>
|
/>
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
@@ -252,8 +274,11 @@ export default class Navbar extends React.Component {
|
|||||||
onClick={this.handleLeave}
|
onClick={this.handleLeave}
|
||||||
>
|
>
|
||||||
<FormattedMessage
|
<FormattedMessage
|
||||||
id='navbar.leave'
|
id='channel_header.leave'
|
||||||
defaultMessage='Leave Channel'
|
defaultMessage='Leave {term}'
|
||||||
|
values={{
|
||||||
|
term: (channelTerm)
|
||||||
|
}}
|
||||||
/>
|
/>
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
@@ -289,8 +314,11 @@ export default class Navbar extends React.Component {
|
|||||||
dialogProps={{channel}}
|
dialogProps={{channel}}
|
||||||
>
|
>
|
||||||
<FormattedMessage
|
<FormattedMessage
|
||||||
id='navbar.delete'
|
id='channel_header.delete'
|
||||||
defaultMessage='Delete Channel...'
|
defaultMessage='Delete {term}...'
|
||||||
|
values={{
|
||||||
|
term: (channelTerm)
|
||||||
|
}}
|
||||||
/>
|
/>
|
||||||
</ToggleModalButton>
|
</ToggleModalButton>
|
||||||
</li>
|
</li>
|
||||||
@@ -305,8 +333,11 @@ export default class Navbar extends React.Component {
|
|||||||
onClick={this.showRenameChannelModal}
|
onClick={this.showRenameChannelModal}
|
||||||
>
|
>
|
||||||
<FormattedMessage
|
<FormattedMessage
|
||||||
id='navbar.rename'
|
id='channel_header.rename'
|
||||||
defaultMessage='Rename Channel...'
|
defaultMessage='Rename {term}...'
|
||||||
|
values={{
|
||||||
|
term: (channelTerm)
|
||||||
|
}}
|
||||||
/>
|
/>
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user