1 files changed, 34 insertions, 25 deletions
diff --git a/httemplate/elements/progress-popup.html b/httemplate/elements/progress-popup.html
index 200f97d9b..cda704a12 100644
--- a/httemplate/elements/progress-popup.html
+++ b/httemplate/elements/progress-popup.html
@@ -1,28 +1,29 @@
-<%
-  my $jobnum = $cgi->param('jobnum');
-  my $url = $cgi->param('url');
-  my $message = $cgi->param('message');
-  my $formname = scalar($cgi->param('formname'));
-%>
+%
+%  my $jobnum = $cgi->param('jobnum');
+%  my $url = $cgi->param('url');
+%  my $message = $cgi->param('message');
+%  my $formname = scalar($cgi->param('formname'));
+%
+
 <HTML>
   <HEAD>
     <TITLE></TITLE>
   </HEAD>
   <BODY BGCOLOR="#ccccff" onLoad="refreshStatus()">
 
-<%= include('/elements/xmlhttp.html',
+<% include('/elements/xmlhttp.html',
               'url'  => $p.'elements/jsrsServer.html',
               'subs' => [ 'job_status' ],
            )
 %>
-<SCRIPT TYPE="text/javascript" src="../elements/qlib/control.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" src="../elements/qlib/imagelist.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" src="../elements/qlib/progress.js"></SCRIPT>
+<SCRIPT TYPE="text/javascript" src="<%$fsurl%>elements/qlib/control.js"></SCRIPT>
+<SCRIPT TYPE="text/javascript" src="<%$fsurl%>elements/qlib/imagelist.js"></SCRIPT>
+<SCRIPT TYPE="text/javascript" src="<%$fsurl%>elements/qlib/progress.js"></SCRIPT>
 <SCRIPT TYPE="text/javascript">
 function refreshStatus () {
-  //jsrsExecute( '<%=$p%>elements/jsrsServer.html', updateStatus, 'job_status', '<%= $jobnum %>' );
+  //jsrsExecute( '<%$p%>elements/jsrsServer.html', updateStatus, 'job_status', '<% $jobnum %>' );
 
-  job_status( '<%= $jobnum %>', updateStatus );
+  job_status( '<% $jobnum %>', updateStatus );
 }
 function updateStatus( status_statustext ) {
 
@@ -37,26 +38,34 @@ function updateStatus( status_statustext ) {
     document.getElementById("progress_percent").innerHTML = statustext + '%';
     bar1.set(statustext);
     bar1.update;
-    //jsrsExecute( '<%=$p%>elements/jsrsServer.html', updateStatus, 'job_status', '<%= $jobnum %>' );
-    job_status( '<%= $jobnum %>', updateStatus );
+    //jsrsExecute( '<%$p%>elements/jsrsServer.html', updateStatus, 'job_status', '<% $jobnum %>' );
+    job_status( '<% $jobnum %>', updateStatus );
   } else if ( status.indexOf('complete') > -1 ) {
-<% if ( $message ) { %>
-    document.getElementById("progress_message").innerHTML = "<%= $message %>";
+% if ( $message ) { 
+
+    document.getElementById("progress_message").innerHTML = "<% $message %>";
     document.getElementById("progress_bar").innerHTML = '';
     document.getElementById("progress_percent").innerHTML = '<INPUT TYPE="button" VALUE="OK" onClick="parent.nd(1);">';
     document.getElementById("progress_jobnum").innerHTML = '';
-    parent.document.<%=$formname%>.submit.disabled=false;
-<% } elsif ( $url ) { %>
-    window.top.location.href = '<%= $url %>';
-<% } else { %>
+    if ( parent.document.<%$formname%>.submit.disabled == true ) {
+      parent.document.<%$formname%>.submit.disabled=false;
+    }
+% } elsif ( $url ) { 
+
+    window.top.location.href = '<% $url %>';
+% } else { 
+
     alert('job done but no url or message specified');
-<% } %>
+% } 
+
   } else if ( status.indexOf('error') > -1 ) {
     document.getElementById("progress_message").innerHTML = '<FONT SIZE="+1" COLOR="#FF0000">Error: ' + statustext + '</FONT>';
     document.getElementById("progress_bar").innerHTML = '';
     document.getElementById("progress_percent").innerHTML = '<INPUT TYPE="button" VALUE="OK" onClick="parent.nd(1);">';
     document.getElementById("progress_jobnum").innerHTML = '';
-    parent.document.<%=$formname%>.submit.disabled=false;
+    if ( parent.document.<%$formname%>.submit.disabled == true ) {
+      parent.document.<%$formname%>.submit.disabled=false;
+    }
   } else {
     alert('XXX unknown status returned from server: ' + status);
   }
@@ -64,7 +73,7 @@ function updateStatus( status_statustext ) {
 }
 </SCRIPT>
 
-    <TABLE>
+    <TABLE WIDTH="100%">
       <TR>
         <TD ALIGN="center" ID="progress_message">
           Server processing job...
@@ -73,7 +82,7 @@ function updateStatus( status_statustext ) {
         <TD ALIGN="center" ID="progress_bar">
           <SCRIPT TYPE="text/javascript">
             // Create imagelist
-            SEGS = new QImageList(4, 23, "../images/progressbar-empty.png", "../images/progressbar-full.png");
+            SEGS = new QImageList(4, 23, "<%$fsurl%>images/progressbar-empty.png", "<%$fsurl%>images/progressbar-full.png");
             // Create bars
             bar1 = new QProgress(null, "bar1", SEGS, 100);
             // bar1.set(0);
@@ -86,7 +95,7 @@ function updateStatus( status_statustext ) {
         </TD>
       </TR><TR>
         <TD ALIGN="center" ID="progress_jobnum">
-          (progress of job #<%= $jobnum %>)
+          (progress of job #<% $jobnum %>)
         </TD>
       </TR>
     </TABLE>