From d89d165ddfd6f55129e80a60bbaffd2b0f50e269 Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Fri, 22 Oct 2021 09:24:45 +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    |  2 +-
 login/ForgotPW.aspx.vb |  3 ++-
 login/login_FLEX.aspx  | 10 +++++-----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/login/ForgotPW.aspx b/login/ForgotPW.aspx
index 564d7c3..13ea5b7 100644
--- a/login/ForgotPW.aspx
+++ b/login/ForgotPW.aspx
@@ -237,7 +237,7 @@
             <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" Width="265" CausesValidation="false" Text="Back"  style="margin-left:49px;"/>
+                                       <asp:Button ID="btn_Back" runat="server" Width="265" CausesValidation="false" Text="Back" OnClientClick="JavaScript:window.history.back(1);return false;" style="margin-left:49px;"/>
                                    </td>
                                </tr>
                  <tr style="color:#003680; height:32px;font-size:14px">
diff --git a/login/ForgotPW.aspx.vb b/login/ForgotPW.aspx.vb
index 5deddce..8ab06a6 100644
--- a/login/ForgotPW.aspx.vb
+++ b/login/ForgotPW.aspx.vb
@@ -448,7 +448,7 @@ Partial Class ForgotPW
         ElseIf String.IsNullOrWhiteSpace(HttpContext.Current.Request.ServerVariables("SERVER_NAME")) = True Then
             getdomianenvironment = HttpContext.Current.Request.ServerVariables("SERVER_NAME")
             'MsgBox(getdomianenvironment)
-            ServPort = ":" + Request.ServerVariables("SERVER_PORT")
+            ServPort = String.Empty
             'pagename = Request.ServerVariables("SCRIPT_NAME")
             mailto = email
             Betreff = "Passwort reset"
@@ -585,6 +585,7 @@ Partial Class ForgotPW
             End If
         Catch ex As Exception
             'MsgBox(Err.Number & ex.Message & ex.StackTrace.ToString) 'Falls ein Fehler auftritt wird eine MsgBox angezeigt
+            lblMessage.Text = "Error12: No Token could be generated! Try to contact the admin."
         End Try
         Return True
     End Function
diff --git a/login/login_FLEX.aspx b/login/login_FLEX.aspx
index 2695d84..2c84d4b 100644
--- a/login/login_FLEX.aspx
+++ b/login/login_FLEX.aspx
@@ -272,7 +272,7 @@
         <form id="form1" runat="server">       
                      <!-- Große Bildschirme-->   
             <div class="d-none d-md-block">
-                 <asp:Login ID = "Login1" runat = "server" OnAuthenticate= "ValidateUser" LoginButtonType="Link" DisplayRememberMe="true" DestinationPageUrl="../Customers/CustomsAviso.aspx" ValidateRequestMode="Enabled">          
+                 <asp:Login ID = "Login1" runat = "server" OnAuthenticate= "ValidateUser" DisplayRememberMe="true" DestinationPageUrl="../Customers/CustomsAviso.aspx" ValidateRequestMode="Enabled">          
             <LayoutTemplate>     
                 <center> 
                     <table id="tbl_main" cellpadding="0" style="margin: 22px 0px 6px 6px; border:none">
@@ -303,7 +303,7 @@
                                  </tr>       
                          <tr style="color:#003680; height:55px;">
                                       <td align="left" colspan="2">
-                                         <asp:LinkButton ID="LoginButton" runat="server" CommandName="Login" BorderStyle="None" Text="Login" ValidationGroup="Login" target="_top" OnClientClick="bust2()" Width="320px" Font-Size="20px" style="margin-left:22px; padding:0px 0px 0px 0px"></asp:LinkButton>
+                                         <asp:LinkButton ID="LoginButton" runat="server" CommandName="Login" BorderStyle="None" Text="Login" ValidationGroup="Login" CssClass="btn btn-primary" target="_top" OnClientClick="bust2()" Width="320px" Font-Size="20px" style="margin-left:22px; padding:0px 0px 0px 0px;background-color:#003680"></asp:LinkButton>
                                       </td>
                              </tr>
                                  <tr id="tblrowbuttons" style="color:#003680; height:37px;">
@@ -311,7 +311,7 @@
                                            <asp:CheckBox ID="RememberMe" runat="server" ValidationGroup="Login" Text="Remember me." style="margin-left:22px;"/>
                                       </td>
                                      <td align="right" colspan="4">                            
-                                       <asp:LinkButton id="btn_ForgotPW" runat="server" target="_top" href="ForgotPW.aspx" style="margin-left:-154px;margin-right:-42px">I forgot my password</asp:LinkButton> 
+                                       <asp:LinkButton id="btn_ForgotPW" runat="server" target="_top" href="ForgotPW.aspx" style="margin-left:-154px;margin-right:-42px">I forgot my password </asp:LinkButton>
                                    </td>  
                                  </tr>
                                  <tr style="color:#003680; height:16px">
@@ -326,7 +326,7 @@
                 </div>
                       <!--Smartphone-Bildschirme-->   
                        <div class="d-md-none"> 
-                             <asp:Login ID = "Login2" runat = "server" OnAuthenticate= "ValidateUser" DestinationPageUrl="../Customers/CustomsAviso.aspx" >
+                             <asp:Login ID = "Login2" runat = "server" OnAuthenticate= "ValidateUser" DisplayRememberMe="true" DestinationPageUrl="../Customers/CustomsAviso.aspx" ValidateRequestMode="Enabled">
                                  <LayoutTemplate>     
                                 <center> 
                            <table id="tbl_main_M" cellpadding="0" style="margin: 4px 0px 4px 4px;border:none">
@@ -357,7 +357,7 @@
                                  </tr>       
                          <tr style="color:#003680; height:143px;">
                                       <td align="left" colspan="2">
-                                         <asp:Button ID="LoginButton_M" runat="server" CommandName="Login" BorderStyle="None" Text="Login" ValidationGroup="Login_M" target="_top" OnClientClick="bust2()" Width="320px" Font-Size="20px" style="margin-left:22px; padding:0px 0px 0px 0px"/>
+                                         <asp:LinkButton ID="LoginButton_M" runat="server" CommandName="Login" BorderStyle="None"  ValidationGroup="Login_M"  CssClass="btn btn-primary" target="_top" OnClientClick="bust2()" Width="320px" Font-Size="20px" style="margin-left:22px; padding:0px 0px 0px 0px;background-color:#003680;height:52px"><center><label for="LoginButton_M" style="margin:0 auto; margin-top:13px">Login</label></center></asp:LinkButton>
                                       </td>
                              </tr>
                                  <tr style="color:#003680; height:46px;">