--- loncom/interface/spreadsheet/lonspreadsheet.pm	2003/10/11 14:04:54	1.27
+++ loncom/interface/spreadsheet/lonspreadsheet.pm	2004/01/15 03:18:20	1.32
@@ -1,5 +1,5 @@
 #
-# $Id: lonspreadsheet.pm,v 1.27 2003/10/11 14:04:54 www Exp $
+# $Id: lonspreadsheet.pm,v 1.32 2004/01/15 03:18:20 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -72,8 +72,8 @@ use HTML::Entities();
 
 sub textfield {
     my ($title,$name,$value)=@_;
-    return "\n<p><b>$title:</b><br>".
-        '<input type=text name="'.$name.'" size=80 value="'.$value.'">';
+    return "\n<p><b>$title:</b><br />".
+        '<input type=text name="'.$name.'" size=80 value="'.$value.'" />';
 }
 
 sub hiddenfield {
@@ -83,7 +83,7 @@ sub hiddenfield {
 
 sub selectbox {
     my ($title,$name,$value,%options)=@_;
-    my $selout="\n<p><b>$title:</b><br>".'<select name="'.$name.'">';
+    my $selout="\n<p><b>$title:</b><br />".'<select name="'.$name.'">';
     foreach (sort keys(%options)) {
         $selout.='<option value="'.$_.'"';
         if ($_ eq $value) { $selout.=' selected'; }
@@ -162,7 +162,7 @@ sub file_dialogs {
 END
     my $default_filename_set = 0;
     foreach my $sheetfilename ($spreadsheet->othersheets()) {
-        $load_dialog .= '    <option name="'.$sheetfilename.'"';
+        $load_dialog .= '    <option value="'.$sheetfilename.'"';
         if ($filename eq $sheetfilename) {
             $load_dialog .= ' selected';
             $default_filename_set = 1;
@@ -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;
         }
     }
@@ -321,8 +324,8 @@ sub handler {
         my $extra_javascript = 
             &Apache::loncommon::browser_and_searcher_javascript();
         $r->print(<<ENDSCRIPT);
-<script language="JavaScript">
-
+<script type="text/javascript">
+//<!--
     $extra_javascript
 
     var editwin;
@@ -355,13 +358,16 @@ 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);
     }
+//-->
 </script>
 ENDSCRIPT
     }
     $r->print('</head>'.&Apache::loncommon::bodytag('Grades Spreadsheet').
+	      &Apache::loncommon::help_open_faq(134).
+	      &Apache::loncommon::help_open_bug('Spreadsheet').
               '<form action="'.$r->uri.'" name="sheet" method="post">');
     $r->print(&hiddenfield('sname'  ,$ENV{'form.sname'}).
               &hiddenfield('sdomain',$ENV{'form.sdomain'}).
@@ -466,11 +472,9 @@ END
     $r->rflush();
     #
     $r->print("<table><tr>");
-    if ($sheettype eq 'classcalc') {
-        $r->print('<td><input type="submit" value="'.
-		  &mt('Generate Spreadsheet').'" />'.
-                  '</td>');
-    }
+    $r->print('<td><input type="submit" value="'.
+              &mt('Generate Spreadsheet').'" />'.
+              '</td>');
     if ($allowed_to_view) {
         $r->print('<td>'.
                   &Apache::loncommon::help_open_topic("Spreadsheet_About",