diff options
author | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-06-15 11:22:53 -0700 |
---|---|---|
committer | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-06-15 11:22:53 -0700 |
commit | 0cd93cf2da14a4e058eef06a0a0c1770e2fe3ab7 (patch) | |
tree | 3f86c6872aa94ee0530f8a6d2b7458fa655c11de /web/react/components/settings_sidebar.jsx | |
parent | b7a821c3410ecd165241e2dbcf2c8376ae402124 (diff) | |
parent | 6f10c401a422170d42d9cee8ec01b94808fa338f (diff) | |
download | chat-0cd93cf2da14a4e058eef06a0a0c1770e2fe3ab7.tar.gz chat-0cd93cf2da14a4e058eef06a0a0c1770e2fe3ab7.tar.bz2 chat-0cd93cf2da14a4e058eef06a0a0c1770e2fe3ab7.zip |
Merge pull request #1 from mattermost/master
to me
Diffstat (limited to 'web/react/components/settings_sidebar.jsx')
-rw-r--r-- | web/react/components/settings_sidebar.jsx | 6 |
1 files changed, 4 insertions, 2 deletions
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> + */ } }); |