From 242c170a41749462b0f2031393dad3cfdc849b93 Mon Sep 17 00:00:00 2001 From: magnolia-fan Date: Mon, 11 Apr 2011 07:12:06 +0400 Subject: [PATCH] Search fix --- app/controllers/artist_controller.rb | 6 ++-- app/controllers/track_controller.rb | 6 +--- app/views/layouts/application.html.erb | 10 +++--- app/views/main/index.html.erb | 1 - php-bak/favicon.ico | Bin 67646 -> 0 bytes public/favicon.ico | Bin 0 -> 1150 bytes public/stylesheets/beathaven.css | 8 ++--- public/stylesheets/search-autocomplete.css | 40 +++++++++++++++++---- 8 files changed, 49 insertions(+), 22 deletions(-) delete mode 100644 php-bak/favicon.ico diff --git a/app/controllers/artist_controller.rb b/app/controllers/artist_controller.rb index 72138b6..06289e8 100644 --- a/app/controllers/artist_controller.rb +++ b/app/controllers/artist_controller.rb @@ -5,10 +5,12 @@ class ArtistController < ApplicationController if params[:name].nil? name = '' else - name = params[:name].gsub('+', ' ').gsub('%20', ' ') + if request.request_method == 'POST' + redirect_to :action => 'view', :name => params[:name].gsub(' ', '+') + end + name = params[:name].gsub('+', ' ') end @artist = Artist.getByName(name) - pp @artist end def autocomplete diff --git a/app/controllers/track_controller.rb b/app/controllers/track_controller.rb index 4e284a5..022d486 100644 --- a/app/controllers/track_controller.rb +++ b/app/controllers/track_controller.rb @@ -7,11 +7,7 @@ class TrackController < ApplicationController pp album = Album.where(:id => release.album_id).first pp artist = Artist.where(:id => album.artist_id).first - data = Vkontakte.get(artist.name, track.name, (track.length / 1000).round) - #data = open('/Users/chez/Sites/beathaven/tmp/media.mp3').read - #send_data data, :type=>"audio/mp3" + url = Vkontakte.get(artist.name, track.name, (track.length / 1000).round) - #render :text => data - redirect_to data end end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 42945f8..939b498 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,10 +1,12 @@ - BeatHaven - <%= stylesheet_link_tag :all %> - <%= javascript_include_tag :all %> - <%= csrf_meta_tag %> + BeatHaven + + + <%= stylesheet_link_tag :all %> + <%= javascript_include_tag :all %> + <%= csrf_meta_tag %>
diff --git a/app/views/main/index.html.erb b/app/views/main/index.html.erb index 2acb3cf..8634c2f 100644 --- a/app/views/main/index.html.erb +++ b/app/views/main/index.html.erb @@ -13,7 +13,6 @@
-

SEARCH

