merge

app/assets/javascripts/player.coffee

@@ -230,3 +230,10 @@ $('.add-album').live 'click', ->
   _player.addTracks album.tracks
   false
 
+$('.s-add').live 'click', ->
+  artist = $('.artist-info h2').text()
+  album = _player.albums[$(this).attr('data-album-id')]
+  item = album.tracks[$(this).attr('data-id')-1]
+  item['artist'] = artist
+  item['album'] = album.name
+  _player.addTracks [item]

app/controllers/artist_controller.rb

@@ -81,7 +81,7 @@ class ArtistController < ApplicationController
       pic: artist.pic_url,
       urls: artist.artist_links
     }
-    ap artist.artist_links
+    
     media_types = @@default_album_types
     session = Session.find_by_key(session_key)
     unless session.nil?

app/views/artist/_page.html.haml

@@ -22,11 +22,11 @@
       .button-container
         %a.btn.add-album{ :'data-album-id' => album[:id] }= I18n.t 'player.add'
     .span7.columns.tracks
-      %h3= album[:name] + " (" + album[:year].to_s + ")"
+      %h3{ :'data-album-id' => album[:id] }= album[:name] + " (" + album[:year].to_s + ")"
       %table.zebra-striped.tracklist
         - album[:tracks].each do |track|
           %tr
             %td.song-title= track[:name]
             %td.song-duration
               .s-duration= (track[:duration] unless track[:duration] == '0:00')
-              .s-add{ :data_id => track[:id] }= I18n.t 'player.add_one'
+              .s-add{ :'data-album-id' => album[:id], :'data-id' => track[:id] }= I18n.t 'player.add_one'