1
0
Fork 0

Moved from demo to root

This commit is contained in:
magnolia-fan 2011-06-20 18:26:07 +04:00
parent a7b36e6d0e
commit e6b8ebfde0
8 changed files with 76 additions and 93 deletions

View File

@ -1,4 +0,0 @@
<div id="error_page">
<h1>404</h1>
<span>Failed while searching?<br/>Wait for autocomplete, it might help.<br/>How about <a href="" onclick="loadSearchPage();return(false);">one more try</a>?</span>
</div>

View File

@ -1,71 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<title>BetaHaven</title>
<meta charset="utf-8"/>
<link rel="stylesheet" type="text/css" media="screen" href="/stylesheets/layout.css" />
<link rel="stylesheet" type="text/css" media="screen" href="/stylesheets/search.css" />
<link rel="stylesheet" type="text/css" media="screen" href="/stylesheets/misc.css" />
<link rel="stylesheet" type="text/css" media="screen" href="/stylesheets/player.css" />
<link rel="stylesheet" type="text/css" media="screen" href="/stylesheets/albums.css" />
<script type="text/javascript" charset="utf-8" src="/javascripts/jquery/jquery.min.js"></script>
<script type="text/javascript" charset="utf-8" src="/javascripts/jquery/jquery.scroll.js"></script>
<script type="text/javascript" charset="utf-8" src="/javascripts/jquery/jquery.autocomplete.js"></script>
<script type="text/javascript" charset="utf-8" src="/javascripts/jquery/jquery.contentchange.js"></script>
<script type="text/javascript" charset="utf-8" src="/javascripts/beathaven/layout.js"></script>
<script type="text/javascript" charset="utf-8" src="/javascripts/beathaven/ajax.js"></script>
<script type="text/javascript" charset="utf-8" src="/javascripts/beathaven/search.js"></script>
<script type="text/javascript" charset="utf-8" src="/javascripts/beathaven/pages.js"></script>
<script type="text/javascript" charset="utf-8" src="/javascripts/beathaven/audio.js"></script>
<script type="text/javascript" charset="utf-8" src="/javascripts/beathaven/player.js"></script>
<script type="text/javascript" charset="utf-8" src="/javascripts/beathaven/vkontakte.js"></script>
<script type="text/javascript" charset="windows-1251" src="http://vkontakte.ru/js/api/openapi.js"></script>
</head>
<body>
<!-- START PLAYER -->
<div id="player-container">
<div id="player">
<div id="audiobox"></div>
<div class="now-playing">Add some music to playlist</div>
<div class="progress">
<div class="loaded">
<div class="played"></div>
</div>
</div>
<div class="controls">
<div class="prev"></div>
<div class="play"></div>
<div class="pause"></div>
<div class="next"></div>
</div>
</div>
<div id="playlist" class="css-scrollbar">
<ul class="playlist-tracks"></ul>
</div>
</div>
<!-- END PLAYER -->
<!-- START HEADER -->
<div id="header-container">
<div class="hello"></div>
<ul id="navigation">
<li class="logo search">BeatHaven</li>
<li class="search">Search</li>
<li><a href="https://twitter.com/#!/beat_haven" target="_blank">News</a></li>
<li class="vk_auth" id="vk_login">Login</li>
<li class="vk_auth" id="vk_logout">Logout</li>
</ul>
</div>
<!-- END HEADER -->
<!-- START DATA -->
<div id="data-container" class="css-scrollbar">
<div class="inner"></div>
</div>
<!-- END DATA -->
<div id="vk_api_transport"></div>
<div class="auth_notice"><div class="arrow">&uarr;</div>Don't forget to log in, please. It's simple.</div>
</body>
</html>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 55 KiB

View File