<%= form_tag('/artist', :method => 'post') %> <%= text_field_tag 'name', nil %>
diff --git a/php-bak/favicon.ico b/php-bak/favicon.ico deleted file mode 100644 index 273bb046059943e4f30b2eb8c047c18e9bbe559b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 67646 zcmeI52bdmZx%X#7?>z(pgwPU7=)Hx25C|Ov5jf!CgAYRaE)E?1rIR``#ly<=D zIvxQ*iXc&%bP^zB`(`%@qFx$%R3zW;H+k>Pvy*q1U9!6=%;vf?^Sm?fJSJz7<)+Be!XwMMY+wE z0Q;qpWh$~{g$s-FJ(YF;cn)jtV!a%)DzZAV8nObi6you+9T(3w2<*jrEo2z72{IfR zf~h^H z*pGem(MQi;W|?Iso_+S&w^BX`*$?r!=Xt*0^ZTVASajP!8`ht%i;P0{LH2*_vB%C^ zdF7QSvevE@X}a{%ORwYevB((2ykHn&|G++?@uTEG|FnVjrSw-Do6DKgt%q!j?2g_4 zzm-;6N$i`KUV7=eL4yW0u-|y?wbx$Baec$yh+G+p*e6g&iGSa=ftW9a#Q2MLrmglh z57cSwH?JG^qaXd~nezGc1=WI8|~be98i}$TjK7!?;g9{a?8CT_De3gWC!-a0sX=1tFQjXE3dqA zD(4#~>?3T1I7TE-`?6l2Mt>4mXpiE)0b;(btdBSjXFKZ~`m}v6x#W_)!TfbFZWa3! ze`7$1$G6&QtEb<8|NWz=gK@x^Vcp6&Fn^c?_O_$GcoW1t%YL_ZwguuCoZR>%_^Ur; z9_}1)zyW80?XSSSp@_fsANafFys5_>cig?`I{+!;!2IDZ7W#YbdS%2s+;Ns&ko}Oc z$Uew+h<0YK=K1qr*v)62-|bw^q)C&qb=Fzu3b36H{`Ex;r1-;!dd_RP=9+7+M6W); zKH+er><{z~m%!e*u5TCLtq^TW+zes^4ADRI6o2jA++6)) zW1Q}CF6Y^2pIwSR-_2kt-4Sy^#}TUP<@3I7$3;<}xtp=rSnqsV8tcXW z(3@_$>1){FJG5=fvdb>3uWcMWc<^iBZw{!x=+6IF!`}RHKV*O8Gl)DGfyj-j`mVqJ z`fa%WM0`MV>i_ivVgGKISYnALxcT~9Z@qOqy7U3+)t{9tU*jT?MqTL*T zjKhx}HGcf~J81Vt+PsOrc%5P!uf6u#uY&*PoL3buJ`Y>)8lDq&FZN=75IJ7V z^KCvq5HZ#m6NVvG^Y-8W{`cAN;lr<|PSd-?pJR>>*FXI5!)Kw(YnDD>u04vqvEG=d zO^S=Lejj9<^4xRJowLa%n>?o-;rHv2I`Iz<^uqqNee(n3$|z(svj0zh@{{w()nhKF z`72-f%C&x8IqrGpmD=l)NGBV7;)y4QF!nov7}VMw2juN8yX^8P{gi#tVICWKfOYDm z^HWqV#(M2Szq=nI_J`bg=bg2yt+v`EFm55wuM0^zKn!jgGGs_k{J(82&%{#-S>pp(u|L0K#!)@ut}Adcnbu^u})^8EA9zZGm7XuBrn+v=1Q z|KLC`@i+FbjSPF}p@&Yc%;UABn5mD?C;j3VzZlPXqY=jzHblCN0~>C*;Vs}hE%gDx z0r6Ml$oAWB|HQ0Wvy3hJ75$L)nTJz+wz%>^uIoo5)(>OfSidJ?+#Sc*`SC{_am4@F zUSQmSeb$AfJop6oN32=mo_p@;n9E6RHo>Z8v&}a9d24IyXDf9Jyo?|7`0Ve0|NA4T z??m%b^%b#Cd_WWDo{tXw&v0ZF#Q3+k;+@`Cw7))Bf4VWEFC2{=q`dm-t7kBO@+@sR z6|Cz6_t?%S{&`(4zWCyfxtyZC2L2U$Z6n7wZ{H8GPq+!9&#u~cJLHfC$&@Qy9{ zS)CGPd0;Hi2Y_J{WAi>#dhjKgV#j z*)GQzfA+JVt%J@N(3y`*=mS!Hq0{_=*mEknwnB`3RecJdFD@L=UurY@I@@n^M0+yF z9{1sgA0GbYFMs(a+ne@s+&ss6)m2xmQ=;5g_>)^?%;#yV)4(dv*}`WR@dD3gxb+HS z&Bstzb5nV1|FNnMAa0$b4=DQo=&!itc-v7&9rb;5===16<`u?(#mxtJKN0Koo6gr8 zNA-PUk#WEI&2NtT{O3Ra05)NM-yp_;J9&Sd66KT&`hoBPy|sU?o4x+}>w_4VyHTvf zKI}hiHt^EFh}Q`xoNyQ4b3CG3A24CUgdr6lkoPCl7rNZ4k83q@FK@o{&O3*pZv?Wq z#Q<^F=Iz@=tlx-z$G#i`%VRxjr%&5yr=5NZ_EW*VUVH=d;x;%CzF>awrw-YZPd>RS zm^@1Vy)ET{J|Hj?FUrP=DUAD{&i5Rf=(g{6`&uo!^o9Dw zg((IYs}(Wqt?0+hXS^S6-g}ed_Myfg_Up$n7Irc7H?PsIt$}S3^Ryi2^d4WpF+ikbqWAp`` z6W9=0(ER{yR?PL+%OKvHw%b!NuXE1E`E&i5xSKEAw{r|7kM$pY^wD8o|N7Uj#dlAk zU77=9d~scO66d8n&#p15{ExbHC&O-)TTj30haysF_JV@@2Oy62vI>I3%Rd-^naZkx@6 z85|!6r&_?+oHmaq;vTx(%DKxfyX-2yZ=2aCS`N_$2O58`>3x`oin;e@o@1=rsfS{2 zY))_6j7C0#h`Tw?!SB8I-YKI;kA9roXet=i_XP8l6a9%l^~-L%?Y2?i@pky^G*$;@ z;OE-E=(}yn_w;d94y|GPy zy)SYAGPZ}}*qwRZ!HAe2fgFw;O5SuK^Ebc5PFqt<*IaYWx}HjWPaYI~05&^c_D>x% z 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 literal 0 HcmV?d00001 diff --git a/public/stylesheets/beathaven.css b/public/stylesheets/beathaven.css index be5e4cc..8f69b94 100644 --- a/public/stylesheets/beathaven.css +++ b/public/stylesheets/beathaven.css @@ -99,9 +99,9 @@ body { .search #name { width: 300px; - border: 1px solid ##bdbdbd; - background: #555555; - color: #ffffff; - font-size: 1.1em; + border: #AAA 3px solid; + border-radius: 7px; + font-size: 1.5em; + padding: 0.2em; } diff --git a/public/stylesheets/search-autocomplete.css b/public/stylesheets/search-autocomplete.css index ec11895..7ff5ef0 100644 --- a/public/stylesheets/search-autocomplete.css +++ b/public/stylesheets/search-autocomplete.css @@ -1,7 +1,35 @@ - -.autocomplete-w1 { background:url(../images/shadow.png) no-repeat bottom right; position:absolute; top:0px; left:0px; margin:8px 0 0 6px; /* IE6 fix: */ _background:none; _margin:0; } -.autocomplete { border:1px solid #999; background:#FFF; cursor:default; text-align:left; max-height:350px; overflow:auto; margin:-6px 6px 6px -6px; /* IE6 specific: */ _height:350px; _margin:0; _overflow-x:hidden; } -.autocomplete .selected { background:#F0F0F0; } -.autocomplete div { padding:2px 5px; white-space:nowrap; } -.autocomplete strong { font-weight:normal; color:#3399FF; } +.autocomplete-w1 { + background: url(../images/shadow.png) no-repeat bottom right; + position: absolute; + top: 0px; + left: 0px; + margin: 8px 0 0 6px; + /* IE6 fix: */ + _background: none; + _margin: 0; +} +.autocomplete { + border:1px solid #999; + background:#FFF; + cursor:default; + text-align:left; + max-height:350px; + overflow:auto; + margin:-6px 6px 6px -6px; + /* IE6 specific: */ + _height: 350px; + _margin: 0; + _overflow-x: hidden; +} +.autocomplete .selected { + background: #F0F0F0; +} +.autocomplete div { + padding: 2px 5px; + white-space: nowrap; +} +.autocomplete strong { + font-weight: normal; + color: #3399FF; +}