--- loncom/interface/spreadsheet/lonspreadsheet.pm 2012/05/10 20:20:07 1.61.6.1
+++ loncom/interface/spreadsheet/lonspreadsheet.pm 2013/07/15 14:33:06 1.64
@@ -1,5 +1,5 @@
#
-# $Id: lonspreadsheet.pm,v 1.61.6.1 2012/05/10 20:20:07 raeburn Exp $
+# $Id: lonspreadsheet.pm,v 1.64 2013/07/15 14:33:06 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -345,10 +345,10 @@ sub handler {
##
my $js;
if ($allowed_to_edit) {
- my %lt=(
+ my %lt=&Apache::lonlocal::texthash(
'ce' => 'Cell',
- 'ac' => 'Accept',
- 'dc' => 'Discard Changes'
+ 'ac' => 'Save',
+ 'dc' => 'Cancel'
);
my $extra_javascript =
&Apache::loncommon::browser_and_searcher_javascript();
@@ -384,7 +384,7 @@ sub handler {
edit_text += cellformula+'';
edit_text += '
';
edit_text += '';
+ edit_text += ' onclick="javascript:self.close()" />';
edit_text += '
$cell_edit_end';
if (editwin != null && !(editwin.closed) ) {
@@ -418,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
@@ -532,14 +535,11 @@ ENDSCRIPT
''.
''.$html." | \n");
if ($action_message ne '') {
- $r->print(<
-Last Action: |
- |
- $action_message |
-
-
-END
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &mt('Last Action:')
+ .$action_message)
+ );
}
$r->rflush();
} else {
@@ -555,13 +555,13 @@ END
if ($allowed_to_view) {
$r->print(''.
&Apache::loncommon::help_open_topic("Spreadsheet_About",
- 'Spreadsheet Help').
+ &mt('Spreadsheet Help')).
' | ');
}
if ($allowed_to_edit) {
$r->print(''.
&Apache::loncommon::help_open_topic("Spreadsheet_Editing",
- 'Editing Help').
+ &mt('Editing Help')).
' | ');
}
$r->print('');
@@ -581,6 +581,7 @@ END
$spreadsheet->display($r);
}
$r->print('');
+ &Apache::lonquickgrades::endGradeScreen($r);
$r->print(&Apache::loncommon::end_page());
$spreadsheet->clear_package();
return OK;