Init spinner

app/coffeescripts/beathaven.coffee

@@ -44,8 +44,6 @@ class BeatHaven
 		_pages = new Pages()
 		
 		_settings = new Settings()
-		
-		_ajax.detectPage()
 	
 	adjustSizes: ->
 		$('.data-container').height $(window).height() - $('.header-container').height()

app/coffeescripts/pages.coffee

@@ -80,7 +80,7 @@ class Pages
 		false
 	
 	renderSettings: (data) ->
-		unless _session.getUser().name?
+		unless _session.getUser().id?
 			_ajax.go('/search/')
 			return false
 		$('.data-container').css background: 'none'

app/coffeescripts/vkontakte.coffee

@@ -37,12 +37,18 @@ class Vkontakte
 							_session.setUser ar2.user
 							$('.header-container .hello .greating')
 								.html 'Tēnā koe, <span class="settings">' +(if _session.getUser().name then _session.getUser().name else '%username%')+ '</span>!'
+							window._session = _session
+							_ajax.detectPage()
+							$('.fullscreen').hide();
 				else
 					_session.setUser ar.user
 				
 				$('.header-container .hello').show()
 				$('.header-container .hello .greating')
 					.html 'Tēnā koe, <span class="settings">' +(if _session.getUser().name then _session.getUser().name else '%username%')+ '</span>!'
+				window._session = _session
+				_ajax.detectPage()
+				$('.fullscreen').hide();
 			
 			if response.session.expire?
 				setTimeout ->
@@ -54,10 +60,12 @@ class Vkontakte
 			_session.setUser {}
 			$('#vk_login, .auth_notice').css display: 'block'
 			$('.header-container .hello').hide()
-		window._session = _session
+			window._session = _session
+			_ajax.detectPage()
+			$('.fullscreen').hide();
 	
 	auth: ->
-		VK.Auth.login (response) ->
+		VK.Auth.getLoginStatus (response) ->
 			_vkontakte.authInfo(response)
 			false
 		, 8
@@ -121,7 +129,10 @@ class Vkontakte
 		false
 
 $('#vk_login').live 'click', ->
-	_vkontakte.auth()
+	VK.Auth.login (response) ->
+		_vkontakte.authInfo(response)
+		false
+	, 8
 	false
 $('#vk_logout').live 'click', ->
 	_ajax.go '/search/';

app/views/layouts/application.html.erb

@@ -74,6 +74,11 @@
 
 		<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>
+		<div class="fullscreen">
+			<div class="inner">
+				<img src="/images/loader.gif" alt=""/>
+			</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>