X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fprogress-init.html;h=194fc7480f593c2d60a49d294439d9848c942e4c;hb=7b125e587a4d1ee0aca692e23ea7897f671855ae;hp=ba9f6edd61afc7ab016a62428f79633392a7f749;hpb=5f155263a2c9837640d2fab0817d1f36b8cb3f8c;p=freeside.git

diff --git a/httemplate/elements/progress-init.html b/httemplate/elements/progress-init.html
index ba9f6edd6..194fc7480 100644
--- a/httemplate/elements/progress-init.html
+++ b/httemplate/elements/progress-init.html
@@ -1,45 +1,31 @@
-<%
-  my( $formname, $fields, $action, $url_or_message, $key ) = @_;
-  $key = '' unless defined $key;
-
-  my $url_or_message_link;
-  if ( ref($url_or_message) ) { #its a message or something
-    $url_or_message_link =
-      'message='. uri_escape( $url_or_message->{'message'} )
-  } else {
-    $url_or_message_link = "url=$url_or_message";
-  }
-%>
-
-<%= include('/elements/xmlhttp.html',
+<% include('/elements/xmlhttp.html',
               'method' => 'POST',
               'url'    => $action,
-              'subs'   => [ $key.'start_job' ],
+              'subs'   => [ 'start_job' ],
+              'key'    => $key,
            )
 %>
-<SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws_iframe.js"></SCRIPT>
+
+<% include('/elements/init_overlib.html') %>
+
 <SCRIPT TYPE="text/javascript">
-function OLiframeContent(src, width, height, name) {
-  return ('<iframe src="'+src+'" width="'+width+'" height="'+height+'"'
-   +(name?' name="'+name+'" id="'+name+'"':'')+' scrolling="auto">'
-   +'<div>[iframe not supported]</div></iframe>');
-}
 
-function <%=$key%>process () {
+function <%$key%>process () {
 
-  //alert('<%=$key%>process for form <%=$formname%>');
+  //alert('<%$key%>process for form <%$formname%>');
 
-  document.<%=$formname%>.submit.disabled=true;
+  if ( document.<%$formname%>.submit.disabled == false ) {
+    document.<%$formname%>.submit.disabled=true;
+  }
 
   overlib( 'Submitting job to server...', WIDTH, 444, HEIGHT, 168, CAPTION, 'Please wait...', STICKY, AUTOSTATUSCAP, CLOSETEXT, '', CLOSECLICK, MIDX, 0, MIDY, 0 );
 
   var Hash = new Array();
   var x = 0;
   var fieldName;
-  for (var i = 0; i<document.<%=$formname%>.elements.length; i++) {
-    field  = document.<%=$formname%>.elements[i];
-    if ( <%= join(' || ', map { "(field.name.indexOf('$_') > -1)" } @$fields ) %>
+  for (var i = 0; i<document.<%$formname%>.elements.length; i++) {
+    field  = document.<%$formname%>.elements[i];
+    if ( <% join(' || ', map { "(field.name.indexOf('$_') > -1)" } @$fields ) %>
        )
     {
         if ( field.type == 'select-multiple' ) {
@@ -53,7 +39,7 @@ function <%=$key%>process () {
           }
         } else if (    ( field.type != 'radio'  && field.type != 'checkbox' )
                     || ( ( field.type == 'radio' || field.type == 'checkbox' )
-                         && document.<%=$formname%>.elements[i].checked
+                         && document.<%$formname%>.elements[i].checked
                        )
                   )
         {
@@ -64,18 +50,38 @@ function <%=$key%>process () {
   }
 
   // jsrsPOST = true;
-  // jsrsExecute( '<%= $action %>', <%=$key%>myCallback, 'start_job', Hash );
+  // jsrsExecute( '<% $action %>', <%$key%>myCallback, 'start_job', Hash );
 
-  //alert('start_job( ' + Hash + ', <%=$key%>myCallback )' );
+  //alert('start_job( ' + Hash + ', <%$key%>myCallback )' );
   //alert('start_job()' );
-  <%=$key%>start_job( Hash, <%=$key%>myCallback );
+  <%$key%>start_job( Hash, <%$key%>myCallback );
 
 }
 
-function <%=$key%>myCallback( jobnum ) {
+function <%$key%>myCallback( jobnum ) {
 
-  overlib( OLiframeContent('<%=$p%>elements/progress-popup.html?jobnum=' + jobnum + ';<%=$url_or_message_link%>;formname=<%=$formname%>' , 444, 168, 'progress_popup'), CAPTION, 'Please wait...', STICKY, AUTOSTATUSCAP, CLOSETEXT, '', CLOSECLICK, MIDX, 0, MIDY, 0 );
+  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 );
 
 }
 
 </SCRIPT>
+
+<%init>
+
+my( $formname, $fields, $action, $url_or_message, $key ) = @_;
+$key = '' unless defined $key;
+
+my $url_or_message_link;
+if ( ref($url_or_message) ) { #its a message or something
+  $url_or_message_link = 'message='. uri_escape( $url_or_message->{'message'} );
+  $url_or_message_link .= ';url='.   uri_escape( $url_or_message->{'url'} )
+    if $url_or_message->{'url'};
+} else {
+  $url_or_message_link = "url=$url_or_message";
+}
+
+#stupid safari is caching the "location" of popup iframs, and submitting them
+#instead of displaying them.  this should prevent that.
+my $popup_name = 'popup-'.time. "-$$-". rand() * 2**32;
+
+</%init>