diff --git a/public/demo/404.html b/public/demo/404.html deleted file mode 100644 index 6c3363d..0000000 --- a/public/demo/404.html +++ /dev/null @@ -1,4 +0,0 @@ -
-

404

- Failed while searching?
Wait for autocomplete, it might help.
How about one more try? -
\ No newline at end of file diff --git a/public/demo/index.html b/public/demo/index.html deleted file mode 100644 index 70fd908..0000000 --- a/public/demo/index.html +++ /dev/null @@ -1,71 +0,0 @@ - - - - BetaHaven - - - - - - - - - - - - - - - - - - - - - - -
-
-
-
Add some music to playlist
-
-
-
-
-
-
- -
-
- -
-
-
- -
-
- - - -
-
- -
- - - -
-
-
- - -
-
↑
Don't forget to log in, please. It's simple.
- - diff --git a/public/images/black_knight.jpg b/public/images/black_knight.jpg deleted file mode 100644 index 1322219..0000000 Binary files a/public/images/black_knight.jpg and /dev/null differ diff --git a/public/index.html b/public/index.html index ab1aaaa..cc8b93d 100644 --- a/public/index.html +++ b/public/index.html @@ -1,24 +1,73 @@ - BeatHaven - + BetaHaven + + + + + + + + + + + + + + + + + + -
-

None shall pass!

- Cumming soon (: + + +
+
+
+
Add some music to playlist
+
+
+
+
+
+
+ +
+
+ +
+
+
+
    +
    + + + +
    +
    + +
    + + + +
    +
    +
    + + +
    +
    ↑
    Don't forget to log in, please. It's simple.
    + +
    diff --git a/public/javascripts/beathaven/ajax.js b/public/javascripts/beathaven/ajax.js index 988ae07..84d294f 100644 --- a/public/javascripts/beathaven/ajax.js +++ b/public/javascripts/beathaven/ajax.js @@ -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({ @@ -62,6 +67,10 @@ var Ajax = { getAnchor: function() { return window.location.hash.substring(1); }, + + setTitle: function(title) { + document.title = title +' @ BeatHaven'; + }, detectPage: function() { if (m = Ajax.getAnchor().match(/\/artist\/(.+)\//)) { diff --git a/public/javascripts/beathaven/layout.js b/public/javascripts/beathaven/layout.js index f922525..ab79748 100644 --- a/public/javascripts/beathaven/layout.js +++ b/public/javascripts/beathaven/layout.js @@ -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) diff --git a/public/demo/search.html b/public/search.html similarity index 100% rename from public/demo/search.html rename to public/search.html diff --git a/public/demo/whee.html b/public/whee.html similarity index 100% rename from public/demo/whee.html rename to public/whee.html