From 7344eb523115ffe90983059021a57250ae93431c Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Fri, 19 Nov 2021 14:18:59 +0100
Subject: [PATCH] =?UTF-8?q?=C3=84nderungen=20Error-Messages=20Vereinheitli?=
 =?UTF-8?q?chungen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 login/Change_PW.aspx   | 14 +++++++-------
 login/ForgotPW.aspx    |  8 ++++----
 login/ForgotPW.aspx.vb |  2 +-
 login/login_FLEX.aspx  | 18 +++++++++---------
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/login/Change_PW.aspx b/login/Change_PW.aspx
index 70cab3f..b82d6f6 100644
--- a/login/Change_PW.aspx
+++ b/login/Change_PW.aspx
@@ -305,8 +305,8 @@
                               <tr style="color:#003680;height:30px;width:306px">
                             <td>                                                                         
                                 <asp:CompareValidator ID="confirmPasswordReq" style="margin-left:32px;" Enabled="false" runat="server" ControlToCompare="txt_Pw" ControlToValidate="txt_Pw_WH" ErrorMessage="Please try again! The passwords didn't match." Display="Dynamic" ForeColor="Red"></asp:CompareValidator>                                
-                                <asp:RegularExpressionValidator ID="regexval_txt_Pw"  style="margin-left:32px;" Enabled="false" runat="server" ControlToValidate="txt_Pw" ValidationGroup="TXT_val" ForeColor="Red" ValidationExpression="^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^a-zA-Z\d]).{4,35}$" Display="Dynamic" ErrorMessage="The Password has to match the criterias above." SetFocusOnError="true"></asp:RegularExpressionValidator>
-                                <asp:RegularExpressionValidator ID="regexval_txt_Pw_WH" style="margin-left:32px;" Enabled="false" runat="server" ControlToValidate="txt_Pw_WH" ValidationGroup="TXT_val" ValidationExpression="^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^a-zA-Z\d]).{4,35}$" Display="Dynamic" ForeColor="Red" ErrorMessage="The Password has to match the criterias above." SetFocusOnError="true"></asp:RegularExpressionValidator>                                                                                                                  
+                                <asp:RegularExpressionValidator ID="regexval_txt_Pw"  style="margin-left:32px;" Font-Size="18px" Enabled="false" runat="server" ControlToValidate="txt_Pw" ValidationGroup="TXT_val" ForeColor="Red" ValidationExpression="^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^a-zA-Z\d]).{4,35}$" Display="Dynamic" ErrorMessage="The Password has to match the criterias above." SetFocusOnError="true"></asp:RegularExpressionValidator>
+                                <asp:RegularExpressionValidator ID="regexval_txt_Pw_WH" style="margin-left:32px;" Font-Size="18px" Enabled="false" runat="server" ControlToValidate="txt_Pw_WH" ValidationGroup="TXT_val" ValidationExpression="^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^a-zA-Z\d]).{4,35}$" Display="Dynamic" ForeColor="Red" ErrorMessage="The Password has to match the criterias above." SetFocusOnError="true"></asp:RegularExpressionValidator>                                                                                                                  
                                 </td>
                         </tr>
                     <tr style="padding: 2px 2px 2px 2px;width:306px">
@@ -361,7 +361,7 @@
                               </tr>
                               <tr style="height:20px">
                               <td>                                  
-                                  <asp:RequiredFieldValidator ID="reqPassw1txt_M" runat="server" Enabled="false" ControlToValidate="txt_Pw_M" ErrorMessage="*" ForeColor="Red" Font-Size="19" Display="Dynamic"></asp:RequiredFieldValidator>
+                                  <asp:RequiredFieldValidator ID="reqPassw1txt_M" runat="server" Enabled="false" ControlToValidate="txt_Pw_M" ErrorMessage="*" ForeColor="Red" Font-Size="18px" Display="Dynamic"></asp:RequiredFieldValidator>
                               </td>
                               </tr>                                 
                          <tr style="color:#003680;height:36.67px;">
@@ -373,7 +373,7 @@
                          </tr>
                       <tr style="height:15px">
                           <td colspan="2">
-                              <asp:RequiredFieldValidator ID="reqPasswtxt_M" runat="server" Enabled="false" ControlToValidate="txt_Pw_WH_M" ErrorMessage="*" Font-Size="19" ForeColor="Red" Display="Dynamic"></asp:RequiredFieldValidator>
+                              <asp:RequiredFieldValidator ID="reqPasswtxt_M" runat="server" Enabled="false" ControlToValidate="txt_Pw_WH_M" ErrorMessage="*" Font-Size="18px" ForeColor="Red" Display="Dynamic"></asp:RequiredFieldValidator>
                           </td>
                       </tr>
                         <tr style="color:#003680;height:26.67px;">
