diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-03-30 10:10:44 -0400 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2016-03-30 10:10:44 -0400 |
| commit | 4cc7b29c9288321d95ee753b767c9cd0b529f52f (patch) | |
| tree | ae8998336ccd467ff9096c97ce149818fe8f2ae0 | |
| parent | 2ab4581d5e658b22c4a957ec57bb3530f92ad66b (diff) | |
| parent | 696a2c7697ddd51184177c1aed4e04462f6fd6c7 (diff) | |
| download | chat-4cc7b29c9288321d95ee753b767c9cd0b529f52f.tar.gz chat-4cc7b29c9288321d95ee753b767c9cd0b529f52f.tar.bz2 chat-4cc7b29c9288321d95ee753b767c9cd0b529f52f.zip | |
Merge pull request #2574 from asaadmahmoodspin/ui-improvements
PLT-2296 - Adding back button to main create team page
| -rw-r--r-- | webapp/components/signup_team.jsx | 55 | ||||
| -rw-r--r-- | webapp/sass/routes/_signup.scss | 7 |
2 files changed, 44 insertions, 18 deletions
diff --git a/webapp/components/signup_team.jsx b/webapp/components/signup_team.jsx index e6b27e745..3ad47500d 100644 --- a/webapp/components/signup_team.jsx +++ b/webapp/components/signup_team.jsx @@ -138,6 +138,24 @@ export default class TeamSignUp extends React.Component { } let signupMethod = null; + let goBack = ( + <div className='signup-header'> + <a + href='#' + onClick={ + (e) => { + e.preventDefault(); + this.updatePage('choose'); + } + } + > + <span className='fa fa-chevron-left'/> + <FormattedMessage + id='web.header.back' + /> + </a> + </div> + ); if (global.window.mm_config.EnableTeamCreation !== 'true') { if (teamListing == null) { @@ -154,9 +172,12 @@ export default class TeamSignUp extends React.Component { updatePage={this.updatePage} /> ); + goBack = null; } else if (this.state.page === 'email') { signupMethod = ( - <EmailSignUpPage/> + <div> + <EmailSignUpPage/> + </div> ); } else if (this.state.page === 'ldap') { return ( @@ -180,24 +201,28 @@ export default class TeamSignUp extends React.Component { defaultMessage='No team creation method has been enabled. Please contact an administrator for access.' /> ); + goBack = null; } return ( - <div className='col-sm-12'> - <div className='signup-team__container'> - <img - className='signup-team-logo' - src={logoImage} - /> - <h1>{global.window.mm_config.SiteName}</h1> - <h4 className='color--light'> - <FormattedMessage - id='web.root.singup_info' + <div> + {goBack} + <div className='col-sm-12'> + <div className='signup-team__container'> + <img + className='signup-team-logo' + src={logoImage} /> - </h4> - <div id='signup-team'> - {teamListing} - {signupMethod} + <h1>{global.window.mm_config.SiteName}</h1> + <h4 className='color--light'> + <FormattedMessage + id='web.root.singup_info' + /> + </h4> + <div id='signup-team'> + {teamListing} + {signupMethod} + </div> </div> </div> </div> diff --git a/webapp/sass/routes/_signup.scss b/webapp/sass/routes/_signup.scss index 61bb93daf..062e4c9a5 100644 --- a/webapp/sass/routes/_signup.scss +++ b/webapp/sass/routes/_signup.scss @@ -200,7 +200,7 @@ display: block; height: 40px; line-height: 34px; - margin: 1em 0; + margin: 1em 0 1em 10px; min-width: 200px; padding: 0 1em; width: 200px; @@ -262,9 +262,10 @@ } &.btn-full { - width: 100%; - text-align: left; + margin-left: 0; padding-left: 35px; + text-align: left; + width: 100%; } } |