localhots
/
oldhaven
1
0
Fork 0
Code Releases Activity

Bad local time fix, social buttons

This commit is contained in:
magnolia-fan 2011-11-28 03:13:14 +04:00
parent b55da886db
commit 4c40a928ab
6 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/application.js
View File

@ -14,3 +14,5 @@
//= require settings
//= require beathaven
//= require_tree ./social

7
app/assets/javascripts/social/facebook.js Normal file
View File

@ -0,0 +1,7 @@
(function(d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0];
if (d.getElementById(id)) {return;}
js = d.createElement(s); js.id = id;
js.src = "//connect.facebook.net/en_US/all.js#xfbml=1";
fjs.parentNode.insertBefore(js, fjs);
}(document, 'script', 'facebook-jssdk'));

7
app/assets/javascripts/vkontakte.coffee
View File

@ -1,6 +1,7 @@
class window.Vkontakte
api_id: null
session_length: 3600 # seconds
constructor: (@api_id) ->
@ -13,6 +14,7 @@ class window.Vkontakte
VK.init apiId: _vkontakte.getApiId()
_vkontakte.auth()
setTimeout ->
$('#vk_api_transport').append($('<script async="async" type="text/javascript" src="http://vkontakte.ru/js/api/openapi.js">'))
, 0
@ -49,7 +51,9 @@ class window.Vkontakte
$('.fullscreen').hide();
if response.session.expire?
expire_in = response.session.expire * 1000 - new Date().getTime()
# expire_in = response.session.expire * 1000 - new Date().getTime()
# the time is an illusion...
expire_in = @session_length * 1000
log "Session will expire in #{Math.round(expire_in / 1000)} seconds"
setTimeout ->
log "Session expired"
@ -78,6 +82,7 @@ $('#login').live 'click', ->
false
, 8
false
$('#logout').live 'click', ->
VK.Auth.logout (response) ->
_vkontakte.authInfo(response)

9
app/assets/stylesheets/misc.scss
View File

@ -41,3 +41,12 @@ table.stats {
color: inherit;
}
}
.fb-like, .vk-like {
float: left;
}
.vk-like td {
padding: 0 !important;
line-height: 12px;
}

4
app/views/application/_like.html.haml Normal file
View File

@ -0,0 +1,4 @@
.fb-like{ "data-href" => "http://facebook.com/BeatHavenHQ", "data-send" => "false", "data-layout" => "button_count", "data-width" => "100", "data-show-faces" => "false", "data-font" => "lucida grande" }
.vk-like
%script{ type: "text/javascript" }
document.write(VK.Share.button(false, {type: "round", text: "Нравится"}));

15
app/views/layouts/application.html.haml
View File

@ -8,10 +8,11 @@
%link{ rel: "shortcut icon", href: "/favicon.ico" }
%link{ rel: "apple-touch-icon", href: image_path("logo.png") }
%link{ rel: "search", type: "application/opensearchdescription+xml", title: "BeatHaven", href: "/opensearch.xml"}
= stylesheet_link_tag "application"
= javascript_include_tag "application"
= stylesheet_link_tag :application, cache: true
= javascript_include_tag :application, cache: true
= javascript_include_tag "http://vkontakte.ru/js/api/share.js", charset: "windows-1251"
%body
#fb-root
.topbar-wrapper
.topbar
.topbar-inner
@ -52,7 +53,6 @@
.row
.span11.columns#content
&nbsp;
.span5.columns
.ad_here= t('global.your_ad_here').html_safe
.player
@ -73,14 +73,11 @@
.quality-buttons
%a.q-good{ :title => t('player.thumbs_up') }= image_tag "icns/thumbs-up.png"
%a.q-bad{ :title => t('player.thumbs_down') }= image_tag "icns/thumbs-down.png"
%ul.playlist
.row
.span11= render "like"
.fullscreen
.inner
= image_tag "loader.gif"
#vk_api_transport
#jplayer