X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fprogress-init.html;h=194fc7480f593c2d60a49d294439d9848c942e4c;hb=624b2d44625f69d71175c3348cae635d580c890b;hp=01bf859352f8daf6592be2e6aaa914be3c8886c6;hpb=a0a5a11af6648c147a1e68877ac099035c18790a;p=freeside.git
diff --git a/httemplate/elements/progress-init.html b/httemplate/elements/progress-init.html
index 01bf85935..194fc7480 100644
--- a/httemplate/elements/progress-init.html
+++ b/httemplate/elements/progress-init.html
@@ -1,17 +1,3 @@
-%
-% 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',
'method' => 'POST',
'url' => $action,
@@ -19,14 +5,10 @@
'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'} );
+ $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>