From 34695c716bda5a1ff77c608467eed6275d0ea261 Mon Sep 17 00:00:00 2001
From: Steven Miers <steven.miers@gmail.com>
Date: Tue, 4 Nov 2014 12:31:38 -0600
Subject: [PATCH] VRFS-1849 : Show google login link beside the "Upload to
 Youtube" link.

---
 web/app/assets/images/google_signin.png          | Bin 0 -> 3093 bytes
 .../dialogs/recordingFinishedDialog.css.scss     |   8 ++++++++
 .../dialogs/_recordingFinishedDialog.html.haml   |   7 +++++--
 web/app/views/shared/_google_login.html.slim     |   5 +++++
 4 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 web/app/assets/images/google_signin.png
 create mode 100644 web/app/views/shared/_google_login.html.slim

diff --git a/web/app/assets/images/google_signin.png b/web/app/assets/images/google_signin.png
new file mode 100644
index 0000000000000000000000000000000000000000..408190f1fcfa3655b55ac5bd62cf6121559b4765
GIT binary patch
literal 3093
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

literal 0
HcmV?d00001

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"