diff options
| author | ivan <ivan> | 2005-06-02 09:29:56 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2005-06-02 09:29:56 +0000 |
| commit | 684a478c0f88e5bf6d1d3f32f4618089146b5709 (patch) | |
| tree | 1f0c8e23048aa20e872ff10f07a134436968ac43 /httemplate/elements | |
| parent | 14cc10e34e277f4761be76d67d621b5a5d10a87f (diff) | |
add ability to search on a date range of invoice events and then reprint or reemail (boy was that a bit more work than i expected), closes: Bug#946
Diffstat (limited to 'httemplate/elements')
| -rw-r--r-- | httemplate/elements/progress-init.html | 12 | ||||
| -rw-r--r-- | httemplate/elements/progress-popup.html | 11 |
2 files changed, 21 insertions, 2 deletions
diff --git a/httemplate/elements/progress-init.html b/httemplate/elements/progress-init.html index 41feaac4b..a8268c12c 100644 --- a/httemplate/elements/progress-init.html +++ b/httemplate/elements/progress-init.html @@ -1,6 +1,14 @@ <% - my( $formname, $fields, $action, $success_url, $key ) = @_; + 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"; + } %> <SCRIPT TYPE="text/javascript" SRC="../elements/jsrsClient.js"></SCRIPT> @@ -52,7 +60,7 @@ function <%=$key%>process () { function <%=$key%>myCallback( jobnum ) { - overlib( OLiframeContent('<%=$p%>elements/progress-popup.html?jobnum=' + jobnum + ';url=<%=$success_url%>;formname=<%=$formname%>' , 432, 136, '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%>' , 432, 136, 'progress_popup'), CAPTION, 'Please wait...', STICKY, AUTOSTATUSCAP, CLOSETEXT, '', CLOSECLICK, MIDX, 0, MIDY, 0 ); } diff --git a/httemplate/elements/progress-popup.html b/httemplate/elements/progress-popup.html index d180c17d4..20bb5fc5a 100644 --- a/httemplate/elements/progress-popup.html +++ b/httemplate/elements/progress-popup.html @@ -1,6 +1,7 @@ <% my $jobnum = $cgi->param('jobnum'); my $url = $cgi->param('url'); + my $message = $cgi->param('message'); my $formname = scalar($cgi->param('formname')); %> <HTML> @@ -29,7 +30,17 @@ function updateStatus( status_statustext ) { bar1.update; jsrsExecute( '<%=$p%>elements/jsrsServer.html', updateStatus, 'job_status', '<%= $jobnum %>' ); } else if ( status.indexOf('complete') > -1 ) { +<% if ( $message ) { %> + document.getElementById("progress_message").innerHTML = "<%= $message %>"; + document.getElementById("progress_bar").innerHTML = ''; + document.getElementById("progress_percent").innerHTML = '<INPUT TYPE="button" VALUE="OK" onClick="parent.nd(1);">'; + document.getElementById("progress_jobnum").innerHTML = ''; + parent.document.<%=$formname%>.submit.disabled=false; +<% } elsif ( $url ) { %> window.top.location.href = '<%= $url %>'; +<% } else { %> + alert('job done but no url or message specified'); +<% } %> } else if ( status.indexOf('error') > -1 ) { document.getElementById("progress_message").innerHTML = '<FONT SIZE="+1" COLOR="#FF0000">Error: ' + statustext + '</FONT>'; document.getElementById("progress_bar").innerHTML = ''; |