--- loncom/interface/spreadsheet/lonspreadsheet.pm	2009/04/22 17:19:14	1.53
+++ loncom/interface/spreadsheet/lonspreadsheet.pm	2010/12/03 21:33:56	1.58
@@ -1,5 +1,5 @@
 #
-# $Id: lonspreadsheet.pm,v 1.53 2009/04/22 17:19:14 bisitz Exp $
+# $Id: lonspreadsheet.pm,v 1.58 2010/12/03 21:33:56 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -64,6 +64,7 @@ use Apache::lonnet;
 use Apache::lonhtmlcommon;
 use Apache::lonlocal;
 use Apache::loncoursedata();
+use Apache::lonquickgrades();
 use HTML::Entities();
 
 ##
@@ -86,7 +87,7 @@ sub selectbox {
     my $selout="\n<p><b>$title:</b><br />".'<select name="'.$name.'">';
     foreach (sort keys(%options)) {
         $selout.='<option value="'.$_.'"';
-        if ($_ eq $value) { $selout.=' selected'; }
+        if ($_ eq $value) { $selout.=' selected="selected"'; }
         $selout.='>'.&mt($options{$_}).'</option>';
     }
     return $selout.'</select>';
@@ -146,7 +147,7 @@ sub file_dialogs {
         $truefilename.'" />'.
         '</span>';
     my $makedefault_dialog = '<input type="submit" name="makedefault" '.
-        'value="'.&mt('Save as & Make This Sheet the Default').'"/>';
+        'value="'.&mt('Save as &amp; Make This Sheet the Default').'"/>';
     #
     my $link = '<a href="javascript:openbrowser'.
         "('sheet','loadfilename','spreadsheet')\">".&mt('Select Spreadsheet File')."</a>";
@@ -165,17 +166,18 @@ END
     foreach my $sheetfilename ($spreadsheet->othersheets()) {
         $load_dialog .= '    <option value="'.$sheetfilename.'"';
         if ($filename eq $sheetfilename) {
-            $load_dialog .= ' selected';
+            $load_dialog .= ' selected="selected"';
             $default_filename_set = 1;
         }
         $load_dialog .= '>'.$sheetfilename."</option>\n";
     }
     $load_dialog .= "</select>\n</td><td>&nbsp;</td></tr>\n</table>\n";
         #
+    my $headline = &mt('File Dialogs');
     $result .=<<END;
 <!-- 
     <fieldset title="File Dialogs" >
-    <legend>File Dialogs</legend>
+    <legend>$headline</legend>
   -->
 <!-- load / save dialogs -->
 <table cellspacing="2">
@@ -199,16 +201,6 @@ END
 sub handler {
     my $r=shift;
     #
-    # Overload checking
-    #
-    # Check this server
-    my $loaderror=&Apache::lonnet::overloaderror($r);
-    if ($loaderror) { return $loaderror; }
-    # Check the course homeserver
-    $loaderror= &Apache::lonnet::overloaderror($r,
-                      $env{'course.'.$env{'request.course.id'}.'.home'});
-#    if ($loaderror) { return $loaderror; } 
-    #
     # HTML Header
     #
     if ($r->header_only) {
@@ -404,8 +396,17 @@ ENDSCRIPT
           bug   => 'Spreadsheet'});
     $r->print(&Apache::loncommon::start_page('Grades Spreadsheet',$js).
               &Apache::lonhtmlcommon::breadcrumbs('Spreadsheet',
-						  'Spreadsheet_About').
-              '<form action="'.$r->uri.'" name="sheet" method="post">');
+						  'Spreadsheet_About'));
+
+    #
+    # Tabs
+    # 
+    &Apache::lonquickgrades::startGradeScreen($r,'spreadsheet');
+
+    #
+    # Open the form
+    # 
+    $r->print('<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'}));
@@ -427,7 +428,7 @@ ENDSCRIPT
         if (exists($env{'form.recalc'})) {
             &Apache::loncoursedata::delete_caches($env{'requres.course.id'});
         }
-        if ($env{'form.recalc'} eq 'ilovewastingtime') {
+        if ($env{'form.recalc'} eq 'expireallsheets') {
             &Apache::lonnet::logthis('spreadsheet expired: entire course');
             # expire ALL spreadsheets
             &Apache::lonnet::expirespread('','','studentcalc');
@@ -547,7 +548,7 @@ END
     $r->print(&hiddenfield('filename',$filename));
     #
     # Keep track of the number of times we have been called, sort of.
-    $r->print(&hiddenfield('not_first_run','whatever'));
+    $r->print(&hiddenfield('not_first_run','1'));
     #
     if (exists($env{'form.not_first_run'}) || $sheettype ne 'classcalc') {
         $r->print($spreadsheet->get_html_title());
@@ -557,7 +558,9 @@ END
         $r->rflush();
         $spreadsheet->display($r);
     }
-    $r->print('</form>'.&Apache::loncommon::end_page());
+    $r->print('</form>');
+    &Apache::lonquickgrades::endGradeScreen($r);
+    $r->print(&Apache::loncommon::end_page());
     $spreadsheet->clear_package();
     return OK;
 }