@ -1,24 +1,73 @@
<!DOCTYPE html>
<html>
<head>
<title>BeatHaven</title>
<style type="text/css" media="screen">
#whoaaa {
position: absolute;
top: 50%;
left: 50%;
width: 700px;
height: 350px;
margin: -300px 0 0 -350px;
text-align: center;
font: 36px Georgia;
}
</style>
<title>BetaHaven</title>
<meta charset="utf-8"/>
<link rel="stylesheet" type="text/css" media="screen" href="/stylesheets/layout.css" />
<link rel="stylesheet" type="text/css" media="screen" href="/stylesheets/search.css" />
<link rel="stylesheet" type="text/css" media="screen" href="/stylesheets/misc.css" />
<link rel="stylesheet" type="text/css" media="screen" href="/stylesheets/player.css" />
<link rel="stylesheet" type="text/css" media="screen" href="/stylesheets/albums.css" />
<script type="text/javascript" charset="utf-8" src="/javascripts/jquery/jquery.min.js"></script>
<script type="text/javascript" charset="utf-8" src="/javascripts/jquery/jquery.scroll.js"></script>
<script type="text/javascript" charset="utf-8" src="/javascripts/jquery/jquery.autocomplete.js"></script>
<script type="text/javascript" charset="utf-8" src="/javascripts/jquery/jquery.contentchange.js"></script>
<script type="text/javascript" charset="utf-8" src="/javascripts/beathaven/layout.js"></script>
<script type="text/javascript" charset="utf-8" src="/javascripts/beathaven/ajax.js"></script>
<script type="text/javascript" charset="utf-8" src="/javascripts/beathaven/search.js"></script>
<script type="text/javascript" charset="utf-8" src="/javascripts/beathaven/pages.js"></script>
<script type="text/javascript" charset="utf-8" src="/javascripts/beathaven/audio.js"></script>
<script type="text/javascript" charset="utf-8" src="/javascripts/beathaven/player.js"></script>
<script type="text/javascript" charset="utf-8" src="/javascripts/beathaven/vkontakte.js"></script>
<script type="text/javascript" charset="windows-1251" src="http://vkontakte.ru/js/api/openapi.js"></script>
</head>
<body>
<div id="whoaaa">
<h1>None shall pass!</h1>
<img src="/images/black_knight.jpg" alt="Cumming soon (:">
<!-- START PLAYER -->
<div id="player-container">
<div id="player">
<div id="audiobox"></div>
<div class="now-playing">Add some music to playlist</div>
<div class="progress">
<div class="loaded">
<div class="played"></div>
</div>
</div>
<div class="controls">
<div class="prev"></div>
<div class="play"></div>
<div class="pause"></div>
<div class="next"></div>
</div>
</div>
<div id="playlist" class="css-scrollbar">
<ul class="playlist-tracks"></ul>
</div>
</div>
<!-- END PLAYER -->
<!-- START HEADER -->
<div id="header-container">
<div class="hello"></div>
<ul id="navigation">
<li class="logo search">BeatHaven</li>
<li class="search">Search</li>
<li><a href="https://twitter.com/#!/beat_haven" target="_blank">News</a></li>
<li class="vk_auth" id="vk_login">Login</li>
<li class="vk_auth" id="vk_logout">Logout</li>
</ul>
</div>
<!-- END HEADER -->
<!-- START DATA -->
<div id="data-container" class="css-scrollbar">
<div class="inner"></div>
</div>
<!-- END DATA -->
<div id="vk_api_transport"></div>
<div class="auth_notice"><div class="arrow">&uarr;</div>Don't forget to log in, please. It's simple.</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><!-- /Yandex.Metrika counter -->
</body>
</html>

View File

@ -16,7 +16,10 @@ var Ajax = {
}
return false;
} else {
var display_name = name.split('+').join(' ');
yaCounter7596904.hit('/artist/'+ name +'/', display_name, Ajax.getAnchor());
Ajax.setArchor('/artist/'+ name +'/');
Ajax.setTitle(display_name);
Pages.renderArtist(data);
beathaven.redrawScrollbar();
}
@ -24,8 +27,10 @@ var Ajax = {
},
loadSearchPage: function() {
Ajax.setArchor('/search/');
$.get('/demo/search.html', function(data){
yaCounter7596904.hit('/search/', 'Artist Search', Ajax.getAnchor());
Ajax.setArchor('/search/');
Ajax.setTitle('Artist Search');
$('#data-container .inner').html(data);
beathaven.redrawScrollbar();
$('#search_field').autocomplete({
@ -63,6 +68,10 @@ var Ajax = {
return window.location.hash.substring(1);
},
setTitle: function(title) {
document.title = title +' @ BeatHaven';
},
detectPage: function() {
if (m = Ajax.getAnchor().match(/\/artist\/(.+)\//)) {
Ajax.loadArtistData(m[1]);

View File

@ -1,6 +1,6 @@
$(function(){
if (document.location.host != 'beathaven.org' && document.location.host != 'localhost') {
document.location.href = 'http://beathaven.org/demo/';
document.location.href = 'http://beathaven.org/'+ document.location.hash;
}
beathaven.init();
$(window).resize(beathaven.adjustSizes)