--- loncom/interface/spreadsheet/classcalc.pm	2006/08/18 15:15:39	1.28
+++ loncom/interface/spreadsheet/classcalc.pm	2011/12/21 21:25:46	1.31
@@ -1,5 +1,5 @@
 #
-# $Id: classcalc.pm,v 1.28 2006/08/18 15:15:39 raeburn Exp $
+# $Id: classcalc.pm,v 1.31 2011/12/21 21:25:46 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -91,15 +91,10 @@ sub html_header {
         $toprow .= '<th align="center"><b>'.&mt($name).'</b></th>';
         $bottomrow .= '<td>'.$selector.'</td>';
     }
-    my $status .= '<nobr>'.&mt('Status: [_1]',
-                            '<input type="text" '.
-                            'name="spreadsheet_status" size="60" value="" />'
-                            ).'</nobr>';
-
     return "<p>\n<table>\n".
         "<tr>".$toprow."</tr>\n".
         "<tr>".$bottomrow."</tr>\n".
-        "</table>\n".$status."\n".
+        "</table>\n".
         "</p>";
 }
 
@@ -321,7 +316,7 @@ sub outsheet_htmlclasslist {
     #
     if ($show_expire_link) {
         $r->print('<a href="/adm/classcalc?output_format=htmlclasslist&'.
-                  'recalc=ilovewastingtime&not_first_run=1">'.
+                  'recalc=expireallsheets&not_first_run=1">'.
                   &mt('Expire all student spreadsheets').'</a>'.$/);
     }
     #
@@ -385,16 +380,6 @@ END
     return;
 }
 
-sub update_status {
-    my ($r,$message) = @_;
-    $r->print('<script>'.
-              'window.document.sheet.spreadsheet_status.value="'.
-              $message.
-              '";</script>');
-    $r->rflush();
-    return;
-}
-
 sub compute {
     my $self = shift;
     my ($r) = @_;
@@ -403,14 +388,9 @@ sub compute {
     $self->initialize_safe_space();
     my %c = $self->constants();
     my %f = $self->formulas();
-    &update_status($r,'Initializing Course Structure');
     &Apache::studentcalc::initialize_package();
-    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
-        ($r,&mt('Spreadsheet Computation Status'),
-         &mt('Spreadsheet Computation'), scalar(@Students),'inline',undef,
-         'sheet','spreadsheet_status');
-    &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
-                                          &mt('Processing first student'));
+    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,scalar(@Students));
+    &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Processing first student'));
     foreach my $student (@Students) {
         if ($connection->aborted()) { $self->cleanup(); return; }
         my $sname = $student->{'username'}.':'.$student->{'domain'};
@@ -436,17 +416,14 @@ sub compute {
                 $c{$cell} = $data;
             }
 	}
-        &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
-                                                 'last student');
+        &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,'last student');
     }
     &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
-    &update_status($r,'Done computing student sheets');
     $r->rflush();
     $self->constants(\%c);
     $self->formulas(\%f);
     $self->calcsheet();
     $self->save() if ($self->need_to_save());
-    &update_status($r,'Done!');
 }
 
 1;