Working search! Weee!

This commit is contained in:
magnolia-fan
2011-09-10 02:13:02 +04:00
parent 16703a87ec
commit fe7737574d
14 changed files with 349 additions and 344 deletions
+2
View File
@@ -0,0 +1,2 @@
.alert-message.error
%p Something very bad happened, sorry :(
@@ -1,11 +1,15 @@
- if @loading
.alert-message.warning
%p Artist info is loading for the first time. Please, be patient! :)
.row.artist-info
.span4.columns.pic
%img{ :src => @data[:artist][:pic] }
= image_tag @artist[:artist][:pic] unless @artist[:artist][:pic].nil?
.span7.columns.desc
%h2= @data[:artist][:name]
= @data[:artist][:desc]
%h2= @artist[:artist][:name]
= @artist[:artist][:desc] unless @artist[:artist][:desc].nil?
- @data[:albums].each do |album|
- @artist[:albums].each do |album|
.row.album
.span4.columns.art
%img{ :src => album[:pic] }
@@ -17,4 +21,4 @@
- album[:tracks][:album].each do |track|
%tr
%td.song-title= track[:name]
%td.song-duration= track[:duration]
%td.song-duration= track[:duration]
+12
View File
@@ -0,0 +1,12 @@
.alert-message.warning
%p Made a typo?
%ul.suggestions
- @suggestions.each do |artist|
%li
%a.data.artist= artist[:name]
 (
= artist[:type]
)
%br
%p= artist[:desc]
+2 -8
View File
@@ -21,9 +21,9 @@
%a{ :href => "http://blog.beathaven.org/", :"data-ls" => "NEWS" } Blog
%li
%a.about{ :href => "#/about/" } About
%form{ :action => "" }
%form#search-form{ :action => "" }
%input#search{ :type => "text", :placeholder => "Search" }
.artist-loader
#artist-load-spinner
= image_tag "artist_loader.gif"
%ul.nav.secondary-nav
%li.dropdown
@@ -86,9 +86,3 @@
= image_tag "loader.gif"
#vk_api_transport
<!-- Yandex.Metrika counter -->
<script type="text/javascript">var yaParams = {};</script><div style="display:none;"><script type="text/javascript">(function(w, c) { (w[c] = w[c] || []).push(function() { try { w.yaCounter7596904 = new Ya.Metrika({id:7596904, enableAll: true,params:window.yaParams||{ }}); } catch(e) { } }); })(window, "yandex_metrika_callbacks");</script></div><script src="//mc.yandex.ru/metrika/watch.js" type="text/javascript" defer="defer"></script><noscript><div><img src="//mc.yandex.ru/watch/7596904" style="position:absolute; left:-9999px;" alt="" /></div></noscript>
<!-- /Yandex.Metrika counter -->