diff --git a/web/app/assets/javascripts/notificationPanel.js b/web/app/assets/javascripts/notificationPanel.js index 2f78c7e53..d7731f0c9 100644 --- a/web/app/assets/javascripts/notificationPanel.js +++ b/web/app/assets/javascripts/notificationPanel.js @@ -214,6 +214,7 @@ var notificationHtml = context.JK.fillTemplate(template, { notificationId: val.notification_id, sessionId: val.session_id, + hoveraction: val.session_id ? "session" : "", avatar_url: context.JK.resolveAvatarUrl(val.photo_url), text: val.formatted_msg, date: $.timeago(val.created_at) @@ -1147,6 +1148,7 @@ var notificationHtml = context.JK.fillTemplate(template, { notificationId: payload.notification_id, sessionId: payload.session_id, + hoveraction: payload.session_id ? "session" : "", avatar_url: context.JK.resolveAvatarUrl(payload.photo_url), text: payload.msg instanceof jQuery ? payload.msg.html() : payload.msg , date: $.timeago(payload.created_at) diff --git a/web/app/views/clients/_findSession.html.erb b/web/app/views/clients/_findSession.html.erb index 42cabf7d6..467852aaa 100644 --- a/web/app/views/clients/_findSession.html.erb +++ b/web/app/views/clients/_findSession.html.erb @@ -35,14 +35,11 @@
-
- <%= render :partial => "sessionList", :locals => {:title => "sessions you're invited to", :category => "sessions-invitations"} %> +
+ <%= render :partial => "sessionList", :locals => {:title => "current, active sessions", :category => "sessions-active"} %>
- <%= render :partial => "sessionList", :locals => {:title => "sessions with friends or bandmates", :category => "sessions-friends"} %> -
-
- <%= render :partial => "sessionList", :locals => {:title => "other sessions", :category => "sessions-other"} %> + <%= render :partial => "sessionList", :locals => {:title => "future, scheduled sessions", :category => "sessions-scheduled"} %>
Next
diff --git a/web/app/views/clients/_sessionList.html.erb b/web/app/views/clients/_sessionList.html.erb index 451bb286c..db3bec657 100644 --- a/web/app/views/clients/_sessionList.html.erb +++ b/web/app/views/clients/_sessionList.html.erb @@ -2,12 +2,10 @@ - - + - - +
GENREDESCRIPTIONSESSION MUSICIANSAUDIENCE LATENCYLISTENPOLICIES JOIN