@@ -383,9 +383,9 @@
                         </tr>
                               <tr style="color:#003680;height:20px;width:306px">
                             <td>                                                                
-                                <asp:CompareValidator ID="confirmPasswordReq_M" runat="server" ControlToCompare="txt_Pw_M" Enabled="false" ControlToValidate="txt_Pw_WH_M" ValidationGroup="TXT_val_WH_M" Font-Size="19px" ForeColor="Red" ErrorMessage="Please try again! The passwords didn't match." Display="Dynamic"></asp:CompareValidator>                                
-                                <asp:RegularExpressionValidator ID="regexval_txt_Pw_WH_M" runat="server" Enabled="false" ControlToValidate="txt_Pw_WH_M" ValidationGroup="TXT_val_WH_M" ForeColor="Red" Font-Size="19px" ValidationExpression="^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^a-zA-Z\d]).{4,35}$" Display="Dynamic" ErrorMessage="The Password has to match the criterias of the info-button." SetFocusOnError="true"></asp:RegularExpressionValidator>                                                                                  
-                                <asp:RegularExpressionValidator ControlToValidate="txt_Pw_M" runat="server" Enabled="false" ID="regexval_txt_Pw_M" ValidationGroup="TXT_val_M" ForeColor="Red" Font-Size="19px" ValidationExpression="^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^a-zA-Z\d]).{4,35}$" Display="Dynamic" ErrorMessage="The Password has to match the criterias of the info-button." SetFocusOnError="true"></asp:RegularExpressionValidator>
+                                <asp:CompareValidator ID="confirmPasswordReq_M" runat="server" Font-Size="18px" ControlToCompare="txt_Pw_M" Enabled="false" ControlToValidate="txt_Pw_WH_M" ValidationGroup="TXT_val_WH_M"  ForeColor="Red" ErrorMessage="Please try again! The passwords didn't match." Display="Dynamic"></asp:CompareValidator>                                
+                                <asp:RegularExpressionValidator ID="regexval_txt_Pw_WH_M" runat="server" Enabled="false" ControlToValidate="txt_Pw_WH_M" ValidationGroup="TXT_val_WH_M" ForeColor="Red" Font-Size="18px" ValidationExpression="^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^a-zA-Z\d]).{4,35}$" Display="Dynamic" ErrorMessage="The Password has to match the criterias of the info-button." SetFocusOnError="true"></asp:RegularExpressionValidator>                                                                                  
+                                <asp:RegularExpressionValidator ControlToValidate="txt_Pw_M" runat="server" Enabled="false" ID="regexval_txt_Pw_M" ValidationGroup="TXT_val_M" ForeColor="Red" Font-Size="18px" ValidationExpression="^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^a-zA-Z\d]).{4,35}$" Display="Dynamic" ErrorMessage="The Password has to match the criterias of the info-button." SetFocusOnError="true"></asp:RegularExpressionValidator>
                           </td>
                         </tr>
                         <tr style="padding: 2px 2px 2px 2px;width:306px">
diff --git a/login/ForgotPW.aspx b/login/ForgotPW.aspx
index 5d2a7dc..6df582e 100644
--- a/login/ForgotPW.aspx
+++ b/login/ForgotPW.aspx
@@ -409,10 +409,10 @@
                 <tr style="color:#003680; height:50px;">
                 <td align="right" colspan="2" style="width:335px">                    
                 <asp:Label ID="lblMessage_M" Font-Size="24px" runat="server" />
