From 46ae56e7e84cbfe11756680fafe7e7b8f8a3fae4 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Sun, 11 Jan 2015 20:43:15 -0600 Subject: [PATCH] * fix listen link --- web/app/assets/javascripts/sessionList.js | 12 +++++++++++- web/app/views/clients/_findSession.html.erb | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/web/app/assets/javascripts/sessionList.js b/web/app/assets/javascripts/sessionList.js index 7cc62dfd9..1c135c64d 100644 --- a/web/app/assets/javascripts/sessionList.js +++ b/web/app/assets/javascripts/sessionList.js @@ -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'); diff --git a/web/app/views/clients/_findSession.html.erb b/web/app/views/clients/_findSession.html.erb index 69c5c97c7..6f3375004 100644 --- a/web/app/views/clients/_findSession.html.erb +++ b/web/app/views/clients/_findSession.html.erb @@ -97,7 +97,7 @@ <%= image_tag "content/listen-icon.jpg", :size => "40x40" %>
- Listen? + {listen_link_text}?