--- loncom/interface/spreadsheet/lonspreadsheet.pm	2003/05/27 19:17:07	1.5
+++ loncom/interface/spreadsheet/lonspreadsheet.pm	2003/05/29 13:39:38	1.8
@@ -1,5 +1,5 @@
 #
-# $Id: lonspreadsheet.pm,v 1.5 2003/05/27 19:17:07 matthew Exp $
+# $Id: lonspreadsheet.pm,v 1.8 2003/05/29 13:39:38 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -58,7 +58,6 @@ use Apache::classcalc();
 use Apache::studentcalc();
 use Apache::assesscalc();
 use Apache::Constants qw(:common :http);
-use Apache::lonmenu();
 use Apache::lonnet;
 use Apache::lonhtmlcommon;
 use HTML::Entities();
@@ -127,7 +126,7 @@ sub file_dialogs {
     ##
     ## Create the save and load dialogs
     my $filename = $spreadsheet->filename();
-    $filename = '' if ($filename =~ /^default\.$sheettype/i);
+    $filename = 'Default' if ($filename =~ /^default\.$sheettype/i);
     $filename =~ s/_$sheettype$//;
     my $save_dialog = '<nobr>'.
         '<input type="submit" name="save" value="Save as" /> '.
@@ -148,16 +147,23 @@ sub file_dialogs {
     </td></tr>
 <tr><td>&nbsp;</td><td>
     <select name="fileselect" onchange="document.sheet.loadfilename.value=document.sheet.fileselect.value" >
-    <option name="Default">Default</option>
 END
+    my $default_filename_set = 0;
     foreach my $sheetfilename ($spreadsheet->othersheets()) {
         $sheetfilename =~ s/_$sheettype$//;
         $load_dialog .= '    <option name="'.$sheetfilename.'"';
         if ($filename eq $sheetfilename) {
             $load_dialog .= ' selected';
+            $default_filename_set = 1;
         }
         $load_dialog .= '>'.$sheetfilename."</option>\n";
     }
+    if ($default_filename_set) {
+        $load_dialog .= '<option name="Default">Default</option>'."\n";
+    } else {
+        $load_dialog .= '<option name="Default" selected >Default</option>'.
+            "\n";
+    }
     $load_dialog .= "</td><td>&nbsp;</td></tr>\n</table>\n";
         #
     $result .=<<END;
@@ -313,8 +319,7 @@ ENDSCRIPT
               '<form action="'.$r->uri.'" name="sheet" method="post">');
     $r->print(&hiddenfield('sname'  ,$ENV{'form.sname'}).
               &hiddenfield('sdomain',$ENV{'form.sdomain'}).
-              &hiddenfield('usymb'  ,$ENV{'form.usymb'}).
-              &Apache::lonmenu::regflush());
+              &hiddenfield('usymb'  ,$ENV{'form.usymb'}));
     $r->rflush();
     ##
     ## Determine the filename to use
@@ -324,6 +329,7 @@ ENDSCRIPT
         #
         if (exists($ENV{'form.load'}) && exists($ENV{'form.loadfilename'})) {
             $filename = $ENV{'form.loadfilename'};
+            $ENV{'form.workcopy'} = 'no';
         }
     }
     ##
@@ -345,6 +351,7 @@ ENDSCRIPT
         # error error - run in circles, scream and shout
         return;
     }
+    $spreadsheet->initialize();
     #
     # Output selector
     $r->print('<input type="submit" value="Update Display" /><br />');