diff --git a/ruby/lib/jam_ruby/models/track.rb b/ruby/lib/jam_ruby/models/track.rb index 76b428b09..2413028eb 100644 --- a/ruby/lib/jam_ruby/models/track.rb +++ b/ruby/lib/jam_ruby/models/track.rb @@ -14,6 +14,10 @@ module JamRuby validates :sound, :inclusion => {:in => SOUND} + def user + self.connection.user + end + def self.index(current_user, music_session_id) query = Track .joins( diff --git a/web/app/views/music_sessions/show.html.erb b/web/app/views/music_sessions/show.html.erb index d60140bb3..43c318db5 100644 --- a/web/app/views/music_sessions/show.html.erb +++ b/web/app/views/music_sessions/show.html.erb @@ -1,24 +1,72 @@ -<% provide(:title, "Now Playing: #{@music_session.description}") %> -
- -
-

Internal Session Activity

-
-

Wait a moment...

-
-
+<% provide(:title, "#{@claimed_recording.name}") %> + +
+ <% unless @claimed_recording.recording.band.nil? %> +
+ <% unless @claimed_recording.recording.band.photo_url.blank? %> + <%= image_tag "#{@claimed_recording.recording.band.photo_url}", {:alt => ""} %> + <% else %> + <%= image_tag "shared/avatar_generic_band.png", {:alt => ""} %> + <% end %> +
+ <%= @claimed_recording.recording.band.name %> + <% else %> +
+ <% unless @claimed_recording.recording.owner.photo_url.blank? %> + <%= image_tag "#{@claimed_recording.recording.owner.photo_url}", {:alt => ""} %> + <% else %> + <%= image_tag "shared/avatar_generic.png", {:alt => ""} %> + <% end %> +
+ <%= @claimed_recording.recording.owner.name %> + <% end %>
-<% content_for :post_scripts do %> - +
+
RECORDING
+
<%= @claimed_recording.recording.created_at.strftime("%b %e %Y, %l:%M %p") %>
+

+

<%= @claimed_recording.name %>

+
+ <%= image_tag "content/icon_like.png", {:width => 12, :height => 12} %> LIKE    + <%= image_tag "content/icon_share.png", {:width => 13, :height => 15} %> SHARE +
+
TODO: Which field is this in the database??

+
+
+ <%= image_tag "content/icon_playbutton.png", {:width => 20, :height => 20} %> +
+
0:00
+
+
<%= image_tag "content/slider_playcontrols.png", {:width => 5, :height => 16} %>
+
+
4:59
+
+
1:23
+
+ +
<%= @claimed_recording.genre_id.capitalize %>
+
+ <%= @claimed_recording.recording.play_count %> + <%= image_tag "content/icon_arrow.png", {:width => 7, :height => 12, :align => "absmiddle"} %>     + <%= @claimed_recording.recording.comment_count %> + <%= image_tag "content/icon_comment.png", {:width => 13, :height => 12, :align => "absmiddle"} %>     + <%= @claimed_recording.recording.like_count %> + <%= image_tag "content/icon_like.png", {:width => 12, :height => 12, :align => "absmiddle"} %> +
+
+

+ <%= render :partial => "shared/track_details", :locals => {:tracks => @claimed_recording.recording.recorded_tracks} %> +
+
+ +<% if signed_in? %> + <%= render :partial => "shared/landing_sidebar", :locals => {:user => @claimed_recording.recording.owner} %> +<% else %> + <%= render :partial => "shared/cta_sidebar" %> +<% end %> + +<% content_for :after_black_bar do %> +
+ <%= render :partial => "shared/comments", :locals => {:comments => @claimed_recording.recording.comments} %> <% end %> diff --git a/web/app/views/recordings/show.html.erb b/web/app/views/recordings/show.html.erb index b7f2c811e..43c318db5 100644 --- a/web/app/views/recordings/show.html.erb +++ b/web/app/views/recordings/show.html.erb @@ -24,7 +24,7 @@
RECORDING
-
<%= @claimed_recording.recording.created_at %>
+
<%= @claimed_recording.recording.created_at.strftime("%b %e %Y, %l:%M %p") %>


<%= @claimed_recording.name %>

@@ -36,7 +36,7 @@
<%= image_tag "content/icon_playbutton.png", {:width => 20, :height => 20} %>
-
0:00
+
0:00
<%= image_tag "content/slider_playcontrols.png", {:width => 5, :height => 16} %>
@@ -56,49 +56,17 @@


- - <% @claimed_recording.recording.recorded_tracks.each_with_index do |track, index| %> - <% if index % 2 == 0 %> - - - <% end %> - - <% if index % 2 > 0 %> - - <% end %> - <% end %> -
 
- - - - - - - -
-
- <% unless track.user.photo_url.blank? %> - <%= image_tag "#{track.user.photo_url}", {:alt => ""} %> - <% else %> - <%= image_tag "shared/avatar_generic.png", {:alt => ""} %> - <% end %> -
-
<%= track.user.name %>
 -
- <%= image_tag "content/icon_instrument_#{track.instrument_id.tr(" ", "_")}45.png", {:width => 32, :alt => ""} %> -
-
-
+ <%= render :partial => "shared/track_details", :locals => {:tracks => @claimed_recording.recording.recorded_tracks} %>

-<% if !signed_in? %> - <%= render "shared/landing_sidebar" %> +<% if signed_in? %> + <%= render :partial => "shared/landing_sidebar", :locals => {:user => @claimed_recording.recording.owner} %> <% else %> - <%= render "shared/cta_sidebar" %> + <%= render :partial => "shared/cta_sidebar" %> <% end %> <% content_for :after_black_bar do %>
- <%= render "shared/comments", :locals => {:comments => @claimed_recording.recording.comments} %> + <%= render :partial => "shared/comments", :locals => {:comments => @claimed_recording.recording.comments} %> <% end %> diff --git a/web/app/views/shared/_comments.html.erb b/web/app/views/shared/_comments.html.erb index 024273321..955d8baae 100644 --- a/web/app/views/shared/_comments.html.erb +++ b/web/app/views/shared/_comments.html.erb @@ -9,14 +9,20 @@
-
- <%= image_tag "shared/avatar_generic.png", {:alt => ""} %> -
-
- Billy Saban Ut eu ligula. Etiam ligula enim, tempor ut, blandit nec, mollis eu, lectus. -
-
Yesterday, 2:45 pm
-
-
+ <% comments.each do |c| %> +
+ <% unless c.user.photo_url.blank? %> + <%= image_tag "#{c.user.photo_url}", {:alt => ""} %> + <% else %> + <%= image_tag "shared/avatar_generic.png", {:alt => ""} %> + <% end %> +
+
+ <%= c.user.name %> <%= c.comment %> +
+
<%= c.created_at.strftime("%b %e %Y, %l:%M %p") %>
+
+
+ <% end %>
\ No newline at end of file diff --git a/web/app/views/shared/_landing_sidebar.html.erb b/web/app/views/shared/_landing_sidebar.html.erb index 01b80d4e2..36cb3abfb 100644 --- a/web/app/views/shared/_landing_sidebar.html.erb +++ b/web/app/views/shared/_landing_sidebar.html.erb @@ -1,5 +1,5 @@

-

More by Raven & The Blackbirds:


+

More by <%= user.name %>:


Now:
SESSION: Live Session in Progress
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi commodo, ipsum sed pharetra gravida, orci magna rhoncus neque, id pulvinar odio lorem non turpis.
diff --git a/web/app/views/shared/_track_details.html.erb b/web/app/views/shared/_track_details.html.erb new file mode 100644 index 000000000..9921c2807 --- /dev/null +++ b/web/app/views/shared/_track_details.html.erb @@ -0,0 +1,33 @@ + + <% tracks.each_with_index do |track, index| %> + <% if index % 2 == 0 %> + + + <% end %> + + <% if index % 2 > 0 %> + + <% end %> + <% end %> +
 
+ + + + + + + +
+
+ <% unless track.user.photo_url.blank? %> + <%= image_tag "#{track.user.photo_url}", {:alt => ""} %> + <% else %> + <%= image_tag "shared/avatar_generic.png", {:alt => ""} %> + <% end %> +
+
<%= track.user.name %>
 +
+ <%= image_tag "content/icon_instrument_#{track.instrument_id.tr(" ", "_")}45.png", {:width => 32, :alt => "", :title => "#{track.instrument_id}"} %> +
+
+
\ No newline at end of file