VRFS-1820 fixed aesthetic issues

This commit is contained in:
Brian Smith 2014-06-26 23:28:59 -04:00
parent eb30ee3391
commit 79dc9c37c2
2 changed files with 11 additions and 43 deletions

View File

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

View File

@ -81,7 +81,7 @@
<td width="30%">
<table class="musician-groups" cellpadding="0" cellspacing="0" width="100%">
<tr>
<td>{name}</td>
<td class="bold">{name}</td>
<td align="right" width="75">({genres})</td>
</tr>
<tr>
@ -128,14 +128,10 @@
</td>
<td width="20%">
<table class="musicians" cellpadding="0" cellspacing="0">
<tr><td class="bold">Chat Language:</td></tr>
<tr><td>{language}</td></tr>
<tr><td class="bold">Musician Access:</td></tr>
<tr><td>{musician_access}</td></tr>
<tr><td class="bold">Fan Access:</td></tr>
<tr><td>{fan_access}</td></tr>
<tr><td class="bold">Legal Policy:</td></tr>
<tr><td>{legal_policy}</td></tr>
<tr><td><span class="bold">Chat Language:</span><br/>{language}</td></tr>
<tr><td><span class="bold">Musician Access:</span><br/>{musician_access}</td></tr>
<tr><td><span class="bold">Fan Access:</span><br/>{fan_access}</td></tr>
<tr><td><span class="bold">Legal Policy:</span><br/>{legal_policy}</td></tr>
</table>
</td>
<td class="noborder" style="text-align:center; vertical-align:middle;">
@ -152,7 +148,7 @@
<td width="30%">
<table class="musician-groups" cellpadding="0" cellspacing="0" width="100%">
<tr>
<td>{name}</td>
<td class="bold">{name}</td>
<td align="right" width="75">({genres})</td>
</tr>
<tr>
@ -182,14 +178,6 @@
</table>
</td>
</tr>
<tr>
<td>Invited:</td>
<td>
<table class="musicians" cellpadding="0" cellspacing="0">
{pending_invitations}
</table>
</td>
</tr>
</table>
</td>
<td width="10%" align="center">
@ -199,14 +187,10 @@
</td>
<td width="20%">
<table class="musicians" cellpadding="0" cellspacing="0">
<tr><td class="bold">Chat Language:</td></tr>
<tr><td>{language}</td></tr>
<tr><td class="bold">Musician Access:</td></tr>
<tr><td>{musician_access}</td></tr>
<tr><td class="bold">Fan Access:</td></tr>
<tr><td>{fan_access}</td></tr>
<tr><td class="bold">Legal Policy:</td></tr>
<tr><td>{legal_policy}</td></tr>
<tr><td><span class="bold">Chat Language:</span><br/>{language}</td></tr>
<tr><td><span class="bold">Musician Access:</span><br/>{musician_access}</td></tr>
<tr><td><span class="bold">Fan Access:</span><br/>{fan_access}</td></tr>
<tr><td><span class="bold">Legal Policy:</span><br/>{legal_policy}</td></tr>
</table>
</td>
<td class="noborder" style="text-align:center; vertical-align:middle;">
@ -249,10 +233,6 @@
</tr>
</script>
<script type="text/template" id="template-pending-invitations">
<img src="{avatar_url}" />&nbsp;
</script>
<script type="text/template" id="template-latency">
<tr class="mb15">
<td class="{latency_style}">