--- loncom/interface/spreadsheet/lonspreadsheet.pm	2003/06/16 13:51:46	1.9
+++ loncom/interface/spreadsheet/lonspreadsheet.pm	2003/06/18 15:32:37	1.10
@@ -1,5 +1,5 @@
 #
-# $Id: lonspreadsheet.pm,v 1.9 2003/06/16 13:51:46 www Exp $
+# $Id: lonspreadsheet.pm,v 1.10 2003/06/18 15:32:37 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -126,12 +126,14 @@ sub file_dialogs {
     ##
     ## Create the save and load dialogs
     my $filename = $spreadsheet->filename();
-    $filename = 'Default' 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"/>';
@@ -142,7 +144,7 @@ sub file_dialogs {
 <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>
@@ -150,7 +152,6 @@ sub file_dialogs {
 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';
@@ -158,12 +159,6 @@ END
         }
         $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;
@@ -354,10 +349,12 @@ ENDSCRIPT
     $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");
@@ -367,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));
     #
@@ -379,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;