Artist import moved to a controller, added shiny buttons

public/javascripts/ajax.js

@@ -1,11 +1,12 @@
+function loadArtistData(name) {
+	$.get('/artist/'+ name +'/', function(data){
+		Pages.renderArtist(data);
+	})
+}
+
 $(function(){
-	$('a.data').live('click', function(){
-		var button = this;
-		$.get(this.href, function(data){
-			if ($(button).hasClass('artist')) {
-				Pages.renderArtist(data);
-			}
-		})
+	$('a.data.artist').live('click', function(){
+		loadArtistData($(this).html());
 		return false;
 	});
 	$('a.data').trigger('click');

public/javascripts/pages.js

@@ -20,7 +20,9 @@ var Pages = {
 				<h2 class="name">'+ album.name +' ('+ album.year +')</h2>\
 				<div class="pic">\
 					<img src="'+ album.pic +'" alt="'+ album.name +' by '+ data.artist.name +'" width="250" />\
-					<div class="add-album">Add to playlist</div>\
+					<div class="add-album-button-container">\
+						<div class="add-album button gray">Add to Now Playing</div>\
+					</div>\
 				</div>\
 				<div class="tracklist">\
 					<ul>\
@@ -32,9 +34,12 @@ var Pages = {
 			$.each(album.tracks.album, function(i, track){
 				var track_info = $('\
 				<li>\
-					<span class="index">'+ (i+1) +'</span>\
-					<div class="trackname">'+ track.name +'</div>\
-					<div class="length">'+ track.duration +'</div>\
+					<div class="add-track button gray">+</div>\
+					<div class="track-container">\
+						<span class="index">'+ (i+1) +'</span>\
+						<div class="trackname">'+ track.name +'</div>\
+						<div class="length">'+ track.duration +'</div>\
+					</div>\
 				</li>\
 				');
 				

public/javascripts/player.js

@@ -1,6 +1,6 @@
 var Player = {
 	
-	bar_width: 290,
+	bar_width: 330,
 	
 	getTrackUrl: function(data) {
 		
@@ -42,18 +42,32 @@ var Player = {
 }
 
 $('.add-album').live('click', function() {
-	var artist = $(this).parent().parent().parent().parent().find('.artist-info .name').html();
-	$(this).parent().parent().find('.tracklist li').each(function(i, item){
+	var artist = $('.artist-info .name').html();
+	$(this).parent().parent().parent().find('.tracklist li').each(function(i, item){
 		var track_name = $(item).find('.trackname').html();
 		var length = $(item).find('.length').html();
 		Player.addTrack(artist, track_name, length);
 	});
 })
+$('.add-track').live('click', function(){
+	var artist = $('.artist-info .name').html();
+	var track_name = $(this).parent().find('.trackname').html();
+	var length = $(this).parent().find('.length').html();
+	Player.addTrack(artist, track_name, length);
+});
+
+$('.tracklist li').live('mouseover mouseout', function(e){
+	if (e.type == 'mouseover') {
+		$(this).find('.add-track').show();
+	} else {
+		$(this).find('.add-track').hide();
+	}
+});
 
 $('.playlist-tracks li').live('dblclick', function(){
 	Player.setTrack(this);
-})
+});
 
 $(function(){
 	Audio.init();
-})
+});