From 60fd88555a87c01fe66f683df84008a50ad827a0 Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Thu, 18 Nov 2021 16:53:04 +0100
Subject: [PATCH] =?UTF-8?q?Email=20=C3=84nderungen=20ersten=202=20bilder?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 login/Change_PW.aspx    | 41 ++++++++++++-----------------------------
 login/Change_PW.aspx.vb | 11 ++++++-----
 2 files changed, 18 insertions(+), 34 deletions(-)

diff --git a/login/Change_PW.aspx b/login/Change_PW.aspx
index 9dafc16..b515112 100644
--- a/login/Change_PW.aspx
+++ b/login/Change_PW.aspx
@@ -221,7 +221,7 @@
                                 <table>
                                     <tr>
                                         <td>
-                                            <asp:Image ID="ImageButton1" runat="server" ImageUrl="~/images/Icons/service/hilfe.png" Height="17px" Width="15px" style="margin-left:18px"/>
+                                            <asp:Image ID="ImageButton1" runat="server" ImageUrl="~/images/Icons/service/hilfe.png" Height="17px" Width="15px" style="margin-left:280px"/>
                                         </td>
                                      </tr>
                                      <tr>
@@ -232,24 +232,15 @@
                                     </table>
                                      <ul style="list-style:circle">
                                          <li>
-                                              <asp:Label ID="Label11" runat="server" style="color:#003680;margin-left:22px">1 Uppercase</asp:Label>
-                                         </li>                                     
-                                    
-                                         <li>
-                                             <asp:Label ID="Label8" runat="server" style="color:#003680;margin-left:22px">1 Downcase </asp:Label>
-                                         </li>                           
+                                              <asp:Label ID="Label11" runat="server" style="color:#003680;margin-left:22px">1 Upper- and 1 lowercase letter</asp:Label>
+                                         </li>                     
                                          <li>
                                              <asp:Label ID="Label9" runat="server" style="color:#003680;margin-left:22px">and one special letter</asp:Label>
                                          </li>                           
                                          <li>
-                                             <asp:Label ID="Label10" runat="server" style="color:#003680;margin-left:22px;margin-right:0px">at an minimal length of 4 and an maximal</asp:Label>                                  
+                                             <asp:Label ID="Label10" runat="server" style="color:#003680;margin-left:22px;margin-right:0px">between 4 and 30 characters.</asp:Label>                                  
                                         </li>
-                                        </ul>
-                                 <ul style="list-style:none">
-                                     <li style="margin-top:-15px">
-                                         <asp:Label ID="Label12" runat="server" style="color:#003680;margin-left:-7px;">length of 30 characters.</asp:Label>
-                                     </li>
-                                 </ul>
+                                        </ul>                                 
                                  </td>
                                     </tr>
                                  
@@ -318,27 +309,19 @@
                                         </td>                                     
                                     </tr>
                                     </table>
-                                     <ul style="list-style:circle;margin-left:48px">
+                                     <ul style="list-style:circle">
                                          <li>
-                                              <asp:Label ID="Label3" runat="server" style="color:#003680;margin-left:2px">1 Uppercase</asp:Label>
-                                         </li>                                     
-                                    
+                                              <asp:Label ID="Label3" runat="server" style="color:#003680;margin-left:22px">1 Upper- and 1 lowercase letter</asp:Label>
+                                         </li>                     
                                          <li>
-                                             <asp:Label ID="Label4" runat="server" style="color:#003680;margin-left:2px">1 Downcase </asp:Label>
+                                             <asp:Label ID="Label4" runat="server" style="color:#003680;margin-left:22px">and one special letter</asp:Label>
                                          </li>                           
                                          <li>
-                                             <asp:Label ID="Label5" runat="server" style="color:#003680;margin-left:2px">and one special letter</asp:Label>
-                                         </li>                           
-                                         <li>
-                                             <asp:Label ID="Label6" runat="server" style="color:#003680;margin-left:2px;margin-right:0px">at an minimal length of 4 and an maximal</asp:Label>                                  
+                                             <asp:Label ID="Label5" runat="server" style="color:#003680;margin-left:22px;margin-right:0px">between 4 and 30 characters.</asp:Label>                                  
                                         </li>
-                                        </ul>
-                                 <ul style="list-style:none">
-                                     <li style="margin-top:-15px">
-                                         <asp:Label ID="Label7" runat="server" style="color:#003680;margin-left:48px;">length of 30 characters.</asp:Label>
-                                     </li>
-                                 </ul>
+                                        </ul>                                 
                                  </td>
+                                
                                     </tr>
                           <tr style="color:#003680;height:46.67px;">
                             <td>
diff --git a/login/Change_PW.aspx.vb b/login/Change_PW.aspx.vb
index c457d88..f0c0fac 100644
--- a/login/Change_PW.aspx.vb
+++ b/login/Change_PW.aspx.vb
@@ -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 = "Passwords do not match."
             '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 = "Passwords do not match."
             '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 chosen password should not be the old one!"
                             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 = "Password has been changed sucessfully!"
                             End If
                         End Using
                         con.Close()
@@ -398,7 +398,8 @@ 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!"
+                'Button hierher
+                '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"