Move email above username field.

Update user.ascx to change order of fields for user registration (#3204)

Author: thabaum

Website/controls/user.ascx

@@ -3,9 +3,9 @@
 <%@ Register TagPrefix="dnn" TagName="label" Src="~/controls/labelControl.ascx" %>
 <table cellSpacing="0" cellPadding="1" border="0" summary="User Design Table">
 	<tr>
-		<td class="SubHead" width="175">
+	    <td class="SubHead" width="175">
 			<dnn:label id="plFirstName" runat="server" controlname="txtFirstName" text="First Name:"></dnn:label></td>
-		<td class="NormalBold" noWrap>
+	    <td class="NormalBold" noWrap>
 			<asp:textbox id="txtFirstName" tabIndex="1" runat="server" cssclass="NormalTextBox" size="25"
 				maxlength="50"></asp:textbox>&nbsp;*
 			<asp:requiredfieldvalidator id="valFirstName" runat="server" cssclass="NormalRed" display="Dynamic" errormessage="<br>First Name Is Required."
@@ -20,6 +20,16 @@
 			<asp:requiredfieldvalidator id="valLastName" runat="server" cssclass="NormalRed" display="Dynamic" errormessage="<br>Last Name Is Required."
 				controltovalidate="txtLastName" resourcekey="valLastName"></asp:requiredfieldvalidator></td>
 	</tr>
+        <tr>
+	    <td class="SubHead" width="175">
+			<dnn:label id="plEmail" runat="server" controlname="txtEmail" text="Email Address:"></dnn:label></td>
+		<td class="NormalBold" noWrap>
+			<asp:textbox id="txtEmail" tabIndex="6" runat="server" cssclass="NormalTextBox" size="25" maxlength="175"></asp:textbox>&nbsp;*
+			<asp:requiredfieldvalidator id="valEmail1" runat="server" cssclass="NormalRed" display="Dynamic" errormessage="<br>Email Is Required."
+				controltovalidate="txtEmail" resourcekey="valEmail1"></asp:requiredfieldvalidator>
+			<asp:regularexpressionvalidator id="valEmail2" runat="server" cssclass="NormalRed" display="Dynamic" errormessage="<br>Email Must be Valid."
+				controltovalidate="txtEmail" resourcekey="valEmail2" validationexpression="[\w\.-]+(\+[\w-]*)?@([\w-]+\.)+[\w-]+"></asp:regularexpressionvalidator></td>
+	</tr>	
 	<tr>
 		<td class="SubHead" width="175">
 			<dnn:label id="plUserName" runat="server" controlname="txtUsername" text="User Name:"></dnn:label></td>
@@ -33,7 +43,7 @@
 	</tr>
 	<tr id="PasswordRow" runat="server">
 		<td class="SubHead" width="175">
-			<dnn:label id="plPassword" runat="server" controlname="txtPassword" text="Password:"></dnn:label></td>
+		    <dnn:label id="plPassword" runat="server" controlname="txtPassword" text="Password:"></dnn:label></td>
 		<td class="NormalBold" noWrap>
 			<asp:textbox id="txtPassword" tabIndex="4" runat="server" cssclass="NormalTextBox" size="25"
 				maxlength="20" textmode="Password"></asp:textbox>&nbsp;*
@@ -51,16 +61,6 @@
 			<asp:comparevalidator id="valConfirm2" runat="server" cssclass="NormalRed" display="Dynamic" errormessage="<br>Password Values Entered Do Not Match."
 				controltovalidate="txtConfirm" resourcekey="valConfirm2" controltocompare="txtPassword"></asp:comparevalidator></td>
 	</tr>
-	<tr>
-		<td class="SubHead" width="175">
-			<dnn:label id="plEmail" runat="server" controlname="txtEmail" text="Email Address:"></dnn:label></td>
-		<td class="NormalBold" noWrap>
-			<asp:textbox id="txtEmail" tabIndex="6" runat="server" cssclass="NormalTextBox" size="25" maxlength="175"></asp:textbox>&nbsp;*
-			<asp:requiredfieldvalidator id="valEmail1" runat="server" cssclass="NormalRed" display="Dynamic" errormessage="<br>Email Is Required."
-				controltovalidate="txtEmail" resourcekey="valEmail1"></asp:requiredfieldvalidator>
-			<asp:regularexpressionvalidator id="valEmail2" runat="server" cssclass="NormalRed" display="Dynamic" errormessage="<br>Email Must be Valid."
-				controltovalidate="txtEmail" resourcekey="valEmail2" validationexpression="[\w\.-]+(\+[\w-]*)?@([\w-]+\.)+[\w-]+"></asp:regularexpressionvalidator></td>
-	</tr>
 	<tr>
 		<td class="SubHead" width="175">
 			<dnn:label id="plWebsite" runat="server" controlname="txtWebsite" text="Website:"></dnn:label></td>