Skip to content

Move email above username field. #3204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 29, 2019
Merged

Move email above username field. #3204

Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e99400d
Update user.ascx
thabaum Oct 26, 2019
609d8dd
Update user.ascx
thabaum Oct 26, 2019
329d9db
Update user.ascx
thabaum Oct 26, 2019
9fe0b4e
Update user.ascx
thabaum Oct 28, 2019
a9d081c
Update user.ascx
thabaum Oct 28, 2019
4184038
Remove extra TR ending
david-poindexter Oct 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 15 additions & 14 deletions Website/controls/user.ascx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand All @@ -20,6 +20,17 @@
<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>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
</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>
Expand All @@ -30,10 +41,10 @@
<asp:label id="lblUsername" runat="server"></asp:label>
<asp:requiredfieldvalidator id="valUsername" runat="server" cssclass="NormalRed" display="Dynamic" errormessage="<br>Username Is Required."
controltovalidate="txtUsername" resourcekey="valUsername"></asp:requiredfieldvalidator></td>
</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;*
Expand All @@ -51,16 +62,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>
Expand Down