Egalware/NKC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/FixPageInfiniteReload'

Browse Source
This commit is contained in:
Samuele Locatelli
2023-08-10 10:02:54 +02:00
parent 188e1a6ff4 8cddc5ae26
commit 53f29f7e61
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NKC_WF/Site.Master
+1 -1
View File
@@ -29,7 +29,7 @@
</head>
<body class="pt-0">
<form runat="server">
<asp:ScriptManager runat="server" EnablePartialRendering="false">
<asp:ScriptManager runat="server">
<Scripts>
<%--To learn more about bundling scripts in ScriptManager see https://go.microsoft.com/fwlink/?LinkID=301884 --%>
<%--Framework Scripts--%>
NKC_WF/WebUserControls/cmp_footer.ascx
+3 -3
View File
@@ -16,8 +16,8 @@
<div class="px-1">
<asp:UpdateProgress ID="UpdateProgressDisplay" runat="server" DisplayAfter="10">
<ProgressTemplate>
<i class="fa fa-circle-o-notch fa-spin fa-fw" aria-hidden="true"></i>
<i class="fa fa-circle-o-notch fa-spin fa-fw" aria-hidden="true"></i>
<i class="fa fa-circle-o-notch fa-spin fa-fw text-primary" aria-hidden="true"></i>
<i class="fa fa-circle-o-notch fa-spin fa-fw text-info" aria-hidden="true"></i>
<i class="fa fa-circle-o-notch fa-spin fa-fw" aria-hidden="true"></i>
</ProgressTemplate>
</asp:UpdateProgress>
@@ -25,7 +25,7 @@
</div>
</div>
</div>
<asp:Timer ID="Timer1" runat="server" Interval="10000">
<asp:Timer ID="Timer1" runat="server" Interval="60000" OnTick="Timer1_Tick">
</asp:Timer>
</div>
</footer>
NKC_WF/WebUserControls/cmp_footer.ascx.cs
+1 -2
View File
@@ -26,8 +26,7 @@ namespace NKC_WF.WebUserControls
/// </summary>
private void setTimer()
{
Timer1.Tick += Timer1_Tick;
Timer1.Interval = SteamWare.memLayer.ML.confReadInt("intUpdatePagina_ms");
Timer1.Interval = memLayer.ML.confReadInt("intUpdatePagina_ms");
}
#endregion Private Methods