-                    <asp:RegularExpressionValidator ID="valid_getNumber_M_Input" ControlToValidate="txt_CustomerID_M" ValidationGroup="val-mobil" ForeColor="Red" Font-Size="19px" runat="server" style="margin-left:22px;" Display="Dynamic" SetFocusOnError="false" ValidationExpression="[0-9]{1,10}" ErrorMessage="The Customer-ID is not valid."></asp:RegularExpressionValidator>
-                    <asp:RegularExpressionValidator ControlToValidate="txtEmail_M" ForeColor="Red" Font-Size="19px"  runat="server" ID="regexval_2_txt_Email_M" ValidationGroup="val-mobil" ValidationExpression="[\w\.]+\@[\w]+(?:\.[\w]{3}|\.[\w]{2}\.[\w]{2}|\.[\w]{2})\b" Display="Dynamic" ErrorMessage="Die Zeichenfolge stimmt nicht mit den Kriterien einer E-Mail überein" SetFocusOnError="true"></asp:RegularExpressionValidator>
-                    <asp:RegularExpressionValidator ControlToValidate="txtEmail_M" ForeColor="Red" Font-Size="19px" runat="server" ID="regexval_txt_Email_M" ValidationGroup="val-mobil" ValidationExpression="[a-zA-Z]{2}\@(\bverag.ag\b)" Display="Dynamic" ErrorMessage="" SetFocusOnError="true"></asp:RegularExpressionValidator>
-                    <asp:RegularExpressionValidator ID="check_UserName_regex_M" ForeColor="Red" Font-Size="19px" ErrorMessage="Try again. The Username don't meet the rquirements." ControlToValidate="txt_Username_M" ValidationGroup="val-mobil" runat="server" Display="Dynamic" SetFocusOnError="true" ValidationExpression="([a-zA-Z1-9]{4,30})"></asp:RegularExpressionValidator>
+                    <asp:RegularExpressionValidator ID="valid_getNumber_M_Input" ControlToValidate="txt_CustomerID_M" ValidationGroup="val-mobil" ForeColor="Red" Font-Size="18px" runat="server" style="margin-left:22px;" Display="Dynamic" SetFocusOnError="false" ValidationExpression="[0-9]{1,10}" ErrorMessage="The Customer-ID is not valid."></asp:RegularExpressionValidator>
+                    <asp:RegularExpressionValidator ControlToValidate="txtEmail_M" ForeColor="Red" Font-Size="18px"  runat="server" ID="regexval_2_txt_Email_M" ValidationGroup="val-mobil" ValidationExpression="[\w\.]+\@[\w]+(?:\.[\w]{3}|\.[\w]{2}\.[\w]{2}|\.[\w]{2})\b" Display="Dynamic" ErrorMessage="Die Zeichenfolge stimmt nicht mit den Kriterien einer E-Mail überein" SetFocusOnError="true"></asp:RegularExpressionValidator>
+                    <asp:RegularExpressionValidator ControlToValidate="txtEmail_M" ForeColor="Red" Font-Size="18px" runat="server" ID="regexval_txt_Email_M" ValidationGroup="val-mobil" ValidationExpression="[a-zA-Z]{2}\@(\bverag.ag\b)" Display="Dynamic" ErrorMessage="" SetFocusOnError="true"></asp:RegularExpressionValidator>
+                    <asp:RegularExpressionValidator ID="check_UserName_regex_M" ForeColor="Red" Font-Size="18px" ErrorMessage="Try again. The Username don't meet the rquirements." ControlToValidate="txt_Username_M" ValidationGroup="val-mobil" runat="server" Display="Dynamic" SetFocusOnError="true" ValidationExpression="([a-zA-Z1-9]{4,30})"></asp:RegularExpressionValidator>
                     </td></tr>                      
                 <tr><td>                    
                     </td></tr>
diff --git a/login/ForgotPW.aspx.vb b/login/ForgotPW.aspx.vb
index ec24994..8134e1f 100644
--- a/login/ForgotPW.aspx.vb
+++ b/login/ForgotPW.aspx.vb
@@ -109,7 +109,7 @@ Partial Class ForgotPW
                 'MsgBox("The form has not been filled completeley.", MsgBoxStyle.Critical, "Error08")
                 lblMessage.ForeColor = Color.Red
                 VERAG_VARIABLES.seterrorcount(8)
-                lblMessage.Text = VERAG_VARIABLES.geterrornumb + "This Form has to be filled completely."
+                lblMessage.Text = VERAG_VARIABLES.geterrornumb + "This Form has to be filled out completely."
             End If
 
             'Erweiterte Degub Msg-Box
diff --git a/login/login_FLEX.aspx b/login/login_FLEX.aspx
index e78d3af..2dcbf02 100644
--- a/login/login_FLEX.aspx
+++ b/login/login_FLEX.aspx
@@ -387,7 +387,7 @@
                                 <tr style="color:#003680; height:46px;">
                                         <td align="left"  colspan="2">                                                                           
                                             <asp:TextBox ID="txt_CustomerID" CssClass="bg-UID-icon" runat="server" ValidationGroup="Login" Width="330px" Placeholder="Customer-ID" style="margin-left: 22px;border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;" Font-Size="1.25em" Height="32px"></asp:TextBox>                                             
