From 1944832c96f608d886b3c4c783bfbe3f13224454 Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Mon, 23 May 2016 14:49:24 -0500
Subject: [PATCH] VRFS-4112 login redirect on client/ signin

---
 web/app/assets/javascripts/user_dropdown.js | 22 +++++++++++++++------
 web/app/views/users/_user_dropdown.html.erb |  2 +-
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/web/app/assets/javascripts/user_dropdown.js b/web/app/assets/javascripts/user_dropdown.js
index 5264c0d3f..75e63671e 100644
--- a/web/app/assets/javascripts/user_dropdown.js
+++ b/web/app/assets/javascripts/user_dropdown.js
@@ -12,6 +12,7 @@
     var userMe = null;
     var invitationDialog = null;
     var nowYetShownGettingStarted = true;
+    var $dropdown = null;
 
     function menuHoverIn() {
       $('ul.shortcuts', this).show();
@@ -22,7 +23,7 @@
     }
 
     function events() {
-      $('.userinfo').hoverIntent({
+      $dropdown.hoverIntent({
         over: function () {
           $('ul.shortcuts', this).fadeIn(100);
         },
@@ -32,25 +33,33 @@
         timeout: 500
       });
 
-      $('.userinfo .invite-friends .menuheader').on('click', function (e) {
+      $dropdown.find('.real-signin').on('click', function(e) {
+        e.stopPropagation()
+
+        window.location.href ="/signin?redirect-to=" + encodeURIComponent(window.location.href)
+
+        return false;
+      })
+
+      $dropdown.find('.invite-friends .menuheader').on('click', function (e) {
         $(this).closest('li').css('height', 'auto').find('ul').toggle();
         e.stopPropagation();
         return false;
       });
 
-      $('.invite-friends .google-invite a').on('click', function (e) {
+      $dropdown.find('.invite-friends .google-invite a').on('click', function (e) {
         invitationDialog.showGoogleDialog();
       });
 
-      $('.invite-friends .email-invite a').on('click', function (e) {
+      $dropdown.find('.invite-friends .email-invite a').on('click', function (e) {
         invitationDialog.showEmailDialog();
       });
 
-      $('.invite-friends .facebook-invite a').on('click', function (e) {
+      $dropdown.find('.invite-friends .facebook-invite a').on('click', function (e) {
         invitationDialog.showFacebookDialog(e);
       });
 
-      $('.shortcuts .test-network').on('click', function(e) {
+      $dropdown.find('.shortcuts .test-network').on('click', function(e) {
         app.layout.showDialog('network-test');
         return false;
       });
@@ -108,6 +117,7 @@
     }
 
     this.initialize = function (invitationDialogInstance) {
+      $dropdown = $('#profile.userinfo');
       events();
       invitationDialog = invitationDialogInstance;
       loadMe();
diff --git a/web/app/views/users/_user_dropdown.html.erb b/web/app/views/users/_user_dropdown.html.erb
index 40d20c8e7..c32e894a0 100644
--- a/web/app/views/users/_user_dropdown.html.erb
+++ b/web/app/views/users/_user_dropdown.html.erb
@@ -21,7 +21,7 @@
 
 <!-- end profile area -->
 <% else %>
-      <div class="user"><a class="signin" href="/signup">Sign Up</a>&nbsp;or&nbsp;<a class="signin" href="/signin">Sign In</a></div>
+      <div class="user"><a class="signin" href="/signup">Sign Up</a>&nbsp;or&nbsp;<a class="signin real-signin" href="/signin">Sign In</a></div>
 <% end %>
 
 <!-- avatar -->