From e71173262c6f99b7a35322903e4ff8f0cb5e6de1 Mon Sep 17 00:00:00 2001
From: Philipp Becker <becker@peppertree-solutions.com>
Date: Tue, 24 Feb 2015 12:24:09 +0100
Subject: [PATCH] 
 https://github.com/DNN-Connect/UserAccountRegistration/issues/15

---
 Templates/Default/Form.txt | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/Templates/Default/Form.txt b/Templates/Default/Form.txt
index b3a8272..bb35c73 100644
--- a/Templates/Default/Form.txt
+++ b/Templates/Default/Form.txt
@@ -1,11 +1,11 @@
 <div id="ConnectRegisterForm" class="dnnForm dnnClear">
 
     <ul id="ConnectRegisterFormTabs" runat="Server" class="dnnAdminTabNav dnnClear">
-        <li><a href="#dvFormTemplate" class="connect_RegisterTabLink">[RESX:LOGIN:CreateAccountTab]</a></li>
-        <li><a href="#dvLoginTemplate" class="connect_LoginTabLink">[RESX:LOGIN:LoginTab]</a></li>
+        <li><a href="#Register" class="connect_RegisterTabLink">[RESX:LOGIN:CreateAccountTab]</a></li>
+        <li><a href="#Login" class="connect_LoginTabLink">[RESX:LOGIN:LoginTab]</a></li>
     </ul>
 
-	<div id="dvFormTemplate" class="connect_register">
+	<div id="Register" class="connect_register">
 		
 		<div class="dnnFormItem dnnClear">
 		  [DNNLBL:USER:Username:HideRequired]
@@ -49,7 +49,7 @@
 
 	</div>
 
-		<div id="dvLoginTemplate" class="connect_login">
+	<div id="Login" class="connect_login">
 
 
 		<div class="dnnFormItem dnnClear">
@@ -81,12 +81,27 @@
 (function ($, Sys) {
 
     function setupFormSettings() {
-        $('#ConnectRegisterForm').dnnTabs();
-		$('.connect_LoginTabLink').click(function () {
-			$('#dvLoginTemplate > input.dnnPrimaryAction').focus();
+        
+		$('#ConnectRegisterForm').dnnTabs();
+		
+		$('#Register > .dnnFormItem > input').keypress(function (e){
+			
+			 var key = e.which;
+			 if(key == 13) {
+				$('#Register > .dnnActions > li > .dnnPrimaryAction').click();
+				return false;
+			 }
+
 		});
-		$('.connect_RegisterTabLink').click(function () {
-			$('#dvFormTemplate > input.dnnPrimaryAction').focus();
+
+		$('#Login > .dnnFormItem > input').keypress(function (e){
+
+			var key = e.which;
+			if(key == 13) {
+				$('#Login > .dnnActions > li > .dnnPrimaryAction').click();
+				return false;
+			}
+
 		});
     }