--- loncom/interface/spreadsheet/lonspreadsheet.pm 2010/12/02 00:53:46 1.57 +++ loncom/interface/spreadsheet/lonspreadsheet.pm 2010/12/03 21:33:56 1.58 @@ -1,5 +1,5 @@ # -# $Id: lonspreadsheet.pm,v 1.57 2010/12/02 00:53:46 www Exp $ +# $Id: lonspreadsheet.pm,v 1.58 2010/12/03 21:33:56 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -64,6 +64,7 @@ use Apache::lonnet; use Apache::lonhtmlcommon; use Apache::lonlocal; use Apache::loncoursedata(); +use Apache::lonquickgrades(); use HTML::Entities(); ## @@ -395,9 +396,17 @@ ENDSCRIPT bug => 'Spreadsheet'}); $r->print(&Apache::loncommon::start_page('Grades Spreadsheet',$js). &Apache::lonhtmlcommon::breadcrumbs('Spreadsheet', - 'Spreadsheet_About'). - &Apache::lonhtmlcommon::coursepreflink(&mt('Grade display settings'),'grading'). - '
'); + 'Spreadsheet_About')); + + # + # Tabs + # + &Apache::lonquickgrades::startGradeScreen($r,'spreadsheet'); + + # + # Open the form + # + $r->print(''); $r->print(&hiddenfield('sname' ,$env{'form.sname'}). &hiddenfield('sdomain',$env{'form.sdomain'}). &hiddenfield('usymb' ,$env{'form.usymb'})); @@ -419,7 +428,7 @@ ENDSCRIPT if (exists($env{'form.recalc'})) { &Apache::loncoursedata::delete_caches($env{'requres.course.id'}); } - if ($env{'form.recalc'} eq 'ilovewastingtime') { + if ($env{'form.recalc'} eq 'expireallsheets') { &Apache::lonnet::logthis('spreadsheet expired: entire course'); # expire ALL spreadsheets &Apache::lonnet::expirespread('','','studentcalc'); @@ -539,7 +548,7 @@ END $r->print(&hiddenfield('filename',$filename)); # # Keep track of the number of times we have been called, sort of. - $r->print(&hiddenfield('not_first_run','whatever')); + $r->print(&hiddenfield('not_first_run','1')); # if (exists($env{'form.not_first_run'}) || $sheettype ne 'classcalc') { $r->print($spreadsheet->get_html_title()); @@ -549,7 +558,9 @@ END $r->rflush(); $spreadsheet->display($r); } - $r->print('
'.&Apache::loncommon::end_page()); + $r->print(''); + &Apache::lonquickgrades::endGradeScreen($r); + $r->print(&Apache::loncommon::end_page()); $spreadsheet->clear_package(); return OK; }