Änderungen email #2

This commit is contained in:
ja
2021-11-19 09:33:54 +01:00
parent e030a3b1ea
commit dbd2aeb59a
3 changed files with 30 additions and 31 deletions

View File

@@ -246,7 +246,7 @@
<tr style="color:#003680;height:56.67px;">
<td colspan="4">
<asp:TextBox id="txt_Pw" CssClass="bg-key-icon" runat="server" TextMode="Password" Width="250px" Font-Names="Verdana" OnTextChanged="txt_Pw_TextChanged" AutoCompleteType="Disabled" style="margin-left:40px;color:#003680;border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;" OnClick="this.value='';" Placeholder="Enter Password"></asp:TextBox>
<asp:TextBox id="txt_Pw" CssClass="bg-key-icon" runat="server" TextMode="Password" Width="250px" Font-Names="Verdana" OnTextChanged="txt_Pw_TextChanged" AutoCompleteType="Disabled" style="margin-left:30px;color:#003680;border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;" OnClick="this.value='';" Placeholder="Enter Password"></asp:TextBox>
<span></span>
</td>
</tr>
@@ -258,7 +258,7 @@
<tr style="color:#003680;height:56.67px;">
<td>
<asp:TextBox id="txt_Pw_WH" CssClass="bg-key-icon" Width="250px" OnTextChanged="txt_Pw_WH_TextChanged" runat="server" TextMode="Password" Font-Names="Verdana" AutoCompleteType="Disabled" style="margin-left:40px;color:#003680;border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;" OnClick="this.value='';" Placeholder="Repeat Password"></asp:TextBox>
<asp:TextBox id="txt_Pw_WH" CssClass="bg-key-icon" Width="250px" OnTextChanged="txt_Pw_WH_TextChanged" runat="server" TextMode="Password" Font-Names="Verdana" AutoCompleteType="Disabled" style="margin-left:30px;color:#003680;border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;" OnClick="this.value='';" Placeholder="Repeat Password"></asp:TextBox>
<span></span>
</td>
</tr>
@@ -269,7 +269,7 @@
</tr>
<tr style="color:#003680;height:35.67px;">
<td>
<asp:Button ID="btn_submitpw" runat="server" OnClick="btn_submitpw_Click" Text="Change password" Width="250px" style="margin-left:19px;margin-right:auto;border:none"/>
<asp:Button ID="btn_submitpw" runat="server" OnClick="btn_submitpw_Click" Text="Change password" Width="250px" style="margin-left:28px;margin-right:auto;border:none"/>
</td>
</tr>
<tr style="color:#003680;height:30px;">
@@ -292,7 +292,7 @@
<table id="tbl_main_M" cellpadding="0" style="margin: 10px 4px 1px 2px;border:none;height:50px">
<tr style="color:#003680;height:25px;margin-left:105px">
<td>
<asp:Label ID="lbl_Ueberschrift_M" runat="server" Text="Password-Change:" style="color:#003681;background-color:none;font-size:26px" Font-Bold="true"></asp:Label>
<asp:Label ID="lbl_Ueberschrift_M" runat="server" Text="Password-Change:" style="color:#003681;background-color:none;font-size:26px;margin-left:30px" Font-Bold="true"></asp:Label>
</td>
</tr>
<tr style="border:2px solid #003680; width:320px; margin:4px auto 4px auto;background-color:rgba(255,255,255,0.5)">
@@ -300,24 +300,24 @@
<table>
<tr>
<td>
<asp:Image ID="Image1" runat="server" ImageUrl="~/images/Icons/service/hilfe.png" Height="17px" Width="15px" style="margin-left:18px"/>
<asp:Image ID="Image1" runat="server" ImageUrl="~/images/Icons/service/hilfe.png" Height="17px" Width="15px" style="margin-left:280px"/>
</td>
</tr>
<tr>
<td>
<asp:Label ID="Label1" runat="server" style="color:#003680;">The Password has to contain:</asp:Label>
<asp:Label ID="Label1" runat="server" style="color:#003680;margin-left:32px">The Password has to contain:</asp:Label>
</td>
</tr>
</table>
<ul style="list-style:circle">
<li>
<asp:Label ID="Label3" runat="server" style="color:#003680;margin-left:22px">1 Upper- and 1 lowercase letter</asp:Label>
<asp:Label ID="Label3" runat="server" style="color:#003680;margin-left:32px">1 Upper- and 1 lowercase letter</asp:Label>
</li>
<li>
<asp:Label ID="Label4" runat="server" style="color:#003680;margin-left:22px">and one special letter</asp:Label>
<asp:Label ID="Label4" runat="server" style="color:#003680;margin-left:32px">and one special letter</asp:Label>
</li>
<li>
<asp:Label ID="Label5" runat="server" style="color:#003680;margin-left:22px;margin-right:0px">between 4 and 30 characters.</asp:Label>
<asp:Label ID="Label5" runat="server" style="color:#003680;margin-left:32px;margin-right:0px">between 4 and 30 characters.</asp:Label>
</li>
</ul>
</td>
@@ -325,7 +325,7 @@
</tr>
<tr style="color:#003680;height:46.67px;">
<td>
<asp:TextBox id="txt_Pw_M" CssClass="bg-key-icon" runat="server" Font-Size="1.125em" ValidationGroup="TXT_val_M" TextMode="Password" Width="245px" Font-Names="Verdana" OnTextChanged="txt_Pw_M_TextChanged" AutoCompleteType="Disabled" style="margin-left:30px;color:#003680;border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;" Placeholder="Enter Password"></asp:TextBox>
<asp:TextBox id="txt_Pw_M" CssClass="bg-key-icon" runat="server" Font-Size="1.125em" ValidationGroup="TXT_val_M" TextMode="Password" Width="245px" Font-Names="Verdana" OnTextChanged="txt_Pw_M_TextChanged" AutoCompleteType="Disabled" style="margin-left:30px;margin-top:20px;color:#003680;border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;" Placeholder="Enter Password"></asp:TextBox>
<span></span></td>
</tr>

