--- loncom/interface/spreadsheet/lonspreadsheet.pm	2021/12/14 12:59:21	1.61.6.3
+++ loncom/interface/spreadsheet/lonspreadsheet.pm	2013/01/08 15:48:51	1.62
@@ -1,5 +1,5 @@
 #
-# $Id: lonspreadsheet.pm,v 1.61.6.3 2021/12/14 12:59:21 raeburn Exp $
+# $Id: lonspreadsheet.pm,v 1.62 2013/01/08 15:48:51 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -241,29 +241,6 @@ sub handler {
     }
 
     #
-    # Check if display of course gradebook is blocked
-    #
-
-    if ($env{'request.course.id'}) {
-        my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-        my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-        my $clientip = &Apache::lonnet::get_requestor_ip($r);
-        my ($blocked,$blocktext) =
-            &Apache::loncommon::blocking_status('grades',$clientip,$cnum,$cdom);
-        if ($blocked) {
-            my $checkrole = "cm./$cdom/$cnum";
-            if ($env{'request.course.sec'} ne '') {
-                $checkrole .= "/$env{'request.course.sec'}";
-            }
-            unless ((&Apache::lonnet::allowed('evb',undef,undef,$checkrole)) &&
-                    ($env{'request.role'} !~ m{^st\./$cdom/$cnum})) {
-                &Apache::lonquickgrades::grades_blocked($r,$blocktext,'spreadsheet');
-                return OK;
-            }
-        }
-    }
-
-    #
     # Do not allow users without vgr or mgr priv to continue unless 
     # grading type is set to spreadsheet. 
     #
@@ -368,10 +345,10 @@ sub handler {
     ##
     my $js;
     if ($allowed_to_edit) {
-	my %lt=&Apache::lonlocal::texthash(
+	my %lt=(
 		'ce' => 'Cell',
-		'ac' => 'Save',
-		'dc' => 'Cancel'
+		'ac' => 'Accept',
+		'dc' => 'Discard Changes'
 	);
         my $extra_javascript = 
             &Apache::loncommon::browser_and_searcher_javascript();
@@ -400,14 +377,14 @@ sub handler {
         // cellformula may contain less-than and greater-than symbols, so
         // we need to escape them?  
         edit_text +='$cell_edit_start';
-        edit_text += '<form name="editwinform" action="">';
+        edit_text += '<form name="editwinform">';
         edit_text += '<center><h3>$lt{'ce'} '+cellname+'</h3>';
         edit_text += '<textarea id="LC_newformula" name="newformula" ';
         edit_text += ' cols="60" rows="12"; wrap="off" style="width:100%">';
 	edit_text += cellformula+'</textarea>';
         edit_text += '<div id="LC_aftertextarea"><br />';
         edit_text += '<input type="button" name="accept" value="$lt{'ac'}"';
-        edit_text += ' onclick=\\\'javascript:';
+        edit_text += ' onClick=\\\'javascript:';
         edit_text += 'opener.document.sheet.cell.value=';
         edit_text +=     '"'+cellname+'";';
         edit_text += 'opener.document.sheet.newformula.value=';
@@ -417,7 +394,7 @@ sub handler {
         edit_text += '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
         edit_text += '<input type="button" name="abort" ';
         edit_text +=     'value="$lt{'dc'}"';
-        edit_text += ' onclick="javascript:self.close()" />';
+        edit_text += ' onClick="javascript:self.close()" />';
         edit_text += '</center></div></form>$cell_edit_end';
 
         if (editwin != null && !(editwin.closed) ) {
@@ -441,9 +418,12 @@ ENDSCRIPT
           bug   => 'Spreadsheet'});
     $r->print(&Apache::loncommon::start_page('Grades Spreadsheet',$js).
               &Apache::lonhtmlcommon::breadcrumbs('Spreadsheet',
-						  'Spreadsheet_About').
-              &Apache::lonhtmlcommon::coursepreflink(&mt('Grade display settings'),
-                                                     'grading'));
+						  'Spreadsheet_About'));
+
+    #
+    # Tabs
+    # 
+    &Apache::lonquickgrades::startGradeScreen($r,'spreadsheet');
 
     #
     # Open the form
@@ -555,11 +535,14 @@ ENDSCRIPT
                   '</td>'.
                   '<td valign="center">'.$html."</td></tr></table>\n");
         if ($action_message ne '') {
-            $r->print(
-                &Apache::loncommon::confirmwrapper(
-                    &mt('Last Action:')
-                   .$action_message)
-            );
+            $r->print(<<END);
+<table>
+<tr><td valign="top"><b>Last Action:</b></td>
+    <td>&nbsp;</td>
+    <td>$action_message</td>
+</tr>
+</table>
+END
         }
         $r->rflush();
     } else {
@@ -601,6 +584,7 @@ ENDSCRIPT
         $spreadsheet->display($r);
     }
     $r->print('</form>');
+    &Apache::lonquickgrades::endGradeScreen($r);
     $r->print(&Apache::loncommon::end_page());
     $spreadsheet->clear_package();
     return OK;