--- loncom/interface/spreadsheet/lonspreadsheet.pm	2003/09/16 15:41:16	1.24
+++ loncom/interface/spreadsheet/lonspreadsheet.pm	2004/02/24 21:03:09	1.31.2.1
@@ -1,5 +1,5 @@
 #
-# $Id: lonspreadsheet.pm,v 1.24 2003/09/16 15:41:16 matthew Exp $
+# $Id: lonspreadsheet.pm,v 1.31.2.1 2004/02/24 21:03:09 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -62,6 +62,8 @@ use Apache::assesscalc();
 use Apache::Constants qw(:common :http);
 use Apache::lonnet;
 use Apache::lonhtmlcommon;
+use Apache::lonlocal;
+use Apache::loncoursedata();
 use HTML::Entities();
 
 ##
@@ -70,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 {
@@ -81,11 +83,11 @@ 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'; }
-        $selout.='>'.$options{$_}.'</option>';
+        $selout.='>'.&mt($options{$_}).'</option>';
     }
     return $selout.'</select>';
 }
@@ -120,10 +122,10 @@ sub file_dialogs {
         $result .=&hiddenfield('workcopy',$sheettype);
         if ($ENV{'form.newformula'} !~ /^\s*$/) {
             $message .='<table><tr>'.
-              '<td valign="top"><pre>Cell '.$ENV{'form.cell'}.' = </pre></td>'.
+              '<td valign="top"><pre>'.&mt('Cell').' '.$ENV{'form.cell'}.' = </pre></td>'.
               '<td><pre>'.$ENV{'form.newformula'}."</pre></td></tr></table>\n";
         } else {
-            $message .= 'Deleted contents of cell '.$ENV{'form.cell'}.'.';
+            $message .= &mt('Deleted contents of cell').' '.$ENV{'form.cell'}.'.';
         }
     }
     ##
@@ -138,18 +140,19 @@ sub file_dialogs {
         $filename = 'Default';
     }
     my $save_dialog = '<nobr>'.
-        '<input type="submit" name="save" value="Save as" /> '.
+        '<input type="submit" name="save" value="'.&mt('Save as').'" /> '.
         '<input type="text" name="savefilename" size="30" value="'.
         $truefilename.'" />'.
         '</nobr>';
     my $makedefault_dialog = '<input type="submit" name="makedefault" '.
-        'value="Save as & Make This Sheet the Default"/>';
+        'value="'.&mt('Save as & Make This Sheet the Default').'"/>';
     #
     my $link = '<a href="javascript:openbrowser'.
-        "('sheet','loadfilename','spreadsheet')\">Select Spreadsheet File</a>";
+        "('sheet','loadfilename','spreadsheet')\">".&mt('Select Spreadsheet File')."</a>";
+    my $load=&mt('Load:');
     my $load_dialog = <<END;
 <table bgcolor="$bgcolor">
-<tr><td><input type="submit" name="load" value="Load" /></td>
+<tr><td><input type="submit" name="load" value="$load" /></td>
     <td><nobr>
         <input type="text" name="loadfilename" size="20" value="$filename" />
         $link</nobr>
@@ -159,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;
@@ -208,7 +211,7 @@ sub handler {
     # HTML Header
     #
     if ($r->header_only) {
-        $r->content_type('text/html');
+        &Apache::loncommon::content_type($r,'text/html');
         $r->send_http_header;
         return OK;
     }
@@ -224,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;
         }
     }
