Skip to content
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

Move Email Above Username in User.ascx #3305 #3306

Merged
merged 2 commits into from
Nov 17, 2019
Merged

Move Email Above Username in User.ascx #3305 #3306

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe015e1
Move Email Above Username in User.ascx
thabaum Nov 17, 2019
56e376c
Fixed tab index values in User.ascx
thabaum Nov 17, 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
26 changes: 13 additions & 13 deletions DNN Platform/Website/controls/user.ascx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,22 @@
maxlength="50"></asp:textbox>&nbsp;*
<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="3" 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>
<td class="NormalBold" noWrap>
<asp:textbox id="txtUsername" tabIndex="3" runat="server" cssclass="NormalTextBox" size="25"
<asp:textbox id="txtUsername" tabIndex="4" runat="server" cssclass="NormalTextBox" size="25"
maxlength="175"></asp:textbox>
<asp:label id="lblUsernameAsterisk" runat="server">*</asp:label>
<asp:label id="lblUsername" runat="server"></asp:label>
Expand All @@ -35,7 +45,7 @@
<td class="SubHead" width="175">
<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"
<asp:textbox id="txtPassword" tabIndex="5" runat="server" cssclass="NormalTextBox" size="25"
maxlength="20" textmode="Password"></asp:textbox>&nbsp;*
<asp:requiredfieldvalidator id="valPassword" runat="server" cssclass="NormalRed" display="Dynamic" errormessage="<br>Password Is Required."
controltovalidate="txtPassword" resourcekey="valPassword"></asp:requiredfieldvalidator></td>
Expand All @@ -44,23 +54,13 @@
<td class="SubHead" width="175">
<dnn:label id="plConfirm" runat="server" controlname="txtConfirm" text="Confirm:"></dnn:label></td>
<td class="NormalBold" noWrap>
<asp:textbox id="txtConfirm" tabIndex="5" runat="server" cssclass="NormalTextBox" size="25" maxlength="20"
<asp:textbox id="txtConfirm" tabIndex="6" runat="server" cssclass="NormalTextBox" size="25" maxlength="20"
textmode="Password"></asp:textbox>&nbsp;*
<asp:requiredfieldvalidator id="valConfirm1" runat="server" cssclass="NormalRed" display="Dynamic" errormessage="<br>Password Confirmation Is Required."
controltovalidate="txtConfirm" resourcekey="valConfirm1"></asp:requiredfieldvalidator>
<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