diff options
author | Corey Hulen <corey@hulen.com> | 2015-06-25 11:20:19 -0400 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2015-06-25 11:20:19 -0400 |
commit | 049a41f9beb3b55a4eb84d4730011b257aaf26b3 (patch) | |
tree | 7ea9f7eeaa753d8ceac1f955b6b9af061fe4d751 /web/react/components/settings_sidebar.jsx | |
parent | bfe8d13cd15d7e4ba7da76d3b202109d2a4b7847 (diff) | |
parent | 40b9fc5e398f8212feca10459b654230af872298 (diff) | |
download | chat-049a41f9beb3b55a4eb84d4730011b257aaf26b3.tar.gz chat-049a41f9beb3b55a4eb84d4730011b257aaf26b3.tar.bz2 chat-049a41f9beb3b55a4eb84d4730011b257aaf26b3.zip |
Merge pull request #27 from mattermost/mm-1240
fixes mm-1240 adds ability to turn valet feature on
Diffstat (limited to 'web/react/components/settings_sidebar.jsx')
-rw-r--r-- | web/react/components/settings_sidebar.jsx | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/web/react/components/settings_sidebar.jsx b/web/react/components/settings_sidebar.jsx index a1546890f..ae8510cf2 100644 --- a/web/react/components/settings_sidebar.jsx +++ b/web/react/components/settings_sidebar.jsx @@ -1,6 +1,8 @@ // Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved. // See License.txt for license information. +var utils = require('../utils/utils.jsx'); + module.exports = React.createClass({ updateTab: function(tab) { this.props.updateTab(tab); @@ -11,16 +13,11 @@ module.exports = React.createClass({ return ( <div className=""> <ul className="nav nav-pills nav-stacked"> - <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 == 'appearance' ? 'active' : ''}><a href="#" onClick={function(){self.updateTab("appearance");}}><i className="glyphicon glyphicon-wrench"></i>Appearance</a></li> + {this.props.tabs.map(function(tab) { + return <li className={self.props.activeTab == tab.name ? 'active' : ''}><a href="#" onClick={function(){self.updateTab(tab.name);}}><i className={tab.icon}></i>{tab.ui_name}</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> - */ } }); |