VRFS-1849 : Show google login link beside the "Upload to Youtube" link.

This commit is contained in:
Steven Miers 2014-11-04 12:31:38 -06:00
parent df9352d608
commit 34695c716b
4 changed files with 18 additions and 2 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

View File

@ -40,5 +40,13 @@
}
clear: left;
}
.google_login_button {
}
.signed_in_to_google {
color: yellow;
}
}

View File

@ -27,8 +27,11 @@
%input{:checked => "checked", :name => "save_video", :type => "checkbox"}/
%label{:for => "save_video"} Save Video to Computer
.field.left{:purpose => "upload_to_youtube"}
%input{:checked => "checked", :name => "upload_to_youtube", :type => "checkbox"}/
%label{:for => "upload_to_youtube"} Upload Video to YouTube
%span
%input{:checked => "checked", :name => "upload_to_youtube", :type => "checkbox"}/
%label{:for => "upload_to_youtube"} Upload Video to YouTube
%span
= render(:partial => "shared/google_login")
.field.left{:purpose => "is_public"}
%input{:checked => "checked", :name => "is_public", :type => "checkbox"}/
%label{:for => "is_public"} Public Recording

View File

@ -0,0 +1,5 @@
-google_auth = JamRuby::UserAuthorization.google_auth(current_user).first
-if google_auth
span.signed_in_to_google="(Signed in)"
-else
input.google_login_button type='image' onclick='window._oauth_win = window.open("/auth/google_login", "_blank", "height=500,width=500,menubar=no,resizable=no,status=no");' src="../assets/google_signin.png" height="30px"