localhots
/
beathaven
1
0
Fork 0
Code Releases Activity

Model url method

This commit is contained in:
Gregory Eremin 2012-09-02 03:38:14 +04:00
parent e2e2868309
commit be5a643b55
4 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/backbone/models/player.js.coffee
View File

@ -72,4 +72,3 @@ class BeatHaven.Models.Player extends Backbone.Model
return false if @move_it_mousedown return false if @move_it_mousedown
percent = obj.position / obj.duration * 100 percent = obj.position / obj.duration * 100
$(".player .progress-bar .bar").css(width: "#{percent}%") $(".player .progress-bar .bar").css(width: "#{percent}%")

8
app/assets/javascripts/backbone/templates/album/show.mustache
View File

@ -3,8 +3,12 @@
<div class="album"> <div class="album">
<div class="pic"> <div class="pic">
<img src="{{album_pic}}" alt="{{album_title}}"><br> <img src="{{album_pic}}" alt="{{album_title}}"><br>
<a href="" class="btn btn-bh-blue album-add"><i class="icon-plus icon-white"></i> Add to playlist</a> <div class="bh-underlay-blue">
<a href="" class="btn btn-bh-green album-play"><i class="icon-play icon-white"></i> Play</a> <a href="" class="btn btn-bh-dark album-add"><i class="icon-plus icon-white"></i> Add to playlist</a>
</div>
<div class="bh-underlay-green">
<a href="" class="btn btn-bh-dark album-play"><i class="icon-play icon-white"></i> Play</a>
</div>
</div> </div>
<ul class="tracks"> <ul class="tracks">
{{#album_tracks}} {{#album_tracks}}

9
app/models/album.rb
View File

@ -33,6 +33,10 @@ class Album < ActiveRecord::Base
end end
end end
def url
"/album/#{id}"
end
def dump_json def dump_json
Jbuilder.encode do |j| Jbuilder.encode do |j|
j.album_title title j.album_title title
@ -42,8 +46,13 @@ class Album < ActiveRecord::Base
j.track_id track.id j.track_id track.id
j.track_title track.title j.track_title track.title
j.track_duration track.duration j.track_duration track.duration
j.track_artists track.artists do |j, artist|
j.artist_title artist.name
j.artist_url artist.url
end
j.track_disc track.disc_id j.track_disc track.disc_id
j.track_position track.position j.track_position track.position
j.track_length track.length
j.meta do |j| j.meta do |j|
j.id track.id j.id track.id
j.title track.title j.title track.title

5
app/models/artist.rb
View File

@ -10,12 +10,17 @@ class Artist < ActiveRecord::Base
pic? && bio? pic? && bio?
end end
def url
"/artist/#{name.gsub(/\s/, "+")}"
end
def dump_json def dump_json
Jbuilder.encode do |j| Jbuilder.encode do |j|
j.artist_title name j.artist_title name
j.artist_pic pic j.artist_pic pic
j.artist_bio bio j.artist_bio bio
j.artist_loaded loaded? j.artist_loaded loaded?
j.artist_url url
j.artist_albums albums.shown.to_a do |j, album| j.artist_albums albums.shown.to_a do |j, album|
j.album_title album.title j.album_title album.title
j.album_year album.year j.album_year album.year