From dcbdddde3c030f419a2064f1c952b26c27fe9a2a Mon Sep 17 00:00:00 2001
From: root <zonk2world@gmail.com>
Date: Sun, 10 Aug 2014 08:30:47 +0200
Subject: [PATCH] fix sidebar height issue, request sent button issue

---
 web/app/assets/javascripts/hoverMusician.js        | 10 +++++++---
 web/app/assets/stylesheets/client/sidebar.css.scss |  8 +++++++-
 web/app/views/clients/_hoverMusician.html.erb      |  4 +++-
 web/app/views/clients/_sidebar.html.erb            |  2 ++
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/web/app/assets/javascripts/hoverMusician.js b/web/app/assets/javascripts/hoverMusician.js
index 985da502b..70f688d35 100644
--- a/web/app/assets/javascripts/hoverMusician.js
+++ b/web/app/assets/javascripts/hoverMusician.js
@@ -95,7 +95,8 @@
               session_display: sessionDisplayStyle,
               join_display: joinDisplayStyle,
               sessionId: sessionId,
-              friendAction: response.is_friend ? "removeMusicianFriend" : (response.pending_friend_request ? "" : "sendMusicianFriendRequest"),
+              //friendAction: response.is_friend ? "removeMusicianFriend" : (response.pending_friend_request ? "" : "sendMusicianFriendRequest"),
+              friendAction: response.is_friend ? "" : (response.pending_friend_request ? "" : "sendMusicianFriendRequest"),
               followAction: response.is_following ? "removeMusicianFollowing" : "addMusicianFollowing",
               biography: response.biography,
               followings: response.followings && response.followings.length > 0 ? followingHtml : "<tr><td>N/A</td></tr>",
@@ -133,13 +134,16 @@
       }
       else {
         if (user.is_friend) {
-          $(btnFriendSelector, hoverSelector).html('DISCONNECT');
+          $(btnFriendSelector, hoverSelector).html('CONNECTED');
+          $(btnFriendSelector, hoverSelector).addClass('disabled');
         }
         if (user.is_following) {
           $(btnFollowSelector, hoverSelector).html('UNFOLLOW');
         }
         if (user.pending_friend_request) {
-          $(btnFriendSelector, hoverSelector).hide();
+          //$(btnFriendSelector, hoverSelector).hide();
+          $(btnFriendSelector, hoverSelector).html('REQUEST SENT');
+          $(btnFriendSelector, hoverSelector).addClass('disabled');
         }
       }
 
diff --git a/web/app/assets/stylesheets/client/sidebar.css.scss b/web/app/assets/stylesheets/client/sidebar.css.scss
index f934b0cf3..09c4a4585 100644
--- a/web/app/assets/stylesheets/client/sidebar.css.scss
+++ b/web/app/assets/stylesheets/client/sidebar.css.scss
@@ -181,7 +181,11 @@
       display: block;
       overflow: auto;
       margin: 0px 15px;
-      height: 210px;
+      /*height: 210px;*/
+      height: 73%;
+    }
+    .chart-text-section {
+      
     }
 
     .btn-send-chat-message {
@@ -232,6 +236,8 @@
       position: absolute;
       bottom: 10px;
       padding: 0px 15px;
+      height: 20%;
+      min-height: 69px;
     }
 
     em {
diff --git a/web/app/views/clients/_hoverMusician.html.erb b/web/app/views/clients/_hoverMusician.html.erb
index 253e7dceb..f44bd0cbd 100644
--- a/web/app/views/clients/_hoverMusician.html.erb
+++ b/web/app/views/clients/_hoverMusician.html.erb
@@ -171,7 +171,9 @@
 
   function sendMusicianFriendRequest(userId) {
     rest.sendFriendRequest(JK.app, userId);
-    $("#btnFriend", "#musician-hover").hide();
+    //$("#btnFriend", "#musician-hover").hide();
+    $("#btnFriend").html('REQUEST SENT');
+    $("#btnFriend").addClass('disabled');
   }
 
   function removeMusicianFriend(userId) {
diff --git a/web/app/views/clients/_sidebar.html.erb b/web/app/views/clients/_sidebar.html.erb
index a0b37fe1f..b488db763 100644
--- a/web/app/views/clients/_sidebar.html.erb
+++ b/web/app/views/clients/_sidebar.html.erb
@@ -104,10 +104,12 @@
         <div class="chat-status">
           <span>Chat is available when in session.</span>
         </div>
+        
         <div class="chat-list-scroller">
           <div class="previous-chat-list wrapword">
           </div>
         </div>
+      
         <div class="chat-sender">
           <form class="chat-message-form">
             <textarea name="chat-message" id="new-chat-message" placeholder="enter message"></textarea>