@@ -250,10 +256,12 @@ sub handler {
     $symb = $ENV{'form.usymb'} if (exists($ENV{'form.usymb'}));
     my $name   = $ENV{'user.name'};
     my $domain = $ENV{'user.domain'};
-    if (exists($ENV{'form.sname'})) {
+    if (exists($ENV{'form.sname'}) && $ENV{'form.sname'} ne '') {
         $name   = $ENV{'form.sname'};
         $domain = $ENV{'form.sdomain'};
     }
+    $ENV{'form.sname'} = $name;
+    $ENV{'form.sdomain'} = $domain;
     ##
     ## Check permissions
     my $allowed_to_edit = &Apache::lonnet::allowed('mgr',
@@ -297,7 +305,7 @@ sub handler {
     #
     # Open page, try to prevent browser cache.
     #
-    $r->content_type('text/html');
+    &Apache::loncommon::content_type($r,'text/html');
     &Apache::loncommon::no_cache($r);
     $r->send_http_header;
 
@@ -310,11 +318,16 @@ sub handler {
     ## Spit out the javascript required for editing
     ##
     if ($allowed_to_edit) {
+	my %lt=(
+		'ce' => 'Cell',
+		'ac' => 'Accept',
+		'dc' => 'Discard Changes'
+	);
         my $extra_javascript = 
             &Apache::loncommon::browser_and_searcher_javascript();
         $r->print(<<ENDSCRIPT);
-<script language="JavaScript">
-
+<script type="text/javascript">
+//<!--
     $extra_javascript
 
     var editwin;
@@ -325,11 +338,11 @@ sub handler {
         // we need to escape them?  
         edit_text +='<html><head><title>Cell Edit Window</title></head><body>';
         edit_text += '<form name="editwinform">';
-        edit_text += '<center><h3>Cell '+cellname+'</h3>';
+        edit_text += '<center><h3>$lt{'ce'} '+cellname+'</h3>';
         edit_text += '<textarea name="newformula" cols="60" rows="12"';
         edit_text += ' wrap="off" >'+cellformula+'</textarea>';
         edit_text += '</br>';
-        edit_text += '<input type="button" name="accept" value="Accept"';
+        edit_text += '<input type="button" name="accept" value="$lt{'ac'}"';
         edit_text += ' onClick=\\\'javascript:';
         edit_text += 'opener.document.sheet.cell.value=';
         edit_text +=     '"'+cellname+'";';
@@ -339,7 +352,7 @@ sub handler {
         edit_text += 'self.close()\\\' />';
         edit_text += '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
         edit_text += '<input type="button" name="abort" ';
-        edit_text +=     'value="Discard Changes"';
+        edit_text +=     'value="$lt{'dc'}"';
         edit_text += ' onClick="javascript:self.close()" />';
         edit_text += '</center></body></html>';
 
@@ -347,9 +360,10 @@ 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
     }
@@ -373,6 +387,9 @@ ENDSCRIPT
     ##
     ## Take care of "backdoor" spreadsheet expiration / recalc stuff
     if ($allowed_to_edit && exists($ENV{'form.recalc'})) {
+        if (exists($ENV{'form.recalc'})) {
+            &Apache::loncoursedata::delete_caches($ENV{'requres.course.id'});
+        }
         if ($ENV{'form.recalc'} eq 'ilovewastingtime') {
             &Apache::lonnet::logthis('ilovewastingtime');
             # expire ALL spreadsheets
@@ -425,13 +442,13 @@ ENDSCRIPT
             if ($action_message) {
                 $action_message .= '<br />';
             }
-            $action_message .= 'Made this spreadsheet the default';
+            $action_message .= &mt('Made this spreadsheet the default');
             if ($sheettype eq 'classcalc') {
-                $action_message .= ' for the course';
+                $action_message .= ' '.&mt('for the course');
             } elsif ($sheettype eq 'studentcalc') {
-                $action_message .= ' for all students';
+                $action_message .= ' '.&mt('for all students');
             } elsif ($sheettype eq 'assesscalc') {
-                $action_message .= ' for all assessments';
+                $action_message .= ' '.&mt('for all assessments');
             }
             $action_message .= '.';
         }
@@ -455,10 +472,9 @@ END
     $r->rflush();
     #
     $r->print("<table><tr>");
-    if ($sheettype eq 'classcalc') {
-        $r->print('<td><input type="submit" value="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",