Changeset 23520

Show
Ignore:
Timestamp:
22.12.2010 00:12:30 (9 years ago)
Author:
davidb
Message:

Only want to see the dots if there is no 'action' happening with a file transfer

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/cgi-bin/talkback-progressbar.pl

    r23518 r23520  
    435435 
    436436    my $wait_dots = inc_wait_dots(); 
    437     my $html = "$wait_dots<br>"; 
     437    my $dots_html = "Waiting for transfer: $wait_dots<br>"; 
    438438 
    439439    my $filename = $gsdl_cgi->param('uploadedfile'); 
    440440 
     441    my $inner_html; 
     442 
    441443    if ((defined $filename) && ($filename ne "")) { 
    442     $html .= check_status_single_file($filename); 
     444    $inner_html = check_status_single_file($filename); 
    443445    } 
    444446    else { 
    445     $html .= check_status_all(); 
    446     } 
     447    $inner_html = check_status_all(); 
     448    } 
     449 
     450    my $html = ($inner_html ne "") ? $inner_html : $dots_html; 
    447451 
    448452    return $html;