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-1555 VRFS-1556 do not show private sessions and recordings

This commit is contained in:
Brian Smith 2014-04-26 16:31:51 -04:00
parent c06458550c
commit 7e2d37bac5
5 changed files with 130 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/app/views/api_music_sessions/history_show.rabl
View File

@ -1,6 +1,6 @@
object @history
attributes :id, :music_session_id, :description, :genres, :like_count, :comment_count, :created_at
attributes :id, :music_session_id, :description, :fan_access, :genres, :like_count, :comment_count, :created_at
node :share_url do |history|
unless history.share_token.nil?

2
web/app/views/clients/index.html.erb
View File

@ -62,6 +62,8 @@
<%= render "clients/banners/disconnected" %>
<%= render "overlay_small" %>
<%= render "help" %>
<%= render "commentDialog" %>
<div id="fb-root"></div>
<script type="text/javascript">

1
web/app/views/layouts/web.html.erb
View File

@ -80,6 +80,7 @@
<%= render "clients/hoverBand" %>
<%= render "clients/hoverSession" %>
<%= render "clients/hoverRecording" %>
<%= render "clients/commentDialog" %>
<%= yield(:extra_dialogs) %>

177
web/app/views/music_sessions/show.html.erb
View File

@ -17,73 +17,78 @@
<% end %>
<div class="sessions-page">
<div class="landing-band">
<% unless @music_session.band.nil? %>
<div class="landing-avatar">
<% unless @music_session.band.photo_url.blank? %>
<%= image_tag "#{@music_session.band.photo_url}", {:alt => ""} %>
<% if @music_session.fan_access %>
<div class="landing-band">
<% unless @music_session.band.nil? %>
<div class="landing-avatar">
<% unless @music_session.band.photo_url.blank? %>
<%= image_tag "#{@music_session.band.photo_url}", {:alt => ""} %>
<% else %>
<%= image_tag "shared/avatar_generic_band.png", {:alt => ""} %>
<% end %>
</div>
<%= @music_session.band.name %>
<% else %>
<%= image_tag "shared/avatar_generic_band.png", {:alt => ""} %>
<div class="landing-avatar">
<% unless @music_session.user.photo_url.blank? %>
<%= image_tag "#{@music_session.user.photo_url}", {:alt => ""} %>
<% else %>
<%= image_tag "shared/avatar_generic.png", {:alt => ""} %>
<% end %>
</div>
<%= @music_session.user.name %>
<% end %>
</div>
<%= @music_session.band.name %>
<div class="landing-details">
<div class="left f20 teal"><strong>SESSION</strong></div>
<div class="right f14 grey"><%= timeago(@music_session.created_at) %></div>
<br clear="all" /><br />
<div class="left w70"><%= @music_session.description %><br /><br /></div>
<% if @music_session.session_removed_at.blank? %>
<div class="right">
<a id="btnLike"><%= image_tag "content/icon_like.png", {:width => 12, :height => 12, :alt => ""} %>&nbsp;LIKE</a>&nbsp;&nbsp;&nbsp;
<a id="btnShare"><%= image_tag "content/icon_share.png", {:width => 13, :height => 15, :alt => ""} %>&nbsp;SHARE</a>
</div>
<% end %>
<br clear="all" />
<div class="w100">
<div class="recording-controls <%= @music_session.is_over? ? 'ended' : 'inprogress' %>" data-music-session="<%=@music_session.id %>">
<a class="left play-button" href="#">
<%= image_tag 'content/icon_playbutton.png', width:20, height:20, class:'play-icon' %>
<% if @music_session.music_session && @music_session.music_session.mount %>
<audio preload="none">
<source src="<%= @music_session.music_session.mount.url %>" type="<%= @music_session.music_session.mount.resolve_string(:mime_type) %>">
</audio>
<% end %>
</a>
<div class="session-status"><%= @music_session.is_over? ? 'SESSION ENDED' : 'LIVE SESSION IN PROGRESS' %></div>
<%= session_duration(@music_session, class: 'session-duration tick-duration recording-current', 'data-created-at' => @music_session.created_at.to_i) %>
</div>
<div class="left white"><%= @music_session.genres.split('|').first.capitalize unless @music_session.genres.blank? %></div>
<div class="right white">
<span id="spnCommentCount"><%= @music_session.comment_count %></span>
<%= image_tag "content/icon_comment.png", {:width => 13, :height => 12, :align => "absmiddle", :style => "vertical-align:middle", :alt => ""} %>&nbsp;&nbsp;&nbsp;&nbsp;
<span id="spnLikeCount"><%= @music_session.like_count %></span>
<%= image_tag "content/icon_like.png", {:width => 12, :height => 12, :align => "absmiddle", :style => "vertical-align:middle", :alt => ""} %>
</div>
</div>
<br clear="all" /><br />
<%= render :partial => "shared/track_details", :locals => {:tracks => @music_session.grouped_tracks} %>
</div>
<br clear="all" />
<% else %>
<div class="landing-avatar">
<% unless @music_session.user.photo_url.blank? %>
<%= image_tag "#{@music_session.user.photo_url}", {:alt => ""} %>
<% else %>
<%= image_tag "shared/avatar_generic.png", {:alt => ""} %>
<% end %>
</div>
<%= @music_session.user.name %>
<div class="left f20 teal"><strong>SESSION NOT FOUND</strong></div>
<% end %>
</div>
<div class="landing-details">
<div class="left f20 teal"><strong>SESSION</strong></div>
<div class="right f14 grey"><%= timeago(@music_session.created_at) %></div>
<br clear="all" /><br />
<div class="left w70"><%= @music_session.description %><br /><br /></div>
<% if @music_session.session_removed_at.blank? %>
<div class="right">
<a id="btnLike"><%= image_tag "content/icon_like.png", {:width => 12, :height => 12, :alt => ""} %>&nbsp;LIKE</a>&nbsp;&nbsp;&nbsp;
<a id="btnShare"><%= image_tag "content/icon_share.png", {:width => 13, :height => 15, :alt => ""} %>&nbsp;SHARE</a>
</div>
<% end %>
<br clear="all" />
<div class="w100">
<div class="recording-controls <%= @music_session.is_over? ? 'ended' : 'inprogress' %>" data-music-session="<%=@music_session.id %>">
<a class="left play-button" href="#">
<%= image_tag 'content/icon_playbutton.png', width:20, height:20, class:'play-icon' %>
<% if @music_session.music_session && @music_session.music_session.mount %>
<audio preload="none">
<source src="<%= @music_session.music_session.mount.url %>" type="<%= @music_session.music_session.mount.resolve_string(:mime_type) %>">
</audio>
<% end %>
</a>
<div class="session-status"><%= @music_session.is_over? ? 'SESSION ENDED' : 'LIVE SESSION IN PROGRESS' %></div>
<%= session_duration(@music_session, class: 'session-duration tick-duration recording-current', 'data-created-at' => @music_session.created_at.to_i) %>
</div>
<div class="left white"><%= @music_session.genres.split('|').first.capitalize unless @music_session.genres.blank? %></div>
<div class="right white">
<span id="spnCommentCount"><%= @music_session.comment_count %></span>
<%= image_tag "content/icon_comment.png", {:width => 13, :height => 12, :align => "absmiddle", :style => "vertical-align:middle", :alt => ""} %>&nbsp;&nbsp;&nbsp;&nbsp;
<span id="spnLikeCount"><%= @music_session.like_count %></span>
<%= image_tag "content/icon_like.png", {:width => 12, :height => 12, :align => "absmiddle", :style => "vertical-align:middle", :alt => ""} %>
</div>
</div>
<br clear="all" /><br />
<%= render :partial => "shared/track_details", :locals => {:tracks => @music_session.grouped_tracks} %>
</div>
<br clear="all" />
</div>
<% if true %>
<% if true %>
<div class="landing-sidebar" style="z-index:900;"><br />
<br>
<br>
@ -100,33 +105,35 @@
class: 'video-slide', :'data-video-header' => 'JamKazam Overview',
:'data-video-url' => 'http://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1') %>
</div>
</div>
</div>
<% else %>
<% if signed_in? %>
<% unless @music_session.band.nil? %>
<%= render :partial => "shared/landing_sidebar", :locals => {:user => @music_session.band, :recent_history => @music_session.band.recent_history} %>
<% else %>
<%= render :partial => "shared/landing_sidebar", :locals => {:user => @music_session.user, :recent_history => @music_session.user.recent_history} %>
<% end %>
<% else %>
<%= render :partial => "shared/cta_sidebar" %>
<% end %>
<% if signed_in? && @music_session.fan_access %>
<% unless @music_session.band.nil? %>
<%= render :partial => "shared/landing_sidebar", :locals => {:user => @music_session.band, :recent_history => @music_session.band.recent_history} %>
<% else %>
<%= render :partial => "shared/landing_sidebar", :locals => {:user => @music_session.user, :recent_history => @music_session.user.recent_history} %>
<% end %>
<% else %>
<%= render :partial => "shared/cta_sidebar" %>
<% end %>
<% end %>
<% content_for :after_black_bar do %>
<br />
<%= render :partial => "shared/comments", :locals => {:comments => @music_session.comments, :id => "txtSessionComment"} %>
<% end %>
<% if @music_session.fan_access %>
<% content_for :after_black_bar do %>
<br />
<%= render :partial => "shared/comments", :locals => {:comments => @music_session.comments, :id => "txtSessionComment"} %>
<% end %>
<% content_for :extra_dialogs do %>
<%= render :partial => "clients/shareDialog" %>
<% end %>
<% content_for :extra_dialogs do %>
<%= render :partial => "clients/shareDialog" %>
<% end %>
<% content_for :extra_js do %>
<script type="text/javascript">
$(function () {
var showMusicSession = new JK.ShowMusicSession(JK.app);
showMusicSession.initialize("<%= @music_session.id %>");
});
</script>
<% end %>
<% content_for :extra_js do %>
<script type="text/javascript">
$(function () {
var showMusicSession = new JK.ShowMusicSession(JK.app);
showMusicSession.initialize("<%= @music_session.id %>");
});
</script>
<% end %>
<% end %>

