localhots/beathaven
1
0
Fork 0
Code Releases Activity

Boostrap 2.1

Browse Source
This commit is contained in:
Gregory Eremin
2012-09-10 20:45:17 +04:00
parent baa680e7b5
commit a29f4433ca
15 changed files with 104 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/javascripts/application.js.coffee
+6 -8
View File
@@ -2,7 +2,11 @@
#= require jquery_ujs
#= require jquery.autocomplete
# require soundmanager
#= require bootstrap-dropdown
#= require bootstrap-tooltip
#= require bootstrap-popover
#= require soundmanager
#= require vk_music
#= require hogan
@@ -14,10 +18,4 @@
#= require backbone/beat_haven
#= require locale/en
#= require locale/ru
#= require bootstrap-dropdown
#= require bootstrap-tooltip
#= require bootstrap-popover
#= require_tree .
#= require_tree ./bindings
app/assets/javascripts/backbone/beat_haven.js.coffee
+1 -2
View File
@@ -5,7 +5,6 @@
#= require_tree ./collections
#= require_tree ./views
#= require_tree ./routers
#= require ./i18n
window.BeatHaven =
Modules: {}
@@ -29,7 +28,7 @@ window.BeatHaven =
@VK = new BeatHaven.Models.VK()
@I18n = new BeatHaven.Modules.I18n()
# @VK.init()
@VK.init()
Backbone.history.start(pushState: true);
$("a").live "click", (e) ->
app/assets/javascripts/backbone/models/track.js.coffee
+3 -3
View File
@@ -15,9 +15,9 @@ class BeatHaven.Models.Track extends Backbone.Model
artists: @.get("artists")
track: @.get("title")
)
# unless @.get("sm_obj")?
# this.add_to_library(autoload: true, autoplay: false)
# BH.Player.play(this)
unless @.get("sm_obj")?
this.add_to_library(autoload: true, autoplay: false)
BH.Player.play(this)
$(".artist-page .tracks li[data-id]").removeClass("now-playing").removeClass("paused")
this.node().addClass("now-playing")
app/assets/javascripts/backbone/templates/album/show.mustache
+2 -2
View File
@@ -9,12 +9,12 @@
<span data-translate-contents="artist.album.add">{{i18n_add}}</span>
</a>
</div>
<div class="bh-underlay-green">
<!-- <div class="bh-underlay-green">
<a href="" class="btn btn-bh-dark album-play">
<i class="icon-play icon-white"></i>
<span data-translate-contents="artist.album.play">{{i18n_play}}</span>
</a>
</div>
</div> -->
</div>
<ul class="tracks">
{{#album_tracks}}
app/assets/javascripts/backbone/templates/artist/show.mustache
+30 -28
View File
@@ -1,15 +1,15 @@
<div class="artist-page">
<h1>{{artist_title}}</h1>
<div class="artist-info">
<div class="pic">
<div class="row artist-info">
<div class="span4 pic">
<img src="{{artist_pic}}" alt="{{artist_title}}">
</div>
<div class="bio">{{& artist_bio}}</div>
<div class="span8 bio">{{& artist_bio}}</div>
</div>
<div class="albums">
{{#artist_albums}}
<div class="album">
<div class="pic">
<div class="row album">
<div class="span4 pic">
<img src="{{album_pic}}" alt="{{album_title}}"><br>
<div class="bh-underlay-blue">
<a href="" class="btn btn-bh-dark album-add">
@@ -17,35 +17,37 @@
<span data-translate-contents="artist.album.add">{{i18n_add}}</span>
</a>
</div>
<div class="bh-underlay-green">
<!-- <div class="bh-underlay-green">
<a href="" class="btn btn-bh-dark album-play">
<i class="icon-play icon-white"></i>
<span data-translate-contents="artist.album.play">{{i18n_play}}</span>
</a>
</div>
</div> -->
</div>
<h2 class="title">{{album_title}} ({{album_year}})</h2>
<ul class="tracks">
{{#album_tracks}}
<li data-id="{{track_id}}">
<a href="" class="btn btn-round track-play" data-translate-title="artist.album.track.play" title="{{i18n_play}}">
<i class="icon-play"></i>
</a>
<a href="" class="btn btn-round track-pause" data-translate-title="artist.album.track.pause" title="{{i18n_pause}}">
<i class="icon-pause"></i>
</a>
<div class="title">
<div class="inner">
<a href="{{track_url}}" class="track-link">{{track_title}}</a>
<div class="span8">
<h2 class="title">{{album_title}} ({{album_year}})</h2>
<ul class="tracks">
{{#album_tracks}}
<li data-id="{{track_id}}">
<a href="" class="btn btn-round track-play" data-translate-title="artist.album.track.play" title="{{i18n_play}}">
<i class="icon-play"></i>
</a>
<a href="" class="btn btn-round track-pause" data-translate-title="artist.album.track.pause" title="{{i18n_pause}}">
<i class="icon-pause"></i>
</a>
<div class="title">
<div class="inner">
<a href="{{track_url}}" class="track-link">{{track_title}}</a>
</div>
</div>
</div>
<span class="length">{{track_length}}</span>
<a href="" class="btn btn-round track-add" data-translate-title="artist.album.track.add" title="{{i18n_add}}">
<i class="icon-plus"></i>
</a>
</li>
{{/album_tracks}}
</ul>
<span class="length">{{track_length}}</span>
<a href="" class="btn btn-round track-add" data-translate-title="artist.album.track.add" title="{{i18n_add}}">
<i class="icon-plus"></i>
</a>
</li>
{{/album_tracks}}
</ul>
</div>
</div>
{{/artist_albums}}
</div>
app/assets/javascripts/bindings/autocomplete.js.coffee
+3 -3
View File
@@ -1,10 +1,10 @@
$ ->
$(".navbar-search input").focus ->
$(this).animate(width: 249)
$(this).animate(width: 244)
$(".player").animate(width: 368)
$(".navbar-search input").blur ->
$(this).animate(width: 99)
$(".player").animate(width: 518)
$(this).animate(width: 133)
$(".player").animate(width: 467)
window.desired = $(".navbar-search input").autocomplete
serviceUrl: "/api/search/complete.json"