Merge branch 'patch-19' of https://github.com/gjones2/Freeside

[freeside.git] / httemplate / elements / progress-init.html

diff --git a/httemplate/elements/progress-init.html b/httemplate/elements/progress-init.html
index 2ec248e..cef54b8 100644 (file)
--- a/httemplate/elements/progress-init.html
+++ b/httemplate/elements/progress-init.html
@@ -54,10 +54,7 @@ sub process_whatever { #class method
            )
 %>
 
-% if (!$noinit) { 
 <& /elements/init_overlib.html &>
-%   $noinit = 1;
-% }
 
 <SCRIPT TYPE="text/javascript">
 
@@ -111,15 +108,12 @@ function <%$key%>process () {
 
 function <%$key%>myCallback( jobnum ) {
 
-  overlib( OLiframeContent('<%$p%>elements/progress-popup.html?jobnum=' + jobnum + ';<%$url_or_message_link%>;formname=<%$formname%>' , 444, 168, '<% $popup_name %>'), CAPTION, 'Please wait...', STICKY, AUTOSTATUSCAP, CLOSETEXT, '', CLOSECLICK, MIDX, 0, MIDY, 0 );
+  overlib( OLiframeContent('<%$fsurl%>elements/progress-popup.html?jobnum=' + jobnum + ';<%$url_or_message_link%>;formname=<%$formname%>' , 444, 168, '<% $popup_name %>'), CAPTION, 'Please wait...', STICKY, AUTOSTATUSCAP, CLOSETEXT, '', CLOSECLICK, MIDX, 0, MIDY, 0 );
 
 }
 
 </SCRIPT>
 
-<%once>
-my $noinit = 0;
-</%once>
 <%init>
 
 my( $formname, $fields, $action, $url_or_message, $key ) = @_;