From 81c66c80914f7700b9a3e423e44da742bd932a5c Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Mon, 11 Oct 2021 14:20:27 +0200
Subject: [PATCH] =?UTF-8?q?=C3=84nderungen=20an=20Login=20Struktur?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Customers/Default2.aspx | 24 +++++++++---------------
 css/login/loginFLEX.css |  5 +++--
 login/ChangePW.aspx     |  2 +-
 login/ForgotPW.aspx     |  2 +-
 login/login_FLEX.aspx   | 40 +++++++++++++---------------------------
 5 files changed, 27 insertions(+), 46 deletions(-)

diff --git a/Customers/Default2.aspx b/Customers/Default2.aspx
index 5908ed4..291d104 100644
--- a/Customers/Default2.aspx
+++ b/Customers/Default2.aspx
@@ -40,11 +40,7 @@
                                         <asp:Label ID="UserNameLabel" runat="server" AssociatedControlID="UserName" CssClass="txt_design2">Benutzername:</asp:Label>      
                                      </td>
                                      <td align="left">
-                                        <asp:TextBox ID="UserName" runat="server" TextMode="SingleLine" Width = "220" ValidationGroup="txt_Username" required="true" Font-Size="1.125em"></asp:TextBox>
-                                     </td>
-                                </tr>
-                                <tr style="color:#003680; height:23px;">
-                                   <td align="left" colspan="2">             
+                                        <asp:TextBox ID="UserName" runat="server" TextMode="SingleLine" Width = "220" ValidationGroup="txt_Username" required="true" Font-Size="1.125em"></asp:TextBox>                                         
                                        <asp:RequiredFieldValidator ID="UserNamerequired" runat="server" ControlToValidate="UserName" ErrorMessage="Der Benutzername ist erforderlich." ToolTip="Der Benutzername ist erforderlich." ValidationGroup="txt_Username">Der Benutzername ist erforderlich.</asp:RequiredFieldValidator> 
                                    </td>
                                 </tr>
@@ -54,14 +50,16 @@
                                     </td>
                                     <td align="left" colspan="2">
                                         <asp:TextBox ID="Password" runat="server" TextMode="Password" required="true" Width = "220" Font-Size="1.125em" ValidationGroup="chk_PWField" MaxLength="30"></asp:TextBox>
-                                    </td>
-                                 </tr>
-                                 <tr style="color:#003680; height:46px;">
-                                      <td align="left" colspan="4">
+                                   
                                           <asp:RequiredFieldValidator ID="Passwordrequired" runat="server" ControlToValidate="Password" ErrorMessage="Das Kennwort ist erforderlich." ToolTip="Das Kennwort ist erforderlich." ValidationGroup="chk_PWField">Bitte Passwort angeben.</asp:RequiredFieldValidator>                                                                    
                                           <asp:RegularExpressionValidator ID="checkpwdREGEX" ControlToValidate="Password" ValidationGroup="chk_PWField" runat="server" Display="Dynamic" SetFocusOnError="true" ValidationExpression=""></asp:RegularExpressionValidator>
                                       </td>
-                                 </tr>                               
+                                 </tr>         
+                                <tr style="color:#003680; height:23px;">
+                                      <td align="left" colspan="2">
+                                         <asp:Button ID="LoginButton" runat="server" CommandName="Login" Text="Login" ValidationGroup="Login1" target="_top" OnClientClick="bust2()" Width="97px" Font-Size="18px"/>
+                                      </td>
+                               </tr>
                                  <tr style="color:#003680; height:23px;">
                                       <td align="left" colspan="2">
                                            <asp:CheckBox ID="RememberMe" runat="server" Text="Anmeldedaten speichern." />
@@ -72,11 +70,7 @@
                                            <asp:Literal ID="FailureText" runat="server" EnableViewState="False"></asp:Literal>
                                       </td>
                                  </tr>
-                                 <tr style="color:#003680; height:23px;">
-                                      <td align="left" colspan="2">
-                                         <asp:Button ID="LoginButton" runat="server" CommandName="Login" Text="Login" ValidationGroup="Login1" target="_top" OnClientClick="bust2()" Width="97px" Font-Size="18px"/>
-                                      </td>
-                                  
+                                <tr>                                 
                                      <td align="left" colspan="2">                                  
                                         <asp:LinkButton ID="LinkButton1" runat="server" target="_top" OnClientClick="bust2()">Admin-Login</asp:LinkButton>
                                      </td>
