Fixed loading widget again

This commit is contained in:
Andre Lorbach 2016-10-12 11:06:41 +02:00
parent 90dedbe2dc
commit 8edd54c1e6
4 changed files with 8 additions and 7 deletions

View File

@ -511,6 +511,8 @@ function CreateLoadingHelper ( szLoadingText )
(function($) { (function($) {
$.widget("artistan.loading", $.ui.dialog, { $.widget("artistan.loading", $.ui.dialog, {
options: { options: {
/* show: "fade",
hide: "fade",*/
// your options // your options
spinnerClassSuffix: 'spinner', spinnerClassSuffix: 'spinner',
spinnerHtml: szLoadingText,// allow for spans with callback for timeout... spinnerHtml: szLoadingText,// allow for spans with callback for timeout...
@ -520,7 +522,7 @@ function CreateLoadingHelper ( szLoadingText )
minWidth: 220, minWidth: 220,
height: 120, height: 120,
width: 300, width: 300,
modal: true modal: false,
}, },
_create: function() { _create: function() {

View File

@ -1,7 +1,7 @@
<table width="100%" border="0" cellspacing="1" cellpadding="0" class="mainfooter"> <table width="100%" border="0" cellspacing="1" cellpadding="0" class="mainfooter">
<tr> <tr>
<td align="center" class="line0" valign="_top">Made by <a href="http://www.adiscon.com" target="_blank">Adiscon GmbH</a> (2008-2014)</td> <td align="center" class="line0" valign="_top">Made by <a href="http://www.adiscon.com" target="_blank">Adiscon GmbH</a> (2008-2016)</td>
<td align="center" class="line1" valign="_top"> <td align="center" class="line1" valign="_top">
&nbsp;<a href="http://loganalyzer.adiscon.com" target="_blank">Adiscon LogAnalyzer</A> Version {BUILDNUMBER} &nbsp;<a href="http://loganalyzer.adiscon.com" target="_blank">Adiscon LogAnalyzer</A> Version {BUILDNUMBER}
</td> </td>
@ -53,6 +53,7 @@
</table> </table>
<!-- ENDIF SHOWDEBUGMSG="true" --> <!-- ENDIF SHOWDEBUGMSG="true" -->
<script>$("#loading_dialog").loading("loadStop"); /* Hide Loading Widget */</script>
{EXTRA_FOOTER} {EXTRA_FOOTER}
</body> </body>
</html> </html>

View File

@ -21,8 +21,8 @@
{EXTRA_HTMLHEAD} {EXTRA_HTMLHEAD}
</head> </head>
<body TOPMARGIN="0" LEFTMARGIN="0" MARGINWIDTH="0" MARGINHEIGHT="0"> <body TOPMARGIN="0" LEFTMARGIN="0" MARGINWIDTH="0" MARGINHEIGHT="0">
<div id="loading_dialog"></div> <div id="loading_dialog"><br/></div>
<script>CreateLoadingHelper("Loading ... please wait");</script> <script>CreateLoadingHelper("Loading ... please wait"); $("#loading_dialog").loading(); /* Show loading during pageload */</script>
{EXTRA_HEADER} {EXTRA_HEADER}
<!-- IF MAXIMIZED!="true" --> <!-- IF MAXIMIZED!="true" -->

View File

@ -245,7 +245,6 @@
</table> </table>
<!-- ENDIF SourceDescriptionEnabled="true" --> <!-- ENDIF SourceDescriptionEnabled="true" -->
<script> $("#loading_dialog").loading();</script>
<!-- IF syslogmessagesenabled="true" --> <!-- IF syslogmessagesenabled="true" -->
<table width="100%" cellpadding="0" cellspacing="1" border="0" align="center" class="with_border_alternate" style="display:none" id="fullcontenttable"> <table width="100%" cellpadding="0" cellspacing="1" border="0" align="center" class="with_border_alternate" style="display:none" id="fullcontenttable">
<tr> <tr>
@ -336,7 +335,6 @@
</table> </table>
<!-- ENDIF syslogmessagesenabled="true" --> <!-- ENDIF syslogmessagesenabled="true" -->
<script>$("#loading_dialog").remove();</script>
<!-- IF main_pagerenabled="true" --> <!-- IF main_pagerenabled="true" -->
<table width="100%" align="center" border="0" cellpadding="1" cellspacing="1" class="with_border"> <table width="100%" align="center" border="0" cellpadding="1" cellspacing="1" class="with_border">
@ -442,7 +440,7 @@ $( "#dialog" ).dialog({
] ]
}); });
$( "#fullcontenttable" ).show(); /* Show Table now! */
$( "#fullcontenttable" ).show(); $( "#fullcontenttable" ).show();
</script> </script>