diff --git a/web/app/views/api_music_sessions/history_show.rabl b/web/app/views/api_music_sessions/history_show.rabl index d29de5af3..9d22fd4ab 100644 --- a/web/app/views/api_music_sessions/history_show.rabl +++ b/web/app/views/api_music_sessions/history_show.rabl @@ -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? diff --git a/web/app/views/clients/index.html.erb b/web/app/views/clients/index.html.erb index bd37726f2..f34fc162a 100644 --- a/web/app/views/clients/index.html.erb +++ b/web/app/views/clients/index.html.erb @@ -62,6 +62,8 @@ <%= render "clients/banners/disconnected" %> <%= render "overlay_small" %> <%= render "help" %> +<%= render "commentDialog" %> +
-<% end %> + <% content_for :extra_js do %> + + <% end %> + <% end %> \ No newline at end of file diff --git a/web/app/views/recordings/show.html.erb b/web/app/views/recordings/show.html.erb index 970cc0ad4..52839832d 100644 --- a/web/app/views/recordings/show.html.erb +++ b/web/app/views/recordings/show.html.erb @@ -18,6 +18,7 @@ <% end %>
+<% if @claimed_recording.is_public %>
<% unless @claimed_recording.recording.band.blank? %>
@@ -90,32 +91,40 @@ <%= render :partial => "shared/track_details", :locals => {:tracks => @claimed_recording.recording.grouped_tracks} %>

-
-<% 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} %> +
RECORDING NOT FOUND
+ <% end %> +
+ +<% 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 %> +
+ <%= 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 %> + <% end %> -<% else %> - <%= render :partial => "shared/cta_sidebar" %> -<% end %> - -<% content_for :after_black_bar do %> -
- <%= 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 %> - <% end %>