jQuery from CDN, work on search

app/coffeescripts/ajax.coffee

@@ -24,12 +24,11 @@ class Ajax
 			else
 				_ajax.setArchor '/artist/' +name+ '/'
 				_pages.renderArtist data
+			_search.hideSpinner()
 		false
 	
 	loadSearchPage: ->
-		$.get '/templates/search.html', (data) ->
-			_ajax.setArchor '/search/'
-			_pages.renderSearch _beathaven.localizeHTML $(data)
+		
 		false
 	
 	loadSettingsPage: ->

app/coffeescripts/beathaven.coffee

@@ -52,7 +52,7 @@ class BeatHaven
 		false
 	
 	adjustSizes: ->
-		$('.data-container').height $(window).height() - $('.header-container').height()
+		$('.data-container').height $(window).height() - $('.header-container').height() - $('.pulldown').height()
 		$('.data-container').width $(window).width() - $('.player').width()
 		$('.player-container').height $(window).height()
 		$('.playlist').height $(window).height() - $('.player').height() - $('.player-container .additional-controls').height()
@@ -103,6 +103,14 @@ class BeatHaven
 			_locale[id][lang]
 		else
 			id
+	
+	pdShowSpinner: ->
+		$('.pulldown').html '<div class="pd-spinner"><img src="/images/loader.gif" alt=""/></div>'
+		false
+	
+	pdHideSpinner: ->
+		$('.pulldown').html ''
+		false
 
 
 String::htmlsafe = ->

app/coffeescripts/pages.coffee

@@ -53,16 +53,9 @@ class Pages
 		false
 	
 	renderSearch: (data) ->
-		$('.data-container').css background: 'url(/images/concrete_wall_2.png) 0 -30px repeat'
-		$('.data-container .inner').html data
-		
-		$('.search-container')
-			.css('marginLeft', ($('.data-container').width() - 425) / 2 + 'px')
-			.css('marginTop', ($('.data-container').height() / 2 - 230)+ 'px')
-			.height(($('.data-container').height() - $('#search_form').height()) / 2)
-			
+		$('.pulldown').html data
 		setTimeout ->
-			$('#search_field').bh_autocomplete
+			$('.search_field').first().bh_autocomplete
 				serviceUrl: '/artist/autocomplete' # Страница для обработки запросов автозаполнения
 				minChars: 2 # Минимальная длина запроса для срабатывания автозаполнения
 				delimiter: /(,|;)\s*/ # Разделитель для нескольких запросов, символ или регулярное выражение
@@ -71,12 +64,9 @@ class Pages
 				zIndex: 9999 # z-index списка
 				deferRequestBy: 500 # Задержка запроса (мсек)
 				onSelect: ->
-					_ajax.loadArtistData $('#search_field').val()
-			$('#search_field').focus()
-		, 501
-		
-		yaCounter7596904.hit _ajax.getAnchor(), 'Artist Search', _ajax.referer
-		_ajax.setTitle 'Artist Search'
+					_ajax.loadArtistData $('.search_field').first().val()
+			$('.search_field').first().focus()
+		, 1
 		false
 	
 	renderSettings: (data) ->

app/coffeescripts/search.coffee

@@ -3,17 +3,17 @@ class Search
 	pics: []
 	
 	showSpinner: ->
-		$('.search-container input').attr(disabled: 'disabled').blur()
-		$('.search-container img').show()
+		$('.search-container input').first().attr(disabled: 'disabled').blur()
+		$('.search-container img').first().show()
 		$('.autocomplete-container').hide()
-		$('.artist_loading.failed').hide()
+		$('.artist_loading.failed').first().hide()
 		this.hideSuggestions()
 		false
 	
 	hideSpinner: ->
-		$('.search-container input').removeAttr 'disabled'
-		$('.search_field').focus()
-		$('.search-container img').hide()
+		$('.search-container input').first().removeAttr 'disabled'
+		$('.search_field').first().focus()
+		$('.search-container img').first().hide()
 		false
 	
 	showSuggestions: (values) ->
@@ -49,14 +49,26 @@ class Search
 
 
 $('.search').live 'click', ->
-	_ajax.go '/search/'
+	if $('.pulldown').css('display') is 'none'
+		$('.pulldown').width $('.data-container').width() - 50
+		$('.pulldown').height 300#38
+		$('.pulldown').slideDown 'fast', ->		
+			data = '<div class="search-container">'+$('.subpages .search-container').html()+'</div>'
+			_pages.renderSearch _beathaven.localizeHTML $(data)
+			_beathaven.adjustSizes()
+			_beathaven.redrawScrollbar()
+	else
+		$('.pulldown').slideUp 'fast', ->
+			$('.pulldown').height 0
+			_beathaven.adjustSizes()
+			_beathaven.redrawScrollbar()
 	false
