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

UI fix for errors in signup and login pages and adding space between buttons in the security tab (#3512)

Browse Source 
* Fixing the errors style on login and signup pages

* Adding space between login options in the security section
This commit is contained in:
Asaad Mahmood
2016-07-07 02:32:27 +05:00
committed by Corey Hulen
parent 31a0f65973
commit 3eee51f74e
4 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
webapp/components/form_error.jsx
View File

@@ -8,6 +8,7 @@ export default class FormError extends React.Component {
// accepts either a single error or an array of errors
return {
error: React.PropTypes.node,
margin: React.PropTypes.node,
errors: React.PropTypes.arrayOf(React.PropTypes.node)
};
}
@@ -39,6 +40,16 @@ export default class FormError extends React.Component {
return null;
}
if (this.props.margin) {
return (
<div className='form-group has-error'>
<label className='control-label'>
{message}
</label>
</div>
);
}
return (
<div className='col-sm-12 has-error'>
<label className='control-label'>

5
webapp/components/login/login_controller.jsx
View File

@@ -336,7 +336,10 @@ export default class LoginController extends React.Component {
onSubmit={this.preSubmit}
>
<div className='signup__email-container'>
<FormError error={this.state.serverError}/>
<FormError
error={this.state.serverError}
margin={true}
/>
<div className={'form-group' + errorClass}>
<input
className='form-control'

5
webapp/components/signup_user_complete.jsx
View File

@@ -393,7 +393,10 @@ export default class SignupUserComplete extends React.Component {
onSubmit={this.handleLdapSignup}
>
<div className='signup__email-container'>
<FormError error={this.state.ldapError}/>
<FormError
error={this.state.ldapError}
margin={true}
/>
<div className={'form-group' + errorClass}>
<input
className='form-control'

11
webapp/components/user_settings/user_settings_security.jsx
View File

@@ -551,7 +551,7 @@ class SecurityTab extends React.Component {
}
emailOption = (
<div>
<div className='padding-bottom x2'>
<Link
className='btn btn-primary'
to={link}
@@ -569,7 +569,7 @@ class SecurityTab extends React.Component {
let gitlabOption;
if (global.window.mm_config.EnableSignUpWithGitLab === 'true' && user.auth_service === '') {
gitlabOption = (
<div>
<div className='padding-bottom x2'>
<Link
className='btn btn-primary'
to={'/claim/email_to_oauth?email=' + encodeURIComponent(user.email) + '&old_type=' + user.auth_service + '&new_type=' + Constants.GITLAB_SERVICE}
@@ -587,7 +587,7 @@ class SecurityTab extends React.Component {
let googleOption;
if (global.window.mm_config.EnableSignUpWithGoogle === 'true' && user.auth_service === '') {
googleOption = (
<div>
<div className='padding-bottom x2'>
<Link
className='btn btn-primary'
to={'/' + teamName + '/claim/email_to_oauth?email=' + encodeURIComponent(user.email) + '&old_type=' + user.auth_service + '&new_type=' + Constants.GOOGLE_SERVICE}
@@ -605,7 +605,7 @@ class SecurityTab extends React.Component {
let ldapOption;
if (global.window.mm_config.EnableLdap === 'true' && user.auth_service === '') {
ldapOption = (
<div>
<div className='padding-bottom x2'>
<Link
className='btn btn-primary'
to={'/claim/email_to_ldap?email=' + encodeURIComponent(user.email)}
@@ -623,7 +623,7 @@ class SecurityTab extends React.Component {
let samlOption;
if (global.window.mm_config.EnableSaml === 'true' && user.auth_service === '') {
samlOption = (
<div>
<div className='padding-bottom x2'>
<Link
className='btn btn-primary'
to={'/claim/email_to_oauth?email=' + encodeURIComponent(user.email) + '&old_type=' + user.auth_service + '&new_type=' + Constants.SAML_SERVICE}
@@ -643,7 +643,6 @@ class SecurityTab extends React.Component {
<div key='userSignInOption'>
{emailOption}
{gitlabOption}
<br/>
{ldapOption}
{samlOption}
{googleOption}