From 40e849681a3f270dd21d35c04bd0eb007ac8b9b6 Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Tue, 15 Feb 2022 08:41:15 +0100
Subject: [PATCH] Revert "Login funktioniert mit Anpassungen der Bezeichner
 wieder"

This reverts commit 0c57f81ef0d21ad924b85902bd67e26f822d9fc7.
---
 login/login_FLEX.aspx | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/login/login_FLEX.aspx b/login/login_FLEX.aspx
index f7309ff..482f65a 100644
--- a/login/login_FLEX.aspx
+++ b/login/login_FLEX.aspx
@@ -411,20 +411,20 @@
                                     </tr>
                                     <tr style="color: #003680; height: 46px;">
                                         <td align="left" colspan="2" style="font-kerning: auto;">
-                                            <asp:TextBox ID="CustomerID" CssClass="bg-UID-icon" runat="server" ValidationGroup="Login1" 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="CustomerID" ForeColor="Red" Font-Size="18px" SetFocusOnError="true" ValidationGroup="Login" ErrorMessage="*"></asp:RequiredFieldValidator>
+                                            <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" Font-Size="18px" SetFocusOnError="true" ValidationGroup="Login" ErrorMessage="*"></asp:RequiredFieldValidator>
                                         </td>
                                     </tr>
                                     <tr style="color: #003680; height: 46px; font-kerning: auto;">
                                         <td align="left" colspan="2">
-                                            <asp:TextBox ID="UserName" runat="server" CssClass="bg-user-icon" TextMode="SingleLine" Width="330px" ToolTip="The Username is required." ValidationGroup="Login1" Font-Size="1.25em" Style="margin-left: 22px; color: #003680; border-radius: 8px 8px 8px 8px; -webkit-border-radius: 8px; -moz-border-radius: 8px;" Placeholder="Username"></asp:TextBox>
+                                            <asp:TextBox ID="UserName" runat="server" CssClass="bg-user-icon" TextMode="SingleLine" Width="330px" ToolTip="The Username is required." ValidationGroup="Login" Font-Size="1.25em" Style="margin-left: 22px; color: #003680; border-radius: 8px 8px 8px 8px; -webkit-border-radius: 8px; -moz-border-radius: 8px;" Placeholder="Username"></asp:TextBox>
                                             <asp:RequiredFieldValidator ID="UserNamerequired" ForeColor="Red" Font-Size="17px" runat="server" ControlToValidate="UserName" SetFocusOnError="true" ErrorMessage="" ValidationGroup="Login"></asp:RequiredFieldValidator>
                                         </td>
                                     </tr>
                                     <tr style="color: #003680; height: 46px; font-kerning: auto;">
                                         <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="18px" ValidationGroup="Login1" 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; font-kerning: auto;">
@@ -446,7 +446,7 @@
                                             <!-- <asp:TextBox ID="txt_numbuserstest" runat="server"></asp:TextBox>-->
                                             <!--<asp:Button ID="btn_CreateTestusers" OnClick="CreateTestusers_Click" CausesValidation="false" runat="server" Text="Create Users"/>--->
                                             <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="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>
+                                            <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>
@@ -467,20 +467,20 @@
                                     </tr>
                                     <tr style="color: #003680; height: 48px">
                                         <td align="left">
-                                            <asp:TextBox ID="txt_CustomerID" CssClass="bg-UID-icon" runat="server" ValidationGroup="Login_M" Width="325" Placeholder="Customer-ID" Font-Size="2.025em" Style="margin-left: 16px; margin-top: 10px; 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" SetFocusOnError="true" Font-Size="18px" ForeColor="Red" Style="margin-left: 22px;" ValidationGroup="Login_M" ErrorMessage="*"></asp:RequiredFieldValidator>
+                                            <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: 16px; margin-top: 10px; 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" Font-Size="18px" ForeColor="Red" Style="margin-left: 22px;" ValidationGroup="Login_M" ErrorMessage="*"></asp:RequiredFieldValidator>
                                         </td>
                                     </tr>
                                     <tr style="color: #003680; height: 48px;">
                                         <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: 16px; 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" Font-Size="18px" ErrorMessage="*" ForeColor="Red" Style="margin-left: 22px;" ValidationGroup="Login_M" SetFocusOnError="false"></asp:RequiredFieldValidator>
+                                            <asp:TextBox ID="Username_m" runat="server" CssClass="bg-user-icon" TextMode="SingleLine" Width="325" ValidationGroup="Login_M" Placeholder="Username" required="true" Font-Size="2.025em" Style="margin-left: 16px; 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_m" Font-Size="18px" ErrorMessage="*" ForeColor="Red" Style="margin-left: 22px;" ValidationGroup="Login_M" SetFocusOnError="false"></asp:RequiredFieldValidator>
                                         </td>
                                     </tr>
                                     <tr style="color: #003680; height: 48px;">
                                         <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: 16px; 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" Font-Size="18px" ControlToValidate="Password" Style="margin-left: 22px; color: red;" ErrorMessage="*" ForeColor="Red" ValidationGroup="Login_M"></asp:RequiredFieldValidator>
+                                            <asp:TextBox ID="txt_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: 16px; 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" Font-Size="18px" ControlToValidate="txt_Password" Style="margin-left: 22px; color: red;" ErrorMessage="*" ForeColor="Red" ValidationGroup="Login_M"></asp:RequiredFieldValidator>
                                         </td>
                                     </tr>
                                     <tr style="color: #003680; height: 70px;">
@@ -499,8 +499,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="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" 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>
+                                            <asp:RegularExpressionValidator ID="check_UserName_M_regex" ControlToValidate="Username_m" 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>