Merge origin/fix/bio-settings into stable

Lokiedu · Feb 16, 2017 · 15a3432 · 15a3432
2 parents cf0ff33 + 44183b7
commit 15a3432
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 15 deletions.
diff --git a/src/pages/base/settings.js b/src/pages/base/settings.js
@@ -146,7 +146,7 @@ class BaseSettingsPage extends React.Component {
                       className="aux-nav__link"
                       to={getUrl(URL_NAMES.SETTINGS)}
                     >
-                      Basic info
+                      Your Bio
                     </IndexLink>
                   </div>
                   <div className="aux-nav__item">
@@ -156,7 +156,7 @@ class BaseSettingsPage extends React.Component {
                       to={getUrl(URL_NAMES.CHANGE_PASSWORD)}
                       visible
                     >
-                      Change password
+                      Change Password
                     </PageContentLink>
                   </div>
                   {/*<div className="aux-nav__item">
@@ -196,7 +196,7 @@ class BaseSettingsPage extends React.Component {
                       to={getUrl(URL_NAMES.EMAIL_SETTINGS)}
                       visible
                     >
-                      Notification settings
+                      Notification Settings
                     </PageContentLink>
                   </div>
                   <div className="aux-nav__item">

diff --git a/src/pages/settings/settings.js b/src/pages/settings/settings.js
@@ -18,7 +18,6 @@
 import React, { PropTypes } from 'react';
 import { connect } from 'react-redux';
 import Helmet from 'react-helmet';
-import i from 'immutable';
 
 import {
   CurrentUser as CurrentUserPropType
@@ -34,7 +33,6 @@ import { ActionsTrigger } from '../../triggers';
 import { createSelector, currentUserSelector } from '../../selectors';
 
 import Button from '../../components/button';
-import { RolesManager } from '../../components/settings';
 import ProfileHeader from '../../components/profile';
 
 class SettingsPage extends React.Component {
@@ -122,8 +120,6 @@ class SettingsPage extends React.Component {
       return false;
     }
 
-    const roles = current_user.getIn(['user', 'more', 'roles'], i.List()).toJS();
-
     return (
       <div>
         <Helmet title="Your Profile Settings on " />
@@ -142,14 +138,6 @@ class SettingsPage extends React.Component {
           ref={c => this.form = c}
           onChange={this.handleFormChange}
         />
-        <div className="paper__page">
-          <h2 className="content__sub_title layout__row">Roles</h2>
-          <RolesManager
-            ref={c => this.roles = c}
-            roles={roles}
-            onChange={this.handleFormChange}
-          />
-        </div>
         {this.state.unsaved &&
           <div className="paper__page layout__raw_grid layout__raw_grid--reverse tools_page__item--flex">
             <Button