diff options
| author | jeff <jeff> | 2009-04-21 02:23:13 +0000 |
|---|---|---|
| committer | jeff <jeff> | 2009-04-21 02:23:13 +0000 |
| commit | 8f548b7139b1bd093c2e23eafcd1e29e64f8e8b7 (patch) | |
| tree | e00bb4bf8ed490b41b4f3834d3f4789cc282a02e | |
| parent | 63bfee7f715403c6ff5d145c09b730928fce2100 (diff) | |
more descriptive progress popups
| -rw-r--r-- | FS/FS/UI/Web.pm | 4 | ||||
| -rw-r--r-- | httemplate/elements/progress-popup.html | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/FS/FS/UI/Web.pm b/FS/FS/UI/Web.pm index 3c52ca547..14af6a467 100644 --- a/FS/FS/UI/Web.pm +++ b/FS/FS/UI/Web.pm @@ -585,7 +585,9 @@ sub job_status { my @return; if ( $job && $job->status ne 'failed' ) { - @return = ( 'progress', $job->statustext ); + my ($progress, $action) = split ',', $job->statustext, 2; + $action ||= 'Server processing job'; + @return = ( 'progress', $progress, $action ); } elsif ( !$job ) { #handle job gone case : job successful # so close popup, redirect parent window... @return = ( 'complete' ); diff --git a/httemplate/elements/progress-popup.html b/httemplate/elements/progress-popup.html index 0bd71ff4a..8a55efb4a 100644 --- a/httemplate/elements/progress-popup.html +++ b/httemplate/elements/progress-popup.html @@ -31,10 +31,12 @@ function updateStatus( status_statustext ) { var statusArray = eval('(' + status_statustext + ')'); var status = statusArray[0]; var statustext = statusArray[1]; + var actiontext = statusArray[2]; //if ( status == 'progress' ) { //IE workaround, no i have no idea why if ( status.indexOf('progress') > -1 ) { + document.getElementById("progress_message").innerHTML = actiontext + '...'; document.getElementById("progress_percent").innerHTML = statustext + '%'; bar1.set(statustext); bar1.update; |