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

updated user sign up page and login page with new UI details

Browse Source
This commit is contained in:
JoramWilander
2015-07-28 11:41:44 -04:00
parent ff362b7792
commit 0bfc769b4d
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/react/components/login.jsx
View File

@@ -105,7 +105,7 @@ module.exports = React.createClass({
<div className="signup-team__container">
<h5 className="margin--less">Sign in to:</h5>
<h2 className="signup-team__name">{ teamDisplayName }</h2>
<h2 className="signup-team__subdomain">on { teamName }</h2>
<h2 className="signup-team__subdomain">on { config.SiteName }</h2>
<form onSubmit={this.handleSubmit}>
<div className={server_error ? 'form-group has-error' : 'form-group'}>
{ server_error }

5
web/react/components/signup_user_complete.jsx
View File

@@ -40,7 +40,7 @@ module.exports = React.createClass({
this.setState({name_error: "", email_error: "", password_error: "", server_error: ""});
this.state.user.allow_marketing = this.refs.email_service.getDOMNode().checked;
this.state.user.allow_marketing = true;
client.createUser(this.state.user, this.state.data, this.state.hash,
function(data) {
@@ -125,7 +125,7 @@ module.exports = React.createClass({
<div>
<img className="signup-team-logo" src="/static/images/logo.png" />
<h5 className="margin--less">Welcome to:</h5>
<h2 className="signup-team__name"> "teamDisplayName" </h2>
<h2 className="signup-team__name">{ this.props.teamDisplayName }</h2>
<h2 className="signup-team__subdomain">on { config.SiteName }</h2>
<h4 className="color--light">Let's create your account</h4>
{ signup_message }
@@ -147,7 +147,6 @@ module.exports = React.createClass({
{ password_error }
</div>
</div>
<div className="checkbox"><label><input type="checkbox" ref="email_service" /> It's ok to send me occassional email with updates about the {config.SiteName} service. </label></div>
</div>
<p className="margin--extra"><button onClick={this.handleSubmit} className="btn-primary btn">Create Account</button></p>
{ server_error }

2
web/react/pages/signup_user_complete.jsx
View File

@@ -1,7 +1,7 @@
// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
// See License.txt for license information.
var SignupUserComplete =require('../components/signup_user_complete.jsx');
var SignupUserComplete = require('../components/signup_user_complete.jsx');
global.window.setup_signup_user_complete_page = function(email, name, ui_name, id, data, hash, auth_services) {
React.render(