diff --git a/web/app/assets/images/google_signin.png b/web/app/assets/images/google_signin.png new file mode 100644 index 000000000..408190f1f Binary files /dev/null and b/web/app/assets/images/google_signin.png differ diff --git a/web/app/assets/stylesheets/dialogs/recordingFinishedDialog.css.scss b/web/app/assets/stylesheets/dialogs/recordingFinishedDialog.css.scss index 3eb894abe..3d6208565 100644 --- a/web/app/assets/stylesheets/dialogs/recordingFinishedDialog.css.scss +++ b/web/app/assets/stylesheets/dialogs/recordingFinishedDialog.css.scss @@ -40,5 +40,13 @@ } clear: left; } + + .google_login_button { + + } + + .signed_in_to_google { + color: yellow; + } } diff --git a/web/app/views/dialogs/_recordingFinishedDialog.html.haml b/web/app/views/dialogs/_recordingFinishedDialog.html.haml index ae4c58afa..07f493cb3 100644 --- a/web/app/views/dialogs/_recordingFinishedDialog.html.haml +++ b/web/app/views/dialogs/_recordingFinishedDialog.html.haml @@ -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 diff --git a/web/app/views/shared/_google_login.html.slim b/web/app/views/shared/_google_login.html.slim new file mode 100644 index 000000000..676749773 --- /dev/null +++ b/web/app/views/shared/_google_login.html.slim @@ -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"