-                                            <asp:RequiredFieldValidator ID="CustomerIDrequired" runat="server" ControlToValidate="txt_CustomerID" ForeColor="Red" style="font-size:17px" SetFocusOnError="true" ValidationGroup="Login" ErrorMessage="*"></asp:RequiredFieldValidator>                                                                                 
+                                            <asp:RequiredFieldValidator ID="CustomerIDrequired" runat="server" ControlToValidate="txt_CustomerID" ForeColor="Red" Font-Size="18px" SetFocusOnError="true" ValidationGroup="Login" ErrorMessage="*"></asp:RequiredFieldValidator>                                                                                 
                                         </td>
                                 </tr>  
                                 <tr style="color:#003680; height:46px;">  
@@ -399,7 +399,7 @@
                                <tr style="color:#003680; height:46px;">  
                                      <td align="left" colspan="2">                                        
                                           <asp:TextBox ID="Password" runat="server" CssClass="bg-key-icon" TextMode="Password" ToolTip="Please enter the Password." Width="330px" Font-Size="1.25em" ValidationGroup="Login" MaxLength="30" AutoCompleteType="Disabled" CausesValidation="true" style="margin-left:22px;color:#003680;border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;" Placeholder="Password"></asp:TextBox>                                    
-                                          <asp:RequiredFieldValidator ID="Passwordrequired" ForeColor="Red" runat="server" ControlToValidate="Password" Font-Size="17px"  ValidationGroup="Login" SetFocusOnError="true" ErrorMessage="*"></asp:RequiredFieldValidator>                                                                                                           
+                                          <asp:RequiredFieldValidator ID="Passwordrequired" ForeColor="Red" runat="server" ControlToValidate="Password" Font-Size="18px"  ValidationGroup="Login" SetFocusOnError="true" ErrorMessage="*"></asp:RequiredFieldValidator>                                                                                                           
                                      </td>
                                  </tr>       
                             <tr style="color:#003680; height:56px;">
@@ -418,8 +418,8 @@
                                  <tr style="color:#003680; height:16px">
                                       <td align="center" style="color:Red;width:400px" colspan="2">
                                            <asp:Literal ID="FailureText" runat="server" EnableViewState="False"></asp:Literal>
-                                           <asp:RegularExpressionValidator ID="check_UserName_regex" ControlToValidate="UserName" Font-Size="17px" ForeColor="Red" ValidationGroup="Login" runat="server" Display="Dynamic" SetFocusOnError="true" ErrorMessage="Username does not meet the requirements." ValidationExpression="^([a-zA-Z1-9]{4,30})$"></asp:RegularExpressionValidator>
-                                           <asp:RegularExpressionValidator ID="valid_getNumberInput" ControlToValidate="txt_CustomerID" style="font-size:17px" ForeColor="Red" ValidationGroup="Login" runat="server" Display="Dynamic" SetFocusOnError="false" ErrorMessage="The Customer-ID is not valid." ValidationExpression="[0-9]{1,10}"></asp:RegularExpressionValidator>
+                                           <asp:RegularExpressionValidator ID="check_UserName_regex" ControlToValidate="UserName" Font-Size="18px" ForeColor="Red" ValidationGroup="Login" runat="server" Display="Dynamic" SetFocusOnError="true" ErrorMessage="Username does not meet the requirements." ValidationExpression="^([a-zA-Z1-9]{4,30})$"></asp:RegularExpressionValidator>
+                                           <asp:RegularExpressionValidator ID="valid_getNumberInput" ControlToValidate="txt_CustomerID" Font-Size="18px" ForeColor="Red" ValidationGroup="Login" runat="server" Display="Dynamic" SetFocusOnError="false" ErrorMessage="The Customer-ID is not valid." ValidationExpression="[0-9]{1,10}"></asp:RegularExpressionValidator>
                                       </td>
                                  </tr>                                          
                                 </table>
@@ -441,19 +441,19 @@
                                 <tr style="color:#003680; height:86px">
                                         <td align="left">                                                                           
                                             <asp:TextBox ID="txt_CustomerID_M" CssClass="bg-UID-icon" runat="server" ValidationGroup="Login_M" Width="325" Placeholder="Customer-ID" Font-Size="2.025em" style="margin-left: 22px;margin-top:20px;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" style="margin-left:22px;font-size:19px" ValidationGroup="Login_M" ErrorMessage="*"></asp:RequiredFieldValidator>                                  