diff --git a/css/login/loginFLEX.css b/css/login/loginFLEX.css
index e011229..f243bcc 100644
--- a/css/login/loginFLEX.css
+++ b/css/login/loginFLEX.css
@@ -25,7 +25,7 @@
 }
 .container-fluid {
      width: 400px;
-    height: 379px;
+    height: 400px;
     background-color: rgba(255,255,255,0.5);
     margin: 0 auto;
     margin-top: 220px;
@@ -52,7 +52,8 @@
 }
 .txt_design2 {
     color: #003680;
-    font-size: 1.725em;
+    font-size: 1.695em;
+    margin-right:1px;
 }
 #LoginButton {
     background-color: #003680;
diff --git a/login/ChangePW.aspx b/login/ChangePW.aspx
index fa9ce14..d3af548 100644
--- a/login/ChangePW.aspx
+++ b/login/ChangePW.aspx
@@ -71,7 +71,7 @@
         <div class="container-fluid">
             <form id="form1" runat="server">  
                <center>
-                 <table id="tbl_main" cellpadding="0">
+                 <table id="tbl_main" cellpadding="0" style="margin: 2px 4px 1px 2px">
                      <tr style="color:#003680;height:38px;">
                         <td>                            
                             <asp:Label ID="lbl_Ueberschrift" runat="server" Text="Passwortwechsel:"></asp:Label>
diff --git a/login/ForgotPW.aspx b/login/ForgotPW.aspx
index 03c5043..d76804a 100644
--- a/login/ForgotPW.aspx
+++ b/login/ForgotPW.aspx
@@ -71,7 +71,7 @@
         <div class="container-fluid">          
         <form id="form1" runat="server">
             <center>
-            <table id="tbl_main" cellpadding="0">
+            <table id="tbl_main" cellpadding="0" style="margin:4px 4px 4px 4px; border: none;">
                 <tr style="color:#003680;height:35px;">
                                    <td>
                                        <asp:Button ID="btn_Back" runat="server" Text="Back" PostBackUrl="~/login/login_FLEX.aspx" OnClick="btn_Back_Click"/>
diff --git a/login/login_FLEX.aspx b/login/login_FLEX.aspx
index ac8cf4e..7dc9f59 100644
--- a/login/login_FLEX.aspx
+++ b/login/login_FLEX.aspx
@@ -88,41 +88,31 @@
                                 <tr style="color:#003680; height:46px;">
                                         <td align="left">  
                                              <asp:Label ID="CustomerIDLabel" runat="server" AssociatedControlID="CustomerID" CssClass="txt_design2">Kundennummer</asp:Label>                                      
-                                            <asp:TextBox ID="CustomerID" runat="server" required="true" Width = "220" ValidationGroup="txt_checkUID" OnTextChanged="CustomerID_TextChanged1" Font-Size="1.125em"></asp:TextBox>  
-                                        </td>
-                                </tr>
-                                <tr style="color:#003680; height:46px;">
-                                        <td align="left">
-                                            <asp:RequiredFieldValidator ID="CustomerIDrequired" runat="server" ControlToValidate="CustomerID" SetFocusOnError="true" ValidationGroup="txt_checkUID" ErrorMessage="Die Kundennummer ist erforderlich"></asp:RequiredFieldValidator>
-                                       </td>
-                                    </tr>
-                                    <tr><td align="left">
+                                            <asp:TextBox ID="CustomerID" runat="server" required="true" Width = "207" ValidationGroup="txt_checkUID" OnTextChanged="CustomerID_TextChanged1" Font-Size="1.125em" style="margin-left:-4px"></asp:TextBox>                                   
+                                            <asp:RequiredFieldValidator ID="CustomerIDrequired" runat="server" ControlToValidate="CustomerID" SetFocusOnError="true" ValidationGroup="txt_checkUID" ErrorMessage="Die Kundennummer ist erforderlich"></asp:RequiredFieldValidator>                                      
                                             <asp:RegularExpressionValidator ID="valid_getNumberInput" ControlToValidate="CustomerID" ValidationGroup="txt_checkUID" runat="server" Display="Dynamic" SetFocusOnError="true" ValidationExpression="<%=regexUID %>"></asp:RegularExpressionValidator>
                                         </td>
                                 </tr>  
                                 <tr style="color:#003680; height:46px;">  
                                      <td align="left" colspan="2">
                                         <asp:Label ID="UserNameLabel" runat="server" AssociatedControlID="UserName" CssClass="txt_design2">Benutzername</asp:Label>                                           
