Merge pull request #275 from asaadmahmoodspin/mm-1762

MM-1762 - Search improvements with some other minor Ui changes

3 files changed, 15 insertions, 6 deletions

diff --git a/web/react/components/search_bar.jsx b/web/react/components/search_bar.jsx
index f21f0cd58..e39cf5d46 100644
--- a/web/react/components/search_bar.jsx
+++ b/web/react/components/search_bar.jsx
@@ -36,6 +36,9 @@ module.exports = React.createClass({
             }
         }
     },
+    clearFocus: function(e) {
+        $('.search-bar__container').removeClass('focused');
+    },
     handleClose: function(e) {
         e.preventDefault();
 
@@ -57,6 +60,7 @@ module.exports = React.createClass({
     },
     handleUserFocus: function(e) {
         e.target.select();
+        $('.search-bar__container').addClass('focused');
     },
     performSearch: function(terms, isMentionSearch) {
         if (terms.length) {
@@ -92,13 +96,14 @@ module.exports = React.createClass({
     render: function() {
         return (
             <div>
-                <div className="sidebar__collapse" onClick={this.handleClose}>Cancel</div>
-                <span className="glyphicon glyphicon-search sidebar__search-icon"></span>
+                <div className="sidebar__collapse" onClick={this.handleClose}><span className="fa fa-angle-left"></span></div>
+                <span onClick={this.clearFocus} className="search__clear">Cancel</span>
                 <form role="form" className="search__form relative-div" onSubmit={this.handleSubmit}>
+                    <span className="glyphicon glyphicon-search sidebar__search-icon"></span>
                     <input
                         type="text"
                         ref="search"
-                        className="form-control search-bar-box"
+                        className="form-control search-bar"
                         placeholder="Search"
                         value={this.state.search_term}
                         onFocus={this.handleUserFocus}
diff --git a/web/react/components/sidebar_header.jsx b/web/react/components/sidebar_header.jsx
index e7512934a..0156dc01a 100644
--- a/web/react/components/sidebar_header.jsx
+++ b/web/react/components/sidebar_header.jsx
@@ -107,6 +107,10 @@ module.exports = React.createClass({
         };
     },
 
+    toggleDropdown: function(e) {
+        $('.team__header').find('.dropdown-toggle').trigger('click');
+    },
+
     render: function() {
         var me = UserStore.getCurrentUser();
 
@@ -116,7 +120,7 @@ module.exports = React.createClass({
 
         return (
             <div className="team__header theme">
-                <a className="settings_link" href="#" data-toggle="modal" data-target="#user_settings1">
+                <a href="#" onClick={this.toggleDropdown}>
                     { me.last_picture_update ?
                     <img className="user__picture" src={"/api/v1/users/" + me.id + "/image?time=" + me.update_at} />
                     :
diff --git a/web/react/components/signup_team_complete.jsx b/web/react/components/signup_team_complete.jsx
index 21f9edef1..e7b37ef39 100644
--- a/web/react/components/signup_team_complete.jsx
+++ b/web/react/components/signup_team_complete.jsx
@@ -620,8 +620,8 @@ PasswordPage = React.createClass({
 
         client.track('signup', 'signup_team_07_password');
 
-        var password_error = this.state.password_error ? <label className="control-label">{ this.state.password_error }</label> : null;
-        var server_error = this.state.server_error ? <label className="control-label">{ this.state.server_error }</label> : null;
+        var password_error = this.state.password_error ? <div className="form-group has-error"><label className="control-label">{ this.state.password_error }</label></div> : null;
+        var server_error = this.state.server_error ? <div className="form-group has-error"><label className="control-label">{ this.state.server_error }</label></div> : null;
 
         return (
             <div>