X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Felements%2Fprogress-init.html;h=2cde86f5b1669cee20fd5235ccd1c28d8176333f;hb=80a95c44afe24cb2e761da9a144f0a22d49df984;hp=7844f56788ecdf6af889976a7f7cdcdf411f515b;hpb=fbff7663ff6fb115bcd4dae2eb991b90339bf68d;p=freeside.git
diff --git a/httemplate/elements/progress-init.html b/httemplate/elements/progress-init.html
index 7844f5678..2cde86f5b 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' => [ 'start_job' ],
+ 'key' => $key,
)
%>
-
-
+
+<% include('/elements/init_overlib.html') %>
+
+
+<%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'} )
+} 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>