-                                        <asp:TextBox ID="UserName" runat="server" TextMode="SingleLine" Width = "220" ValidationGroup="txt_Username" required="true" Font-Size="1.125em"></asp:TextBox>
-                                     </td>
-                                </tr>
-                                <tr style="color:#003680; height:15px;">
-                                   <td align="left" colspan="4">             
+                                        <asp:TextBox ID="UserName" runat="server" TextMode="SingleLine" Width = "207" ValidationGroup="txt_Username" required="true" Font-Size="1.125em" style="margin-right:-14px"></asp:TextBox>                                                
                                        <asp:RequiredFieldValidator ID="UserNamerequired" runat="server" ControlToValidate="UserName" ErrorMessage="Der Benutzername ist erforderlich." ToolTip="Der Benutzername ist erforderlich." ValidationGroup="txt_Username"></asp:RequiredFieldValidator> 
                                    </td>
                                 </tr>
                                <tr style="color:#003680; height:46px;">  
                                      <td align="left" colspan="2">
                                         <asp:Label ID="PasswordLabel" runat="server" AssociatedControlID="Password" CssClass="txt_design2">Kennwort</asp:Label>
-                                        <asp:TextBox ID="Password" runat="server" TextMode="Password" required="true" Width = "220" Font-Size="1.125em" ValidationGroup="chk_PWField" MaxLength="30"></asp:TextBox>
-                                    </td>
-                                 </tr>
-                                 <tr style="color:#003680; height:15px;">
-                                      <td align="left" colspan="2">
-                                          <asp:RequiredFieldValidator ID="Passwordrequired" runat="server" ControlToValidate="Password" ErrorMessage="Bitte Passwort angeben" ToolTip="Das Kennwort ist erforderlich." ValidationGroup="chk_PWField"></asp:RequiredFieldValidator>                                                                    
-                                          <asp:RegularExpressionValidator ID="checkpwdREGEX" ControlToValidate="Password" ValidationGroup="chk_PWField" runat="server" Display="Dynamic" SetFocusOnError="true" ValidationExpression="<%=regexPWVal %>"></asp:RegularExpressionValidator>
+                                        <asp:TextBox ID="Password" runat="server" TextMode="Password" required="true" Width = "207" Font-Size="1.125em" ValidationGroup="chk_PWField" MaxLength="30" AutoCompleteType="Enabled" CausesValidation="true" style="margin-left:56px"></asp:TextBox>                                    
+                                         <asp:RequiredFieldValidator ID="Passwordrequired" runat="server" ControlToValidate="Password" ErrorMessage="Bitte Passwort angeben" ToolTip="Das Kennwort ist erforderlich." ValidationGroup="chk_PWField"></asp:RequiredFieldValidator>                                                                    
+                                         <asp:RegularExpressionValidator ID="checkpwdREGEX" ControlToValidate="Password" ValidationGroup="chk_PWField" runat="server" Display="Dynamic" SetFocusOnError="true" ValidationExpression="<%=regexPWVal %>"></asp:RegularExpressionValidator>
                                       </td>
-                                 </tr>                               
+                                 </tr>       
+                         <tr style="color:#003680; height:23px;">
+                                      <td align="left" colspan="2">
+                                         <asp:Button ID="LoginButton" runat="server" CommandName="Login" Text="Login" ValidationGroup="Login1" target="_top" OnClientClick="bust2()" Width="97px" Font-Size="18px"/>
+                                      </td>
+                             </tr>
                                  <tr style="color:#003680; height:23px;">
                                       <td align="left" colspan="2">
                                            <asp:CheckBox ID="RememberMe" runat="server" Text="Anmeldedaten speichern." />
@@ -132,12 +122,8 @@
                                       <td align="center" style="color:Red;" colspan="2">
                                            <asp:Literal ID="FailureText" runat="server" EnableViewState="False"></asp:Literal>
                                       </td>
-                                 </tr>
+                                 </tr>                                  
                                  <tr style="color:#003680; height:23px;">
-                                      <td align="left" colspan="2">
-                                         <asp:Button ID="LoginButton" runat="server" CommandName="Login" Text="Login" ValidationGroup="Login1" target="_top" OnClientClick="bust2()" Width="97px" Font-Size="18px"/>
-                                      </td>
-                                  
                                      <td align="left" colspan="2">                                  
                                         <asp:LinkButton ID="LinkButton1" runat="server" target="_top" OnClientClick="bust2()">Admin-Login</asp:LinkButton>
                                      </td>