[freeside-commits] freeside/httemplate/elements header-popup.html, 1.6, 1.6.4.1 progress-init.html, 1.16, 1.16.4.1 progress-popup.html, 1.11, 1.11.4.1

Thu May 26 18:11:21 PDT 2011

Update of /home/cvs/cvsroot/freeside/httemplate/elements
In directory wavetail.420.am:/tmp/cvs-serv30400/httemplate/elements

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	header-popup.html progress-init.html progress-popup.html 
Log Message:
invoice batch download fix, #11871

Index: progress-popup.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/progress-popup.html,v
retrieving revision 1.11
retrieving revision 1.11.4.1
diff -u -w -d -r1.11 -r1.11.4.1

--- progress-popup.html	1 Jun 2010 19:58:27 -0000	1.11
+++ progress-popup.html	27 May 2011 01:11:19 -0000	1.11.4.1
@@ -2,6 +2,7 @@
 %  my $jobnum = $cgi->param('jobnum');
 %  my $url = $cgi->param('url');
 %  my $message = $cgi->param('message');
+%  my $popup_url = $cgi->param('popup_url');
 %  my $formname = scalar($cgi->param('formname'));
 %
 
@@ -64,11 +65,12 @@
 % } elsif ( $url ) { 
 
     window.top.location.href = '<% $url %>';
+% } elsif ( $popup_url ) {
+    document.parentWindow.location.replace('<% $popup_url %>');
 % } else { 
 
     alert('job done but no url or message specified');
 % } 
-
   } else if ( status.indexOf('done') > -1 ) {
 
     document.getElementById("progress_message").innerHTML = "Loading report";

Index: header-popup.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/header-popup.html,v
retrieving revision 1.6
retrieving revision 1.6.4.1
diff -u -w -d -r1.6 -r1.6.4.1
--- header-popup.html	26 Jul 2010 23:00:00 -0000	1.6
+++ header-popup.html	27 May 2011 01:11:19 -0000	1.6.4.1
@@ -27,7 +27,7 @@
     <META HTTP-Equiv="Expires" Content="0"> 
     <% $head %>
   </HEAD>
-  <BODY BGCOLOR="#f8f8f8" <% $etc %>>
+  <BODY <% $etc %>>
     <link href="<%$fsurl%>elements/freeside.css" type="text/css" rel="stylesheet">
     <FONT SIZE=6>
       <CENTER><% $title %></CENTER>
@@ -55,6 +55,7 @@
   $etc = @_ ? shift : ''; #$etc is for things like onLoad= etc.
   $head = @_ ? shift : ''; #$head is for things that go in the <HEAD> section
 }
+$etc .= 'BGCOLOR="#f8f8f8"' if (! $etc =~ /BGCOLOR/i );
 
 my $conf = new FS::Conf;
 

Index: progress-init.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/progress-init.html,v
retrieving revision 1.16
retrieving revision 1.16.4.1
diff -u -w -d -r1.16 -r1.16.4.1
--- progress-init.html	6 Jul 2010 12:18:11 -0000	1.16
+++ progress-init.html	27 May 2011 01:11:19 -0000	1.16.4.1
@@ -11,6 +11,12 @@
              $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 @@
   $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";
 }