View File

@@ -87,7 +87,7 @@
width: 390px;
height: 613px;
margin: 0 auto;
margin-top: 50%;
margin-top: 25%;
margin-left: 5%;
}
.container-fluid {
@@ -105,8 +105,7 @@
font-size: 11px;
border: 1px solid gray;
width: 395px;
height: 713px;
height: 713px;
}
#lbl_Ueberschrift_M {
background-color: #003680;
@@ -350,7 +349,7 @@
</div>
<!--Smartphone-Bildschirme-->
<div class="d-md-none">
<table id="tbl_main_M" cellpadding="0" style="margin:40% 50% 50% 4px; border: none;">
<table id="tbl_main_M" cellpadding="0" style="margin:0% 50% 50% 4px; border: none;">
<tr style="color:#003680;height:65px;margin-top:-70px">
<td>
<asp:Button ID="btn_Back_M" runat="server" Text="Back" OnClick="btn_Back_Click" Height="37px"/>
@@ -367,7 +366,7 @@
</tr>
<tr style="color:#003680;height:40px;">
<td align="left" colspan="2">
<asp:TextBox ID="txt_CustomerID_M" CssClass="bg-UID-icon" runat="server" required="true" ValidationGroup="val-mobil" Width="325" Placeholder="Customer-ID" Font-Size="2.025em" style="margin:0 21px auto 22px;border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;"></asp:TextBox>
<asp:TextBox ID="txt_CustomerID_M" CssClass="bg-UID-icon" runat="server" ValidationGroup="val-mobil" Width="325" Placeholder="Customer-ID" Font-Size="2.025em" style="margin:0 21px auto 22px;border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;"></asp:TextBox>
<asp:RequiredFieldValidator ID="CustomerID_M_required" runat="server" ControlToValidate="txt_CustomerID_M" SetFocusOnError="true" ForeColor="Red" Font-Size="24px" style="margin-left:22px;" ValidationGroup="val-mobil" ErrorMessage="Die Kundenummer muss angegeben werden!"></asp:RequiredFieldValidator>
</td></tr>
<tr style="color:#003680; height:40px;">

View File

