--- loncom/interface/spreadsheet/lonspreadsheet.pm 2003/11/11 15:48:03 1.28 +++ loncom/interface/spreadsheet/lonspreadsheet.pm 2004/01/15 03:18:20 1.32 @@ -1,5 +1,5 @@ # -# $Id: lonspreadsheet.pm,v 1.28 2003/11/11 15:48:03 matthew Exp $ +# $Id: lonspreadsheet.pm,v 1.32 2004/01/15 03:18:20 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -227,9 +227,12 @@ sub handler { } my $courseid = $ENV{'request.course.id'}; # - # Do not allow students to continue if standard grading is in effect. + # Do not allow students to continue if standard or external grading is in + # effect. + # if ($ENV{'request.role'} =~ /^st\./) { - if ($ENV{'course.'.$courseid.'.grading'} eq 'standard') { + if ($ENV{'course.'.$courseid.'.grading'} eq 'standard' || + $ENV{'course.'.$courseid.'.grading'} eq 'external' ) { return HTTP_NOT_ACCEPTABLE; } } @@ -355,7 +358,7 @@ sub handler { editwin.close(); } - editwin = window.open($nothing,'CellEditWin','height=280,width=480,scrollbars=no,resizeable=yes,alwaysRaised=yes,dependent=yes',true); + editwin = window.open($nothing,'CellEditWin','height=280,width=480,scrollbars=no,resizable=yes,alwaysRaised=yes,dependent=yes',true); editwin.document.write(edit_text); } //--> @@ -363,6 +366,8 @@ sub handler { ENDSCRIPT } $r->print(''.&Apache::loncommon::bodytag('Grades Spreadsheet'). + &Apache::loncommon::help_open_faq(134). + &Apache::loncommon::help_open_bug('Spreadsheet'). '
'); $r->print(&hiddenfield('sname' ,$ENV{'form.sname'}). &hiddenfield('sdomain',$ENV{'form.sdomain'}). @@ -467,11 +472,9 @@ END $r->rflush(); # $r->print(""); - if ($sheettype eq 'classcalc') { - $r->print(''); - } + $r->print(''); if ($allowed_to_view) { $r->print('
'. - ''. + ''. &Apache::loncommon::help_open_topic("Spreadsheet_About",