+                                            <asp:RequiredFieldValidator ID="CustomerID_M_required" runat="server" ControlToValidate="txt_CustomerID_M" SetFocusOnError="true" Font-Size="18px" ForeColor="Red" style="margin-left:22px;" ValidationGroup="Login_M" ErrorMessage="*"></asp:RequiredFieldValidator>                                  
                                         </td>
                                 </tr>  
                                 <tr style="color:#003680; height:86px;">  
                                      <td align="left" colspan="2">                                        
                                         <asp:TextBox id="Username" runat="server" CssClass="bg-user-icon" TextMode="SingleLine" Width = "325"  ValidationGroup="Login_M" Placeholder="Username" required="true" Font-Size="2.025em"  style="margin-left:22px;color:#003680;border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;"></asp:TextBox>                                                                                     
-                                        <asp:RequiredFieldValidator ID="UserName_M_required" runat="server" ControlToValidate="Username" ErrorMessage="*" ForeColor="Red" style="margin-left:22px;" ValidationGroup="Login_M" SetFocusOnError="false"></asp:RequiredFieldValidator>                                   
+                                        <asp:RequiredFieldValidator ID="UserName_M_required" runat="server" ControlToValidate="Username" Font-Size="18px" ErrorMessage="*" ForeColor="Red" style="margin-left:22px;" ValidationGroup="Login_M" SetFocusOnError="false"></asp:RequiredFieldValidator>                                   
                                      </td>
                                 </tr>
                                <tr style="color:#003680; height:86px;">  
                                      <td align="left" colspan="2">                                        
                                         <asp:TextBox ID="Password" runat="server" CssClass="bg-key-icon" TextMode="Password" Tooltip="Please provide the Password" required="true" Width = "325" Font-Size="2.025em" ValidationGroup="Login_M" MaxLength="30" AutoCompleteType="Enabled" CausesValidation="true" style="margin-left:22px;color:#003680;border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;" Placeholder="Password" Text="Password"></asp:TextBox>                                    
-                                         <asp:RequiredFieldValidator ID="Passwordrequired_M" runat="server" SetFocusOnError="true" ControlToValidate="Password" style="margin-left:22px;color:red;" ErrorMessage="*" ForeColor="Red" ValidationGroup="Login_M"></asp:RequiredFieldValidator>                                         
+                                         <asp:RequiredFieldValidator ID="Passwordrequired_M" runat="server" SetFocusOnError="true" Font-Size="18px" ControlToValidate="Password" style="margin-left:22px;color:red;" ErrorMessage="*" ForeColor="Red" ValidationGroup="Login_M"></asp:RequiredFieldValidator>                                         
                                      </td>
                                  </tr>       
                          <tr style="color:#003680; height:143px;">
@@ -472,8 +472,8 @@
                                  <tr style="color:#003680; height:12px">
                                       <td align="center" style="width:295px" colspan="2">
                                            <asp:Literal ID="FailureText_M" runat="server" EnableViewState="False"></asp:Literal>
-                                           <asp:RegularExpressionValidator ID="check_UserName_M_regex" ControlToValidate="Username" ValidationGroup="Login_M" ForeColor="Red" Font-Size="19px" runat="server" style="margin-left:132px;color:red" Display="Dynamic" SetFocusOnError="true" ValidationExpression="^([a-zA-Z1-9]{4,30})$" ErrorMessage="Username does not meet the requirements." ></asp:RegularExpressionValidator>
-                                           <asp:RegularExpressionValidator ID="valid_getNumber_M_Input" ControlToValidate="txt_CustomerID_M" ValidationGroup="Login_M" ForeColor="Red" Font-Size="19px" runat="server" style="margin-left:22px;font-size:19px" Display="Dynamic" SetFocusOnError="false" ValidationExpression="[0-9]{4,10}" ErrorMessage="The Customer-ID is not valid."></asp:RegularExpressionValidator>
+                                           <asp:RegularExpressionValidator ID="check_UserName_M_regex" ControlToValidate="Username" ValidationGroup="Login_M" ForeColor="Red" Font-Size="18px" runat="server" style="margin-left:132px;color:red" Display="Dynamic" SetFocusOnError="true" ValidationExpression="^([a-zA-Z1-9]{4,30})$" ErrorMessage="Username does not meet the requirements." ></asp:RegularExpressionValidator>
+                                           <asp:RegularExpressionValidator ID="valid_getNumber_M_Input" ControlToValidate="txt_CustomerID_M" ValidationGroup="Login_M" ForeColor="Red" Font-Size="18px" runat="server" style="margin-left:22px;" Display="Dynamic" SetFocusOnError="false" ValidationExpression="[0-9]{4,10}" ErrorMessage="The Customer-ID is not valid."></asp:RegularExpressionValidator>
                                       </td>
                                  </tr>                          
                                 </table>