IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Improving about modal and colon issue with webhooks (#3343)

Browse Source 
Updating word break

Updating improvements for about modal
This commit is contained in:
Asaad Mahmood
2016-06-16 17:42:38 +05:00
committed by Harrison Healey
parent e1703d8800
commit 4e38796e69
8 changed files with 66 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
webapp/components/channel_info_modal.jsx
View File

@@ -20,8 +20,11 @@ export default class ChannelInfoModal extends React.Component {
return false;
}
render() {
let channel = this.props.channel;
let channelIcon;
if (!channel) {
const notFound = Utils.localizeMessage('channel_info.notFound', 'No Channel Found');
@@ -33,68 +36,58 @@ export default class ChannelInfoModal extends React.Component {
};
}
if (channel.type === 'O') {
channelIcon = (<span className='fa fa-globe'/>);
} else if (channel.type === 'P') {
channelIcon = (<span className='fa fa-lock'/>);
}
const channelURL = Utils.getTeamURLFromAddressBar() + '/channels/' + channel.name;
return (
<Modal
dialogClassName='about-modal'
show={this.props.show}
onHide={this.props.onHide}
>
<Modal.Header closeButtton={true}>
<Modal.Header closeButton={true}>
<Modal.Title>
{channel.display_name}
<FormattedMessage
id='channel_info.about'
defaultMessage='About'
/>
<strong>{channelIcon}{channel.display_name}</strong>
</Modal.Title>
</Modal.Header>
<Modal.Body ref='modalBody'>
<div className='row form-group'>
<div className='col-sm-3 info__label'>
<FormattedMessage
id='channel_info.name'
defaultMessage='Channel Name:'
/>
</div>
<div className='col-sm-9'>{channel.display_name}</div>
</div>
<div className='row form-group'>
<div className='col-sm-3 info__label'>
<FormattedMessage
id='channel_info.url'
defaultMessage='Channel URL:'
/>
</div>
<div className='col-sm-9'>{channelURL}</div>
</div>
<div className='row form-group'>
<div className='col-sm-3 info__label'>
<FormattedMessage
id='channel_info.id'
defaultMessage='Channel ID:'
/>
</div>
<div className='col-sm-9'>{channel.id}</div>
</div>
<div className='row'>
<div className='col-sm-3 info__label'>
<div className='form-group'>
<div className='info__label'>
<FormattedMessage
id='channel_info.purpose'
defaultMessage='Channel Purpose:'
defaultMessage='Purpose:'
/>
</div>
<div className='col-sm-9'>{channel.purpose}</div>
<div className='info__value'>{channel.purpose}</div>
</div>
<div className='form-group'>
<div className='info__label'>
<FormattedMessage
id='channel_info.url'
defaultMessage='URL:'
/>
</div>
<div className='info__value'>{channelURL}</div>
</div>
<div className='about-modal__hash form-group padding-top x2'>
<p>
<FormattedMessage
id='channel_info.id'
defaultMessage='ID: '
/>
{channel.id}
</p>
</div>
</Modal.Body>
<Modal.Footer>
<button
type='button'
className='btn btn-default'
onClick={this.props.onHide}
>
<FormattedMessage
id='channel_info.close'
defaultMessage='Close'
/>
</button>
</Modal.Footer>
</Modal>
);
}

2
webapp/components/post_view/components/post_header.jsx
View File

@@ -52,7 +52,7 @@ export default class PostHeader extends React.Component {
}
if (this.props.compactDisplay) {
colon = (<strong>{':'}</strong>);
colon = (<strong className='colon'>{':'}</strong>);
}
return (

2
webapp/components/user_profile.jsx
View File

@@ -64,7 +64,7 @@ export default class UserProfile extends React.Component {
}
if (this.props.disablePopover) {
return <div>{name}</div>;
return <div className='user-popover'>{name}</div>;
}
var dataContent = [];

9
webapp/i18n/en.json
View File

@@ -684,11 +684,12 @@
"channel_header.setPurpose": "Set {term} Purpose...",
"channel_header.viewInfo": "View Info",
"channel_info.close": "Close",
"channel_info.id": "Channel ID:",
"channel_info.name": "Channel Name:",
"channel_info.about": "About",
"channel_info.id": "ID: ",
"channel_info.name": "Name:",
"channel_info.notFound": "No Channel Found",
"channel_info.purpose": "Channel Purpose:",
"channel_info.url": "Channel URL:",
"channel_info.purpose": "Purpose:",
"channel_info.url": "URL:",
"channel_invite.add": " Add",
"channel_invite.addNewMembers": "Add New Members to ",
"channel_invite.close": "Close",

10
webapp/sass/components/_modal.scss
View File

@@ -89,9 +89,15 @@
}
.info__label {
@include opacity(.5);
font-size: .9em;
font-weight: 600;
padding-right: 0;
text-align: right;
margin-bottom: 3px;
}
.info__value {
padding-left: 10px;
word-break: break-word;
}
.team-member-list {

4
webapp/sass/layout/_post.scss
View File

@@ -768,7 +768,7 @@ body.ios {
white-space: nowrap;
}
strong {
.colon {
display: none;
font-weight: 900;
margin-left: 2px;
@@ -1118,7 +1118,7 @@ body.ios {
font-family: inherit;
font-size: 11px;
font-weight: 600;
margin: 0 0 0 -4px;
margin: 0 10px 0 -4px;
padding: 2px 4px;
}

2
webapp/sass/responsive/_tablet.scss
View File

@@ -122,7 +122,7 @@
z-index: 1;
}
strong {
.colon {
display: inline;
}

10
webapp/sass/routes/_about-modal.scss
View File

@@ -20,12 +20,22 @@
color: inherit;
font-size: 16px;
}
.fa {
margin: 0 4px 0 8px;
}
}
.modal-body {
padding: 20px 25px 5px;
}
&.large {
.modal-body {
padding-bottom: 20px;
}
}
.about-modal__content {
@include clearfix;
@include display-flex;