--- loncom/interface/spreadsheet/lonspreadsheet.pm	2003/05/27 19:17:07	1.5
+++ loncom/interface/spreadsheet/lonspreadsheet.pm	2003/06/18 15:32:37	1.10
@@ -1,5 +1,5 @@
 #
-# $Id: lonspreadsheet.pm,v 1.5 2003/05/27 19:17:07 matthew Exp $
+# $Id: lonspreadsheet.pm,v 1.10 2003/06/18 15:32:37 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,34 +126,36 @@ sub file_dialogs {
     ##
     ## Create the save and load dialogs
     my $filename = $spreadsheet->filename();
-    $filename = '' if ($filename =~ /^default\.$sheettype/i);
-    $filename =~ s/_$sheettype$//;
+    my $truefilename = $filename;
+    if ($spreadsheet->is_default()) {
+        $filename = 'Default';
+    }
     my $save_dialog = '<nobr>'.
         '<input type="submit" name="save" value="Save as" /> '.
         '<input type="text" name="savefilename" size="30" value="'.
-        $filename.'" />'.
+        $truefilename.'" />'.
         '</nobr>';
     my $makedefault_dialog = '<input type="submit" name="makedefault" '.
         'value="Make This Sheet the Default"/>';
     #
     my $link = '<a href="javascript:openbrowser'.
-        "('sheet','loadfilename','spreadsheet')\">Browse</a>";
+        "('sheet','loadfilename','spreadsheet')\">Select Spreadsheet File</a>";
     my $load_dialog = <<END;
 <table bgcolor="$bgcolor">
 <tr><td><input type="submit" name="load" value="Load" /></td>
     <td><nobr>
-        <input type="text" name="loadfilename" size="25" value="$filename" />
+        <input type="text" name="loadfilename" size="20" value="$filename" />
         $link</nobr>
     </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";
     }
@@ -313,8 +314,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 +324,7 @@ ENDSCRIPT
         #
         if (exists($ENV{'form.load'}) && exists($ENV{'form.loadfilename'})) {
             $filename = $ENV{'form.loadfilename'};
+            $ENV{'form.workcopy'} = 'no';
         }
     }
     ##
@@ -345,12 +346,15 @@ ENDSCRIPT
         # error error - run in circles, scream and shout
         return;
     }
+    $spreadsheet->initialize();
     #
     # Output selector
-    $r->print('<input type="submit" value="Update Display" /><br />');
     ##
     ## Editing/loading/saving
     if ($allowed_to_edit) {
+        if ($ENV{'form.makedefault'}) {
+            $spreadsheet->make_default();
+        }
         $r->print('<table><tr><td>'.$spreadsheet->html_header().'</td>'.
                   '<td valign="bottom">'.
                   &file_dialogs($spreadsheet)."</td></tr></table>\n");
@@ -360,6 +364,10 @@ ENDSCRIPT
                   "</td></tr></table>\n");
     }
     #
+    if (! exists($ENV{'form.not_first_run'}) && $sheettype eq 'classcalc') {
+        $r->print('<input type="submit" value="Generate Spreadsheet" /><br />');
+    }
+    #
     # Keep track of the filename
     $r->print(&hiddenfield('filename',$filename));
     #
@@ -372,8 +380,6 @@ ENDSCRIPT
             $r->print($spreadsheet->parent_link());
         }
         $spreadsheet->display($r);
-    } else {
-        $r->print("<h2>Make your selections and bonk the 'update display' button</h2>");
     }
     $r->print('</form></body></html>');
     return OK;