@@ -61,18 +61,18 @@ Partial Class ForgotPW
If regexval_txt_Email.IsValid = False Then
regexval_txt_Email.ForeColor = Drawing.Color.OrangeRed
VERAG_VARIABLES.seterrorcount(2)
regexval_txt_Email.ErrorMessage = VERAG_VARIABLES.geterrornumb + "Anmerkung: Die Domäne ist nicht die korrekt hinterlegte."
regexval_txt_Email.ErrorMessage = VERAG_VARIABLES.geterrornumb + "Annotation: The Domain is not valid!"
regexval_txt_Email_2.Validate()
If regexval_txt_Email_2.IsValid = True Then
email = txtEmail.Text
lblMessage.ForeColor = Drawing.Color.Lime
lblMessage.Text = "E-mail Addresse ist validiert.."
lblMessage.Text = "E-mail Adresse is valid.."
End If
Else
regexval_txt_Email.Validate()
If regexval_txt_Email.IsValid = True Then
lblMessage.ForeColor = Drawing.Color.Lime
lblMessage.Text = "E-mail Adresse ist korrekt."
lblMessage.Text = "E-mail Address is correct."
email = txtEmail.Text
End If
End If
@@ -86,7 +86,7 @@ Partial Class ForgotPW
Else
valid_getNumberInput.ForeColor = Drawing.Color.Red
VERAG_VARIABLES.seterrorcount(2)
valid_getNumberInput.ErrorMessage = VERAG_VARIABLES.geterrornumb + "Die Kundennummer ist nicht numerisch oder zu lang."
valid_getNumberInput.ErrorMessage = VERAG_VARIABLES.geterrornumb + "The Customer-ID is not numeric or too long."
End If
End If
@@ -96,20 +96,20 @@ Partial Class ForgotPW
If check_UserName_regex.IsValid = False Then
check_UserName_regex.ForeColor = Drawing.Color.Red
VERAG_VARIABLES.seterrorcount(3)
check_UserName_regex.ErrorMessage = VERAG_VARIABLES.geterrornumb + "Der Benutzername ist zu lange."
check_UserName_regex.ErrorMessage = VERAG_VARIABLES.geterrornumb + "Username is too long."
isusrnmright = False
Else
username = txt_Username.Text
isusrnmright = True
check_UserName_regex.ForeColor = Drawing.Color.Lime
check_UserName_regex.ErrorMessage = "Ein korrekter Benutzername ist eingegeben worden."
check_UserName_regex.ForeColor = Drawing.Color.Green
check_UserName_regex.ErrorMessage = "Username is not right."
End If
End If
Else
'MsgBox("The form has not been filled completeley.", MsgBoxStyle.Critical, "Error08")
lblMessage.ForeColor = Color.Red
VERAG_VARIABLES.seterrorcount(8)
lblMessage.Text = VERAG_VARIABLES.geterrornumb + "Das Formular muss vollständig ausgefüllt werden."
lblMessage.Text = VERAG_VARIABLES.geterrornumb + "This Form has to be filled completely."
End If
'Erweiterte Degub Msg-Box
@@ -150,7 +150,7 @@ Partial Class ForgotPW
ElseIf String.IsNullOrEmpty(txt_Username.Text) = True Then
check_UserName_regex.MatchTimeout = 3000
VERAG_VARIABLES.seterrorcount(5)
check_UserName_regex.ErrorMessage = VERAG_VARIABLES.geterrornumb + "Kein passender Benutzername wurde in der Datenbank gefunden!"
check_UserName_regex.ErrorMessage = VERAG_VARIABLES.geterrornumb + "No Username was !"
isusrnmright = False
Try
check_UserName_regex.Validate()
@@ -162,17 +162,17 @@ Partial Class ForgotPW
email = txtEmail.Text
lblMessage.ForeColor = Color.Green
isemailright = True
lblMessage.Text = "Die Email besteht in der Datenbank."
lblMessage.Text = "This email is from you!"
ElseIf String.IsNullOrEmpty(email) = True Then
lblMessage.ForeColor = Color.Red
isemailright = False
VERAG_VARIABLES.seterrorcount(6)
lblMessage.Text = VERAG_VARIABLES.geterrornumb + "Die eingegebene E-Mail passt nicht zum Datenbankeintrag. Bitte erneut versuchen."
lblMessage.Text = VERAG_VARIABLES.geterrornumb + "The e-mail does not match with the given User."
Else
lblMessage_M.ForeColor = Color.Red
isemailright = False
VERAG_VARIABLES.seterrorcount(7)
lblMessage.Text = VERAG_VARIABLES.geterrornumb + "Die E-Mail existiert in unserer Datenbank nicht."
lblMessage.Text = VERAG_VARIABLES.geterrornumb + "This e-mail address does not exist."
End If
If (txt_CustomerID.Text = dr("KundenNr").ToString() AndAlso String.IsNullOrEmpty(txt_CustomerID_M.Text) = True) And String.IsNullOrEmpty(UserID) = False Then
customerID = txt_CustomerID.Text
@@ -182,16 +182,16 @@ Partial Class ForgotPW
lblMessage_M.ForeColor = Color.Red
isCustomeridright = False
VERAG_VARIABLES.seterrorcount(9)
lblMessage.Text = VERAG_VARIABLES.geterrornumb + "Die einegebene Nutzernummer steht nicht in unserer Datenbank."
lblMessage.Text = VERAG_VARIABLES.geterrornumb + "The Customer-ID you entered is wrong."
Else
lblMessage.ForeColor = Color.Red
isCustomeridright = False
VERAG_VARIABLES.seterrorcount(8)
lblMessage.Text = VERAG_VARIABLES.geterrornumb + "Die Nutzernummer ist nicht in der Datenbank vorhanden."
lblMessage.Text = VERAG_VARIABLES.geterrornumb + "Not such a Customer-ID is known."
End If
Catch ex As Exception
VERAG_VARIABLES.seterrorcount(408)
Title = VERAG_VARIABLES.geterrornumb() + "Authentifizierungs-Fehler!"
Title = VERAG_VARIABLES.geterrornumb() + "Authentification-Error!"
'MsgBox(Msg, Style, Title)
'If MsgBox(Msg, Style, Title).Yes Then
'txtEmail.Text = String.Empty
@@ -256,7 +256,7 @@ Partial Class ForgotPW
Else
lblMessage.ForeColor = Drawing.Color.Red
VERAG_VARIABLES.seterrorcount(13)
lblMessage.Text = VERAG_VARIABLES.geterrornumb + "Datenbankverbindungsfehler." + Environment.NewLine + "Bitte den Admin kontaktieren."
lblMessage.Text = VERAG_VARIABLES.geterrornumb + "Datenbankverbindungsfehler."
End If
Catch Exc As Exception
lblMessage.ForeColor = Drawing.Color.Red