--- loncom/interface/spreadsheet/lonspreadsheet.pm 2003/10/11 14:04:54 1.27 +++ loncom/interface/spreadsheet/lonspreadsheet.pm 2008/12/11 14:55:20 1.52 @@ -1,5 +1,5 @@ # -# $Id: lonspreadsheet.pm,v 1.27 2003/10/11 14:04:54 www Exp $ +# $Id: lonspreadsheet.pm,v 1.52 2008/12/11 14:55:20 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -72,8 +72,8 @@ use HTML::Entities(); sub textfield { my ($title,$name,$value)=@_; - return "\n

$title:
". - ''; + return "\n

$title:
". + ''; } sub hiddenfield { @@ -83,7 +83,7 @@ sub hiddenfield { sub selectbox { my ($title,$name,$value,%options)=@_; - my $selout="\n

$title:
".''; foreach (sort keys(%options)) { $selout.='

'.&mt('Cell').' '.$env{'form.cell'}.' = 
'. + '
'.$env{'form.newformula'}."
\n"; } else { - $message .= &mt('Deleted contents of cell').' '.$ENV{'form.cell'}.'.'; + $message .= &mt('Deleted contents of cell').' '.$env{'form.cell'}.'.'; } } ## @@ -139,11 +140,11 @@ sub file_dialogs { if ($spreadsheet->is_default()) { $filename = 'Default'; } - my $save_dialog = ''. + my $save_dialog = ''. ' '. ''. - ''; + ''; my $makedefault_dialog = ''; # @@ -153,16 +154,16 @@ sub file_dialogs { my $load_dialog = < - + - $link + $link   '. - ''); - } + $r->print(''. + ''); if ($allowed_to_view) { $r->print(''. &Apache::loncommon::help_open_topic("Spreadsheet_About", @@ -491,7 +549,7 @@ END # Keep track of the number of times we have been called, sort of. $r->print(&hiddenfield('not_first_run','whatever')); # - if (exists($ENV{'form.not_first_run'}) || $sheettype ne 'classcalc') { + if (exists($env{'form.not_first_run'}) || $sheettype ne 'classcalc') { $r->print($spreadsheet->get_html_title()); if ($allowed_to_view || $allowed_to_edit) { $r->print($spreadsheet->parent_link()); @@ -499,7 +557,8 @@ END $r->rflush(); $spreadsheet->display($r); } - $r->print(''); + $r->print(''.&Apache::loncommon::end_page()); + $spreadsheet->clear_package(); return OK; }