59
web/app/views/recordings/show.html.erb
View File

@ -18,6 +18,7 @@
<% end %>
<div class="recordings-page">
<% if @claimed_recording.is_public %>
<div class="landing-band">
<% unless @claimed_recording.recording.band.blank? %>
<div class="landing-avatar">
@ -90,32 +91,40 @@
<%= render :partial => "shared/track_details", :locals => {:tracks => @claimed_recording.recording.grouped_tracks} %>
</div>
<br clear="all" />
</div>
<% if signed_in? %>
<% unless @claimed_recording.recording.band.nil? %>
<%= render :partial => "shared/landing_sidebar", :locals => {:user => @claimed_recording.recording.band, :recent_history => @claimed_recording.recording.band.recent_history} %>
<% else %>
<%= render :partial => "shared/landing_sidebar", :locals => {:user => @claimed_recording.recording.owner, :recent_history => @claimed_recording.recording.owner.recent_history} %>
<div class="left f20 orange"><strong>RECORDING NOT FOUND</strong></div>
<% end %>
</div>
<% if @claimed_recording.is_public %>
<% if signed_in? %>
<% unless @claimed_recording.recording.band.nil? %>
<%= render :partial => "shared/landing_sidebar", :locals => {:user => @claimed_recording.recording.band, :recent_history => @claimed_recording.recording.band.recent_history} %>
<% else %>
<%= render :partial => "shared/landing_sidebar", :locals => {:user => @claimed_recording.recording.owner, :recent_history => @claimed_recording.recording.owner.recent_history} %>
<% end %>
<% else %>
<%= render :partial => "shared/cta_sidebar" %>
<% end %>
<% content_for :after_black_bar do %>
<br />
<%= render :partial => "shared/comments", :locals => {:comments => @claimed_recording.recording.comments, :id => "txtRecordingComment"} %>
<% end %>
<% content_for :extra_dialogs do %>
<%= render :partial => "clients/shareDialog" %>
<% end %>
<% content_for :extra_js do %>
<script type="text/javascript">
$(function () {
var showRecording = new JK.ShowRecording(JK.app);
showRecording.initialize("<%= @claimed_recording.id %>", "<%= @claimed_recording.recording_id %>");
});
</script>
<% end %>
<% else %>
<%= render :partial => "shared/cta_sidebar" %>
<% end %>
<% content_for :after_black_bar do %>
<br />
<%= render :partial => "shared/comments", :locals => {:comments => @claimed_recording.recording.comments, :id => "txtRecordingComment"} %>
<% end %>
<% content_for :extra_dialogs do %>
<%= render :partial => "clients/shareDialog" %>
<% end %>
<% content_for :extra_js do %>
<script type="text/javascript">
$(function () {
var showRecording = new JK.ShowRecording(JK.app);
showRecording.initialize("<%= @claimed_recording.id %>", "<%= @claimed_recording.recording_id %>");
});
</script>
<% end %>