From e030a3b1ea0392c38b11a8dbace8981996d931f5 Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Fri, 19 Nov 2021 08:50:48 +0100
Subject: [PATCH] =?UTF-8?q?=C3=84nderungen=20validatoren=20und=20GUIDesign?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 css/login/ForgotPW.css | 31 ++++++++++++++-----------------
 login/Change_PW.aspx   |  6 +++---
 login/ForgotPW.aspx    | 29 ++++++++++++++++++++---------
 login/ForgotPW.aspx.vb |  6 ++++++
 4 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/css/login/ForgotPW.css b/css/login/ForgotPW.css
index e662217..03d9e05 100644
--- a/css/login/ForgotPW.css
+++ b/css/login/ForgotPW.css
@@ -10,7 +10,17 @@
     overflow-y: clip;
     overflow-x: clip;
 }
-
+.container-fluid {
+    width: 500px;
+    height: 473px;
+    position: absolute;
+    background-color: rgba(255,255,255,0.5);
+    top: 50%;
+    bottom: 50%;
+    left: 50%;
+    right: 50%;
+    margin: -140px auto auto -180px;
+}   
 #Login1_LoginButton {
     color: #fff;
     background-color: #003680;
@@ -24,27 +34,14 @@
     height: 100%;
     margin: 0 auto;
 }
-
-.container-fluid {
-    width: 400px;
-    height: 350px;
-    background-color: rgba(255,255,255,0.5);
-    top: 50%;
-    bottom: auto;
-    left: -20%;
-    right: 520px;
-    margin: 0 auto;
-    margin-top: 450px;
-}
-
 #tbl_main {
     font-family: Arial;
-    font-size: 11px;
+    font-size: 14px;
     border: 1px solid gray;
     width: 400px;
     height: 260px;
     margin-block: auto inherit;
-    margin-top:40px;
+    margin: 0% -20% 50% 50%;
 }
 
 #lbl_Ueberschrift {
@@ -88,7 +85,7 @@
     color: #fff;
     width: 140px;
     height: 25px;   
-    font-size:16px;
+    font-size:18px;
 }
 
 .bg-email-icon {
diff --git a/login/Change_PW.aspx b/login/Change_PW.aspx
index b515112..c220abf 100644
--- a/login/Change_PW.aspx
+++ b/login/Change_PW.aspx
@@ -246,7 +246,7 @@
                                  
                    <tr style="color:#003680;height:56.67px;">
                        <td colspan="4">
-                           <asp:TextBox id="txt_Pw" CssClass="bg-key-icon" runat="server" TextMode="Password" Width="250px" Font-Names="Verdana" OnTextChanged="txt_Pw_TextChanged" AutoCompleteType="Disabled" style="margin-left:46px;color:#003680;border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;" OnClick="this.value='';" Placeholder="Enter Password"></asp:TextBox>
+                           <asp:TextBox id="txt_Pw" CssClass="bg-key-icon" runat="server" TextMode="Password" Width="250px" Font-Names="Verdana" OnTextChanged="txt_Pw_TextChanged" AutoCompleteType="Disabled" style="margin-left:40px;color:#003680;border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;" OnClick="this.value='';" Placeholder="Enter Password"></asp:TextBox>
                            <span></span>                       
                        </td>
                    </tr>
@@ -258,7 +258,7 @@
                               
                          <tr style="color:#003680;height:56.67px;">
                             <td>
-                                <asp:TextBox id="txt_Pw_WH" CssClass="bg-key-icon" Width="250px" OnTextChanged="txt_Pw_WH_TextChanged" runat="server" TextMode="Password" Font-Names="Verdana" AutoCompleteType="Disabled" style="margin-left:46px;color:#003680;border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;" OnClick="this.value='';" Placeholder="Repeat Password"></asp:TextBox>  
+                                <asp:TextBox id="txt_Pw_WH" CssClass="bg-key-icon" Width="250px" OnTextChanged="txt_Pw_WH_TextChanged" runat="server" TextMode="Password" Font-Names="Verdana" AutoCompleteType="Disabled" style="margin-left:40px;color:#003680;border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;" OnClick="this.value='';" Placeholder="Repeat Password"></asp:TextBox>  
                                 <span></span>                                
                             </td>
                          </tr>    
@@ -269,7 +269,7 @@
                          </tr>
                         <tr style="color:#003680;height:35.67px;">
                             <td>    
-                                <asp:Button ID="btn_submitpw" runat="server" OnClick="btn_submitpw_Click" Text="Change password" Width="250px" style="margin-left:15%;margin-right:auto;border:none"/>
+                                <asp:Button ID="btn_submitpw" runat="server" OnClick="btn_submitpw_Click" Text="Change password" Width="250px" style="margin-left:19px;margin-right:auto;border:none"/>
                             </td>
                         </tr>
                               <tr style="color:#003680;height:30px;">
diff --git a/login/ForgotPW.aspx b/login/ForgotPW.aspx
index 4c910ae..d84af20 100644
--- a/login/ForgotPW.aspx
+++ b/login/ForgotPW.aspx
@@ -55,6 +55,17 @@
     color: #003680;
     font-size: 1.725em;
         }
