--- loncom/interface/spreadsheet/lonspreadsheet.pm	2003/08/17 18:50:12	1.20
+++ loncom/interface/spreadsheet/lonspreadsheet.pm	2003/10/11 14:04:54	1.27
@@ -1,5 +1,5 @@
 #
-# $Id: lonspreadsheet.pm,v 1.20 2003/08/17 18:50:12 matthew Exp $
+# $Id: lonspreadsheet.pm,v 1.27 2003/10/11 14:04:54 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -54,12 +54,16 @@ built-in functions.
 package Apache::lonspreadsheet;
             
 use strict;
+use warnings FATAL=>'all';
+no warnings 'uninitialized';
 use Apache::classcalc();
 use Apache::studentcalc();
 use Apache::assesscalc();
 use Apache::Constants qw(:common :http);
 use Apache::lonnet;
 use Apache::lonhtmlcommon;
+use Apache::lonlocal;
+use Apache::loncoursedata();
 use HTML::Entities();
 
 ##
@@ -83,7 +87,7 @@ sub selectbox {
     foreach (sort keys(%options)) {
         $selout.='<option value="'.$_.'"';
         if ($_ eq $value) { $selout.=' selected'; }
-        $selout.='>'.$options{$_}.'</option>';
+        $selout.='>'.&mt($options{$_}).'</option>';
     }
     return $selout.'</select>';
 }
@@ -103,9 +107,8 @@ sub file_dialogs {
         if ($save_status ne 'ok') {
             $message .= "An error occurred while saving the spreadsheet".
                 "There error is:".$save_status;
-            return $result;
         } else {
-            $message .= "Spreadsheet saved as ".$ENV{'form.savefilename'};
+            $message .= "Spreadsheet saved as ".$spreadsheet->filename();
         }
     } elsif (exists($ENV{'form.newformula'}) && 
              exists($ENV{'form.cell'})       && 
@@ -119,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'}.'.';
         }
     }
     ##
@@ -137,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>
@@ -165,9 +169,13 @@ END
         }
         $load_dialog .= '>'.$sheetfilename."</option>\n";
     }
-    $load_dialog .= "</td><td>&nbsp;</td></tr>\n</table>\n";
+    $load_dialog .= "</select>\n</td><td>&nbsp;</td></tr>\n</table>\n";
         #
     $result .=<<END;
+<!-- 
+    <fieldset title="File Dialogs" >
+    <legend>File Dialogs</legend>
+  -->
 <!-- load / save dialogs -->
 <table cellspacing="2">
 <tr>
@@ -180,6 +188,9 @@ END
     </td>
 </tr>
 </table>
+<!--
+    </fieldset>
+  -->
 END
     return ($result,$message);
 }
@@ -200,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;
     }
@@ -289,7 +300,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;
 
@@ -302,6 +313,11 @@ 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);
@@ -317,11 +333,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+'";';
@@ -331,7 +347,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>';
 
@@ -365,6 +381,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
@@ -417,13 +436,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 .= '.';
         }
@@ -448,21 +467,22 @@ END
     #
     $r->print("<table><tr>");
     if ($sheettype eq 'classcalc') {
-        $r->print('<td><input type="submit" value="Generate Spreadsheet" />'.
+        $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",
+                                                      'Spreadsheet Help').
+                  '</td>');
+    }
+    if ($allowed_to_edit) {
+        $r->print('<td>'.
+                  &Apache::loncommon::help_open_topic("Spreadsheet_Editing",
+                                                      'Editing Help').
                   '</td>');
     }
-#    if ($allowed_to_view) {
-#        $r->print('<td>'.
-#                  &Apache::loncommon::help_open_topic("Spreadsheet_About",
-#                                                      'Spreadsheet Help').
-#                  '</td>');
-#    }
-#    if ($allowed_to_edit) {
-#        $r->print('<td>'.
-#                  &Apache::loncommon::help_open_topic("Spreadsheet_Editing",
-#                                                      'Editing Help').
-#                  '</td>');
-#    }
     $r->print('</tr></table>');
     #
     # Keep track of the filename