1 files changed, 74 insertions, 3 deletions

diff --git a/web/react/components/sidebar_header.jsx b/web/react/components/sidebar_header.jsx
index de28a8374..3f777d93c 100644
--- a/web/react/components/sidebar_header.jsx
+++ b/web/react/components/sidebar_header.jsx
@@ -1,17 +1,42 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var NavbarDropdown = require('./navbar_dropdown.jsx');
-var UserStore = require('../stores/user_store.jsx');
+const NavbarDropdown = require('./navbar_dropdown.jsx');
+const TutorialTip = require('./tutorial/tutorial_tip.jsx');
+
+const UserStore = require('../stores/user_store.jsx');
+const PreferenceStore = require('../stores/preference_store.jsx');
+
 const Utils = require('../utils/utils.jsx');
+const Constants = require('../utils/constants.jsx');
+const Preferences = Constants.Preferences;
+const TutorialSteps = Constants.TutorialSteps;
+
+const Tooltip = ReactBootstrap.Tooltip;
+const OverlayTrigger = ReactBootstrap.OverlayTrigger;
 
 export default class SidebarHeader extends React.Component {
     constructor(props) {
         super(props);
 
         this.toggleDropdown = this.toggleDropdown.bind(this);
+        this.onPreferenceChange = this.onPreferenceChange.bind(this);
+
+        this.state = this.getStateFromStores();
+    }
+    componentDidMount() {
+        PreferenceStore.addChangeListener(this.onPreferenceChange);
+    }
+    componentWillUnmount() {
+        PreferenceStore.removeChangeListener(this.onPreferenceChange);
+    }
+    getStateFromStores() {
+        const tutorialPref = PreferenceStore.getPreference(Preferences.TUTORIAL_STEP, UserStore.getCurrentId(), {value: '0'});
 
-        this.state = {};
+        return {showTutorialTip: parseInt(tutorialPref.value, 10) === TutorialSteps.MENU_POPOVER};
+    }
+    onPreferenceChange() {
+        this.setState(this.getStateFromStores());
     }
     toggleDropdown(e) {
         e.preventDefault();
@@ -21,6 +46,38 @@ export default class SidebarHeader extends React.Component {
         }
         $('.team__header').find('.dropdown-toggle').dropdown('toggle');
     }
+    createTutorialTip() {
+        const screens = [];
+
+        screens.push(
+            <div>
+                <h4>{'Main Menu'}</h4>
+                <p>
+                {'The '}<strong>{'Main Menu'}</strong>{' is where you can '}
+                <strong>{'Invite New Members'}</strong>
+                {', access your '}
+                <strong>{'Account Settings'}</strong>
+                {' and set your '}<strong>{'Theme Color'}</strong>{'.'}
+                </p>
+                <p>
+                {'Team administrators can also access their '}<strong>{'Team Settings'}</strong>{' from this menu.'}
+                </p>
+            </div>
+        );
+
+        return (
+            <div
+                onClick={this.toggleDropdown}
+            >
+                <TutorialTip
+                    ref='tip'
+                    placement='right'
+                    screens={screens}
+                    overlayClass='tip-overlay--header'
+                />
+            </div>
+        );
+    }
     render() {
         var me = UserStore.getCurrentUser();
         var profilePicture = null;
@@ -38,8 +95,14 @@ export default class SidebarHeader extends React.Component {
             );
         }
 
+        let tutorialTip = null;
+        if (this.state.showTutorialTip) {
+            tutorialTip = this.createTutorialTip();
+        }
+
         return (
             <div className='team__header theme'>
+                {tutorialTip}
                 <a
                     href='#'
                     onClick={this.toggleDropdown}
@@ -47,7 +110,15 @@ export default class SidebarHeader extends React.Component {
                     {profilePicture}
                     <div className='header__info'>
                         <div className='user__name'>{'@' + me.username}</div>
+                        <OverlayTrigger
+                            trigger={['hover', 'focus']}
+                            delayShow={1000}
+                            placement='bottom'
+                            overlay={<Tooltip id='team-name__tooltip'>{this.props.teamDisplayName}</Tooltip>}
+                            ref='descriptionOverlay'
+                        >
                         <div className='team__name'>{this.props.teamDisplayName}</div>
+                        </OverlayTrigger>
                     </div>
                 </a>
                 <NavbarDropdown