From 79dc9c37c2067178ea269fd495a10d86bccfb3d8 Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Thu, 26 Jun 2014 23:28:59 -0400 Subject: [PATCH] VRFS-1820 fixed aesthetic issues --- web/app/assets/javascripts/sessionList.js | 14 +------- web/app/views/clients/_findSession.html.erb | 40 ++++++--------------- 2 files changed, 11 insertions(+), 43 deletions(-) diff --git a/web/app/assets/javascripts/sessionList.js b/web/app/assets/javascripts/sessionList.js index b3e2467b3..89b74b168 100644 --- a/web/app/assets/javascripts/sessionList.js +++ b/web/app/assets/javascripts/sessionList.js @@ -12,7 +12,6 @@ var $inactiveSessionTemplate = $('#template-inactive-session-row'); var $notationFileTemplate = $('#template-notation-files'); var $openSlotsTemplate = $('#template-open-slots'); - var $pendingInvitationsTemplate = $('#template-pending-invitations'); var $latencyTemplate = $('#template-latency'); var $musicianTemplate = $('#template-musician-info'); var showJoinLink = true; @@ -131,7 +130,7 @@ $('#actionHeader', tbGroup).html('RSVP'); var i = 0; - var rsvpUsersHtml = '', openSlotsHtml = '', pendingInvitationsHtml = '', latencyHtml = '', notationFileHtml = ''; + var rsvpUsersHtml = '', openSlotsHtml = '', latencyHtml = '', notationFileHtml = ''; // render users who have approved RSVPs if (session.approved_rsvps) { @@ -159,7 +158,6 @@ if (session.pending_invitations[i].id === context.JK.currentUserId) { hasInvitation = true; } - pendingInvitationsHtml += createPendingInvitation(session.pending_invitations[i]); } } @@ -178,7 +176,6 @@ } var sessionVals = buildSessionObject(session, notationFileHtml, rsvpUsersHtml, openSlotsHtml, latencyHtml); - sessionVals.pending_invitations = pendingInvitationsHtml.length > 0 ? pendingInvitationsHtml : 'N/A'; sessionVals.rsvp_link_display_style = showRsvpLink ? "block" : "none"; var row = context.JK.fillTemplate($inactiveSessionTemplate.html(), sessionVals); @@ -331,15 +328,6 @@ return context.JK.fillTemplate($openSlotsTemplate.html(), slot); } - function createPendingInvitation(user) { - - var invitationVals = { - avatar_url: context.JK.resolveAvatarUrl(user.photo_url) - }; - - return context.JK.fillTemplate($pendingInvitationsTemplate.html(), invitationVals); - } - function createNotationFile(notation) { var notationVals = { file_url: notation.file_url, diff --git a/web/app/views/clients/_findSession.html.erb b/web/app/views/clients/_findSession.html.erb index 050f5658c..18123d54c 100644 --- a/web/app/views/clients/_findSession.html.erb +++ b/web/app/views/clients/_findSession.html.erb @@ -81,7 +81,7 @@ - + @@ -128,14 +128,10 @@ - - - -
{name}{name} ({genres})
- - - - - - - - + + + +
Chat Language:
{language}
Musician Access:
{musician_access}
Fan Access:
{fan_access}
Legal Policy:
{legal_policy}
Chat Language:
{language}
Musician Access:
{musician_access}
Fan Access:
{fan_access}
Legal Policy:
{legal_policy}
@@ -152,7 +148,7 @@ - + @@ -182,14 +178,6 @@
{name}{name} ({genres})
Invited: - - {pending_invitations} -
-
@@ -199,14 +187,10 @@ - - - - - - - - + + + +
Chat Language:
{language}
Musician Access:
{musician_access}
Fan Access:
{fan_access}
Legal Policy:
{legal_policy}
Chat Language:
{language}
Musician Access:
{musician_access}
Fan Access:
{fan_access}
Legal Policy:
{legal_policy}
@@ -249,10 +233,6 @@ - -