diff options
Diffstat (limited to 'web')
| -rw-r--r-- | web/react/components/login.jsx | 10 | ||||
| -rw-r--r-- | web/react/components/signup_team_complete.jsx | 3 | ||||
| -rw-r--r-- | web/react/components/signup_user_complete.jsx | 1 | ||||
| -rw-r--r-- | web/react/components/textbox.jsx | 2 | ||||
| -rw-r--r-- | web/react/utils/utils.jsx | 12 | ||||
| -rw-r--r-- | web/static/config/config.js | 4 |
6 files changed, 23 insertions, 9 deletions
diff --git a/web/react/components/login.jsx b/web/react/components/login.jsx index 8d82a4b62..65f1da1f8 100644 --- a/web/react/components/login.jsx +++ b/web/react/components/login.jsx @@ -52,20 +52,20 @@ var FindTeamDomain = React.createClass({ <div> <span className="signup-team__name">{ config.SiteName }</span> <br/> - <span className="signup-team__subdomain">Enter your {strings.TeamPlural} domain.</span> + <span className="signup-team__subdomain">Enter your {strings.Team}'s domain.</span> <br/> <br/> </div> <form onSubmit={this.handleSubmit}> <div className={server_error ? 'form-group has-error' : 'form-group'}> { server_error } - <input type="text" className="form-control" name="domain" ref="domain" placeholder="teamdomain" /> + <input type="text" className="form-control" name="domain" ref="domain" placeholder="team domain" /> </div> <div className="form-group"> <button type="submit" className="btn btn-primary">Continue</button> </div> <div> - <span>Don't remember your {strings.TeamPlural} domain? <a href="/find_team">Find it here</a></span> + <span>Don't remember your {strings.Team}'s domain? <a href="/find_team">Find it here</a></span> </div> <br/> <br/> @@ -74,7 +74,7 @@ var FindTeamDomain = React.createClass({ <br/> <br/> <div> - <span>{"Want to create your own " + strings.Team + "?"} <a href="/" className="signup-team-login">Sign up now</a></span> + <span>{"Want to create your own " + strings.Team + "?"} <a href={utils.getHomeLink()} className="signup-team-login">Sign up now</a></span> </div> </form> </div> @@ -188,7 +188,7 @@ module.exports = React.createClass({ <a href="/reset_password">I forgot my password</a> </div> <div className="external-link"> - <span>{"Want to create your own " + strings.Team + "?"} <a href={config.HomeLink} className="signup-team-login">Sign up now</a></span> + <span>{"Want to create your own " + strings.Team + "?"} <a href={utils.getHomeLink()} className="signup-team-login">Sign up now</a></span> </div> </form> </div> diff --git a/web/react/components/signup_team_complete.jsx b/web/react/components/signup_team_complete.jsx index 066161a10..b038679e6 100644 --- a/web/react/components/signup_team_complete.jsx +++ b/web/react/components/signup_team_complete.jsx @@ -467,7 +467,8 @@ UsernamePage = React.createClass({ </div> { name_error } </div> - <p>{"Pick something " + strings.Team + "mates will recognize. Your username is how you will appear to others"}</p> + <p>{"Pick something " + strings.Team + "mates will recognize. Your username is how you will appear to others."}</p> + <p>It can be made of lowercase letters and numbers.</p> <button className="btn btn-default" onClick={this.submitBack}><i className="glyphicon glyphicon-chevron-left"></i> Back</button> <button className="btn-primary btn" onClick={this.submitNext}>Next<i className="glyphicon glyphicon-chevron-right"></i></button> </div> diff --git a/web/react/components/signup_user_complete.jsx b/web/react/components/signup_user_complete.jsx index 0fcdc92b0..146419cf5 100644 --- a/web/react/components/signup_user_complete.jsx +++ b/web/react/components/signup_user_complete.jsx @@ -120,6 +120,7 @@ module.exports = React.createClass({ <img className="signup-team-logo" src="/static/images/logo.png" /> <h4>Welcome to { config.SiteName }</h4> <p>{"Choose your username and password for the " + this.props.team_name + " " + strings.Team +"."}</p> + <p>Your username can be made of lowercase letters and numbers.</p> <label className="control-label">Username</label> <div className={ name_error ? "form-group has-error" : "form-group" }> <input type="text" ref="name" className="form-control" placeholder="" maxLength="128" /> diff --git a/web/react/components/textbox.jsx b/web/react/components/textbox.jsx index 45798809f..7a4762e07 100644 --- a/web/react/components/textbox.jsx +++ b/web/react/components/textbox.jsx @@ -204,7 +204,7 @@ module.exports = React.createClass({ // If there is a space after the last @, nothing to do. if (lastSpace > atIndex || lastCharSpace > atIndex) { - this.setState({ mentionText: '-1' }); + this.updateMentionTab('-1', null); return; } diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx index 72ed48faf..628d92342 100644 --- a/web/react/utils/utils.jsx +++ b/web/react/utils/utils.jsx @@ -730,3 +730,15 @@ Image.prototype.load = function(url, progressCallback) { }; Image.prototype.completedPercentage = 0; + +module.exports.getHomeLink = function() { + if (config.HomeLink != "") { + return config.HomeLink; + } + var parts = window.location.host.split("."); + if (parts.length <= 1) { + return window.location.protocol + "//" + window.location.host; + } + parts[0] = "www"; + return window.location.protocol + "//" + parts.join("."); +} diff --git a/web/static/config/config.js b/web/static/config/config.js index 080f16a30..82d4bbf70 100644 --- a/web/static/config/config.js +++ b/web/static/config/config.js @@ -24,7 +24,7 @@ var config = { AboutLink: "/static/help/configure_links.html", HelpLink: "/static/help/configure_links.html", ReportProblemLink: "/static/help/configure_links.html", - HomeLink: "http://localhost:8065", + HomeLink: "", ThemeColors: ["#2389d7", "#008a17", "#dc4fad", "#ac193d", "#0072c6", "#d24726", "#ff8f32", "#82ba00", "#03b3b2", "#008299", "#4617b4", "#8c0095", "#004b8b", "#004b8b", "#570000", "#380000", "#585858", "#000000"] }; @@ -35,4 +35,4 @@ var strings = { TeamPlural: "teams", Company: "company", CompanyPlural: "companies" -} +}; |