--- loncom/interface/spreadsheet/lonspreadsheet.pm	2011/10/09 00:28:03	1.55.6.1
+++ loncom/interface/spreadsheet/lonspreadsheet.pm	2013/01/08 15:48:51	1.62
@@ -1,5 +1,5 @@
 #
-# $Id: lonspreadsheet.pm,v 1.55.6.1 2011/10/09 00:28:03 raeburn Exp $
+# $Id: lonspreadsheet.pm,v 1.62 2013/01/08 15:48:51 bisitz 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();
 
 ##
@@ -203,16 +204,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) {
@@ -251,7 +242,7 @@ sub handler {
 
     #
     # Do not allow users without vgr or mgr priv to continue unless 
-    # grading type is set to spreadsheet.
+    # grading type is set to spreadsheet. 
     #
 
     if ((!$allowed_to_view) && (!$allowed_to_edit)) {
@@ -425,15 +416,18 @@ ENDSCRIPT
           text  => 'Spreadsheet',
           faq   => 134,
           bug   => 'Spreadsheet'});
-    my $settingslink = &Apache::lonhtmlcommon::coursepreflink(&mt('Grade display settings'),
-                                                              'grading');
-    &Apache::lonhtmlcommon::add_breadcrumb_tool('advtools',$settingslink);
     $r->print(&Apache::loncommon::start_page('Grades Spreadsheet',$js).
               &Apache::lonhtmlcommon::breadcrumbs('Spreadsheet',
 						  'Spreadsheet_About'));
+
     #
-    # Open the form
+    # Tabs
+    # 
+    &Apache::lonquickgrades::startGradeScreen($r,'spreadsheet');
+
     #
+    # Open the form
+    # 
     if ($warning) {
         $r->print('<p class="LC_info">'.$warning.'</p>');
     }
@@ -459,7 +453,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');
@@ -564,13 +558,13 @@ END
     if ($allowed_to_view) {
         $r->print('<td>'.
                   &Apache::loncommon::help_open_topic("Spreadsheet_About",
-                                                      'Spreadsheet Help').
+                                                      &mt('Spreadsheet Help')).
                   '</td>');
     }
     if ($allowed_to_edit) {
         $r->print('<td>'.
                   &Apache::loncommon::help_open_topic("Spreadsheet_Editing",
-                                                      'Editing Help').
+                                                      &mt('Editing Help')).
                   '</td>');
     }
     $r->print('</tr></table>');
@@ -579,7 +573,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());
@@ -589,7 +583,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;
 }