diff options
Diffstat (limited to 'web/react/components')
| -rw-r--r-- | web/react/components/create_comment.jsx | 7 | ||||
| -rw-r--r-- | web/react/components/find_team.jsx | 2 | ||||
| -rw-r--r-- | web/react/components/login.jsx | 2 | ||||
| -rw-r--r-- | web/react/components/post_deleted_modal.jsx | 2 | ||||
| -rw-r--r-- | web/react/components/settings_sidebar.jsx | 6 | ||||
| -rw-r--r-- | web/react/components/user_settings.jsx | 5 | ||||
| -rw-r--r-- | web/react/components/view_image.jsx | 2 |
7 files changed, 18 insertions, 8 deletions
diff --git a/web/react/components/create_comment.jsx b/web/react/components/create_comment.jsx index 3534c7573..9bcbad079 100644 --- a/web/react/components/create_comment.jsx +++ b/web/react/components/create_comment.jsx @@ -55,12 +55,15 @@ module.exports = React.createClass({ }.bind(this), function(err) { - var state = {} + var state = {}; state.server_error = err.message; - this.setState(state); + if (err.message === "Invalid RootId parameter") { if ($('#post_deleted').length > 0) $('#post_deleted').modal('show'); } + else { + this.setState(state); + } }.bind(this) ); }, diff --git a/web/react/components/find_team.jsx b/web/react/components/find_team.jsx index 329592a73..91a842ffc 100644 --- a/web/react/components/find_team.jsx +++ b/web/react/components/find_team.jsx @@ -56,7 +56,7 @@ module.exports = React.createClass({ <div> <h4>Find Your Team</h4> <form onSubmit={this.handleSubmit}> - <p>{"An email will be sent to this address with links to any " + strings.TeamPlural}</p> + <p>{"We'll send you an email with links to your " + strings.TeamPlural + "."}</p> <div className="form-group"> <label className='control-label'>Email</label> <div className={ email_error ? "form-group has-error" : "form-group" }> diff --git a/web/react/components/login.jsx b/web/react/components/login.jsx index 8d82a4b62..685e1b058 100644 --- a/web/react/components/login.jsx +++ b/web/react/components/login.jsx @@ -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={config.HomeLink} className="signup-team-login">Sign up now</a></span> </div> </form> </div> diff --git a/web/react/components/post_deleted_modal.jsx b/web/react/components/post_deleted_modal.jsx index 307120df3..83b007bad 100644 --- a/web/react/components/post_deleted_modal.jsx +++ b/web/react/components/post_deleted_modal.jsx @@ -23,7 +23,7 @@ module.exports = React.createClass({ <p>Someone deleted the message on which you tried to post a comment.</p> </div> <div className="modal-footer"> - <button type="button" className="btn btn-primary" data-dismiss="modal">Agree</button> + <button type="button" className="btn btn-primary" data-dismiss="modal">Okay</button> </div> </div> </div> diff --git a/web/react/components/settings_sidebar.jsx b/web/react/components/settings_sidebar.jsx index 34e3c9203..a1546890f 100644 --- a/web/react/components/settings_sidebar.jsx +++ b/web/react/components/settings_sidebar.jsx @@ -14,11 +14,13 @@ module.exports = React.createClass({ <li className={this.props.activeTab == 'general' ? 'active' : ''}><a href="#" onClick={function(){self.updateTab("general");}}><i className="glyphicon glyphicon-cog"></i>General</a></li> <li className={this.props.activeTab == 'security' ? 'active' : ''}><a href="#" onClick={function(){self.updateTab("security");}}><i className="glyphicon glyphicon-lock"></i>Security</a></li> <li className={this.props.activeTab == 'notifications' ? 'active' : ''}><a href="#" onClick={function(){self.updateTab("notifications");}}><i className="glyphicon glyphicon-exclamation-sign"></i>Notifications</a></li> - <li className={this.props.activeTab == 'sessions' ? 'active' : ''}><a href="#" onClick={function(){self.updateTab("sessions");}}><i className="glyphicon glyphicon-globe"></i>Sessions</a></li> - <li className={this.props.activeTab == 'activity_log' ? 'active' : ''}><a href="#" onClick={function(){self.updateTab("activity_log");}}><i className="glyphicon glyphicon-time"></i>Activity Log</a></li> <li className={this.props.activeTab == 'appearance' ? 'active' : ''}><a href="#" onClick={function(){self.updateTab("appearance");}}><i className="glyphicon glyphicon-wrench"></i>Appearance</a></li> </ul> </div> ); + /* Temporarily removing sessions and activity logs + <li className={this.props.activeTab == 'sessions' ? 'active' : ''}><a href="#" onClick={function(){self.updateTab("sessions");}}><i className="glyphicon glyphicon-globe"></i>Sessions</a></li> + <li className={this.props.activeTab == 'activity_log' ? 'active' : ''}><a href="#" onClick={function(){self.updateTab("activity_log");}}><i className="glyphicon glyphicon-time"></i>Activity Log</a></li> + */ } }); diff --git a/web/react/components/user_settings.jsx b/web/react/components/user_settings.jsx index b165a59ad..a9c2433f2 100644 --- a/web/react/components/user_settings.jsx +++ b/web/react/components/user_settings.jsx @@ -1126,6 +1126,9 @@ module.exports = React.createClass({ <NotificationsTab user={this.state.user} activeSection={this.props.activeSection} updateSection={this.props.updateSection} /> </div> ); + + /* Temporarily removing sessions and activity_log tabs + } else if (this.props.activeTab === 'sessions') { return ( <div> @@ -1138,6 +1141,8 @@ module.exports = React.createClass({ <AuditTab activeSection={this.props.activeSection} updateSection={this.props.updateSection} /> </div> ); + */ + } else if (this.props.activeTab === 'appearance') { return ( <div> diff --git a/web/react/components/view_image.jsx b/web/react/components/view_image.jsx index 7d0f0d8a9..4cb30e1d3 100644 --- a/web/react/components/view_image.jsx +++ b/web/react/components/view_image.jsx @@ -165,7 +165,7 @@ module.exports = React.createClass({ <span className="text"> | </span> </div> : "" } - <a href={this.props.filenames[id]} download={name} className="text">Download</a> + <a href={this.props.filenames[id]} download={decodeURIComponent(name)} className="text">Download</a> </div> </div> {loading} |