Studio login/registration redirects to LMS

cms/templates/widgets/header.html

@@ -229,6 +229,10 @@
       </nav>
 
     % else:
+      <%
+        login_url = settings.LMS_ROOT_URL + '/login'
+        register_url = settings.LMS_ROOT_URL + '/register'
+      %>
       <nav class="nav-not-signedin nav-pitch" aria-label="${_('Account')}">
         <h2 class="sr-only">${_("Account Navigation")}</h2>
         <ol>
@@ -237,11 +241,11 @@
           </li>
           % if static.get_value('ALLOW_PUBLIC_ACCOUNT_CREATION', settings.FEATURES.get('ALLOW_PUBLIC_ACCOUNT_CREATION')):
               <li class="nav-item nav-not-signedin-signup">
-                <a class="action action-signup" href="${reverse('signup')}">${_("Sign Up")}</a>
+                <a class="action action-signup" href="${register_url}?next=${current_url}">${_("Sign Up")}</a>
               </li>
           % endif
           <li class="nav-item nav-not-signedin-signin">
-            <a class="action action-signin" href="${reverse('login')}">${_("Sign In")}</a>
+            <a class="action action-signin" href="${login_url}?next=${current_url}">${_("Sign In")}</a>
           </li>
         </ol>
       </nav>

cms/templates/widgets/user_dropdown.html

@@ -39,7 +39,9 @@
     </span>
     <span class="icon fa fa-caret-down ui-toggle-dd" aria-hidden="true"></span>
   </h3>
-
+  <%
+    logout_url = settings.LMS_ROOT_URL + '/logout'
+  %>
   <div class="wrapper wrapper-nav-sub">
     <div class="nav-sub">
       <ul>
@@ -52,7 +54,7 @@
         </li>
         % endif
         <li class="nav-item nav-account-signout">
-          <a class="action action-signout" href="${reverse('logout')}">${_("Sign Out")}</a>
+          <a class="action action-signout" href="${logout_url}?next=${current_site_url}">${_("Sign Out")}</a>
         </li>
       </ul>
     </div>