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

* fix listen link

This commit is contained in:
Seth Call 2015-01-11 20:43:15 -06:00
parent d139966445
commit 46ae56e7e8
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
web/app/assets/javascripts/sessionList.js
View File

@ -88,7 +88,6 @@
var inSessionUsers = [];
showJoinLink = session.musician_access;
console.log('session', session)
showListenLink = session.fan_access && session.active_music_session && session.active_music_session.mount;
// render musicians who are already in the session
@ -159,6 +158,17 @@
sessionVals.in_session_musicians = inSessionUsersHtml.length > 0 ? inSessionUsersHtml : 'N/A';
sessionVals.join_link_display_style = showJoinLink ? "block" : "none";
sessionVals.listen_link_display_style = showListenLink ? "inline-block" : "none";
if (!session.fan_access) {
sessionVals.listen_link_text = '';
}
else if (session.active_music_session && session.active_music_session.mount) {
sessionVals.listen_link_text = 'Listen';
}
else {
sessionVals.listen_link_text = 'Broadcasting Offline';
}
}
var $row = $(context.JK.fillTemplate($activeSessionTemplate.html(), sessionVals));
var $offsetParent = $(tbGroup).closest('.content');

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

@ -97,7 +97,7 @@
<%= image_tag "content/listen-icon.jpg", :size => "40x40" %>
</a>
<br/>
<span class="listen-link-details"><span class="listen-link-text">Listen</span><a href="#" class="listen-detail-hover">?</a></span>
<span class="listen-link-details"><span class="listen-link-text">{listen_link_text}</span><a href="#" class="listen-detail-hover">?</a></span>
</td>
<td>
<a class="join-link" style="display:{join_link_display_style};">