From ba4d403315a5bfbaf732e16b1d1db5738144dad3 Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Wed, 29 Sep 2021 15:39:21 +0200
Subject: [PATCH] Login fix

---
 login/login_FLEX.aspx         |  2 +-
 login/login_FLEX.aspx.vb      |  5 -----
 newpageJulius_Sidebar.aspx    | 24 +++---------------------
 newpageJulius_Sidebar.aspx.vb |  5 -----
 4 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/login/login_FLEX.aspx b/login/login_FLEX.aspx
index 884c3e8..77ae15a 100644
--- a/login/login_FLEX.aspx
+++ b/login/login_FLEX.aspx
@@ -131,7 +131,7 @@
                                     </tr>
                                     <tr>
                                         <td align="left" colspan="2">
-                                           <br/> <asp:Button ID="LoginButton" runat="server" CommandName="Login" Text="Anmelden" ValidationGroup="Login1" target="_top" PostBackUrl="../newpageJulius_Sidebar.aspx"></asp:Button>
+                                           <br/> <asp:Button ID="LoginButton" runat="server" CommandName="Login" Text="Login" ValidationGroup="Login1" target="_top" href="../newpageJulius_Sidebar.aspx"/>
                                         </td>
                                          <td align="middle" colspan="2">                                  
                                        <asp:LinkButton ID="LinkButton1" runat="server" target="_top" OnClientClick="bust2">Admin-Login</asp:LinkButton>
diff --git a/login/login_FLEX.aspx.vb b/login/login_FLEX.aspx.vb
index 39192e2..9e4d7a8 100644
--- a/login/login_FLEX.aspx.vb
+++ b/login/login_FLEX.aspx.vb
@@ -57,9 +57,4 @@ Partial Class login_login_TEST
         End Using
     End Sub
 
-
-
-    Protected Sub LoginButton_Click(sender As Object, e As EventArgs)
-
-    End Sub
 End Class
diff --git a/newpageJulius_Sidebar.aspx b/newpageJulius_Sidebar.aspx
index ed82a87..f1ee163 100644
--- a/newpageJulius_Sidebar.aspx
+++ b/newpageJulius_Sidebar.aspx
@@ -550,12 +550,10 @@
                                     </a> -->  
                              <asp:LoginView ID="LoginView1" runat="server" ClientIDMode="AutoID">
                                  <AnonymousTemplate>                                     
-                                    <iframe name="frame1" sandbox="allow-same-origin allow-top-navigation allow-scripts allow-popups allow-forms" src="/login/login_FLEX.aspx" runat="server" seamless="seamless" style="width:300px;height:300px;overflow:no-content;background-image:none;" scrolling="no" /> 
-                                    <div id="loadingMessage1">Loading...</div>
+                                    <iframe name="frame1" sandbox="allow-same-origin allow-top-navigation allow-scripts allow-popups allow-forms" src="/login/login_FLEX.aspx" runat="server" seamless="seamless" style="width:300px;height:300px;overflow:no-content;background-image:none;" scrolling="no" />                                     
                                      </AnonymousTemplate>
                                  <LoggedInTemplate> 
-                                     <iframe name="frame2" sandbox="allow-same-origin allow-top-navigation allow-scripts allow-popups allow-forms" onload="Unnamed_Load" src="/login/Loggedin.aspx" runat="server" seamless="seamless" style="width:300px;height:300px;overflow:no-content;background-image:none;" scrolling="no" /> 
-                                    <div id="loadingMessage2">Loading...</div>
+                                     <iframe name="frame2" sandbox="allow-same-origin allow-top-navigation allow-scripts allow-popups allow-forms" src="/login/Loggedin.aspx" runat="server" seamless="seamless" style="width:300px;height:300px;overflow:no-content;background-image:none;" scrolling="no" />                                   
                                  </LoggedInTemplate>                                 
                              </asp:LoginView>
                           <div style="height:10px"></div>
@@ -619,22 +617,6 @@
                       //topup
                   }
                } 
-           </script>  
-            <script type="text/javascript">
-                $('#frame1').ready(function () {
-                    $('#loadingMessage1').css('display', 'none');
-                });
-                $('#frame1').load(function () {
-                    $('#loadingMessage1').css('display', 'none');
-                });
-            </script>
-     <script type="text/javascript">
-         $('#frame2').ready(function () {
-             $('#loadingMessage2').css('display', 'none');
-         });
-         $('#frame2').load(function () {
-             $('#loadingMessage2').css('display', 'none');
-         });
-     </script>
+           </script>              
     </body>
 </html>
\ No newline at end of file
diff --git a/newpageJulius_Sidebar.aspx.vb b/newpageJulius_Sidebar.aspx.vb
index 2c4e2af..05832a6 100644
--- a/newpageJulius_Sidebar.aspx.vb
+++ b/newpageJulius_Sidebar.aspx.vb
@@ -20,9 +20,4 @@ Partial Class _Default
         'Response.Cookies.Add(cookie2)
 
     End Sub
-
-    Protected Sub Unnamed_Load(sender As Object, e As EventArgs)
-        Dim frm As HtmlIframe = sender
-        frm.InnerText = "I frame is loading..."
-    End Sub
 End Class