Этот коммит содержится в:
Christopher Speller
2016-09-23 12:29:54 -04:00
коммит произвёл GitHub
родитель 214f9c13a2
Коммит 93f2b6a833
73 изменённых файлов: 180 добавлений и 173 удалений

Просмотреть файл

@@ -77,7 +77,7 @@ export default class AdminNavbarDropdown extends React.Component {
<li
key='teamDiv'
className='divider'
></li>
/>
);
}
@@ -118,7 +118,7 @@ export default class AdminNavbarDropdown extends React.Component {
<li
key='teamDiv'
className='divider'
></li>
/>
<li>
<a
href='#'

Просмотреть файл

@@ -124,7 +124,7 @@ export default class AdminSidebar extends React.Component {
>
<i
className='fa fa-plus'
></i>
/>
</a>
</OverlayTrigger>
</span>

Просмотреть файл

@@ -86,7 +86,7 @@ export default class Audits extends React.Component {
className='btn btn-link pull-right'
onClick={this.reload}
>
<i className='fa fa-refresh'></i>
<i className='fa fa-refresh'/>
<FormattedMessage
id='admin.audits.reload'
defaultMessage='Reload User Activity Logs'

Просмотреть файл

@@ -82,7 +82,7 @@ export default class ClusterSettings extends AdminSettings {
style={{marginBottom: '10px'}}
className='alert alert-warning'
>
<i className='fa fa-warning'></i>
<i className='fa fa-warning'/>
<FormattedHTMLMessage
id='admin.cluster.loadedFrom'
defaultMessage='This configuration file was loaded from Node ID {clusterId}. Please see the Troubleshooting Guide in our <a href="http://docs.mattermost.com/deployment/cluster.html" target="_blank">documentation</a> if you are accessing the System Console through a load balancer and experiencing issues.'
@@ -101,7 +101,7 @@ export default class ClusterSettings extends AdminSettings {
style={{marginBottom: '10px'}}
className='alert alert-warning'
>
<i className='fa fa-warning'></i>
<i className='fa fa-warning'/>
<FormattedMessage
id='admin.cluster.should_not_change'
defaultMessage='WARNING: These settings may not sync with the other servers in the cluster. High Availability inter-node communication will not start until you modify the config.json to be identical on all servers and restart Mattermost. Please see the <a href="http://docs.mattermost.com/deployment/cluster.html" target="_blank">documentation</a> on how to add or remove a server from the cluster. If you are accessing the System Console through a load balancer and experiencing issues, please see the Troubleshooting Guide in our <a href="http://docs.mattermost.com/deployment/cluster.html" target="_blank">documentation</a>.'

Просмотреть файл

@@ -121,7 +121,7 @@ export default class ClusterTable extends React.Component {
className='btn btn-link'
onClick={this.props.reload}
>
<i className='fa fa-refresh'></i>
<i className='fa fa-refresh'/>
<FormattedMessage
id='admin.cluster.status_table.reload'
defaultMessage=' Reload Cluster Status'

Просмотреть файл

@@ -201,7 +201,7 @@ export default class ComplianceReports extends React.Component {
<table className='table'>
<thead>
<tr>
<th></th>
<th/>
<th>
<FormattedMessage
id='admin.compliance_table.timestamp'
@@ -373,7 +373,7 @@ export default class ComplianceReports extends React.Component {
className='btn btn-link'
onClick={this.reload}
>
<i className='fa fa-refresh'></i>
<i className='fa fa-refresh'/>
<FormattedMessage
id='admin.compliance_reports.reload'
defaultMessage='Reload Completed Compliance Reports'

Просмотреть файл

@@ -64,7 +64,7 @@ export default class EmailConnectionTestButton extends React.Component {
if (this.state.success) {
testMessage = (
<div className='alert alert-success'>
<i className='fa fa-check'></i>
<i className='fa fa-check'/>
<FormattedMessage
id='admin.email.emailSuccess'
defaultMessage='No errors were reported while sending an email. Please check your inbox to make sure.'
@@ -74,7 +74,7 @@ export default class EmailConnectionTestButton extends React.Component {
} else if (this.state.fail) {
testMessage = (
<div className='alert alert-warning'>
<i className='fa fa-warning'></i>
<i className='fa fa-warning'/>
<FormattedMessage
id='admin.email.emailFail'
defaultMessage='Connection unsuccessful: {error}'

Просмотреть файл

@@ -96,7 +96,7 @@ export default class LdapTestButton extends React.Component {
);
}
let helpText = (
const helpText = (
<FormattedHTMLMessage
id='admin.ldap.testHelpText'
defaultMessage='Tests if the Mattermost server can connect to the AD/LDAP server specified. See log file for more detailed error messages.'

Просмотреть файл

@@ -45,14 +45,14 @@ export default class RecycleDbButton extends React.Component {
render() {
if (global.window.mm_license.IsLicensed !== 'true') {
return <div></div>;
return <div/>;
}
let testMessage = null;
if (this.state.fail) {
testMessage = (
<div className='alert alert-warning'>
<i className='fa fa-warning'></i>
<i className='fa fa-warning'/>
<FormattedMessage
id='admin.recycle.reloadFail'
defaultMessage='Recycling unsuccessful: {error}'
@@ -64,7 +64,7 @@ export default class RecycleDbButton extends React.Component {
);
}
let helpText = (
const helpText = (
<FormattedHTMLMessage
id='admin.recycle.recycleDescription'
defaultMessage='Deployments using multiple databases can switch from one master database to another without restarting the Mattermost server by updating "config.json" to the new desired configuration and using the <a href="../general/configuration"><b>Configuration > Reload Configuration from Disk</b></a> feature to load the new settings while the server is running. The administrator should then use <b>Recycle Database Connections</b> feature to recycle the database connections based on the new settings.'

Просмотреть файл

@@ -48,14 +48,14 @@ export default class ReloadConfigButton extends React.Component {
render() {
if (global.window.mm_license.IsLicensed !== 'true') {
return <div></div>;
return <div/>;
}
let testMessage = null;
if (this.state.fail) {
testMessage = (
<div className='alert alert-warning'>
<i className='fa fa-warning'></i>
<i className='fa fa-warning'/>
<FormattedMessage
id='admin.reload.reloadFail'
defaultMessage='Reload unsuccessful: {error}'
@@ -67,7 +67,7 @@ export default class ReloadConfigButton extends React.Component {
);
}
let helpText = (
const helpText = (
<FormattedHTMLMessage
id='admin.reload.reloadDescription'
defaultMessage='Deployments using multiple databases can switch from one master database to another without restarting the Mattermost server by updating "config.json" to the new desired configuration and using the <b>Reload Configuration from Disk</b> feature to load the new settings while the server is running. The administrator should then use the <a href="../advanced/database"><b>Database > Recycle Database Connections</b></a> feature to recycle the database connections based on the new settings.'

Просмотреть файл

@@ -53,7 +53,7 @@ export default class SyncNowButton extends React.Component {
if (this.state.fail) {
failMessage = (
<div className='alert alert-warning'>
<i className='fa fa-warning'></i>
<i className='fa fa-warning'/>
<FormattedMessage
id='admin.ldap.syncFailure'
defaultMessage='Sync Failure: {error}'
@@ -65,7 +65,7 @@ export default class SyncNowButton extends React.Component {
);
}
let helpText = (
const helpText = (
<FormattedHTMLMessage
id='admin.ldap.syncNowHelpText'
defaultMessage='Initiates an AD/LDAP synchronization immediately.'

Просмотреть файл

@@ -562,7 +562,7 @@ export default class UserItem extends React.Component {
aria-expanded='true'
>
<span>{currentRoles} </span>
<span className='caret'></span>
<span className='caret'/>
</a>
<ul
className='dropdown-menu member-menu'