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

VRFS-1669 find session work

This commit is contained in:
Brian Smith 2014-06-06 03:07:02 -04:00
parent cff09fd4de
commit 1339d8448f
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/app/assets/javascripts/notificationPanel.js
View File

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

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

@ -35,14 +35,11 @@
</div>
<div class="content-scroller">
<div class="content-wrapper" style="padding-left:35px;padding-top:10px;">
<div id="sessions-invitations">
<%= render :partial => "sessionList", :locals => {:title => "sessions you're invited to", :category => "sessions-invitations"} %>
<div id="sessions-active">
<%= render :partial => "sessionList", :locals => {:title => "current, active sessions", :category => "sessions-active"} %>
</div>
<div id="sessions-friends" class="mt35">
<%= render :partial => "sessionList", :locals => {:title => "sessions with friends or bandmates", :category => "sessions-friends"} %>
</div>
<div id="sessions-other" class="mt35">
<%= render :partial => "sessionList", :locals => {:title => "other sessions", :category => "sessions-other"} %>
<%= render :partial => "sessionList", :locals => {:title => "future, scheduled sessions", :category => "sessions-scheduled"} %>
</div>
<span class="btn-next-wrapper"><a href="/api/sessions/nindex/clientid?page=1" class="btn-next">Next</a></span>
</div>

6
web/app/views/clients/_sessionList.html.erb
View File

@ -2,12 +2,10 @@
<table id="<%= category %>" class="findsession-table" cellspacing="0" cellpadding="0" border="0">
<!-- header -->
<tr>
<th align="left" width="100">GENRE</th>
<th align="left" width="25%">DESCRIPTION</th>
<th align="left" width="100">SESSION</th>
<th align="left" width="20%">MUSICIANS</th>
<th align="left" width="15%">AUDIENCE</th>
<th width="60" style="text-align:center">LATENCY</th>
<th width="50" style="text-align:center">LISTEN</th>
<th align="left" width="15%">POLICIES</th>
<th class="noborder" width="30" style="text-align:center">JOIN</th>
</tr>
<!-- session row goes here -->