diff options
Diffstat (limited to 'web/react/components')
-rw-r--r-- | web/react/components/admin_console/privacy_settings.jsx | 34 | ||||
-rw-r--r-- | web/react/components/admin_console/service_settings.jsx | 37 | ||||
-rw-r--r-- | web/react/components/create_comment.jsx | 40 | ||||
-rw-r--r-- | web/react/components/setting_item_max.jsx | 11 | ||||
-rw-r--r-- | web/react/components/signup_user_complete.jsx | 2 | ||||
-rw-r--r-- | web/react/components/textbox.jsx | 2 | ||||
-rw-r--r-- | web/react/components/user_settings/user_settings_integrations.jsx | 2 |
7 files changed, 71 insertions, 57 deletions
diff --git a/web/react/components/admin_console/privacy_settings.jsx b/web/react/components/admin_console/privacy_settings.jsx index a32ca3136..70ec04f4a 100644 --- a/web/react/components/admin_console/privacy_settings.jsx +++ b/web/react/components/admin_console/privacy_settings.jsx @@ -30,7 +30,6 @@ export default class PrivacySettings extends React.Component { var config = this.props.config; config.PrivacySettings.ShowEmailAddress = React.findDOMNode(this.refs.ShowEmailAddress).checked; config.PrivacySettings.ShowFullName = React.findDOMNode(this.refs.ShowFullName).checked; - config.PrivacySettings.EnableSecurityFixAlert = React.findDOMNode(this.refs.EnableSecurityFixAlert).checked; Client.saveConfig( config, @@ -138,39 +137,6 @@ export default class PrivacySettings extends React.Component { </div> <div className='form-group'> - <label - className='control-label col-sm-4' - htmlFor='EnableSecurityFixAlert' - > - {'Send Error and Diagnostic: '} - </label> - <div className='col-sm-8'> - <label className='radio-inline'> - <input - type='radio' - name='EnableSecurityFixAlert' - value='true' - ref='EnableSecurityFixAlert' - defaultChecked={this.props.config.PrivacySettings.EnableSecurityFixAlert} - onChange={this.handleChange} - /> - {'true'} - </label> - <label className='radio-inline'> - <input - type='radio' - name='EnableSecurityFixAlert' - value='false' - defaultChecked={!this.props.config.PrivacySettings.EnableSecurityFixAlert} - onChange={this.handleChange} - /> - {'false'} - </label> - <p className='help-text'>{'When true, System Administrators are notified by email if a relevant security fix alert has been announced in the last 12 hours. Requires email to be enabled.'}</p> - </div> - </div> - - <div className='form-group'> <div className='col-sm-12'> {serverError} <button diff --git a/web/react/components/admin_console/service_settings.jsx b/web/react/components/admin_console/service_settings.jsx index 3968d9820..f29d62646 100644 --- a/web/react/components/admin_console/service_settings.jsx +++ b/web/react/components/admin_console/service_settings.jsx @@ -35,11 +35,13 @@ export default class ServiceSettings extends React.Component { config.ServiceSettings.SegmentDeveloperKey = React.findDOMNode(this.refs.SegmentDeveloperKey).value.trim(); config.ServiceSettings.GoogleDeveloperKey = React.findDOMNode(this.refs.GoogleDeveloperKey).value.trim(); - //config.ServiceSettings.EnableOAuthServiceProvider = React.findDOMNode(this.refs.EnableOAuthServiceProvider).checked; config.ServiceSettings.EnableIncomingWebhooks = React.findDOMNode(this.refs.EnableIncomingWebhooks).checked; config.ServiceSettings.EnablePostUsernameOverride = React.findDOMNode(this.refs.EnablePostUsernameOverride).checked; config.ServiceSettings.EnablePostIconOverride = React.findDOMNode(this.refs.EnablePostIconOverride).checked; config.ServiceSettings.EnableTesting = React.findDOMNode(this.refs.EnableTesting).checked; + config.ServiceSettings.EnableSecurityFixAlert = React.findDOMNode(this.refs.EnableSecurityFixAlert).checked; + + //config.ServiceSettings.EnableOAuthServiceProvider = React.findDOMNode(this.refs.EnableOAuthServiceProvider).checked; var MaximumLoginAttempts = 10; if (!isNaN(parseInt(React.findDOMNode(this.refs.MaximumLoginAttempts).value, 10))) { @@ -305,6 +307,39 @@ export default class ServiceSettings extends React.Component { </div> <div className='form-group'> + <label + className='control-label col-sm-4' + htmlFor='EnableSecurityFixAlert' + > + {'Enable Security Alerts: '} + </label> + <div className='col-sm-8'> + <label className='radio-inline'> + <input + type='radio' + name='EnableSecurityFixAlert' + value='true' + ref='EnableSecurityFixAlert' + defaultChecked={this.props.config.ServiceSettings.EnableSecurityFixAlert} + onChange={this.handleChange} + /> + {'true'} + </label> + <label className='radio-inline'> + <input + type='radio' + name='EnableSecurityFixAlert' + value='false' + defaultChecked={!this.props.config.ServiceSettings.EnableSecurityFixAlert} + onChange={this.handleChange} + /> + {'false'} + </label> + <p className='help-text'>{'When true, System Administrators are notified by email if a relevant security fix alert has been announced in the last 12 hours. Requires email to be enabled.'}</p> + </div> + </div> + + <div className='form-group'> <div className='col-sm-12'> {serverError} <button diff --git a/web/react/components/create_comment.jsx b/web/react/components/create_comment.jsx index add4125d7..680d693f1 100644 --- a/web/react/components/create_comment.jsx +++ b/web/react/components/create_comment.jsx @@ -262,25 +262,27 @@ export default class CreateComment extends React.Component { id={this.props.rootId} className='post-create-body comment-create-body' > - <Textbox - onUserInput={this.handleUserInput} - onKeyPress={this.commentMsgKeyPress} - messageText={this.state.messageText} - createMessage='Add a comment...' - initialText='' - id='reply_textbox' - ref='textbox' - /> - <FileUpload - ref='fileUpload' - getFileCount={this.getFileCount} - onUploadStart={this.handleUploadStart} - onFileUpload={this.handleFileUploadComplete} - onUploadError={this.handleUploadError} - onTextDrop={this.handleTextDrop} - postType='comment' - channelId={this.props.channelId} - /> + <div className='post-body__cell'> + <Textbox + onUserInput={this.handleUserInput} + onKeyPress={this.commentMsgKeyPress} + messageText={this.state.messageText} + createMessage='Add a comment...' + initialText='' + id='reply_textbox' + ref='textbox' + /> + <FileUpload + ref='fileUpload' + getFileCount={this.getFileCount} + onUploadStart={this.handleUploadStart} + onFileUpload={this.handleFileUploadComplete} + onUploadError={this.handleUploadError} + onTextDrop={this.handleTextDrop} + postType='comment' + channelId={this.props.channelId} + /> + </div> </div> <MsgTyping channelId={this.props.channelId} diff --git a/web/react/components/setting_item_max.jsx b/web/react/components/setting_item_max.jsx index d2cbc798e..4f0fe3ed0 100644 --- a/web/react/components/setting_item_max.jsx +++ b/web/react/components/setting_item_max.jsx @@ -32,11 +32,17 @@ export default class SettingItemMax extends React.Component { } var inputs = this.props.inputs; + var widthClass; + if (this.props.width === 'full') { + widthClass = 'col-sm-12'; + } else { + widthClass = 'col-sm-9 col-sm-offset-3'; + } return ( <ul className='section-max form-horizontal'> <li className='col-sm-12 section-title'>{this.props.title}</li> - <li className='col-sm-9 col-sm-offset-3'> + <li className={widthClass}> <ul className='setting-list'> <li className='setting-list-item'> {inputs} @@ -69,5 +75,6 @@ SettingItemMax.propTypes = { extraInfo: React.PropTypes.element, updateSection: React.PropTypes.func, submit: React.PropTypes.func, - title: React.PropTypes.string + title: React.PropTypes.string, + width: React.PropTypes.string }; diff --git a/web/react/components/signup_user_complete.jsx b/web/react/components/signup_user_complete.jsx index 75661f812..8a3af707f 100644 --- a/web/react/components/signup_user_complete.jsx +++ b/web/react/components/signup_user_complete.jsx @@ -149,7 +149,7 @@ export default class SignupUserComplete extends React.Component { // set up the email entry and hide it if an email was provided var yourEmailIs = ''; if (this.state.user.email) { - yourEmailIs = <span>Your email address is {this.state.user.email}. You'll use this address to sign in to {global.window.config.SiteName}.</span>; + yourEmailIs = <span>Your email address is <strong>{this.state.user.email}</strong>. You'll use this address to sign in to {global.window.config.SiteName}.</span>; } var emailContainerStyle = 'margin--extra'; diff --git a/web/react/components/textbox.jsx b/web/react/components/textbox.jsx index 0563c294a..741dbcd5d 100644 --- a/web/react/components/textbox.jsx +++ b/web/react/components/textbox.jsx @@ -246,9 +246,11 @@ export default class Textbox extends React.Component { if (e.scrollHeight - mod < 167) { $(e).css({height: 'auto', 'overflow-y': 'hidden'}).height(e.scrollHeight - mod); $(w).css({height: 'auto'}).height(e.scrollHeight + 2); + $(w).closest('.post-body__cell').removeClass('scroll'); } else { $(e).css({height: 'auto', 'overflow-y': 'scroll'}).height(167); $(w).css({height: 'auto'}).height(167); + $(w).closest('.post-body__cell').addClass('scroll'); } if (prevHeight !== $(e).height() && this.props.onHeightChange) { diff --git a/web/react/components/user_settings/user_settings_integrations.jsx b/web/react/components/user_settings/user_settings_integrations.jsx index 5e20d41f1..3be062ad3 100644 --- a/web/react/components/user_settings/user_settings_integrations.jsx +++ b/web/react/components/user_settings/user_settings_integrations.jsx @@ -38,6 +38,7 @@ export default class UserSettingsIntegrationsTab extends React.Component { incomingHooksSection = ( <SettingItemMax title='Incoming Webhooks' + width = 'full' inputs={inputs} updateSection={function clearSection(e) { this.updateSection(''); @@ -49,6 +50,7 @@ export default class UserSettingsIntegrationsTab extends React.Component { incomingHooksSection = ( <SettingItemMin title='Incoming Webhooks' + width = 'full' describe='Manage your incoming webhooks (Developer feature)' updateSection={function updateNameSection() { this.updateSection('incoming-hooks'); |