From 2ab0a0c0bf5ef838f05c0758dfe2c601e07935d0 Mon Sep 17 00:00:00 2001 From: ja Date: Thu, 18 Nov 2021 12:02:57 +0100 Subject: [PATCH] =?UTF-8?q?=C3=84nderumngen=20Email=20vom=2018:11.2021=20a?= =?UTF-8?q?bgeschlossen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/login/Changepw.css | 9 +- css/login/ForgotPW.css | 6 -- login/Change_PW.aspx | 232 +++++++++++++++++++++------------------- login/Change_PW.aspx.vb | 18 ++-- login/ForgotPW.aspx | 36 +++---- login/ForgotPW.aspx.vb | 10 +- login/login_FLEX.aspx | 18 ++-- 7 files changed, 161 insertions(+), 168 deletions(-) diff --git a/css/login/Changepw.css b/css/login/Changepw.css index 517a0d2..227f455 100644 --- a/css/login/Changepw.css +++ b/css/login/Changepw.css @@ -108,10 +108,8 @@ width: 400px; height: 379px; } -#lbl_Ueberschrift { - background-color: #003680; - font-size: 2.55em; - color:#fff; +#lbl_Ueberschrift { + font-size: 1.139em; } .txt_design { color: #003680; @@ -132,4 +130,7 @@ color:#fff; width:200px; height:35px; +} +#Image2{ + margin-left:275px; } \ No newline at end of file diff --git a/css/login/ForgotPW.css b/css/login/ForgotPW.css index e662217..3fb359f 100644 --- a/css/login/ForgotPW.css +++ b/css/login/ForgotPW.css @@ -47,12 +47,6 @@ margin-top:40px; } -#lbl_Ueberschrift { - background-color: #003680; - font-size: 2.55em; - color: #fff; -} - .txt_design { color: #003680; font-size: 1.65em; diff --git a/login/Change_PW.aspx b/login/Change_PW.aspx index 929c3a3..397cbe5 100644 --- a/login/Change_PW.aspx +++ b/login/Change_PW.aspx @@ -78,31 +78,34 @@ background-color: #fff; overflow-y: clip; overflow-x: clip; - max-width:390px; + max-width: 390px; } + h1 { color: #043381; font-size: 22px; } + h2 { color: #043381; font-size: 30px; } - #content_container { + + #content_container { display: flex; justify-content: center; align-items: center; width: 390px; height: 613px; margin: 0 auto; - margin-left:10%; + margin-left: 10%; } - .container-fluid { - width: 390px; - background-color: rgba(255,255,255,0.5); - height: 613px; - top:50%; + .container-fluid { + width: 390px; + background-color: rgba(255,255,255,0.5); + height: 613px; + top: 50%; bottom: -4px; left: -195px; right: 520px; @@ -115,90 +118,109 @@ border: 1px solid gray; width: 300px; height: 613px; - margin-top:80px; + margin-top: 80px; } - #btn_submitpw_M{ + + #btn_submitpw_M { background-color: #003680; color: #fff; width: 325px; height: 32px; margin-bottom: 0px; - margin-left:-15px; + margin-left: -15px; padding-inline: 2px 2px; padding: -10px 0px 10px 1px; - font-weight:600; + font-weight: 600; } - #lbl_Ueberschrift_M{ - font-size:30px; - margin-left:15px; + + #lbl_Ueberschrift_M { + background-color: none; + font-size: 1.85em; + color: #003680; } - } - @media (max-width: 323px) { - body { - font-family: 'Poppins', sans-serif; - background: #fafafa; - background-image: url(../../images/road.jpg); - background-position: center center; - background-repeat: no-repeat; - background-attachment: fixed; - background-size: cover; - background-color: #fff; - overflow-y: clip; - overflow-x: clip; - max-width:323px; + + #Image2 { + margin-left: 275px; } - h1 { - color: #043381; - font-size: 24px; + + @media (max-width: 323px) { + body { + font-family: 'Poppins', sans-serif; + background: #fafafa; + background-image: url(../../images/road.jpg); + background-position: center center; + background-repeat: no-repeat; + background-attachment: fixed; + background-size: cover; + background-color: #fff; + overflow-y: clip; + overflow-x: clip; + max-width: 323px; + } + + h1 { + color: #043381; + font-size: 24px; + } + + h2 { + color: #043381; + font-size: 30px; + } + + #content_container { + display: flex; + justify-content: center; + align-items: center; + width: 323px; + height: 613px; + margin: 0 auto; + margin-left: 10%; + } + + .container-fluid { + width: 325px; + background-color: rgba(255,255,255,0.5); + height: 613px; + top: 50%; + bottom: -4px; + left: -195px; + right: 520px; + margin: 0 auto; + } + + #tbl_main_M { + font-family: Arial; + font-size: 11px; + border: 1px solid gray; + width: 323px; + height: 613px; + margin-top: 80px; + } + + #btn_submitpw_M { + background-color: #003680; + color: #fff; + width: 315px; + height: 32px; + margin-bottom: 0px; + margin-left: -15px; + padding-inline: 2px 2px; + padding: -10px 0px 10px 1px; + font-weight: 600; + font-size: 14px; + } + + #lbl_Ueberschrift_M { + background-color: none; + font-size: 1.85em; + color: #003680; + } + + #Image2 { + margin-left: 275px; + } } - h2 { - color: #043381; - font-size: 30px; - } - #content_container { - display: flex; - justify-content: center; - align-items: center; - width: 323px; - height: 613px; - margin: 0 auto; - margin-left:10%; - } - .container-fluid { - width: 325px; - background-color: rgba(255,255,255,0.5); - height: 613px; - top:50%; - bottom: -4px; - left: -195px; - right: 520px; - margin: 0 auto; - } - #tbl_main_M { - font-family: Arial; - font-size: 11px; - border: 1px solid gray; - width: 323px; - height: 613px; - margin-top:80px; - } - #btn_submitpw_M{ - background-color: #003680; - color: #fff; - width: 315px; - height: 32px; - margin-bottom: 0px; - margin-left:-15px; - padding-inline: 2px 2px; - padding: -10px 0px 10px 1px; - font-weight:600; - font-size:14px; - } - #lbl_Ueberschrift_M{ - font-size:26px; - margin-left:15px; - } - } @@ -213,43 +235,35 @@ - + @@ -301,7 +315,7 @@
- +
- +
- The Password has to contain: + The Password has at least to contain:
-
    +
    • - 1 Uppercase + 1 Upper- and 1 lowercase letter
      • - +
    • - 1 Downcase + one special letter
    • - and one special letter -
      • -
    • - at an minimal length of 4 and an maximal + between 4 and 30 characters
    -
      -
    • - length of 30 characters. -
      • -
