diff --git a/login/Change_PW.aspx b/login/Change_PW.aspx index 6a606a0..70cab3f 100644 --- a/login/Change_PW.aspx +++ b/login/Change_PW.aspx @@ -302,14 +302,14 @@ - + - + @@ -381,14 +381,14 @@ - + - - - + + + - + diff --git a/login/Change_PW.aspx.vb b/login/Change_PW.aspx.vb index 557b5f3..c55af59 100644 --- a/login/Change_PW.aspx.vb +++ b/login/Change_PW.aspx.vb @@ -68,7 +68,7 @@ Partial Class login_Change_PW Else VERAG_VARIABLES.initerrorcount() VERAG_VARIABLES.seterrorcount(1) - lbl_messagetext.Text = VERAG_VARIABLES.geterrornumb + "Link ist abgelaufen. Bitte neue E-Mail senden." + lbl_messagetext.Text = VERAG_VARIABLES.geterrornumb + "Link is invalid. Please send a new E-Mail!" 'Response.Redirect("ForgotPW.aspx") End If dr.Close() @@ -164,7 +164,7 @@ Partial Class login_Change_PW If String.Equals(txt_Pw_WH.Text, dr("Password").ToString) = False Then tempstr = txt_Pw_WH.Text Else - lbl_messagetext.Text = "Die gewählten Passwörter dürfen nicht dem alten entsprechen!" + lbl_messagetext.Text = "The new password should differ from the old one!" End If End If dr.Close() @@ -173,7 +173,8 @@ Partial Class login_Change_PW End Using Else VERAG_VARIABLES.seterrorcount(22) - lbl_messagetext.Text = VERAG_VARIABLES.geterrornumb + "Error bei der Passwort-Validation." + 'lbl_messagetext.Text = VERAG_VARIABLES.geterrornumb + "Error at the Passwort-Validation." + tempstr = "Error02" End If @@ -209,7 +210,7 @@ Partial Class login_Change_PW btn_submitpw.Visible = True Else VERAG_VARIABLES.seterrorcount(25) - lbl_messagetext.Text = VERAG_VARIABLES.geterrornumb() + "Fehler bei der Behebung des Passwortwechsels." + 'lbl_messagetext.Text = VERAG_VARIABLES.geterrornumb() + "Error at changing the Password." End If End Using con.Close() @@ -228,7 +229,7 @@ Partial Class login_Change_PW Style = vbOKOnly + vbInformation + vbDefaultButton1 Title = "Information" regexval_txt_Pw.ForeColor = Drawing.Color.Green - regexval_txt_Pw.Text = "Passwort wurde erfolgreich geändert!" + regexval_txt_Pw.Text = "Passwort has been changed successfully!" 'MsgBox(Msg, Style, Title) ' If MsgBox(Msg, Style, Title).Ok Then 'Response.Redirect("login_FLEX.aspx") diff --git a/login/ForgotPW.aspx b/login/ForgotPW.aspx index 840bd95..5d2a7dc 100644 --- a/login/ForgotPW.aspx +++ b/login/ForgotPW.aspx @@ -355,13 +355,13 @@
- - + + - - + + @@ -391,30 +391,29 @@ - + - + - + + + + - + - - - - - - - - - + + + + + diff --git a/login/ForgotPW.aspx.vb b/login/ForgotPW.aspx.vb index a3b4449..ec24994 100644 --- a/login/ForgotPW.aspx.vb +++ b/login/ForgotPW.aspx.vb @@ -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 + "No Username was !" + check_UserName_regex.ErrorMessage = VERAG_VARIABLES.geterrornumb + "No Username was found!" isusrnmright = False Try check_UserName_regex.Validate() @@ -218,12 +218,13 @@ Partial Class ForgotPW 'Dim msgboxstyle = vbDefaultButton1 + vbOK 'MsgBox(tokenname, msgboxstyle) lblMessage.ForeColor = Color.Green - lblMessage.Text = "Token Generierung erfolgreich." + lblMessage.Text = "Token Generation successful." 'MsgBox("Token generated successfully.") Else lblMessage.ForeColor = Color.Red VERAG_VARIABLES.seterrorcount(14) - lblMessage.Text = VERAG_VARIABLES.geterrornumb + "Der Token ist nicht aktuell genug oder liegt zu weit in der Vergangenheit. Bitte neuen generieren lassen mit einer neuen E-Mail." + lblMessage.Text = VERAG_VARIABLES.geterrornumb + "The Token is too old or not valid anymore. Please generate new Link by enter your data again!" + 'btn hier einfügen 'MsgBox("Token is not valid anymore. Please generate a new one by sending a new e-mail!") If Session.Item("TokenforEmail") = Nothing Then @@ -236,27 +237,29 @@ Partial Class ForgotPW 'SendEmail(username, password, email) 'MsgBox("Mail would be sent successfully!") lblMessage.ForeColor = Color.Green - lblMessage.Text = "Das Passwort wurde erfolgreich an die hinterlegte E-Mail gesendet. Bitte prüfen Sie den Posteingang sowie den Spam-Ordner." + lblMessage.Text = "The Password-Reset-Link has been mailed to the valid Address given." ElseIf SendEmail(username, password, email, tokenname, customerID, isusrnmright, isCustomeridright, isemailright, Session.IsNewSession, UserID) = True Then 'MsgBox("Mail would not be sent successfully!") lblMessage.ForeColor = Color.Red If String.IsNullOrWhiteSpace(username) = True Then VERAG_VARIABLES.seterrorcount(10) - lblMessage.Text = VERAG_VARIABLES.geterrornumb + "Benutzername wurde nicht erkannt!" + lblMessage.Text = VERAG_VARIABLES.geterrornumb + "Username was not recognized!" ElseIf String.IsNullOrWhiteSpace(email) = True Then lblMessage.ForeColor = Drawing.Color.Red VERAG_VARIABLES.seterrorcount(11) - lblMessage.Text = VERAG_VARIABLES.geterrornumb + "Email: Fehler bei der Erkennung!" + lblMessage.Text = VERAG_VARIABLES.geterrornumb + "Email: Not recognized!" ElseIf String.IsNullOrWhiteSpace(password) = True Then lblMessage.ForeColor = Drawing.Color.Red VERAG_VARIABLES.seterrorcount(12) - lblMessage.Text = VERAG_VARIABLES.geterrornumb + "Ein interner Passwort-Suchfehler ist leider aufgetreten." + Environment.NewLine + "Bitte setzten Sie sich mit einem Admin in Verbindung ." + lblMessage.Text = VERAG_VARIABLES.geterrornumb + "An intern error has occured!" + Environment.NewLine + "Please contact an admin." + 'Button End If End If Else lblMessage.ForeColor = Drawing.Color.Red VERAG_VARIABLES.seterrorcount(13) - lblMessage.Text = VERAG_VARIABLES.geterrornumb + "Datenbankverbindungsfehler." + lblMessage.Text = VERAG_VARIABLES.geterrornumb + "Database-Error." + 'Button End If Catch Exc As Exception lblMessage.ForeColor = Drawing.Color.Red @@ -475,7 +478,7 @@ Partial Class ForgotPW 'SendEmail(username, password, email) 'MsgBox("Mail would be sent successfully!") lblMessage_M.ForeColor = Color.Green - lblMessage_M.Text = "The password has been sent sucessfully on the given valid e-mail address." + lblMessage_M.Text = "The Password-Reset-Link has been mailed to the valid E-Mail Address given." ElseIf SendEmail_M(username, password, email, tokenname, customerID, isusernameright, isuserIDright, isuserEmailright, Session.IsNewSession, UserID) = True Then 'MsgBox("Mail would not be sent successfully!") lblMessage_M.ForeColor = Color.Red @@ -561,10 +564,10 @@ Partial Class ForgotPW 'MsgBox("Error07: Die Paramter wurden nicht alle gesetzt. Bitte Felder überprüfen.", vbAbort, "Error07") lblMessage_M.ForeColor = Color.OrangeRed VERAG_VARIABLES.seterrorcount(7) - lblMessage_M.Text = VERAG_VARIABLES.geterrornumb + "Die Paramter wurden nicht alle gesetzt. Bitte Felder überprüfen!" + lblMessage_M.Text = VERAG_VARIABLES.geterrornumb + "The form has not been filled out completely." End If lblMessage_M.ForeColor = Color.Green - lblMessage_M.Text = "Success" + Environment.NewLine + " Mail sent. Please check your inbox." + lblMessage_M.Text = "Success" + Environment.NewLine + "The Password-Reset-Link has been mailed to the valid Address given." 'MsgBox("SENT") Return True Else @@ -653,10 +656,10 @@ Partial Class ForgotPW 'MsgBox("Error07: Die Paramter wurden nicht alle gesetzt. Bitte Felder überprüfen.", vbAbort, "Error07") lblMessage.ForeColor = Color.OrangeRed VERAG_VARIABLES.seterrorcount(7) - lblMessage.Text = VERAG_VARIABLES.geterrornumb + "Die Paramter wurden nicht alle gesetzt. Bitte Felder überprüfen!" + lblMessage.Text = VERAG_VARIABLES.geterrornumb + "Plaese check all fields." End If lblMessage.ForeColor = Color.Green - lblMessage.Text = "Success: Mail sent. Please check your inbox." + lblMessage.Text = "The Password-Reset-Link has been mailed to the valid Address given." 'MsgBox("SENT") Return True Else diff --git a/login/login_FLEX.aspx b/login/login_FLEX.aspx index 87a70cf..e78d3af 100644 --- a/login/login_FLEX.aspx +++ b/login/login_FLEX.aspx @@ -117,7 +117,7 @@ align-items: center; width: 395px; height: 613px; - margin: 0 auto auto -2px; + margin: 0 auto auto 9%; margin-top: 0px; } @@ -267,7 +267,16 @@ overflow-y: clip; overflow-x: clip; max-width: 323px; - } + } + #content_container { + display: flex; + justify-content: center; + align-items: center; + width: 325px; + height: 613px; + margin: 0 auto auto 9%; + margin-top: 0px; + } bg-email-icon { background: url("../../images/Icons/service/mail-icon.gif") no-repeat 1.75% 10px white; margin-left:30px; @@ -277,7 +286,7 @@ -moz-border-radius: 8px; padding-left: 28px; padding-right: 50px; - width: 245px; + width: 235px; border: 1px gray solid; border-radius: 5px 5px 5px 5px; margin-left: -4px; @@ -292,7 +301,7 @@ -moz-border-radius: 8px; padding-left: 28px; padding-right: 50px; - width: 245px; + width: 235px; border: 1px gray solid; border-radius: 5px 5px 5px 5px; margin-left: -4px; @@ -307,7 +316,7 @@ -moz-border-radius: 8px; padding-left: 28px; padding-right: 50px; - width: 245px; + width: 235px; border: 1px gray solid; border-radius: 5px 5px 5px 5px; margin-left: -4px; @@ -322,7 +331,7 @@ -moz-border-radius: 8px; padding-left: 28px; padding-right: 50px; - width: 245px; + width: 235px; border: 1px gray solid; border-radius: 5px 5px 5px 5px; margin-left: -4px; @@ -378,7 +387,7 @@ - + @@ -390,10 +399,10 @@ - + - + @@ -407,7 +416,7 @@ - + @@ -432,19 +441,19 @@ - + - + - + @@ -461,10 +470,10 @@ - + - - + +