--- loncom/interface/spreadsheet/lonspreadsheet.pm 2021/12/14 12:59:21 1.61.6.3 +++ loncom/interface/spreadsheet/lonspreadsheet.pm 2013/01/08 16:21:12 1.63 @@ -1,5 +1,5 @@ # -# $Id: lonspreadsheet.pm,v 1.61.6.3 2021/12/14 12:59:21 raeburn Exp $ +# $Id: lonspreadsheet.pm,v 1.63 2013/01/08 16:21:12 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -241,29 +241,6 @@ sub handler { } # - # Check if display of course gradebook is blocked - # - - if ($env{'request.course.id'}) { - my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; - my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; - my $clientip = &Apache::lonnet::get_requestor_ip($r); - my ($blocked,$blocktext) = - &Apache::loncommon::blocking_status('grades',$clientip,$cnum,$cdom); - if ($blocked) { - my $checkrole = "cm./$cdom/$cnum"; - if ($env{'request.course.sec'} ne '') { - $checkrole .= "/$env{'request.course.sec'}"; - } - unless ((&Apache::lonnet::allowed('evb',undef,undef,$checkrole)) && - ($env{'request.role'} !~ m{^st\./$cdom/$cnum})) { - &Apache::lonquickgrades::grades_blocked($r,$blocktext,'spreadsheet'); - return OK; - } - } - } - - # # Do not allow users without vgr or mgr priv to continue unless # grading type is set to spreadsheet. # @@ -400,14 +377,14 @@ sub handler { // cellformula may contain less-than and greater-than symbols, so // we need to escape them? edit_text +='$cell_edit_start'; - edit_text += '
$cell_edit_end'; if (editwin != null && !(editwin.closed) ) { @@ -441,9 +418,12 @@ 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 @@ -601,6 +581,7 @@ ENDSCRIPT $spreadsheet->display($r); } $r->print(''); + &Apache::lonquickgrades::endGradeScreen($r); $r->print(&Apache::loncommon::end_page()); $spreadsheet->clear_package(); return OK;