* VRFS-3092 - fix jamtrack browse page styling issues, VRFS-3096 - fix standalone download page to have no signup context

web/app/assets/javascripts/jam_track_preview.js.coffee

@@ -9,7 +9,7 @@ context.JK.JamTrackPreview = class JamTrackPreview
     @EVENTS = context.JK.EVENTS
     @rest = context.JK.Rest()
     @logger = context.JK.logger
-    @options = options || {master_shows_duration: false}
+    @options = options || {master_shows_duration: false, color:'gray'}
     @app = app
     @jamTrack = jamTrack
     @jamTrackTrack = jamTrackTrack
@@ -23,7 +23,7 @@ context.JK.JamTrackPreview = class JamTrackPreview
     template = $('#template-jam-track-preview')
     throw "no jam track  preview template" if not template.exists()
 
-    @root.html($(template.html()))
+    @root.html(context._.template(template.html(), @options, {variable:'data'}))
     @playButton = @root.find('.play-button')
     @stopButton = @root.find('.stop-button')
     @instrumentIcon = @root.find('.instrument-icon')
@@ -58,6 +58,7 @@ context.JK.JamTrackPreview = class JamTrackPreview
     else
       if @options.master_shows_duration
         duration = 'entire song'
+        console.log("JANKHATNUH", @jamTrack)
         if @jamTrack.duration
           duration = "0:00 - #{context.JK.prettyPrintSeconds(@jamTrack.duration)}"
         part = duration

web/app/assets/javascripts/jam_track_screen.js.coffee

@@ -260,7 +260,7 @@ context.JK.JamTrackScreen=class JamTrackScreen
     for track in jamTrack.tracks
       trackRow = jamtrackElement.find("[jamtrack-track-id='#{track.id}']")
       previewElement = trackRow.find(".jamtrack-preview")
-      new JK.JamTrackPreview(@app, previewElement, jamTrack, track, {master_shows_duration: true})
+      new JK.JamTrackPreview(@app, previewElement, jamTrack, track, {master_shows_duration: true, color:'gray'})
 
     this.handleExpanded(jamtrackElement, false)
 

web/app/assets/javascripts/web/individual_jamtrack.js

@@ -36,7 +36,7 @@
 
             $previews.append($element);
 
-            new context.JK.JamTrackPreview(app, $element, jam_track, track, {master_shows_duration: false})
+            new context.JK.JamTrackPreview(app, $element, jam_track, track, {master_shows_duration: false, color:'black'})
           })
 
           $previews.append('<br clear = "all" />')

web/app/assets/javascripts/web/individual_jamtrack_band.js

@@ -33,7 +33,7 @@
 
             $previews.append($element);
 
-            new context.JK.JamTrackPreview(app, $element, jam_track, track, {master_shows_duration: false})
+            new context.JK.JamTrackPreview(app, $element, jam_track, track, {master_shows_duration: false, color:'black'})
           })
 
           $previews.append('<br clear = "all" />')

web/app/assets/stylesheets/client/header.css.scss

@@ -24,3 +24,4 @@ div[layout="header"] h1 {
     @include replace-text(image-url("header/logo.png"));
     float:left;
 }
+

web/app/assets/stylesheets/client/jamTrackPreview.css.scss

@@ -24,7 +24,6 @@
     display:inline;
     vertical-align: middle;
     margin-left:10px;
-
   }
 
   .part {
@@ -32,4 +31,30 @@
     vertical-align: middle;
     margin-left:4px;
   }
+  .play-button, .stop-button {
+    vertical-align:middle;
+    height:24px;
+    line-height:24px;
+    width:24px;
+    background-repeat:no-repeat;
+    background-position:center;
+  }
+
+  .play-button {
+    &.gray {
+      background-image: url('/assets/content/icon-play-24-gray.png');
+    }
+    &.black {
+      background-image: url('/assets/content/icon-play-24-black.png');
+    }
+  }
+
+  .pause-button {
+    &.gray {
+      background-image: url('/assets/content/icon-pause-24-gray.png');
+    }
+    &.black {
+      background-image: url('/assets/content/icon-pause-24-black.png');
+    }
+  }
 }

web/app/assets/stylesheets/client/jamtrack.css.scss

@@ -109,6 +109,10 @@
       float: left;
       margin-left: 10px;
     }
+
+    .instrument-name {
+      color:white;
+    }
   }
 
 

web/app/assets/stylesheets/web/downloads.css.scss

@@ -1,7 +1,24 @@
 @import "client/common.css.scss";
 
+
 body.downloads {
 
+  &.standalone {
+    .jamtracks {
+      display:none;
+    }
+    .download-content {
+      border-width:0;
+    }
+    .badge-number {
+      display:none;
+    }
+    .download-app {
+      left:22.5%;
+      float:none;
+      position:relative;
+    }
+  }
 
   h2 {
     font-size:22px;

web/app/controllers/users_controller.rb

@@ -209,6 +209,7 @@ class UsersController < ApplicationController
 
   def downloads
     @no_user_dropdown = true
+    @page_context = 'standalone'
     render :layout => "web"
   end
 

web/app/views/api_jam_tracks/show.rabl

@@ -1,6 +1,6 @@
 object @jam_track
 
-attributes :id, :name, :description, :recording_type, :original_artist, :songwriter, :publisher, :sales_region, :price, :version
+attributes :id, :name, :description, :recording_type, :original_artist, :songwriter, :publisher, :sales_region, :price, :version, :duration
 
 node :genres do |item|
   [item.genre.description] # XXX: need to return single genre; not array

web/app/views/clients/_jam_track_preview.html.slim

@@ -1,10 +1,8 @@
 script type="text/template" id='template-jam-track-preview'
   .jam-track-preview
     .actions
-      a.play-button href="#"
-        | Play
-      a.stop-button.hidden href="#"
-        | Stop
+      a href="#" class='play-button {{data.color}}'
+      a.hidden href="#" class='stop-button {{data.color}}'
     img.instrument-icon hoveraction="instrument" data-instrument-id="" width="24" height="24"
     .instrument-name
     .part

web/app/views/spikes/jam_track_preview.html.slim

@@ -24,7 +24,7 @@ javascript:
 
                   $players.append($element);
 
-                  new JK.JamTrackPreview(data.app, $element, jamTrack, track, {master_shows_duration: true})
+                  new JK.JamTrackPreview(data.app, $element, jamTrack, track, {master_shows_duration: true,color:'black'})
                 })
               })
               .fail(function() {

web/app/views/users/_downloads.html.slim

@@ -1,8 +1,8 @@
 // used by congrats_musician, and downloads
-- provide(:page_name, 'downloads')
+- provide(:page_name, "downloads #{@page_context}")
 - provide(:title, 'Download')
 
-.w100
+.w100.download-container
   .download-app
     .spinner-large
 
@@ -15,11 +15,11 @@
 
         p You need the JamKazam application to:
         ul
+          li Play and control your JamTracks multi-track recordings
           li Play music with others in real time on the JamKazam platform
           li Make audio recordings and share them via Facebook or URL
           li Make video recordings and share them via YouTube or URL
           li Live broadcast your sessions to family, friends, and fans
-          li Have full control over your JamTracks multi-track recordings
 
         p.click-to-download Click the button below to download the JamKazam application installer.
       .downloads-blurb