Multiple UI improvements (#2838)
* Multiple UI improvements * Adding translations in en.json
Этот коммит содержится в:
коммит произвёл
Christopher Speller
родитель
a5fea696a7
Коммит
a0ba70823d
@@ -221,20 +221,20 @@ class AuditTable extends React.Component {
|
|||||||
if (this.props.showUserId) {
|
if (this.props.showUserId) {
|
||||||
var profile = UserStore.getProfile(auditInfo.userId);
|
var profile = UserStore.getProfile(auditInfo.userId);
|
||||||
if (profile) {
|
if (profile) {
|
||||||
uContent = <td>{profile.email}</td>;
|
uContent = <td className='word-break--all'>{profile.email}</td>;
|
||||||
} else {
|
} else {
|
||||||
uContent = <td>{auditInfo.userId}</td>;
|
uContent = <td className='word-break--all'>{auditInfo.userId}</td>;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let iContent;
|
let iContent;
|
||||||
if (this.props.showIp) {
|
if (this.props.showIp) {
|
||||||
iContent = <td>{auditInfo.ip}</td>;
|
iContent = <td className='word-break--all'>{auditInfo.ip}</td>;
|
||||||
}
|
}
|
||||||
|
|
||||||
let sContent;
|
let sContent;
|
||||||
if (this.props.showSession) {
|
if (this.props.showSession) {
|
||||||
sContent = <td>{auditInfo.sessionId}</td>;
|
sContent = <td className='word-break--all'>{auditInfo.sessionId}</td>;
|
||||||
}
|
}
|
||||||
|
|
||||||
let descStyle = {};
|
let descStyle = {};
|
||||||
@@ -244,9 +244,14 @@ class AuditTable extends React.Component {
|
|||||||
|
|
||||||
accessList[i] = (
|
accessList[i] = (
|
||||||
<tr key={audit.id}>
|
<tr key={audit.id}>
|
||||||
<td>{auditInfo.timestamp}</td>
|
<td className='word-break--all'>{auditInfo.timestamp}</td>
|
||||||
{uContent}
|
{uContent}
|
||||||
<td style={descStyle}>{auditInfo.desc}</td>
|
<td
|
||||||
|
className='word-break--all'
|
||||||
|
style={descStyle}
|
||||||
|
>
|
||||||
|
{auditInfo.desc}
|
||||||
|
</td>
|
||||||
{iContent}
|
{iContent}
|
||||||
{sContent}
|
{sContent}
|
||||||
</tr>
|
</tr>
|
||||||
|
|||||||
@@ -51,17 +51,21 @@ export default class PremadeThemeChooser extends React.Component {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div className='row appearance-section'>
|
<div className='row appearance-section'>
|
||||||
{premadeThemes}
|
<div className='clearfix'>
|
||||||
<div className='col-sm-12 padding-bottom x2'>
|
{premadeThemes}
|
||||||
<a
|
</div>
|
||||||
href='http://docs.mattermost.com/help/settings/theme-colors.html#custom-theme-examples'
|
<div className='clearfix'>
|
||||||
target='_blank'
|
<div className='col-sm-12 padding-bottom x2'>
|
||||||
>
|
<a
|
||||||
<FormattedMessage
|
href='http://docs.mattermost.com/help/settings/theme-colors.html#custom-theme-examples'
|
||||||
id='user.settings.display.theme.otherThemes'
|
target='_blank'
|
||||||
defaultMessage='See other themes'
|
>
|
||||||
/>
|
<FormattedMessage
|
||||||
</a>
|
id='user.settings.display.theme.otherThemes'
|
||||||
|
defaultMessage='See other themes'
|
||||||
|
/>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -369,7 +369,7 @@ export default class UserSettingsDisplay extends React.Component {
|
|||||||
/>
|
/>
|
||||||
<FormattedMessage
|
<FormattedMessage
|
||||||
id='user.settings.display.fixedWidthCentered'
|
id='user.settings.display.fixedWidthCentered'
|
||||||
defaultMessage='Fixed with, centered'
|
defaultMessage='Fixed width, centered'
|
||||||
/>
|
/>
|
||||||
</label>
|
</label>
|
||||||
<br/>
|
<br/>
|
||||||
@@ -383,7 +383,7 @@ export default class UserSettingsDisplay extends React.Component {
|
|||||||
/>
|
/>
|
||||||
<FormattedMessage
|
<FormattedMessage
|
||||||
id='user.settings.display.fullScreen'
|
id='user.settings.display.fullScreen'
|
||||||
defaultMessage='Full screen'
|
defaultMessage='Full width'
|
||||||
/>
|
/>
|
||||||
</label>
|
</label>
|
||||||
<br/>
|
<br/>
|
||||||
@@ -392,7 +392,7 @@ export default class UserSettingsDisplay extends React.Component {
|
|||||||
<br/>
|
<br/>
|
||||||
<FormattedMessage
|
<FormattedMessage
|
||||||
id='user.settings.display.channeldisplaymode'
|
id='user.settings.display.channeldisplaymode'
|
||||||
defaultMessage='How to display channels.'
|
defaultMessage='Select how text in a channel is displayed.'
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -421,14 +421,14 @@ export default class UserSettingsDisplay extends React.Component {
|
|||||||
describe = (
|
describe = (
|
||||||
<FormattedMessage
|
<FormattedMessage
|
||||||
id='user.settings.display.fixedWidthCentered'
|
id='user.settings.display.fixedWidthCentered'
|
||||||
defaultMessage='Fixed with, centered'
|
defaultMessage='Fixed width, centered'
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
describe = (
|
describe = (
|
||||||
<FormattedMessage
|
<FormattedMessage
|
||||||
id='user.settings.display.fullScreen'
|
id='user.settings.display.fullScreen'
|
||||||
defaultMessage='Full screen'
|
defaultMessage='Full width'
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1299,6 +1299,9 @@
|
|||||||
"user.settings.display.theme.themeColors": "Theme Colors",
|
"user.settings.display.theme.themeColors": "Theme Colors",
|
||||||
"user.settings.display.theme.title": "Theme",
|
"user.settings.display.theme.title": "Theme",
|
||||||
"user.settings.display.title": "Display Settings",
|
"user.settings.display.title": "Display Settings",
|
||||||
|
"user.settings.display.fixedWidthCentered": "Fixed width, centered",
|
||||||
|
"user.settings.display.fullScreen": "Full width",
|
||||||
|
"user.settings.display.channeldisplaymode": "Select how text in a channel is displayed.",
|
||||||
"user.settings.general.checkEmail": "Check your email at {email} to verify the address.",
|
"user.settings.general.checkEmail": "Check your email at {email} to verify the address.",
|
||||||
"user.settings.general.checkEmailNoAddress": "Check your email to verify your new address",
|
"user.settings.general.checkEmailNoAddress": "Check your email to verify your new address",
|
||||||
"user.settings.general.close": "Close",
|
"user.settings.general.close": "Close",
|
||||||
|
|||||||
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
Ссылка в новой задаче
Block a user