seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'fix_sidebar_chart_height' into develop

This commit is contained in:
root 2014-08-12 07:52:59 +02:00
parent b8c09b912e dcbdddde3c
commit d28301c974
4 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
web/app/assets/javascripts/hoverMusician.js
View File

@ -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');
}
}

8
web/app/assets/stylesheets/client/sidebar.css.scss
View File

@ -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 {

4
web/app/views/clients/_hoverMusician.html.erb
View File

@ -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) {

2
web/app/views/clients/_sidebar.html.erb
View File

@ -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>