localhots/oldhaven
1
0
Fork 0
Code Releases Activity

Merge branch 'master' of github.com:magnolia-fan/BeatHaven

Browse Source 
Conflicts:
	rails/app/views/artist/view.rhtml
	rails/config/routes.rb
	rails/public/stylesheets/beathaven.css
This commit is contained in:
Hipster Hitman
2011-04-09 17:31:13 +04:00
parent 861bb9c69b 3215a40e0f
commit 092ef8f389
36 changed files with 743 additions and 18891 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rails/app/views/artist/view.rhtml
+3 -3
View File
@@ -8,7 +8,7 @@
<% @artist.albums.each do |album| %>
<% unless album.releases.empty? %>
<div class="album">
<div class="pic"></div>
<div class="pic"><img src="<%= album.cover(@artist.name) %>" width="250" height="250" alt=""/></div>
<h3 class="name"><%= album.name %> <%= (album.year ? album.year : '') %></h3>
<%
releases = album.releases
@@ -16,8 +16,8 @@
%>
<ul class="tracks">
<% first_release.tracks.each do |track| %>
<li>
<span class="play"></span>
<li id="<%= track.id %>">
<span class="play<%= (track.inDb ? '' : ' disabled') %>"></span>
<span class="track-name"><%= track.name %></span>
<span class="duration"><%= track.length.toTime %></span>
</li>
rails/app/views/layouts/application.html.erb
+7 -1
View File
@@ -3,12 +3,18 @@
<head>
<title>BeatHaven</title>
<%= stylesheet_link_tag :all %>
<%= javascript_include_tag :defaults %>
<%= javascript_include_tag :all %>
<%= csrf_meta_tag %>
</head>
<body>
<div id="contents">
<div class="inner-1">
<div id="player">
<span id="artist"></span>
<span id="dash"> - </span>
<span id="title"></span>
<audio controls preload style="width:1000px;"></audio>
</div>
<%= yield %>
</div>
</div>