+         .container-fluid {
+        width: 400px;
+        height: 473px;
+        position:absolute;
+        background-color: rgba(255,255,255,0.5);
+        top:50%;
+        bottom: 50%;
+        left: 50%;
+        right: 50%;
+        margin: -140px auto auto -180px;
+    }   
     @media (max-width: 558.98px) {
     body {
         font-family: 'Poppins', sans-serif;
@@ -76,7 +87,7 @@
         width: 390px;
         height: 613px;
         margin: 0 auto;
-        margin-top: 0px;
+        margin-top: 50%;
         margin-left: 5%;
     }
     .container-fluid {
@@ -86,7 +97,7 @@
         top:50%;
         bottom: auto;
         left: -2px;
-        right: 520px;
+        right: 2020px;
         margin: auto;
     }
     #tbl_main_M {
@@ -287,13 +298,13 @@
             <center>
                    <!-- Große Bildschirme-->   
             <div class="d-none d-md-block">
-            <table id="tbl_main" cellpadding="0" style="margin: 14px auto 14px auto; border:none;">
-                <tr style="color:#003680;height:48px;">
+            <table id="tbl_main" cellpadding="0" style="border:none;">
+                <tr style="color:#003680;height:28px;">
                                    <td>
                                        <asp:Button ID="btn_Back" runat="server" Width="265" CausesValidation="false" Text="Back" OnClick="btn_Back_Click" style="margin-left:49px;height:31px;font-weight:300;font-size:20px"/>
                                    </td>
                                </tr>
-                 <tr style="color:#003680; height:32px;font-size:14px">
+                 <tr style="color:#003680; height:42px;font-size:14px">
                    <td align="center" colspan="2" style="color:#fff;font-kerning:auto;font-weight:700;">                                     
             <asp:Label ID="lbl_PWvergessen" Text="Forgot your Password?" runat="server" style="color:#003680; margin-left:79px;font-size:19px;font-weight:300"></asp:Label>
                    </td></tr>  
@@ -303,21 +314,21 @@
                    </td></tr> -->
                  <tr style="color:#003680; height:38px;">
                        <td align="right" colspan="2"> 
-                           <asp:label ID="lbl_filldatahere" runat="server" Text="Fill your data in here:" Font-Size="20px" style="margin-left:94px; margin-top:-4px;color:#003680;font-weight:300"></asp:label>           
+                           <asp:label ID="lbl_filldatahere" runat="server" Text="Fill your data in here:" Font-Size="19px" style="margin-left:90px; margin-top:-4px;color:#003680;font-weight:300"></asp:label>           
                </td></tr>
                <tr style="color:#003680; height:38px;"><td colspan="2">
                        <asp:TextBox ID="txt_CustomerID" CssClass="bg-UID-icon" runat="server" ValidationGroup="val-desk" SetFocusOnError="true" Width="265" Placeholder="Customer-ID" style="margin-left:45px;color:#003680;border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;" 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:RequiredFieldValidator ID="CustomerIDrequired" runat="server" ControlToValidate="txt_CustomerID" SetFocusOnError="true" ForeColor="Red" Text="" ErrorMessage="*" ValidationGroup="val-desk"></asp:RequiredFieldValidator>
                     </td></tr>
                 <tr style="color:#003680; height:38px;">                                 
                     <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;border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;"/>                    
-                        <asp:RequiredFieldValidator ID="valreqtxtEmail" ControlToValidate="txtEmail" SetFocusOnError="true" ValidationGroup="val-desk" runat="server" Text="" ForeColor="Red"></asp:RequiredFieldValidator>                                                  
+                        <asp:RequiredFieldValidator ID="valreqtxtEmail" ControlToValidate="txtEmail" SetFocusOnError="true" ValidationGroup="val-desk" runat="server" Text="" ErrorMessage="*" ForeColor="Red"></asp:RequiredFieldValidator>                                                  
                     </td></tr>
                 <tr style="color:#003680; height:38px;">                                
                      <td align="left" colspan="2"> 
                     <asp:TextBox ID="txt_Username" runat="server" CssClass="bg-user-icon" ValidationGroup="val-desk" Placeholder="Username" Font-Size="1.125em" Width="265" style="margin-left:45px;color:#003680;margin-bottom:-6px;border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;" />
-                    <asp:RequiredFieldValidator ID="valreqtxtusername" SetFocusOnError="true" ControlToValidate="txt_Username" ValidationGroup="val-desk" runat="server" ForeColor="Red" Text="" ErrorMessage=""></asp:RequiredFieldValidator>                           
+                    <asp:RequiredFieldValidator ID="valreqtxtusername" SetFocusOnError="true" ControlToValidate="txt_Username" ValidationGroup="val-desk" runat="server" ForeColor="Red" Text="" ErrorMessage="*"></asp:RequiredFieldValidator>                           
                      </td></tr>                              
                 <tr style="color:#003680; height:49px;"><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> 
diff --git a/login/ForgotPW.aspx.vb b/login/ForgotPW.aspx.vb
index 4b94fac..7cf2889 100644
--- a/login/ForgotPW.aspx.vb
+++ b/login/ForgotPW.aspx.vb
@@ -35,6 +35,9 @@ Partial Class ForgotPW
             Dim isCustomeridright As Boolean = False
             Dim isemailright As Boolean = False
             Dim UserID As String = String.Empty
+            CustomerIDrequired.Validate()
+            valreqtxtusername.Validate()
+            valreqtxtEmail.Validate()
             If String.IsNullOrEmpty(txtEmail.Text) = False And String.IsNullOrEmpty(txt_Username.Text) = False And String.IsNullOrEmpty(txt_CustomerID.Text) = False And String.IsNullOrEmpty(txtEmail_M.Text) = True And String.IsNullOrEmpty(txt_Username_M.Text) = True And String.IsNullOrEmpty(txt_CustomerID_M.Text) = True Then
                 valreqtxtusername.Enabled = True
                 valreqtxtEmail.Enabled = True
@@ -273,6 +276,9 @@ Partial Class ForgotPW
         Dim isusernameright As Boolean = False
         Dim isuserIDright As Boolean = False
         Dim isuserEmailright As Boolean = False
+        CustomerID_M_required.Validate()
+        valreqtxtusername_M.Validate()
+        valid_getNumber_M_Input.Validate()
         'Mobil
         If String.IsNullOrEmpty(txtEmail_M.Text) = False And String.IsNullOrEmpty(txt_Username_M.Text) = False And String.IsNullOrEmpty(txt_CustomerID_M.Text) = False And String.IsNullOrEmpty(txtEmail.Text) = True And String.IsNullOrEmpty(txt_Username.Text) = True And String.IsNullOrEmpty(txt_CustomerID.Text) = True Then
             valreqtxtusername.Enabled = False