localhots/oldhaven
1
0
Fork 0
Code Releases Activity

jQuery from CDN, work on search

Browse Source
This commit is contained in:
magnolia-fan
2011-07-04 19:09:44 +04:00
parent f92693d847
commit 495d0a08df
24 changed files with 235 additions and 924 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/views/layouts/application.html.erb
+23 -10
View File
@@ -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>