summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--web/react/components/login.jsx2
-rw-r--r--web/react/components/signup_user_complete.jsx5
-rw-r--r--web/react/pages/signup_user_complete.jsx2
3 files changed, 4 insertions, 5 deletions
diff --git a/web/react/components/login.jsx b/web/react/components/login.jsx
index 45b558dca..fe0a47777 100644
--- a/web/react/components/login.jsx
+++ b/web/react/components/login.jsx
@@ -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 }
diff --git a/web/react/components/signup_user_complete.jsx b/web/react/components/signup_user_complete.jsx
index 36fa27ad7..670aab943 100644
--- a/web/react/components/signup_user_complete.jsx
+++ b/web/react/components/signup_user_complete.jsx
@@ -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 }
diff --git a/web/react/pages/signup_user_complete.jsx b/web/react/pages/signup_user_complete.jsx
index 60c3a609a..8f9be1f94 100644
--- a/web/react/pages/signup_user_complete.jsx
+++ b/web/react/pages/signup_user_complete.jsx
@@ -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(