From 82879083dd2efddf02192ad48ad0e46e1a16662b Mon Sep 17 00:00:00 2001
From: mark <mark>
Date: Fri, 27 May 2011 01:11:02 +0000
Subject: invoice batch download fix, #11871

---
 httemplate/elements/progress-init.html | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'httemplate/elements/progress-init.html')

diff --git a/httemplate/elements/progress-init.html b/httemplate/elements/progress-init.html
index 8b8da66c8..9f17370db 100644
--- a/httemplate/elements/progress-init.html
+++ b/httemplate/elements/progress-init.html
@@ -11,6 +11,12 @@ In misc/something.html:
              $p.'misc/process_something.html',
              { url => $p.'where_to_go_next.html' },
          #or { message => 'Finished!' },
+         #or { url => $p.'where_to_go.html',
+               message => 'Finished' },
+         # which displays the message, then waits for confirmation before 
+         # redirecting to the URL.
+         #or { popup_url => $p.'popup_contents.html' }
+         # which loads that URL into the popup after completion
          ) %>
   </FORM>
   <SCRIPT TYPE="text/javascript>process();</SCRIPT>
@@ -118,6 +124,8 @@ 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'};
+  $url_or_message_link = 'popup_url=' .uri_escape( $url_or_message->{'popup_url'} )
+    if $url_or_message->{'popup_url'};
 } else {
   $url_or_message_link = "url=$url_or_message";
 }
-- 
cgit v1.2.1