From c3db3c5db31dbe4462006a45e9bb5f93ca419374 Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Mon, 25 Oct 2021 10:28:50 +0200
Subject: [PATCH] =?UTF-8?q?=C3=84nderungen=20GUI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 login/ForgotPW.aspx   | 8 +++++---
 login/login_FLEX.aspx | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/login/ForgotPW.aspx b/login/ForgotPW.aspx
index b938bd8..b8d207e 100644
--- a/login/ForgotPW.aspx
+++ b/login/ForgotPW.aspx
@@ -255,14 +255,14 @@
                <tr style="color:#003680; height:30px;"><td colspan="2">
                        <asp:TextBox ID="txt_CustomerID" CssClass="bg-UID-icon" runat="server" ValidationGroup="val-desk" Width="265" Placeholder="Customer-ID" style="margin-left:45px;color:#003680" Font-Size="1.125em"></asp:TextBox>                                             
                        <asp:RequiredFieldValidator ID="CustomerIDrequired" runat="server" ControlToValidate="txt_CustomerID" SetFocusOnError="true" ForeColor="Red" Text="" ValidationGroup="val-desk"></asp:RequiredFieldValidator>                                      
-                       <asp:RegularExpressionValidator ID="valid_getNumberInput" ControlToValidate="txt_CustomerID" style="font-size:17px" ForeColor="Red" ValidationGroup="val-desk" runat="server" Display="Dynamic" SetFocusOnError="false" ErrorMessage="The Customer-ID is not valid." ValidationExpression="[0-9]{4,10}"></asp:RegularExpressionValidator>
+                       
                     </td></tr>
                 <tr style="color:#003680; height:30px;">                                 
                     <td align="left" colspan="2">  
                         <asp:TextBox ID="txtEmail" runat="server" Width="265" ValidationGroup="val-desk" ForeColor="Red" Font-Size="1.125em" Placeholder="E-Mail" CssClass="bg-email-icon" style="margin-left:45px;color:#003680"/>                    
                         <asp:RequiredFieldValidator ID="valreqtxtEmail" ControlToValidate="txtEmail" SetFocusOnError="true" ValidationGroup="val-desk" runat="server" Text="" ForeColor="Red"></asp:RequiredFieldValidator>                        
                         <asp:RegularExpressionValidator ControlToValidate="txtEmail" runat="server" ID="regexval_txt_Email" ValidationGroup="val-desk" ValidationExpression="[\w\.]{0,2}\@(\bverag.ag\b)" Display="Dynamic" SetFocusOnError="true" style="font-size:1em" ForeColor="Red"></asp:RegularExpressionValidator>
-                        <asp:RegularExpressionValidator ControlToValidate="txtEmail" runat="server" ID="regexval_txt_Email_2" ValidationGroup="val-desk" ValidationExpression="[\w\.]{0,2}\@[\w]+(?:\.[\w]{3}|\.[\w]{2}\.[\w]{2}|\.[\w]{2})\b" Display="Dynamic" ForeColor="Red" SetFocusOnError="true"></asp:RegularExpressionValidator>
+   
                     </td></tr>
                 <tr style="color:#003680; height:20px;">                                
                      <td align="left" colspan="2"> 
@@ -273,7 +273,9 @@
                 <tr style="color:#003680; height:10px;">
                 <td align="right" colspan="2">                    
                 <asp:Label ID="lblMessage" runat="server" />
-                    </td></tr>                
+                    <asp:RegularExpressionValidator ID="valid_getNumberInput" ControlToValidate="txt_CustomerID" style="font-size:17px" ForeColor="Red" ValidationGroup="val-desk" runat="server" Display="Dynamic" SetFocusOnError="false" ErrorMessage="The Customer-ID is not valid." ValidationExpression="[0-9]{4,10}"></asp:RegularExpressionValidator>
+                                     <asp:RegularExpressionValidator ControlToValidate="txtEmail" runat="server" ID="regexval_txt_Email_2" ValidationGroup="val-desk" ValidationExpression="[\w\.]{0,2}\@[\w]+(?:\.[\w]{3}|\.[\w]{2}\.[\w]{2}|\.[\w]{2})\b" Display="Dynamic" ForeColor="Red" SetFocusOnError="true"></asp:RegularExpressionValidator>    
+                </td></tr>                
                 <tr style="color:#003680; height:32px;"><td>    
                      <asp:LinkButton ID="btn_Send" runat="server" CssClass="btn btn-primary" Width="265px" Enabled="true" AutoPostBack="True" Font-Size="22px" style="margin-left:49px;border:none" OnClick="btn_Send_Click" Height="40px"><center><label for="btn_Send" style="color:#fff;margin:0 2px 2px auto;font-size:21px"><center>Send</center></label></center></asp:LinkButton> 
                                     </td></tr> 
diff --git a/login/login_FLEX.aspx b/login/login_FLEX.aspx
index 785ed9c..7bb0422 100644
--- a/login/login_FLEX.aspx
+++ b/login/login_FLEX.aspx
@@ -342,14 +342,14 @@
                                         <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;"></asp:TextBox>                                             
                                             <asp:RequiredFieldValidator ID="CustomerID_M_required" runat="server" ControlToValidate="txt_CustomerID_M" SetFocusOnError="false" ForeColor="Red" style="margin-left:22px;font-size:19px" ValidationGroup="Login_M" ErrorMessage=""></asp:RequiredFieldValidator>                                      
-                                            <asp:RegularExpressionValidator ID="valid_getNumber_M_Input" ControlToValidate="txt_CustomerID_M" ValidationGroup="Login_M" ForeColor="Red" Font-Size="20px" 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>
+                                            
                                         </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"></asp:TextBox>                                                                                     
-                                        <asp:RequiredFieldValidator ID="UserName_M_required" runat="server" ControlToValidate="Username" ErrorMessage="" ForeColor="Red" style="margin-left:22px;font-size:19px" ToolTip="The Username is required." ValidationGroup="Login_M"></asp:RequiredFieldValidator> 
-                                        <asp:RegularExpressionValidator ID="check_UserName_M_regex" ControlToValidate="Username" ValidationGroup="Login_M" ForeColor="Red" 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:RequiredFieldValidator ID="UserName_M_required" runat="server" ControlToValidate="Username" ErrorMessage="" ForeColor="Red" style="margin-left:22px;font-size:19px" ValidationGroup="Login_M"></asp:RequiredFieldValidator> 
+                                        
                                      </td>
                                 </tr>
                                <tr style="color:#003680; height:86px;">  
@@ -374,6 +374,8 @@
                                  <tr style="color:#003680; height:12px">
                                       <td align="center" style="color:Red;" 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" 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="20px" 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>
                                       </td>
                                  </tr>                          
                                 </table>