VRFS-986 landing page work

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(

web/app/views/music_sessions/show.html.erb

@@ -1,24 +1,72 @@
-<% provide(:title, "Now Playing: #{@music_session.description}") %>
-<div class="row">
-  <aside class="span4">
-    <section>
-      <h1>
-        <%= "Now Playing: #{@music_session.description}" %>
-      </h1>
-    </section>
-  </aside>
-  <div class="span8">
-      <h3>Internal Session Activity</h3>
-      <div id="internal_session_activity">
-          <p>Wait a moment... </p>
-      </div>
-  </div>
+<% provide(:title, "#{@claimed_recording.name}") %>
+
+<div class="landing-band">
+  <% unless @claimed_recording.recording.band.nil? %>
+    <div class="landing-avatar">
+      <% 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 %>
+    </div>
+    <%= @claimed_recording.recording.band.name %>
+  <% else %>
+    <div class="landing-avatar">
+      <% 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 %>
+    </div>
+    <%= @claimed_recording.recording.owner.name %>
+  <% end %>
 </div>
 
-<% content_for :post_scripts do %>
-<script type="text/javascript">
-    $(function() {
-        window.jamsocket.init()
-    })
-</script>
+<div class="landing-details">
+  <div class="left f20 orange"><strong>RECORDING</strong></div>
+  <div class="right f14 grey"><%= @claimed_recording.recording.created_at.strftime("%b %e %Y, %l:%M %p") %></div>
+  <br clear="all" /><br />
+  <h2 class="left"><%= @claimed_recording.name %></h2>
+  <div class="right">
+    <a href="#"><%= image_tag "content/icon_like.png", {:width => 12, :height => 12} %>&nbsp;LIKE</a>&nbsp;&nbsp;&nbsp;
+    <a href="#"><%= image_tag "content/icon_share.png", {:width => 13, :height => 15} %>&nbsp;SHARE</a>
+  </div>
+  <br clear="all" />TODO: Which field is this in the database??<br /><br />
+  <div class="w100">
+    <div class="recording-controls">
+      <a class="left" href="#"><%= image_tag "content/icon_playbutton.png", {:width => 20, :height => 20} %></a>
+      <div class="recording-position">
+        <div class="recording-time">0:00</div>
+        <div class="recording-playback">
+          <div class="recording-slider"><%= image_tag "content/slider_playcontrols.png", {:width => 5, :height => 16} %></div>
+        </div>
+        <div class="recording-time">4:59</div>
+      </div>
+      <div class="recording-current">1:23</div>
+    </div>
+
+    <div class="left white"><%= @claimed_recording.genre_id.capitalize %></div>
+    <div class="right white">
+      <%= @claimed_recording.recording.play_count %>
+      <%= image_tag "content/icon_arrow.png", {:width => 7, :height => 12, :align => "absmiddle"} %>&nbsp;&nbsp;&nbsp;&nbsp;
+      <%= @claimed_recording.recording.comment_count %>
+      <%= image_tag "content/icon_comment.png", {:width => 13, :height => 12, :align => "absmiddle"} %>&nbsp;&nbsp;&nbsp;&nbsp;
+      <%= @claimed_recording.recording.like_count %>
+      <%= image_tag "content/icon_like.png", {:width => 12, :height => 12, :align => "absmiddle"} %>
+    </div>
+  </div>
+  <br clear="all" /><br />
+  <%= render :partial => "shared/track_details", :locals => {:tracks => @claimed_recording.recording.recorded_tracks} %>
+</div>
+<br clear="all" />
+
+<% 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 %>
+  <br />
+  <%= render :partial => "shared/comments", :locals => {:comments => @claimed_recording.recording.comments} %>
 <% end %>

web/app/views/recordings/show.html.erb

@@ -24,7 +24,7 @@
 
 <div class="landing-details">
   <div class="left f20 orange"><strong>RECORDING</strong></div>
-  <div class="right f14 grey"><%= @claimed_recording.recording.created_at %></div>
+  <div class="right f14 grey"><%= @claimed_recording.recording.created_at.strftime("%b %e %Y, %l:%M %p") %></div>
   <br clear="all" /><br />
   <h2 class="left"><%= @claimed_recording.name %></h2>
   <div class="right">
@@ -36,7 +36,7 @@
     <div class="recording-controls">
       <a class="left" href="#"><%= image_tag "content/icon_playbutton.png", {:width => 20, :height => 20} %></a>
       <div class="recording-position">
-        <div class="recording-time">0:00</div>                    
+        <div class="recording-time">0:00</div>
         <div class="recording-playback">
           <div class="recording-slider"><%= image_tag "content/slider_playcontrols.png", {:width => 5, :height => 16} %></div>
         </div>
@@ -56,49 +56,17 @@
     </div>
   </div>
   <br clear="all" /><br />
-  <table class="w100">
-    <% @claimed_recording.recording.recorded_tracks.each_with_index do |track, index| %>
-      <% if index % 2 == 0 %>
-        <tr><td height="15px;">&nbsp;</td></tr>
-        <tr>
-      <% end %>
-      <td width="50%">
-        <table class="w100">
-          <tr>
-            <td>        
-              <div class="avatar-small m0">
-                <% unless track.user.photo_url.blank? %>
-                  <%= image_tag "#{track.user.photo_url}", {:alt => ""} %>
-                <% else %>
-                  <%= image_tag "shared/avatar_generic.png", {:alt => ""} %>
-                <% end %>
-              </div>
-            </td>
-            <td><div class="lightgrey f15 ml10"><%= track.user.name %></div></td>
-            <td class="p10">
-              <div class="ml10">
-                <%= image_tag "content/icon_instrument_#{track.instrument_id.tr(" ", "_")}45.png", {:width => 32, :alt => ""} %>
-              </div>
-            </td>
-            <td width="10%"></td>
-          </tr>
-        </table>
-      </td>
-      <% if index % 2 > 0 %>
-        </tr>
-      <% end %>
-    <% end %>
-  </table>
+  <%= render :partial => "shared/track_details", :locals => {:tracks => @claimed_recording.recording.recorded_tracks} %>
 </div>
 <br clear="all" />
 
-<% 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 %>
   <br />
-  <%= render "shared/comments", :locals => {:comments => @claimed_recording.recording.comments} %>
+  <%= render :partial => "shared/comments", :locals => {:comments => @claimed_recording.recording.comments} %>
 <% end %>

web/app/views/shared/_comments.html.erb

@@ -9,14 +9,20 @@
   <br clear="all" />
         
   <div class="landing-comment-scroller">
-    <div class="avatar-small mr10">
-      <%= image_tag "shared/avatar_generic.png", {:alt => ""} %>
-    </div>
-    <div class="w80 left p10 lightgrey">
-      <a href="#">Billy Saban</a> Ut eu ligula. Etiam ligula enim, tempor ut, blandit nec, mollis eu, lectus.
-      <br />
-      <div class="f12 grey mt5">Yesterday, 2:45 pm</div>
-    </div>
-    <br clear="all" />
+    <% comments.each do |c| %>
+      <div class="avatar-small mr10">
+        <% unless c.user.photo_url.blank? %>
+          <%= image_tag "#{c.user.photo_url}", {:alt => ""} %>
+        <% else %>
+          <%= image_tag "shared/avatar_generic.png", {:alt => ""} %>
+        <% end %>
+      </div>
+      <div class="w80 left p10 lightgrey mt10">
+        <a href="#"><%= c.user.name %></a>&nbsp;<%= c.comment %>
+        <br />
+        <div class="f12 grey mt5"><%= c.created_at.strftime("%b %e %Y, %l:%M %p") %></div>
+      </div>
+      <br clear="all" />
+    <% end %>
   </div>
 </div>

web/app/views/shared/_landing_sidebar.html.erb

@@ -1,5 +1,5 @@
 <div class="landing-sidebar"><br />
-  <h2>More by Raven &amp; The Blackbirds:</h2><br />          
+  <h2>More by <%= user.name %>:</h2><br />          
   <div class="grey f16"><em>Now:</em></div>
   <div class="f16"><span class="teal"><strong>SESSION:</strong></span> <a href="#" class="white">Live Session in Progress</a></div>
   <div class="f13 lightgrey">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi commodo, ipsum sed pharetra gravida, orci magna rhoncus neque, id pulvinar odio lorem non turpis.</div>

web/app/views/shared/_track_details.html.erb

@@ -0,0 +1,33 @@
+<table class="w100">
+  <% tracks.each_with_index do |track, index| %>
+    <% if index % 2 == 0 %>
+      <tr><td height="15px;">&nbsp;</td></tr>
+      <tr>
+    <% end %>
+    <td width="50%">
+      <table>
+        <tr>
+          <td>        
+            <div class="avatar-small m0">
+              <% unless track.user.photo_url.blank? %>
+                <%= image_tag "#{track.user.photo_url}", {:alt => ""} %>
+              <% else %>
+                <%= image_tag "shared/avatar_generic.png", {:alt => ""} %>
+              <% end %>
+            </div>
+          </td>
+          <td><div class="lightgrey f15 ml10"><%= track.user.name %></div></td>
+          <td class="p10">
+            <div class="ml10">
+              <%= image_tag "content/icon_instrument_#{track.instrument_id.tr(" ", "_")}45.png", {:width => 32, :alt => "", :title => "#{track.instrument_id}"} %>
+            </div>
+          </td>
+          <td width="10%"></td>
+        </tr>
+      </table>
+    </td>
+    <% if index % 2 > 0 %>
+      </tr>
+    <% end %>
+  <% end %>
+</table>