-$('#search_form').live 'submit', ->
+$('.search_form').live 'submit', ->
 	$('.autocomplete-container').remove()
-	_ajax.loadArtistData $('#search_field').val()
+	_ajax.loadArtistData $('.search_field').first().val()
 	false
 $('.suggestions a').live 'click', ->
-	$('#search_field').val $(this).text()
+	$('.search_field').first().val $(this).text()
 	false
 $('.data.artist').live 'click', ->
 	_ajax.go('/artist/'+$(this).text().replace(' ', '+')+'/');

app/controllers/artist_controller.rb

@@ -82,7 +82,7 @@ class ArtistController < ApplicationController
     end
 		render :json => {
 			:query => params[:query],
-			:suggestions => suggestions.take(10)
+			:suggestions => suggestions.take(5)
 		}
 	end
 	

app/views/layouts/application.html.erb

@@ -5,10 +5,9 @@
 		<meta charset="utf-8"/>
 		<link rel="shortcut icon" href="/favicon.ico" />
 		<link rel="stylesheet" type="text/css" media="screen" href="/stylesheets/beathaven.css" />
-		<%= javascript_include_tag "jquery/jquery.min.js", :type => "text/javascript", :charset => "utf-8"  %>
-		<%= javascript_include_tag "jquery/jquery-ui/js/jquery-ui-1.8.13.custom.min.js", :type => "text/javascript", :charset => "utf-8"  %>
+		<%= javascript_include_tag "http://code.jquery.com/jquery.min.js", :type => "text/javascript", :charset => "utf-8"  %>
+		<%= javascript_include_tag "http://code.jquery.com/ui/1.8.14/jquery-ui.min.js", :type => "text/javascript", :charset => "utf-8"  %>
 		<%= javascript_include_tag "jquery/jquery.autocomplete.js", :type => "text/javascript", :charset => "utf-8"  %>
-		<%= javascript_include_tag "jquery/jquery.contentchange.js", :type => "text/javascript", :charset => "utf-8"  %>
 		<%= javascript_include_tag "jquery/jquery.jplayer.js", :type => "text/javascript", :charset => "utf-8"  %>
 		<%= javascript_include_tag "jquery/jquery.scroll.js", :type => "text/javascript", :charset => "utf-8"  %>
 		<%= javascript_include_tag "coffee/beathaven.js", :type => "text/javascript", :charset => "utf-8" %>
@@ -22,9 +21,6 @@
 		<%= javascript_include_tag "coffee/settings.js", :type => "text/javascript", :charset => "utf-8" %>
 	</head>
 	<body>
-		
-		<%= yield %>
-		
 		<div class="player-container">
 			<div class="player">
 				<div id="jplayer"></div>
@@ -62,13 +58,14 @@
 				<div class="settings settings-button"></div>
 			</div>
 			<ul class="navigation">
-				<li class="logo search">BeatHaven<div class="version">0.4b</div></li>
-				<li class="search" data-ls="SEARCH"></li>
+				<li class="logo search">BeatHaven<div class="version">0.5b</div></li>
+				<li class="search"><a class="a" data-ls="SEARCH"></a></li>
 				<li><a href="http://blog.beathaven.org/" target="_blank" data-ls="NEWS"></a></li>
-				<li class="about" data-ls="ABOUT"></li>
-				<li class="vk_auth" id="vk_login" data-ls="LOGIN"></li>
+				<li class="about"><a class="a" data-ls="ABOUT"></a></li>
+				<li class="vk_auth" id="vk_login"><a class="a" data-ls="LOGIN"></a></li>
 			</ul>
 		</div>
+		<div class="pulldown"></div>
 		<div class="data-container" class="css-scrollbar">
 			<div class="inner"></div>
 		</div>
@@ -83,6 +80,22 @@
 				<img src="/images/loader.gif" alt=""/>
 			</div>
 		</div>
+		<div class="subpages">
+			<div class="search-container">
+				<form action="" method="post" class="search_form">
+					<input type="text" class="search_field"/>
+					<input type="submit" value="" class="search_button button gray big" data-ls="SEARCH"/>
+				</form>
+				<img class="spinner" src="/images/loader.gif" alt=""/>
+				<div class="artist_loading failed" data-ls="ARTIST_LOADING_FAILED"></div>
+				<div class="artist_loading ok" data-ls="ARTIST_LOADING_IN_PROCESS"></div>
+				<div class="artist_pics"></div>
+				<div class="suggestions">
+					<div data-ls="MISSPELLED"></div>
+					<ul></ul>
+				</div>
+			</div>
+		</div>
 		
 		<!-- 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>