From 8b33ebcf279cbf52df6f6fdddb95f95d7969286a Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Mon, 25 Oct 2021 11:21:48 +0200
Subject: [PATCH] GUI-Anpassungen

---
 login/login_FLEX_iFrame.aspx | 30 +++++++++++-------------------
 login/login_TEST.aspx        |  3 +--
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/login/login_FLEX_iFrame.aspx b/login/login_FLEX_iFrame.aspx
index 36e0b63..0b180dd 100644
--- a/login/login_FLEX_iFrame.aspx
+++ b/login/login_FLEX_iFrame.aspx
@@ -78,32 +78,22 @@
                                         <td align="center" colspan="2" style="color:#003680;font-kerning:auto;font-weight:700;">
                                             <asp:Label ID="Label1" runat="server" Text="Login" style="color:#003680;font-size:1.420901320901321em"></asp:Label></td>
                                </tr>
-                                    <tr>
-                                         <td align="right">  
-                                             <asp:Label ID="CustomerIDLabel" runat="server" AssociatedControlID="CustomerID" required="true">Kundennummer:</asp:Label>                                            
-                                         </td>
+                                    <tr>                                         
                                         <td>                                
-                                            <asp:TextBox ID="CustomerID" runat="server" TextMode="Number"></asp:TextBox> 
-                                            <asp:RequiredFieldValidator ID="CustomerIDrequired" runat="server" ControlToValidate="CustomerID" ErrorMessage="Die Kundennummer ist erforderlich." ToolTip="Die Kundennummer ist erforderlich." ValidationGroup="Login1">*</asp:RequiredFieldValidator> 
-                                            <asp:RegularExpressionValidator ID="CustomerIDregex" runat="server" ControlToValidate="CustomerID" Display="Dynamic" ValidationExpression="<%=RegexSammlung_VERAG.UID %>" ErrorMessage="Bitte gültige Zeichen verwenden"></asp:RegularExpressionValidator>
+                                            <asp:TextBox ID="CustomerID" runat="server" TextMode="Number" Placeholder="Kundennummer" ToolTip="Die Kundennummer ist erforderlich"></asp:TextBox> 
+                                            <asp:RequiredFieldValidator ID="CustomerIDrequired" runat="server" ControlToValidate="CustomerID" ErrorMessage="" ValidationGroup="Login1"></asp:RequiredFieldValidator>                                             
                                         </td>
                                     </tr>  
-                                <tr>
-                                   <td align="right">
-                                        <asp:Label ID="UserNameLabel" runat="server" AssociatedControlID="UserName" required="true">Benutzername:</asp:Label>
-                                    </td>
+                                <tr>                                  
                                     <td>                       
-                                        <asp:TextBox ID="UserName" runat="server" TextMode="SingleLine"></asp:TextBox>
-                                        <asp:RequiredFieldValidator ID="UserNamerequired" runat="server" ControlToValidate="UserName" ErrorMessage="Der Benutzername ist erforderlich." ToolTip="Der Benutzername ist erforderlich." ValidationGroup="Login1">*</asp:RequiredFieldValidator> 
+                                        <asp:TextBox ID="UserName" runat="server" TextMode="SingleLine" Placeholder="Username" ToolTip="Der Benutzername ist erforderlich"></asp:TextBox>
+                                        <asp:RequiredFieldValidator ID="UserNamerequired" runat="server" ControlToValidate="UserName" ErrorMessage="" ValidationGroup="Login1"></asp:RequiredFieldValidator> 
                                     </td>
                                     </tr>
-                                    <tr>  
-                                     <td align="right">
-                                           <asp:Label ID="PasswordLabel" runat="server" AssociatedControlID="Password" required="true">Kennwort:</asp:Label>
-                                        </td> 
+                                    <tr>                                      
                                         <td>
-                                            <asp:TextBox ID="Password" runat="server" TextMode="Password"></asp:TextBox>
-                                            <asp:RequiredFieldValidator ID="Passwordrequired" runat="server" ControlToValidate="Password" ErrorMessage="Das Kennwort ist erforderlich." ToolTip="Das Kennwort ist erforderlich." ValidationGroup="Login1">*</asp:RequiredFieldValidator>                                                                    
+                                            <asp:TextBox ID="Password" runat="server" TextMode="Password" Placeholder="Password"></asp:TextBox>
+                                            <asp:RequiredFieldValidator ID="Passwordrequired" runat="server" ControlToValidate="Password" ErrorMessage="" ToolTip="Das Kennwort ist erforderlich." ValidationGroup="Login1"></asp:RequiredFieldValidator>                                                                    
                                         </td>
                                     </tr>
                                     <tr>
@@ -114,6 +104,8 @@
                                     <tr>
                                         <td align="center" colspan="2" style="color:Red;">
                                             <asp:Literal ID="FailureText" runat="server" EnableViewState="False"></asp:Literal>
+                                            <asp:RegularExpressionValidator ID="CustomerIDregex" runat="server" ControlToValidate="CustomerID" Display="Dynamic" ValidationExpression="<%=RegexSammlung_VERAG.UID %>" ErrorMessage="Bitte gültige Zeichen verwenden"></asp:RegularExpressionValidator>
+
                                         </td>
                                     </tr>
                                     <tr>
diff --git a/login/login_TEST.aspx b/login/login_TEST.aspx
index 6998502..eb1bfec 100644
--- a/login/login_TEST.aspx
+++ b/login/login_TEST.aspx
@@ -105,8 +105,7 @@
                                         <td>
                                             <asp:TextBox ID="Password" runat="server" TextMode="Password"></asp:TextBox>
                                             <asp:RequiredFieldValidator ID="PasswordRequired" runat="server" ControlToValidate="Password" ErrorMessage="Das Kennwort ist erforderlich." ToolTip="Das Kennwort ist erforderlich." ValidationGroup="Login1">*</asp:RequiredFieldValidator> 
-                                                         
-                               
+                                                                                        
                                         </td>
                                     </tr>
                                     <tr>