@@ -309,35 +323,27 @@
- +
- +
- The Password has to contain: + The Password has at least to contain:
- + diff --git a/login/Change_PW.aspx.vb b/login/Change_PW.aspx.vb index 9d9c3bd..df59545 100644 --- a/login/Change_PW.aspx.vb +++ b/login/Change_PW.aspx.vb @@ -220,7 +220,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() + "Fehler bei der Behebung des Passwortwechsels." End If End Using con.Close() @@ -228,8 +228,8 @@ Partial Class login_Change_PW End If Else VERAG_VARIABLES.seterrorcount(22) - lbl_messagetext_M.ForeColor = Drawing.Color.Red - lbl_messagetext_M.Text = VERAG_VARIABLES.geterrornumb() + "Error bei der Validierung des Kennwortes." + 'lbl_messagetext_M.ForeColor = Drawing.Color.Red + 'lbl_messagetext_M.Text = VERAG_VARIABLES.geterrornumb() + "Error bei der Validierung des Kennwortes." End If Catch ex As Exception lbl_messagetext.Text = ex.Message @@ -246,7 +246,7 @@ Partial Class login_Change_PW ElseIf tempstr = "Error01" Then regexval_txt_Pw.ForeColor = Drawing.Color.MediumVioletRed VERAG_VARIABLES.seterrorcount(2) - regexval_txt_Pw.Text = VERAG_VARIABLES.geterrornumb + "Passwort konnte nicht erfolgreich geändert werden!" + 'regexval_txt_Pw.Text = VERAG_VARIABLES.geterrornumb + "Passwords could not be found!" ' Msg = "PW nicht erfolgreich geändert!" ' Style = vbAbortRetryIgnore + vbCritical + vbDefaultButton1 ' Title = "Error" @@ -268,7 +268,7 @@ Partial Class login_Change_PW ' btn_submitpw.Enabled = True Else lbl_messagetext.ForeColor = Drawing.Color.Red - lbl_messagetext.Text = "Passwörter stimmen nicht überein." + lbl_messagetext.Text = "No matching Passwords found!" 'btn_submitpw.Enabled = False End If End Sub @@ -302,7 +302,7 @@ Partial Class login_Change_PW 'btn_submitpw_M.Enabled = True Else lbl_messagetext_M.ForeColor = Drawing.Color.Red - lbl_messagetext_M.Text = "Passwörter stimmen nicht überein." + lbl_messagetext_M.Text = "No matching Passwords found. Try again!" 'btn_submitpw.Enabled = False End If End Sub @@ -347,7 +347,7 @@ Partial Class login_Change_PW tempstr = txt_Pw_M.Text Else lbl_messagetext_M.ForeColor = Drawing.Color.Red - lbl_messagetext_M.Text = "Die gewählten Passwörter dürfen nicht dem alten entsprechen!" + lbl_messagetext_M.Text = "The Passwords have to differ from the older ones." End If End If dr.Close() @@ -381,7 +381,7 @@ Partial Class login_Change_PW If String.Equals(usrname, VERAG_PROG_ALLGEMEIN.cCryptography2.Decrypt("Par2"), CompareMethod.Text) = True Then cmd.ExecuteNonQuery() regexval_txt_Pw_M.ForeColor = Drawing.Color.Green - regexval_txt_Pw_M.Text = "Passwort wurde erfolgreich geändert!" + regexval_txt_Pw_M.Text = "Passwort has been changed successfully!" End If End Using con.Close() @@ -398,7 +398,7 @@ Partial Class login_Change_PW ElseIf tempstr = "Error01" Then regexval_txt_Pw_M.ForeColor = Drawing.Color.MediumVioletRed VERAG_VARIABLES.seterrorcount(2) - regexval_txt_Pw_M.Text = VERAG_VARIABLES.geterrornumb + "Passwort konnte nicht erfolgreich geändert werden!" + 'regexval_txt_Pw_M.Text = VERAG_VARIABLES.geterrornumb + "Passwort konnte nicht erfolgreich geändert werden!" ' Msg = "PW nicht erfolgreich geändert!" ' Style = vbAbortRetryIgnore + vbCritical + vbDefaultButton1 ' Title = "Error" diff --git a/login/ForgotPW.aspx b/login/ForgotPW.aspx index 54489d5..e31c8e1 100644 --- a/login/ForgotPW.aspx +++ b/login/ForgotPW.aspx @@ -95,14 +95,10 @@ font-size: 11px; border: 1px solid gray; width: 395px; - height: 713px; + height: 713px; } - #lbl_Ueberschrift_M { - background-color: #003680; - font-size: 1.85em; - color: #fff; - } + #lbl_login_M { background-color: #003680; font-size: 2em; @@ -291,12 +287,12 @@
- +
- +
- + @@ -370,7 +361,11 @@ - + + -
- +
- +
- +
+ + +
@@ -378,10 +373,7 @@
- -
diff --git a/login/ForgotPW.aspx.vb b/login/ForgotPW.aspx.vb index 4b94fac..ecd9f66 100644 --- a/login/ForgotPW.aspx.vb +++ b/login/ForgotPW.aspx.vb @@ -62,13 +62,13 @@ Partial Class ForgotPW regexval_txt_Email_2.Validate() If regexval_txt_Email_2.IsValid = True Then email = txtEmail.Text - lblMessage.ForeColor = Drawing.Color.Lime + lblMessage.ForeColor = Drawing.Color.Green lblMessage.Text = "E-mail Addresse ist validiert.." End If Else regexval_txt_Email.Validate() If regexval_txt_Email.IsValid = True Then - lblMessage.ForeColor = Drawing.Color.Lime + lblMessage.ForeColor = Drawing.Color.Green lblMessage.Text = "E-mail Adresse ist korrekt." email = txtEmail.Text End If @@ -98,7 +98,7 @@ Partial Class ForgotPW Else username = txt_Username.Text isusrnmright = True - check_UserName_regex.ForeColor = Drawing.Color.Lime + check_UserName_regex.ForeColor = Drawing.Color.Green check_UserName_regex.ErrorMessage = "Ein korrekter Benutzername ist eingegeben worden." End If End If @@ -147,7 +147,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 = "Kein passender Benutzername wurde in der Datenbank gefunden!" isusrnmright = False Try check_UserName_regex.Validate() @@ -164,7 +164,7 @@ Partial Class ForgotPW 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 = "Die eingegebene E-Mail passt nicht zum Datenbankeintrag. Bitte erneut versuchen." Else lblMessage_M.ForeColor = Color.Red isemailright = False diff --git a/login/login_FLEX.aspx b/login/login_FLEX.aspx index d080f23..5050b0a 100644 --- a/login/login_FLEX.aspx +++ b/login/login_FLEX.aspx @@ -115,7 +115,7 @@ align-items: center; width: 395px; height: 613px; - margin: 0 auto auto -2px; + margin: 0 auto auto -2px 0px; margin-top: 0px; } @@ -125,9 +125,9 @@ background-color: rgba(255,255,255,0.5); top:50%; bottom: auto; - left: -192px; + left: -132px; right: 520px; - margin: auto auto auto -2px; + margin: auto auto auto 45px; } #tbl_main_M { font-family: Arial; @@ -135,7 +135,7 @@ border: 1px solid gray; width: 295px; height: 613px; - margin: auto auto auto -2px; + margin: 5px auto auto 0px; } #lbl_Ueberschrift_M { background-color: #003680; @@ -274,7 +274,7 @@ @@ -325,10 +325,10 @@
-
- +
+
@@ -356,10 +356,10 @@
- +
- + - I forgot my password + I forgot my password