1
0
Fork 0

Misc links fixes

This commit is contained in:
Gregory Eremin 2011-09-19 12:21:03 +04:00
parent 3cd6c111bd
commit 215c00a1a8
6 changed files with 11 additions and 5 deletions

View File

@ -34,7 +34,7 @@ class window.Ajax
detectPage: () -> detectPage: () ->
if m = _ajax.getAnchor().match /\/artist\/(.+)\// if m = _ajax.getAnchor().match /\/artist\/(.+)\//
_search.loadArtistData m[1] _search.loadArtistData m[1]
else if _ajax.getAnchor() == '' else if _ajax.getAnchor().match /\//
_ajax.loadIndexPage(); _ajax.loadIndexPage();
else if _ajax.getAnchor().match /\/settings\// else if _ajax.getAnchor().match /\/settings\//
_settings.loadSettingsPage() _settings.loadSettingsPage()

View File

@ -29,6 +29,9 @@ class window.Page
false false
$ -> $ ->
$('#logo').live 'click', ->
_ajax.go '/'
false
$('.about').live 'click', -> $('.about').live 'click', ->
_ajax.go '/about/' _ajax.go '/about/'
false false

View File

@ -19,8 +19,10 @@ class window.Search
if data.status in ['ok', 'loading'] if data.status in ['ok', 'loading']
_ajax.setArchor '/artist/' +name+ '/' _ajax.setArchor '/artist/' +name+ '/'
_page.print data.html _page.print data.html
if _session.getUser().id
for album in data.albums for album in data.albums
_player.albums[album.id] = album _player.albums[album.id] = album
$('.button-container').show()
_search.hideSpinner() _search.hideSpinner()
if data.status is 'loading' if data.status is 'loading'
setTimeout () -> setTimeout () ->

View File

@ -132,8 +132,8 @@ $('#login').live 'click', ->
, 8 , 8
false false
$('#logout').live 'click', -> $('#logout').live 'click', ->
_ajax.go '/search/';
VK.Auth.logout (response) -> VK.Auth.logout (response) ->
_vkontakte.authInfo(response) _vkontakte.authInfo(response)
$('.button-container').hide()
false false
false false

View File

@ -19,6 +19,7 @@
max-width: 220px; max-width: 220px;
} }
.button-container { .button-container {
display: none;
text-align: center; text-align: center;
margin-top: 10px; margin-top: 10px;
} }

View File

@ -15,7 +15,7 @@
.topbar-inner .topbar-inner
.container .container
%h3 %h3
%a{ :href => "#/" } BeatHaven %a#logo{ :href => "#/" } BeatHaven
%ul.nav %ul.nav
%li %li
%a{ :href => "http://blog.beathaven.org/" }= I18n.t 'global.news' %a{ :href => "http://blog.beathaven.org/" }= I18n.t 'global.news'