Fix
This commit is contained in:
@@ -131,7 +131,7 @@
|
|||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td align="left" colspan="2">
|
<td align="left" colspan="2">
|
||||||
<br/> <asp:Button ID="LoginButton" runat="server" CommandName="Login" ValidationGroup="Login1" Text="Login" OnClick="reloadpage" PostBackUrl="~/newpageJulius_Sidebar.aspx" />
|
<br/> <asp:Button ID="LoginButton" runat="server" CommandName="Login" Text="Login" ValidationGroup="Login1" target="_top" href="../newpageJulius_Sidebar.aspx"/>
|
||||||
</td>
|
</td>
|
||||||
<td align="middle" colspan="2">
|
<td align="middle" colspan="2">
|
||||||
<asp:LinkButton ID="LinkButton1" runat="server" target="_top" OnClientClick="bust2()">Admin-Login</asp:LinkButton>
|
<asp:LinkButton ID="LinkButton1" runat="server" target="_top" OnClientClick="bust2()">Admin-Login</asp:LinkButton>
|
||||||
|
|||||||
@@ -59,7 +59,7 @@ Partial Class login_login_TEST
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Protected Sub LoginButton_Click(sender As Object, e As EventArgs)
|
||||||
|
|
||||||
|
End Sub
|
||||||
|
|
||||||
End Class
|
End Class
|
||||||
|
|||||||
@@ -551,9 +551,11 @@
|
|||||||
<asp:LoginView ID="LoginView1" runat="server" ClientIDMode="AutoID">
|
<asp:LoginView ID="LoginView1" runat="server" ClientIDMode="AutoID">
|
||||||
<AnonymousTemplate>
|
<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" />
|
<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>
|
||||||
</AnonymousTemplate>
|
</AnonymousTemplate>
|
||||||
<LoggedInTemplate>
|
<LoggedInTemplate>
|
||||||
<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" />
|
<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>
|
||||||
</LoggedInTemplate>
|
</LoggedInTemplate>
|
||||||
</asp:LoginView>
|
</asp:LoginView>
|
||||||
<div style="height:10px"></div>
|
<div style="height:10px"></div>
|
||||||
@@ -618,5 +620,21 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</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>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
@@ -20,4 +20,9 @@ Partial Class _Default
|
|||||||
'Response.Cookies.Add(cookie2)
|
'Response.Cookies.Add(cookie2)
|
||||||
|
|
||||||
End Sub
|
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
|
End Class
|
||||||
|
|||||||
Reference in New Issue
Block a user